Merge master into ocs_api, fix conflicts.

.gitignore

@@ -4,6 +4,7 @@ owncloud
 config/config.php
 config/mount.php
 apps/inc.php
+3rdparty
 
 # just sane ignores
 .*.sw[po]

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "3rdparty/Symfony/Component/Routing"]
-	path = 3rdparty/Symfony/Component/Routing
-	url = git://github.com/symfony/Routing.git

.htaccess

@@ -1,3 +1,11 @@
+<IfModule mod_fcgid.c>
+<IfModule mod_setenvif.c>
+<IfModule mod_headers.c>
+SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
+RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
+</IfModule>
+</IfModule>
+</IfModule>
 ErrorDocument 403 /core/templates/403.php
 ErrorDocument 404 /core/templates/404.php
 <IfModule mod_php5.c>
@@ -12,6 +20,7 @@ php_value memory_limit 512M
 RewriteEngine on
 RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]
+RewriteRule ^.well-known/host-meta.json /public.php?service=host-meta-json [QSA,L]
 RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
 RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]	
 RewriteRule ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L]
@@ -19,4 +28,8 @@ RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L]
 RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
 RewriteRule ^remote/(.*) remote.php [QSA,L]
 </IfModule>
+<IfModule mod_mime.c>
+AddType image/svg+xml svg svgz
+AddEncoding gzip svgz
+</IfModule>
 Options -Indexes

README

@@ -4,6 +4,7 @@ A personal cloud which runs on your own server.
 http://ownCloud.org
 
 Installation instructions: http://owncloud.org/support
+Contribution Guidelines: http://owncloud.org/dev/contribute/
 
 Source code: https://github.com/owncloud
 Mailing list: https://mail.kde.org/mailman/listinfo/owncloud
@@ -16,4 +17,4 @@ Please submit translations via Transifex:
 https://www.transifex.com/projects/p/owncloud/
 
 For more detailed information about translations:
-http://owncloud.org/dev/translation/
+http://owncloud.org/dev/translation/

apps/files/admin.php

@@ -35,7 +35,7 @@ $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $post_max_size_possible = OCP\Util::computerFileSize(get_cfg_var('post_max_size'));
 $maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 $maxUploadFilesizePossible = OCP\Util::humanFileSize(min($upload_max_filesize_possible, $post_max_size_possible));
-if($_POST) {
+if($_POST && OC_Util::isCallRegistered()) {
 	if(isset($_POST['maxUploadSize'])) {
 		if(($setMaxSize = OC_Files::setUploadLimit(OCP\Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
 			$maxUploadFilesize = OCP\Util::humanFileSize($setMaxSize);
@@ -49,7 +49,8 @@ if($_POST) {
 		OCP\Config::setSystemValue('allowZipDownload', isset($_POST['allowZipDownload']));
 	}
 }
-$maxZipInputSize = OCP\Util::humanFileSize(OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB')));
+$maxZipInputSizeDefault = OCP\Util::computerFileSize('800 MB');
+$maxZipInputSize = OCP\Util::humanFileSize(OCP\Config::getSystemValue('maxZipInputSize', $maxZipInputSizeDefault));
 $allowZipDownload = intval(OCP\Config::getSystemValue('allowZipDownload', true));
 
 OCP\App::setActiveNavigationEntry( "files_administration" );

apps/files/ajax/autocomplete.php

@@ -44,7 +44,7 @@ if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
 				if(substr(strtolower($file), 0, $queryLen)==$query) {
 					$item=$base.$file;
 					if((!$dirOnly or OC_Filesystem::is_dir($item))) {
-						$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
+						$files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item);
 					}
 				}
 			}

apps/files/ajax/list.php

@@ -25,7 +25,7 @@ if($doBreadcrumb) {
 	}
 
 	$breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
-	$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
+	$breadcrumbNav->assign( "breadcrumb", $breadcrumb, false );
 
 	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
 }

apps/files/ajax/move.php

@@ -9,9 +9,14 @@ OCP\JSON::callCheck();
 // Get data
 $dir = stripslashes($_GET["dir"]);
 $file = stripslashes($_GET["file"]);
-$target = stripslashes(urldecode($_GET["target"]));
+$target = stripslashes(rawurldecode($_GET["target"]));
 
 
+if(OC_Filesystem::file_exists($target . '/' . $file)) {
+	OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" )));
+	exit;
+}
+
 if(OC_Files::move($dir, $file, $target, $file)) {
 	OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
 } else {

apps/files/ajax/newfile.php

@@ -65,6 +65,7 @@ if($source) {
 	$target=$dir.'/'.$filename;
 	$result=OC_Filesystem::file_put_contents($target, $sourceStream);
 	if($result) {
+		$target = OC_Filesystem::normalizePath($target);
 		$meta = OC_FileCache::get($target);
 		$mime=$meta['mimetype'];
 		$id = OC_FileCache::getId($target);

apps/files/ajax/timezone.php

@@ -1,5 +1,2 @@
 <?php
-	// FIXME: this should start a secure session if forcessl is enabled
+$_SESSION['timezone'] = $_GET['time'];
-	// see lib/base.php for an example
-	//session_start();
-	$_SESSION['timezone'] = $_GET['time'];

apps/files/ajax/upload.php

@@ -10,22 +10,24 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
 if (!isset($_FILES['files'])) {
-	OCP\JSON::error(array("data" => array( "message" => "No file was uploaded. Unknown error" )));
+	OCP\JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' )));
 	exit();
 }
 foreach ($_FILES['files']['error'] as $error) {
 	if ($error != 0) {
 		$l=OC_L10N::get('files');
 		$errors = array(
-			UPLOAD_ERR_OK=>$l->t("There is no error, the file uploaded with success"),
+			UPLOAD_ERR_OK=>$l->t('There is no error, the file uploaded with success'),
-			UPLOAD_ERR_INI_SIZE=>$l->t("The uploaded file exceeds the upload_max_filesize directive in php.ini").ini_get('upload_max_filesize'),
+			UPLOAD_ERR_INI_SIZE=>$l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
-			UPLOAD_ERR_FORM_SIZE=>$l->t("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"),
+										.ini_get('upload_max_filesize'),
-			UPLOAD_ERR_PARTIAL=>$l->t("The uploaded file was only partially uploaded"),
+			UPLOAD_ERR_FORM_SIZE=>$l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified'
-			UPLOAD_ERR_NO_FILE=>$l->t("No file was uploaded"),
+										.' in the HTML form'),
-			UPLOAD_ERR_NO_TMP_DIR=>$l->t("Missing a temporary folder"),
+			UPLOAD_ERR_PARTIAL=>$l->t('The uploaded file was only partially uploaded'),
+			UPLOAD_ERR_NO_FILE=>$l->t('No file was uploaded'),
+			UPLOAD_ERR_NO_TMP_DIR=>$l->t('Missing a temporary folder'),
 			UPLOAD_ERR_CANT_WRITE=>$l->t('Failed to write to disk'),
 		);
-		OCP\JSON::error(array("data" => array( "message" => $errors[$error] )));
+		OCP\JSON::error(array('data' => array( 'message' => $errors[$error] )));
 		exit();
 	}
 }
@@ -38,8 +40,8 @@ $totalSize=0;
 foreach($files['size'] as $size) {
 	$totalSize+=$size;
 }
-if($totalSize>OC_Filesystem::free_space($dir)){
+if($totalSize>OC_Filesystem::free_space($dir)) {
-	OCP\JSON::error(array("data" => array( "message" => "Not enough space available" )));
+	OCP\JSON::error(array('data' => array( 'message' => 'Not enough space available' )));
 	exit();
 }
 
@@ -47,11 +49,17 @@ $result=array();
 if(strpos($dir, '..') === false) {
 	$fileCount=count($files['name']);
 	for($i=0;$i<$fileCount;$i++) {
-        $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
+		$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
+		// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
+		$target = OC_Filesystem::normalizePath($target);
 		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
 			$meta = OC_FileCache::get($target);
 			$id = OC_FileCache::getId($target);
-			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target));
+			$result[]=array( 'status' => 'success',
+				'mime'=>$meta['mimetype'],
+				'size'=>$meta['size'],
+				'id'=>$id,
+				'name'=>basename($target));
 		}
 	}
 	OCP\JSON::encodedPrint($result);
@@ -60,4 +68,4 @@ if(strpos($dir, '..') === false) {
 	$error='invalid dir';
 }
 
-OCP\JSON::error(array('data' => array('error' => $error, "file" => $fileName)));
+OCP\JSON::error(array('data' => array('error' => $error, 'file' => $fileName)));

apps/files/appinfo/app.php

@@ -3,6 +3,10 @@ $l=OC_L10N::get('files');
 
 OCP\App::registerAdmin('files', 'admin');
 
-OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
+OCP\App::addNavigationEntry( array( "id" => "files_index",
+									"order" => 0,
+									"href" => OCP\Util::linkTo( "files", "index.php" ),
+									"icon" => OCP\Util::imagePath( "core", "places/home.svg" ),
+									"name" => $l->t("Files") ));
 
 OC_Search::registerProvider('OC_Search_Provider_File');

apps/files/appinfo/filesync.php

@@ -20,23 +20,23 @@
  * The final URL will look like http://.../remote.php/filesync/oc_chunked/path/to/file
  */
 
-// only need filesystem apps
+// load needed apps
-$RUNTIME_APPTYPES=array('filesystem','authentication');
+$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
 OC_App::loadApps($RUNTIME_APPTYPES);
 if(!OC_User::isLoggedIn()) {
-        if(!isset($_SERVER['PHP_AUTH_USER'])) {
+	if(!isset($_SERVER['PHP_AUTH_USER'])) {
-                header('WWW-Authenticate: Basic realm="ownCloud Server"');
+		header('WWW-Authenticate: Basic realm="ownCloud Server"');
-                header('HTTP/1.0 401 Unauthorized');
+		header('HTTP/1.0 401 Unauthorized');
-                echo 'Valid credentials must be supplied';
+		echo 'Valid credentials must be supplied';
-                exit();
+		exit();
-        } else {
+	} else {
-                if(!OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
+		if(!OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
-                        exit();
+			exit();
-                }
+		}
-        }
+	}
 }
 
-list($type,$file) = explode('/', substr($path_info,1+strlen($service)+1), 2);
+list($type, $file) = explode('/', substr($path_info, 1+strlen($service)+1), 2);
 
 if ($type != 'oc_chunked') {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);

apps/files/appinfo/remote.php

@@ -22,10 +22,13 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// only need filesystem apps
+// load needed apps
-$RUNTIME_APPTYPES=array('filesystem','authentication');
+$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
+
 OC_App::loadApps($RUNTIME_APPTYPES);
 
+OC_Util::obEnd();
+
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
 $lockBackend = new OC_Connector_Sabre_Locks();
@@ -38,9 +41,10 @@ $server = new Sabre_DAV_Server($publicDir);
 $server->setBaseUri($baseuri);
 
 // Load plugins
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
+$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
 
 // And off we go!
 $server->exec();

apps/files/appinfo/routes.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$this->create('download', 'download{file}')
+	->requirements(array('file' => '.*'))
+	->actionInclude('files/download.php');

apps/files/appinfo/update.php

@@ -3,12 +3,15 @@
 // fix webdav properties,add namespace in front of the property, update for OC4.5
 $installedVersion=OCP\Config::getAppValue('files', 'installed_version');
 if (version_compare($installedVersion, '1.1.6', '<')) {
-	$query = OC_DB::prepare( "SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`" );
+	$query = OC_DB::prepare( 'SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`' );
 	$result = $query->execute();
-	while( $row = $result->fetchRow()){
+	$updateQuery = OC_DB::prepare('UPDATE `*PREFIX*properties`'
-		if ( $row["propertyname"][0] != '{' ) {
+								.' SET `propertyname` = ?'
-			$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?' );
+								.' WHERE `userid` = ?'
-			$query->execute( array( '{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"] ));
+								.' AND `propertypath` = ?');
+	while( $row = $result->fetchRow()) {
+		if ( $row['propertyname'][0] != '{' ) {
+			$updateQuery->execute(array('{DAV:}' + $row['propertyname'], $row['userid'], $row['propertypath']));
 		}
 	}
 }
@@ -36,10 +39,11 @@ foreach($filesToRemove as $file) {
 	if(!file_exists($filepath)) {
 		continue;
 	}
-    $success = OCP\Files::rmdirr($filepath);
+	$success = OCP\Files::rmdirr($filepath);
-    if($success === false) {
+	if($success === false) {
 		//probably not sufficient privileges, give up and give a message.
-		OCP\Util::writeLog('files','Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
+		OCP\Util::writeLog('files', 'Could not clean /files/ directory.'
+				.' Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
 		break;
-    }
+	}
 }

apps/files/css/files.css

@@ -4,40 +4,55 @@
 
 /* FILE MENU */
 .actions { padding:.3em; float:left; height:2em; }
-.actions input, .actions button, .actions .button { margin:0; }
+.actions input, .actions button, .actions .button { margin:0; float:left; }
-#file_menu { right:0; position:absolute; top:0; }
+
-#file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
+#new {
-.file_upload_form, #file_newfolder_form { display:inline; float: left; margin-left:0; }
+	height:17px;  margin:0 0 0 1em; z-index:1010; float:left;
-#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
+}
-.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:block; float:left; padding-left:0; overflow:hidden; position:relative; margin:0; margin-left:2px; }
-.file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
-#new { background-color:#5bb75b; float:left; 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-right-radius:0; border-bottom:none; }
-#new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; }
+#new>a { padding:.5em 1.2em .3em; }
-#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 {
-#new>ul>li { margin:.3em; padding-left:2em; background-repeat:no-repeat; cursor:pointer; padding-bottom:0.1em }
+	display:none; position:fixed; min-width:7em; z-index:-1;
+	padding:.5em; margin-top:0.075em; margin-left:-.5em; 
+	text-align:left;
+	background:#f8f8f8; border:1px solid #ddd;
+}
+#new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em;
+		background-repeat:no-repeat; cursor:pointer; }
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#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; z-index:10; }
 
-#file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; }
+#upload { 
-.file_upload_start, .file_upload_filename { font-size:1em; }
+	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
-#file_newfolder_submit, #file_upload_submit { width:3em; }
+}
+#upload a {
+	position:relative; display:block; width:100%; height:27px;
+	cursor:pointer; z-index:1000;
+	background-image:url('%webroot%/core/img/actions/upload.svg');
+	background-repeat:no-repeat;
+	background-position:7px 6px;
+}
 .file_upload_target { display:none; }
+.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
+#file_upload_start { 
+	left:0; top:0; width:28px; height:27px; padding:0;
+	font-size:1em;
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
+	z-index:-1; position:relative; cursor:pointer; overflow:hidden;
+}
 
-.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;}
+#uploadprogresswrapper { position:absolute; right:13.5em; top:0em; }
-.file_upload_filename { background-color:#5bb75b; z-index:100; cursor:pointer; background-image: url('%webroot%/core/img/actions/upload-white.svg'); background-repeat: no-repeat; background-position: center; height: 2.29em; width: 2.5em; }
+#uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
-
-#upload { position:absolute; right:13.5em; top:0em; }
-#upload #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
-
-.file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
 
 /* FILE TABLE */
-#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
+
+#emptyfolder {
+	position:absolute;
+	margin:10em 0 0 10em;
+	font-size:1.5em; font-weight:bold;
+	color:#888; text-shadow:#fff 0 1px 0;
+}
 table { position:relative; top:37px; width:100%; }
 tbody tr { background-color:#fff; height:2.5em; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
@@ -60,13 +75,13 @@ table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
 table td.filename input.filename { width:100%; cursor:text; }
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
 table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
-// TODO fix usability bug (accidental file/folder selection)
+/* TODO fix usability bug (accidental file/folder selection) */
-table td.filename .nametext { width:40em; overflow:hidden; text-overflow:ellipsis; }
+table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; }
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
 table thead.fixed { height:2em; }
-#fileList tr td.filename>input[type=checkbox]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
+#fileList tr td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
 #fileList tr td.filename>input[type="checkbox"]:hover:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
 #fileList tr td.filename>input[type="checkbox"]:checked:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 #fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; position:relative; }
@@ -87,4 +102,4 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
-div.crumb a{ padding: 0.9em 0 0.7em 0; }
+div.crumb a{ padding:0.9em 0 0.7em 0; }

apps/files/download.php

@@ -32,7 +32,7 @@ $filename = $_GET["file"];
 if(!OC_Filesystem::file_exists($filename)) {
 	header("HTTP/1.0 404 Not Found");
 	$tmpl = new OCP\Template( '', '404', 'guest' );
-	$tmpl->assign('file',$filename);
+	$tmpl->assign('file', $filename);
 	$tmpl->printPage();
 	exit;
 }
@@ -44,5 +44,5 @@ header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 OCP\Response::disableCaching();
 header('Content-Length: '.OC_Filesystem::filesize($filename));
 
-@ob_end_clean();
+OC_Util::obEnd();
 OC_Filesystem::readfile( $filename );

apps/files/index.php

@@ -31,12 +31,13 @@ OCP\Util::addscript( 'files', 'jquery.fileupload' );
 OCP\Util::addscript( 'files', 'files' );
 OCP\Util::addscript( 'files', 'filelist' );
 OCP\Util::addscript( 'files', 'fileactions' );
+OCP\Util::addscript( 'files', 'keyboardshortcuts' ); 
 if(!isset($_SESSION['timezone'])) {
 	OCP\Util::addscript( 'files', 'timezone' );
 }
 OCP\App::setActiveNavigationEntry( 'files_index' );
 // Load the files
-$dir = isset( $_GET['dir'] ) ? urldecode(stripslashes($_GET['dir'])) : '';
+$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if(!OC_Filesystem::is_dir($dir.'/')) {
 	header('Location: '.$_SERVER['SCRIPT_NAME'].'');
@@ -67,7 +68,7 @@ $breadcrumb = array();
 $pathtohere = '';
 foreach( explode( '/', $dir ) as $i ) {
 	if( $i != '' ) {
-		$pathtohere .= '/'.str_replace('+','%20', urlencode($i));
+		$pathtohere .= '/'.$i;
 		$breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
 	}
 }
@@ -75,29 +76,29 @@ foreach( explode( '/', $dir ) as $i ) {
 // make breadcrumb und filelist markup
 $list = new OCP\Template( 'files', 'part.list', '' );
 $list->assign( 'files', $files, false );
-$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=', false);
+$list->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false);
 $list->assign( 'downloadURL', OCP\Util::linkTo('files', 'download.php').'?file=', false);
 $breadcrumbNav = new OCP\Template( 'files', 'part.breadcrumb', '' );
 $breadcrumbNav->assign( 'breadcrumb', $breadcrumb, false );
-$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'&dir=', false);
+$breadcrumbNav->assign( 'baseURL', OCP\Util::linkTo('files', 'index.php').'?dir=', false);
 
 $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
 $freeSpace=OC_Filesystem::free_space($dir);
-$freeSpace=max($freeSpace,0);
+$freeSpace=max($freeSpace, 0);
 $maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
 
-$permissions = OCP\Share::PERMISSION_READ;
+$permissions = OCP\PERMISSION_READ;
 if (OC_Filesystem::isUpdatable($dir.'/')) {
-	$permissions |= OCP\Share::PERMISSION_UPDATE;
+	$permissions |= OCP\PERMISSION_UPDATE;
 }
 if (OC_Filesystem::isDeletable($dir.'/')) {
-	$permissions |= OCP\Share::PERMISSION_DELETE;
+	$permissions |= OCP\PERMISSION_DELETE;
 }
 if (OC_Filesystem::isSharable($dir.'/')) {
-	$permissions |= OCP\Share::PERMISSION_SHARE;
+	$permissions |= OCP\PERMISSION_SHARE;
 }
 
 $tmpl = new OCP\Template( 'files', 'index', 'user' );

apps/files/js/fileactions.js

@@ -1,191 +1,192 @@
-var FileActions={
+var FileActions = {
-	actions:{},
+	actions: {},
-	defaults:{},
+	defaults: {},
-	icons:{},
+	icons: {},
-	currentFile:null,
+	currentFile: null,
-	register:function(mime,name,permissions,icon,action){
+	register: function (mime, name, permissions, icon, action) {
-		if(!FileActions.actions[mime]){
+		if (!FileActions.actions[mime]) {
-			FileActions.actions[mime]={};
+			FileActions.actions[mime] = {};
 		}
 		if (!FileActions.actions[mime][name]) {
 			FileActions.actions[mime][name] = {};
 		}
 		FileActions.actions[mime][name]['action'] = action;
 		FileActions.actions[mime][name]['permissions'] = permissions;
-		FileActions.icons[name]=icon;
+		FileActions.icons[name] = icon;
 	},
-	setDefault:function(mime,name){
+	setDefault: function (mime, name) {
-		FileActions.defaults[mime]=name;
+		FileActions.defaults[mime] = name;
 	},
-	get:function(mime,type,permissions){
+	get: function (mime, type, permissions) {
-		var actions={};
+		var actions = {};
-		if(FileActions.actions.all){
+		if (FileActions.actions.all) {
-			actions=$.extend( actions, FileActions.actions.all );
+			actions = $.extend(actions, FileActions.actions.all);
 		}
-		if(mime){
+		if (mime) {
-			if(FileActions.actions[mime]){
+			if (FileActions.actions[mime]) {
-				actions=$.extend( actions, FileActions.actions[mime] );
+				actions = $.extend(actions, FileActions.actions[mime]);
 			}
-			var mimePart=mime.substr(0,mime.indexOf('/'));
+			var mimePart = mime.substr(0, mime.indexOf('/'));
-			if(FileActions.actions[mimePart]){
+			if (FileActions.actions[mimePart]) {
-				actions=$.extend( actions, FileActions.actions[mimePart] );
+				actions = $.extend(actions, FileActions.actions[mimePart]);
 			}
 		}
-		if(type){//type is 'dir' or 'file'
+		if (type) {//type is 'dir' or 'file'
-			if(FileActions.actions[type]){
+			if (FileActions.actions[type]) {
-				actions=$.extend( actions, FileActions.actions[type] );
+				actions = $.extend(actions, FileActions.actions[type]);
 			}
 		}
 		var filteredActions = {};
-		$.each(actions, function(name, action) {
+		$.each(actions, function (name, action) {
 			if (action.permissions & permissions) {
 				filteredActions[name] = action.action;
 			}
 		});
 		return filteredActions;
 	},
-	getDefault:function(mime,type,permissions){
+	getDefault: function (mime, type, permissions) {
-		if(mime){
+		if (mime) {
-			var mimePart=mime.substr(0,mime.indexOf('/'));
+			var mimePart = mime.substr(0, mime.indexOf('/'));
 		}
-		var name=false;
+		var name = false;
-		if(mime && FileActions.defaults[mime]){
+		if (mime && FileActions.defaults[mime]) {
-			name=FileActions.defaults[mime];
+			name = FileActions.defaults[mime];
-		}else if(mime && FileActions.defaults[mimePart]){
+		} else if (mime && FileActions.defaults[mimePart]) {
-			name=FileActions.defaults[mimePart];
+			name = FileActions.defaults[mimePart];
-		}else if(type && FileActions.defaults[type]){
+		} else if (type && FileActions.defaults[type]) {
-			name=FileActions.defaults[type];
+			name = FileActions.defaults[type];
-		}else{
+		} else {
-			name=FileActions.defaults.all;
+			name = FileActions.defaults.all;
 		}
-		var actions=this.get(mime,type,permissions);
+		var actions = this.get(mime, type, permissions);
 		return actions[name];
 	},
-	display:function(parent){
+	display: function (parent) {
-		FileActions.currentFile=parent;
+		FileActions.currentFile = parent;
-		$('#fileList span.fileactions, #fileList td.date a.action').remove();
+		var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
-		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
+		var file = FileActions.getCurrentFile();
-		var file=FileActions.getCurrentFile();
+		if ($('tr').filterAttr('data-file', file).data('renaming')) {
-		if($('tr').filterAttr('data-file',file).data('renaming')){
 			return;
 		}
 		parent.children('a.name').append('<span class="fileactions" />');
-		var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
+		var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
-		for(name in actions){
+		
+		var actionHandler = function (event) {
+			event.stopPropagation();
+			event.preventDefault();
+
+			FileActions.currentFile = event.data.elem;
+			var file = FileActions.getCurrentFile();
+			
+			event.data.actionFunc(file);
+		};
+		
+		$.each(actions, function (name, action) {
 			// NOTE: Temporary fix to prevent rename action in root of Shared directory
-			if (name == 'Rename' && $('#dir').val() == '/Shared') {
+			if (name === 'Rename' && $('#dir').val() === '/Shared') {
-				continue;
+				return true;
 			}
-			if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
+			
-				var img=FileActions.icons[name];
+			if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
-				if(img.call){
+				var img = FileActions.icons[name];
-					img=img(file);
+				if (img.call) {
+					img = img(file);
 				}
-				var html='<a href="#" class="action" style="display:none">';
+				var html = '<a href="#" class="action" data-action="'+name+'">';
-				if(img) { html+='<img src="'+img+'"/> '; }
+				if (img) {
-				html += t('files', name) +'</a>';
+					html += '<img class ="svg" src="' + img + '" /> ';
-				var element=$(html);
+				}
-				element.data('action',name);
+				html += t('files', name) + '</a>';
-				element.click(function(event){
+				
-					event.stopPropagation();
+				var element = $(html);
-					event.preventDefault();
+				element.data('action', name);
-					var action=actions[$(this).data('action')];
+				//alert(element);
-					var currentFile=FileActions.getCurrentFile();
+				element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler);
-					FileActions.hide();
-					action(currentFile);
-				});
-				element.hide();
 				parent.find('a.name>span.fileactions').append(element);
 			}
-		}
+			
-		if(actions['Delete']){
+		});
-			var img=FileActions.icons['Delete'];
+		
-			if(img.call){
+		if (actions['Delete']) {
-				img=img(file);
+			var img = FileActions.icons['Delete'];
+			if (img.call) {
+				img = img(file);
 			}
 			// NOTE: Temporary fix to allow unsharing of files in root of Shared folder
 			if ($('#dir').val() == '/Shared') {
-				var html = '<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" style="display:none" />';
+				var html = '<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" />';
 			} else {
-				var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
+				var html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" />';
 			}
-			var element=$(html);
+			var element = $(html);
-			if(img){
+			if (img) {
-				element.append($('<img src="'+img+'"/>'));
+				element.append($('<img class ="svg" src="' + img + '"/>'));
 			}
-			element.data('action','Delete');
+			element.data('action', actions['Delete']);
-			element.click(function(event){
+			element.on('click',{a:null, elem:parent, actionFunc:actions['Delete']},actionHandler);
-				event.stopPropagation();
-				event.preventDefault();
-				var action=actions[$(this).data('action')];
-				var currentFile=FileActions.getCurrentFile();
-				FileActions.hide();
-				action(currentFile);
-			});
-			element.hide();
 			parent.parent().children().last().append(element);
 		}
-		$('#fileList .action').css('-o-transition-property','none');//temporarly disable
-		$('#fileList .action').fadeIn(200,function(){
-			$('#fileList .action').css('-o-transition-property','opacity');
-		});
-		return false;
 	},
-	hide:function(){
+	getCurrentFile: function () {
-		$('#fileList span.fileactions, #fileList td.date a.action').fadeOut(200,function(){
-			$(this).remove();
-		});
-	},
-	getCurrentFile:function(){
 		return FileActions.currentFile.parent().attr('data-file');
 	},
-	getCurrentMimeType:function(){
+	getCurrentMimeType: function () {
 		return FileActions.currentFile.parent().attr('data-mime');
 	},
-	getCurrentType:function(){
+	getCurrentType: function () {
 		return FileActions.currentFile.parent().attr('data-type');
 	},
-	getCurrentPermissions:function() {
+	getCurrentPermissions: function () {
 		return FileActions.currentFile.parent().data('permissions');
 	}
 };
 
-$(document).ready(function(){
+$(document).ready(function () {
-	if($('#allowZipDownload').val() == 1){
+	if ($('#allowZipDownload').val() == 1) {
 		var downloadScope = 'all';
 	} else {
 		var downloadScope = 'file';
 	}
-	FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download');},function(filename){
+	FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
-		window.location=OC.filePath('files', 'ajax', 'download.php') + '&files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val());
+		return OC.imagePath('core', 'actions/download');
+	}, function (filename) {
+		window.location = OC.filePath('files', 'ajax', 'download.php') + '?files=' + encodeURIComponent(filename) + '&dir=' + encodeURIComponent($('#dir').val());
+	});
+
+	$('#fileList tr').each(function(){
+		FileActions.display($(this).children('td.filename'));
 	});
 });
 
-FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete');},function(filename){
+FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
-	if(Files.cancelUpload(filename)) {
+	return OC.imagePath('core', 'actions/delete');
-		if(filename.substr){
+}, function (filename) {
-			filename=[filename];
+	if (Files.cancelUpload(filename)) {
+		if (filename.substr) {
+			filename = [filename];
 		}
-		$.each(filename,function(index,file){
+		$.each(filename, function (index, file) {
-			var filename = $('tr').filterAttr('data-file',file);
+			var filename = $('tr').filterAttr('data-file', file);
 			filename.hide();
 			filename.find('input[type="checkbox"]').removeAttr('checked');
 			filename.removeClass('selected');
 		});
 		procesSelection();
-	}else{
+	} else {
 		FileList.do_delete(filename);
 	}
 	$('.tipsy').remove();
 });
 
 // t('files', 'Rename')
-FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){
+FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
+	return OC.imagePath('core', 'actions/rename');
+}, function (filename) {
 	FileList.rename(filename);
 });
 
-FileActions.register('dir','Open', OC.PERMISSION_READ, '', function(filename){
+FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
-	window.location=OC.linkTo('files', 'index.php') + '&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
+	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent($('#dir').val()).replace(/%2F/g, '/') + '/' + encodeURIComponent(filename);
 });
 
-FileActions.setDefault('dir','Open');
+FileActions.setDefault('dir', 'Open');

apps/files/js/filelist.js

@@ -32,21 +32,23 @@ var FileList={
 		html+='<td class="date"><span class="modified" title="'+formatDate(lastModified)+'" style="color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')">'+relative_modified_date(lastModified.getTime() / 1000)+'</span></td>';
 		html+='</tr>';
 		FileList.insertElement(name,'file',$(html).attr('data-file',name));
+		var row = $('tr').filterAttr('data-file',name);
 		if(loading){
-			$('tr').filterAttr('data-file',name).data('loading',true);
+			row.data('loading',true);
 		}else{
-			$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
+			row.find('td.filename').draggable(dragOptions);
 		}
 		if (hidden) {
-			$('tr').filterAttr('data-file', name).hide();
+			row.hide();
 		}
+		FileActions.display(row.find('td.filename'));
 	},
 	addDir:function(name,size,lastModified,hidden){
 		var html, td, link_elem, sizeColor, lastModifiedTime, modifiedColor;
 		html = $('<tr></tr>').attr({ "data-type": "dir", "data-size": size, "data-file": name, "data-permissions": $('#permissions').val()});
 		td = $('<td></td>').attr({"class": "filename", "style": 'background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')' });
 		td.append('<input type="checkbox" />');
-		link_elem = $('<a></a>').attr({ "class": "name", "href": OC.linkTo('files', 'index.php')+"&dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
+		link_elem = $('<a></a>').attr({ "class": "name", "href": OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
 		link_elem.append($('<span></span>').addClass('nametext').text(name));
 		link_elem.append($('<span></span>').attr({'class': 'uploadtext', 'currentUploads': 0}));
 		td.append(link_elem);
@@ -66,11 +68,13 @@ var FileList={
 		td.append($('<span></span>').attr({ "class": "modified", "title": formatDate(lastModified), "style": 'color:rgb('+modifiedColor+','+modifiedColor+','+modifiedColor+')' }).text( relative_modified_date(lastModified.getTime() / 1000) ));
 		html.append(td);
 		FileList.insertElement(name,'dir',html);
-		$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
+		var row = $('tr').filterAttr('data-file',name);
-		$('tr').filterAttr('data-file',name).find('td.filename').droppable(folderDropOptions);
+		row.find('td.filename').draggable(dragOptions);
+		row.find('td.filename').droppable(folderDropOptions);
 		if (hidden) {
-			$('tr').filterAttr('data-file', name).hide();
+			row.hide();
 		}
+		FileActions.display(row.find('td.filename'));
 	},
 	refresh:function(data) {
 		var result = jQuery.parseJSON(data.responseText);
@@ -85,7 +89,6 @@ var FileList={
 		$('tr').filterAttr('data-file',name).remove();
 		if($('tr[data-file]').length==0){
 			$('#emptyfolder').show();
-			$('.file_upload_filename').addClass('highlight');
 		}
 	},
 	insertElement:function(name,type,element){
@@ -114,7 +117,6 @@ var FileList={
 			$('#fileList').append(element);
 		}
 		$('#emptyfolder').hide();
-		$('.file_upload_filename').removeClass('highlight');
 	},
 	loadingDone:function(name, id){
 		var mime, tr=$('tr').filterAttr('data-file',name);
@@ -137,7 +139,7 @@ var FileList={
 		tr=$('tr').filterAttr('data-file',name);
 		tr.data('renaming',true);
 		td=tr.children('td.filename');
-		input=$('<input class="filename"></input>').val(name);
+		input=$('<input class="filename"/>').val(name);
 		form=$('<form></form>');
 		form.append(input);
 		td.children('a.name').hide();
@@ -147,6 +149,9 @@ var FileList={
 			event.stopPropagation();
 			event.preventDefault();
 			var newname=input.val();
+			if (Files.containsInvalidCharacters(newname)) {
+				return false;
+			}
 			if (newname != name) {
 				if (FileList.checkName(name, newname, false)) {
 					newname = name;
@@ -156,11 +161,11 @@ var FileList={
 							OC.dialogs.alert(result.data.message, 'Error moving file');
 							newname = name;
 						}
-						tr.data('renaming',false);
 					});
 
 				}
 			}
+			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)));
@@ -375,4 +380,7 @@ $(document).ready(function(){
 			FileList.lastAction();
 		}
 	});
+	$(window).unload(function (){
+		$(window).trigger('beforeunload');
+	});
 });

apps/files/js/files.js

@@ -25,18 +25,27 @@ Files={
 			delete uploadingFiles[index];
 		});
 		procesSelection();
+	},
+	containsInvalidCharacters:function (name) {
+		var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
+		for (var i = 0; i < invalid_characters.length; i++) {
+			if (name.indexOf(invalid_characters[i]) != -1) {
+				$('#notification').text(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
+				$('#notification').fadeIn();
+				return true;
+			}
+		}
+		$('#notification').fadeOut();
+		return false;
 	}
 };
 $(document).ready(function() {
+	Files.bindKeyboardShortcuts(document, jQuery); 
 	$('#fileList tr').each(function(){
 		//little hack to set unescape filenames in attribute
 		$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
 	});
 
-	if($('tr[data-file]').length==0){
-		$('.file_upload_filename').addClass('highlight');
-	}
-
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
@@ -57,19 +66,11 @@ $(document).ready(function() {
 	}
 
 	// Triggers invisible file input
-	$('.file_upload_button_wrapper').live('click', function() {
+	$('#upload a').live('click', function() {
-		$(this).parent().children('.file_upload_start').trigger('click');
+		$(this).parent().children('#file_upload_start').trigger('click');
 		return false;
 	});
 
-	// Sets the file-action buttons behaviour :
-	$('tr').live('mouseenter',function(event) {
-		FileActions.display($(this).children('td.filename'));
-	});
-	$('tr').live('mouseleave',function(event) {
-		FileActions.hide();
-	});
-
 	var lastChecked;
 
 	// Sets the file link behaviour :
@@ -167,12 +168,6 @@ $(document).ready(function() {
 		procesSelection();
 	});
 
-	$('#file_newfolder_name').click(function(){
-		if($('#file_newfolder_name').val() == 'New Folder'){
-			$('#file_newfolder_name').val('');
-		}
-	});
-
 	$('.download').click('click',function(event) {
 		var files=getSelectedFiles('name').join(';');
 		var dir=$('#dir').val()||'/';
@@ -200,16 +195,16 @@ $(document).ready(function() {
 			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
 	});
 
-	if ( document.getElementById("data-upload-form") ) {
+	if ( document.getElementById('data-upload-form') ) {
 	$(function() {
-		$('.file_upload_start').fileupload({
+		$('#file_upload_start').fileupload({
 			dropZone: $('#content'), // restrict dropZone to content div
 			add: function(e, data) {
 				var files = data.files;
 				var totalSize=0;
 				if(files){
 					for(var i=0;i<files.length;i++){
-						if(files[i].size ==0 || files[i].type== '')
+						if(files[i].size ==0 && files[i].type== '')
 						{
 							OC.dialogs.alert(t('files', 'Unable to upload your file as it is a directory or has 0 bytes'), t('files', 'Upload Error'));
 							return;
@@ -217,7 +212,7 @@ $(document).ready(function() {
 						totalSize+=files[i].size;
 						if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file
 							FileList.finishDelete(function(){
-								$('.file_upload_start').change();
+								$('#file_upload_start').change();
 							});
 							return;
 						}
@@ -227,13 +222,21 @@ $(document).ready(function() {
 					$( '#uploadsize-message' ).dialog({
 						modal: true,
 						buttons: {
-							Close: function() {
+							Close: {
-								$( this ).dialog( 'close' );
+								text:t('files', 'Close'),
+								click:function() {
+									$( this ).dialog( 'close' );
+								}
 							}
 						}
 					});
 				}else{
-					var date=new Date();
+                    var dropTarget = $(e.originalEvent.target).closest('tr');
+                    if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
+                        var dirName = dropTarget.attr('data-file')
+                    }
+
+                    var date=new Date();
 					if(files){
 						for(var i=0;i<files.length;i++){
 							if(files[i].size>0){
@@ -282,11 +285,14 @@ $(document).ready(function() {
 							var fileName = files[i].name
 							var dropTarget = $(e.originalEvent.target).closest('tr');
 							if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder
-								var dirName = dropTarget.attr('data-file');
+								var dirName = dropTarget.attr('data-file')
-								var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i],
+								var jqXHR =  $('#file_upload_start').fileupload('send', {files: files[i],
 										formData: function(form) {
 											var formArray = form.serializeArray();
-											formArray[1]['value'] = dirName;
+                                            // array index 0 contains the max files size
+                                            // array index 1 contains the request token
+                                            // array index 2 contains the directory
+											formArray[2]['value'] = dirName;
 											return formArray;
 										}}).success(function(result, textStatus, jqXHR) {
 											var response;
@@ -296,7 +302,13 @@ $(document).ready(function() {
 												$('#notification').fadeIn();
 											}
 											var file=response[0];
+                                            // TODO: this doesn't work if the file name has been changed server side
 											delete uploadingFiles[dirName][file.name];
+                                            if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
+                                                delete uploadingFiles[dirName];
+                                            }
+
+                                            var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
 											var currentUploads = parseInt(uploadtext.attr('currentUploads'));
 											currentUploads -= 1;
 											uploadtext.attr('currentUploads', currentUploads);
@@ -335,7 +347,7 @@ $(document).ready(function() {
 								}
 								uploadingFiles[dirName][fileName] = jqXHR;
 							} else {
-								var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i]})
+								var jqXHR =  $('#file_upload_start').fileupload('send', {files: files[i]})
 										.success(function(result, textStatus, jqXHR) {
 											var response;
 											response=jQuery.parseJSON(result);
@@ -432,7 +444,7 @@ $(document).ready(function() {
 
 	//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
 	if(navigator.userAgent.search(/konqueror/i)==-1){
-		$('.file_upload_start').attr('multiple','multiple')
+		$('#file_upload_start').attr('multiple','multiple')
 	}
 
 	//if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
@@ -460,7 +472,6 @@ $(document).ready(function() {
 	$(window).click(function(){
 		$('#new>ul').hide();
 		$('#new').removeClass('active');
-		$('button.file_upload_filename').removeClass('active');
 		$('#new li').each(function(i,element){
 			if($(element).children('p').length==0){
 				$(element).children('input').remove();
@@ -474,7 +485,6 @@ $(document).ready(function() {
 	$('#new>a').click(function(){
 		$('#new>ul').toggle();
 		$('#new').toggleClass('active');
-		$('button.file_upload_filename').toggleClass('active');
 	});
 	$('#new li').click(function(){
 		if($(this).children('p').length==0){
@@ -496,8 +506,10 @@ $(document).ready(function() {
 		$(this).append(input);
 		input.focus();
 		input.change(function(){
-			if(type != 'web' && $(this).val().indexOf('/')!=-1){
+			if (type != 'web' && Files.containsInvalidCharacters($(this).val())) {
-				$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
+				return;
+			} else if( type == 'folder' && $('#dir').val() == '/' && $(this).val() == 'Shared') {
+				$('#notification').text(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud'));
 				$('#notification').fadeIn();
 				return;
 			}
@@ -707,7 +719,7 @@ function updateBreadcrumb(breadcrumbHtml) {
 
 //options for file drag/dropp
 var dragOptions={
-	distance: 20, revert: 'invalid', opacity: 0.7,
+	distance: 20, revert: 'invalid', opacity: 0.7, helper: 'clone',
 	stop: function(event, ui) {
 		$('#fileList tr td.filename').addClass('ui-draggable');
 	}
@@ -730,7 +742,7 @@ var folderDropOptions={
 }
 var crumbDropOptions={
 	drop: function( event, ui ) {
-		var file=ui.draggable.text().trim();
+		var file=ui.draggable.parent().data('file');
 		var target=$(this).data('dir');
 		var dir=$('#dir').val();
 		while(dir.substr(0,1)=='/'){//remove extra leading /'s
@@ -826,7 +838,7 @@ function getSelectedFiles(property){
 			name:$(element).attr('data-file'),
 			mime:$(element).data('mime'),
 			type:$(element).data('type'),
-			size:$(element).data('size'),
+			size:$(element).data('size')
 		};
 		if(property){
 			files.push(file[property]);
@@ -837,32 +849,11 @@ function getSelectedFiles(property){
 	return files;
 }
 
-function relative_modified_date(timestamp) {
-	var timediff = Math.round((new Date()).getTime() / 1000) - timestamp;
-	var diffminutes = Math.round(timediff/60);
-	var diffhours = Math.round(diffminutes/60);
-	var diffdays = Math.round(diffhours/24);
-	var diffmonths = Math.round(diffdays/31);
-	if(timediff < 60) { return t('files','seconds ago'); }
-	else if(timediff < 120) { return t('files','1 minute ago'); }
-	else if(timediff < 3600) { return t('files','{minutes} minutes ago',{minutes: diffminutes}); }
-	//else if($timediff < 7200) { return '1 hour ago'; }
-	//else if($timediff < 86400) { return $diffhours.' hours ago'; }
-	else if(timediff < 86400) { return t('files','today'); }
-	else if(timediff < 172800) { return t('files','yesterday'); }
-	else if(timediff < 2678400) { return t('files','{days} days ago',{days: diffdays}); }
-	else if(timediff < 5184000) { return t('files','last month'); }
-	//else if($timediff < 31556926) { return $diffmonths.' months ago'; }
-	else if(timediff < 31556926) { return t('files','months ago'); }
-	else if(timediff < 63113852) { return t('files','last year'); }
-	else { return t('files','years ago'); }
-}
-
 function getMimeIcon(mime, ready){
 	if(getMimeIcon.cache[mime]){
 		ready(getMimeIcon.cache[mime]);
 	}else{
-		$.get( OC.filePath('files','ajax','mimeicon.php')+'?mime='+mime, function(path){
+		$.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path){
 			getMimeIcon.cache[mime]=path;
 			ready(getMimeIcon.cache[mime]);
 		});

apps/files/js/keyboardshortcuts.js

@@ -0,0 +1,165 @@
+/**
+ * Copyright (c) 2012 Erik Sargent <esthepiking at gmail dot com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+/*****************************
+ * Keyboard shortcuts for Files app
+ * ctrl/cmd+n: new folder
+ * ctrl/cmd+shift+n: new file
+ * esc (while new file context menu is open): close menu
+ * up/down: select file/folder
+ * enter: open file/folder
+ * delete/backspace: delete file/folder
+ *****************************/
+var Files = Files || {};
+(function(Files) {
+	var keys = [];
+	var keyCodes = {
+		shift: 16,
+		n: 78,
+		cmdFirefox: 224,
+		cmdOpera: 17,
+		leftCmdWebKit: 91,
+		rightCmdWebKit: 93,
+		ctrl: 17,
+		esc: 27,
+		downArrow: 40,
+		upArrow: 38,
+		enter: 13,
+		del: 46
+	};
+
+	function removeA(arr) {
+		var what, a = arguments,
+			L = a.length,
+			ax;
+		while (L > 1 && arr.length) {
+			what = a[--L];
+			while ((ax = arr.indexOf(what)) !== -1) {
+				arr.splice(ax, 1);
+			}
+		}
+		return arr;
+	}
+
+	function newFile() {
+		$("#new").addClass("active");
+		$(".popup.popupTop").toggle(true);
+		$('#new li[data-type="file"]').trigger('click');
+		removeA(keys, keyCodes.n);
+	}
+
+	function newFolder() {
+		$("#new").addClass("active");
+		$(".popup.popupTop").toggle(true);
+		$('#new li[data-type="folder"]').trigger('click');
+		removeA(keys, keyCodes.n);
+	}
+
+	function esc() {
+		$("#controls").trigger('click');
+	}
+
+	function down() {
+		var select = -1;
+		$("#fileList tr").each(function(index) {
+			if ($(this).hasClass("mouseOver")) {
+				select = index + 1;
+				$(this).removeClass("mouseOver");
+			}
+		});
+		if (select === -1) {
+			$("#fileList tr:first").addClass("mouseOver");
+		} else {
+			$("#fileList tr").each(function(index) {
+				if (index === select) {
+					$(this).addClass("mouseOver");
+				}
+			});
+		}
+	}
+
+	function up() {
+		var select = -1;
+		$("#fileList tr").each(function(index) {
+			if ($(this).hasClass("mouseOver")) {
+				select = index - 1;
+				$(this).removeClass("mouseOver");
+			}
+		});
+		if (select === -1) {
+			$("#fileList tr:last").addClass("mouseOver");
+		} else {
+			$("#fileList tr").each(function(index) {
+				if (index === select) {
+					$(this).addClass("mouseOver");
+				}
+			});
+		}
+	}
+
+	function enter() {
+		$("#fileList tr").each(function(index) {
+			if ($(this).hasClass("mouseOver")) {
+				$(this).removeClass("mouseOver");
+				$(this).find("span.nametext").trigger('click');
+			}
+		});
+	}
+
+	function del() {
+		$("#fileList tr").each(function(index) {
+			if ($(this).hasClass("mouseOver")) {
+				$(this).removeClass("mouseOver");
+				$(this).find("a.action.delete").trigger('click');
+			}
+		});
+	}
+
+	function rename() {
+		$("#fileList tr").each(function(index) {
+			if ($(this).hasClass("mouseOver")) {
+				$(this).removeClass("mouseOver");
+				$(this).find("a[data-action='Rename']").trigger('click');
+			}
+		});
+	}
+	Files.bindKeyboardShortcuts = function(document, $) {
+		$(document).keydown(function(event) { //check for modifier keys
+			var preventDefault = false;
+			if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode);
+			if (
+			$.inArray(keyCodes.n, keys) !== -1 && ($.inArray(keyCodes.cmdFirefox, keys) !== -1 || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 || $.inArray(keyCodes.ctrl, keys) !== -1 || event.ctrlKey)) {
+				preventDefault = true; //new file/folder prevent browser from responding
+			}
+			if (preventDefault) {
+				event.preventDefault(); //Prevent web browser from responding
+				event.stopPropagation();
+				return false;
+			}
+		});
+		$(document).keyup(function(event) {
+			// do your event.keyCode checks in here
+			if (
+			$.inArray(keyCodes.n, keys) !== -1 && ($.inArray(keyCodes.cmdFirefox, keys) !== -1 || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 || $.inArray(keyCodes.ctrl, keys) !== -1 || event.ctrlKey)) {
+				if ($.inArray(keyCodes.shift, keys) !== -1) { //16=shift, New File
+					newFile();
+				} else { //New Folder
+					newFolder();
+				}
+			} else if ($("#new").hasClass("active") && $.inArray(keyCodes.esc, keys) !== -1) { //close new window
+				esc();
+			} else if ($.inArray(keyCodes.downArrow, keys) !== -1) { //select file
+				down();
+			} else if ($.inArray(keyCodes.upArrow, keys) !== -1) { //select file
+				up();
+			} else if (!$("#new").hasClass("active") && $.inArray(keyCodes.enter, keys) !== -1) { //open file
+				enter();
+			} else if (!$("#new").hasClass("active") && $.inArray(keyCodes.del, keys) !== -1) { //delete file
+				del();
+			}
+			removeA(keys, event.keyCode);
+		});
+	};
+})(Files);

apps/files/l10n/ar.php

@@ -1,16 +1,18 @@
 <?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" => "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML.",
 "The uploaded file was only partially uploaded" => "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط",
 "No file was uploaded" => "لم يتم ترفيع أي من الملفات",
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Files" => "الملفات",
+"Unshare" => "إلغاء مشاركة",
 "Delete" => "محذوف",
+"Close" => "إغلق",
 "Name" => "الاسم",
 "Size" => "حجم",
 "Modified" => "معدل",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
+"Save" => "حفظ",
 "New" => "جديد",
 "Text file" => "ملف",
 "Folder" => "مجلد",

apps/files/l10n/bg_BG.php

@@ -1,6 +1,5 @@
 <?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" => "Файлът който се опитвате да качите надвишава стойностите в MAX_FILE_SIZE в HTML формата.",
 "The uploaded file was only partially uploaded" => "Файлът е качен частично",
 "No file was uploaded" => "Фахлът не бе качен",
@@ -10,20 +9,18 @@
 "Delete" => "Изтриване",
 "Upload Error" => "Грешка при качване",
 "Upload cancelled." => "Качването е отменено.",
-"Invalid name, '/' is not allowed." => "Неправилно име – \"/\" не е позволено.",
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
 "Maximum upload size" => "Макс. размер за качване",
 "0 is unlimited" => "0 означава без ограничение",
+"Save" => "Запис",
 "New" => "Нов",
 "Text file" => "Текстов файл",
 "Folder" => "Папка",
-"From url" => "От url-адрес",
 "Upload" => "Качване",
 "Cancel upload" => "Отказване на качването",
 "Nothing in here. Upload something!" => "Няма нищо, качете нещо!",
-"Share" => "Споделяне",
 "Download" => "Изтегляне",
 "Upload too large" => "Файлът е прекалено голям",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",

apps/files/l10n/ca.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "El fitxer s'ha pujat correctament",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El fitxer de pujada excedeix la directiva upload_max_filesize establerta a php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML",
 "The uploaded file was only partially uploaded" => "El fitxer només s'ha pujat parcialment",
 "No file was uploaded" => "El fitxer no s'ha pujat",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
 "unshared {files}" => "no compartits {files}",
 "deleted {files}" => "eliminats {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
 "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",
 "Upload Error" => "Error en la pujada",
+"Close" => "Tanca",
 "Pending" => "Pendents",
 "1 file uploading" => "1 fitxer pujant",
 "{count} files uploading" => "{count} fitxers en pujada",
 "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 '/'.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "El nom de la carpeta no és vàlid. L'ús de \"Compartit\" està reservat per a OwnCloud",
 "{count} files scanned" => "{count} fitxers escannejats",
 "error while scanning" => "error durant l'escaneig",
 "Name" => "Nom",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} carpetes",
 "1 file" => "1 fitxer",
 "{count} files" => "{count} fitxers",
-"seconds ago" => "segons enrere",
-"1 minute ago" => "fa 1 minut",
-"{minutes} minutes ago" => "fa {minutes} minuts",
-"today" => "avui",
-"yesterday" => "ahir",
-"{days} days ago" => "fa {days} dies",
-"last month" => "el mes passat",
-"months ago" => "mesos enrere",
-"last year" => "l'any passat",
-"years ago" => "anys enrere",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
 "max. possible: " => "màxim possible:",
@@ -58,11 +50,10 @@
 "New" => "Nou",
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
-"From url" => "Des de la url",
+"From link" => "Des d'enllaç",
 "Upload" => "Puja",
 "Cancel upload" => "Cancel·la la pujada",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
-"Share" => "Comparteix",
 "Download" => "Baixa",
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",

apps/files/l10n/cs_CZ.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Odeslaný soubor přesáhl svou velikostí parametr upload_max_filesize v php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML",
 "The uploaded file was only partially uploaded" => "Soubor byl odeslán pouze částečně",
 "No file was uploaded" => "Žádný soubor nebyl odeslán",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
 "unshared {files}" => "sdílení zrušeno pro {files}",
 "deleted {files}" => "smazáno {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
 "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ů",
 "Upload Error" => "Chyba odesílání",
+"Close" => "Zavřít",
 "Pending" => "Čekající",
 "1 file uploading" => "odesílá se 1 soubor",
 "{count} files uploading" => "odesílám {count} souborů",
 "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",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Neplatný název složky. Použití názvu \"Shared\" je rezervováno pro interní úžití službou Owncloud.",
 "{count} files scanned" => "prozkoumáno {count} souborů",
 "error while scanning" => "chyba při prohledávání",
 "Name" => "Název",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} složky",
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
-"seconds ago" => "před pár sekundami",
-"1 minute ago" => "před 1 minutou",
-"{minutes} minutes ago" => "před {minutes} minutami",
-"today" => "dnes",
-"yesterday" => "včera",
-"{days} days ago" => "před {days} dny",
-"last month" => "minulý měsíc",
-"months ago" => "před pár měsíci",
-"last year" => "minulý rok",
-"years ago" => "před pár lety",
 "File handling" => "Zacházení se soubory",
 "Maximum upload size" => "Maximální velikost pro odesílání",
 "max. possible: " => "největší možná: ",
@@ -58,11 +50,10 @@
 "New" => "Nový",
 "Text file" => "Textový soubor",
 "Folder" => "Složka",
-"From url" => "Z url",
+"From link" => "Z odkazu",
 "Upload" => "Odeslat",
 "Cancel upload" => "Zrušit odesílání",
 "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
-"Share" => "Sdílet",
 "Download" => "Stáhnout",
 "Upload too large" => "Odeslaný soubor je příliš velký",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",

apps/files/l10n/da.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil overskrider upload_max_filesize direktivet i php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen",
 "The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
 "No file was uploaded" => "Ingen fil blev uploadet",
@@ -22,12 +21,12 @@
 "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",
 "Upload Error" => "Fejl ved upload",
+"Close" => "Luk",
 "Pending" => "Afventer",
 "1 file uploading" => "1 fil uploades",
 "{count} files uploading" => "{count} filer uploades",
 "Upload cancelled." => "Upload afbrudt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
-"Invalid name, '/' is not allowed." => "Ugyldigt navn, '/' er ikke tilladt.",
 "{count} files scanned" => "{count} filer skannet",
 "error while scanning" => "fejl under scanning",
 "Name" => "Navn",
@@ -37,16 +36,6 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minut siden",
-"{minutes} minutes ago" => "{minutes} minutter siden",
-"today" => "i dag",
-"yesterday" => "i går",
-"{days} days ago" => "{days} dage siden",
-"last month" => "sidste måned",
-"months ago" => "måneder siden",
-"last year" => "sidste år",
-"years ago" => "år siden",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
 "max. possible: " => "max. mulige: ",
@@ -58,11 +47,9 @@
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
-"From url" => "Fra URL",
 "Upload" => "Upload",
 "Cancel upload" => "Fortryd upload",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
-"Share" => "Del",
 "Download" => "Download",
 "Upload too large" => "Upload for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",

apps/files/l10n/de.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
 "The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
 "unshared {files}" => "Freigabe von {files} aufgehoben",
 "deleted {files}" => "{files} gelöscht",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
 "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" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
 "Upload Error" => "Fehler beim Upload",
+"Close" => "Schließen",
 "Pending" => "Ausstehend",
 "1 file uploading" => "Eine Datei wird hoch geladen",
 "{count} files uploading" => "{count} Dateien werden hochgeladen",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
-"Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
 "{count} files scanned" => "{count} Dateien wurden gescannt",
 "error while scanning" => "Fehler beim Scannen",
 "Name" => "Name",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
-"seconds ago" => "Vor wenigen Sekunden",
-"1 minute ago" => "vor einer Minute",
-"{minutes} minutes ago" => "Vor {minutes} Minuten",
-"today" => "Heute",
-"yesterday" => "Gestern",
-"{days} days ago" => "Vor {days} Tag(en)",
-"last month" => "Letzten Monat",
-"months ago" => "Monate her",
-"last year" => "Letztes Jahr",
-"years ago" => "Jahre her",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
 "max. possible: " => "maximal möglich:",
@@ -58,11 +50,10 @@
 "New" => "Neu",
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
-"From url" => "Von einer URL",
+"From link" => "Von einem Link",
 "Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
-"Share" => "Freigabe",
 "Download" => "Herunterladen",
 "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.",

apps/files/l10n/de_DE.php

@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
+"There is no error, the file uploaded with success" => "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
 "The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
-"Missing a temporary folder" => "Temporärer Ordner fehlt.",
+"Missing a temporary folder" => "Der temporäre Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr freigeben",
@@ -14,20 +14,22 @@
 "replace" => "ersetzen",
 "suggest name" => "Name vorschlagen",
 "cancel" => "abbrechen",
-"replaced {new_name}" => "{new_name} ersetzt",
+"replaced {new_name}" => "{new_name} wurde ersetzt",
 "undo" => "rückgängig machen",
-"replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
+"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
 "unshared {files}" => "Freigabe für {files} beendet",
 "deleted {files}" => "{files} gelöscht",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
 "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 entweder ein Verzeichnis oder 0 Bytes groß ist.",
 "Upload Error" => "Fehler beim Upload",
+"Close" => "Schließen",
 "Pending" => "Ausstehend",
-"1 file uploading" => "Eine Datei wird hoch geladen",
+"1 file uploading" => "1 Datei wird hochgeladen",
 "{count} files uploading" => "{count} Dateien wurden hochgeladen",
 "Upload cancelled." => "Upload 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.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-"Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
 "{count} files scanned" => "{count} Dateien wurden gescannt",
 "error while scanning" => "Fehler beim Scannen",
 "Name" => "Name",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
-"seconds ago" => "Vor wenigen Sekunden",
-"1 minute ago" => "vor einer Minute",
-"{minutes} minutes ago" => "vor {minutes} Minuten",
-"today" => "Heute",
-"yesterday" => "Gestern",
-"{days} days ago" => "vor {days} Tage(en)",
-"last month" => "Letzten Monat",
-"months ago" => "Monate her",
-"last year" => "Letztes Jahr",
-"years ago" => "Jahre her",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
 "max. possible: " => "maximal möglich:",
@@ -58,13 +50,12 @@
 "New" => "Neu",
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
-"From url" => "Von einer URL",
+"From link" => "Von einem Link",
 "Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
-"Share" => "Teilen",
 "Download" => "Herunterladen",
-"Upload too large" => "Upload zu groß",
+"Upload too large" => "Der Upload ist 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" => "Scanne"

apps/files/l10n/el.php

@@ -1,6 +1,6 @@
 <?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 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" => "Κανένα αρχείο δεν στάλθηκε",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
 "unshared {files}" => "μη διαμοιρασμένα {files}",
 "deleted {files}" => "διαγραμμένα {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
 "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" => "Σφάλμα Αποστολής",
+"Close" => "Κλείσιμο",
 "Pending" => "Εκκρεμεί",
 "1 file uploading" => "1 αρχείο ανεβαίνει",
 "{count} files uploading" => "{count} αρχεία ανεβαίνουν",
 "Upload cancelled." => "Η αποστολή ακυρώθηκε.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη.  Έξοδος από την σελίδα τώρα θα ακυρώσει την αποστολή.",
-"Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του \"Shared\" είναι δεσμευμένη από το Owncloud",
 "{count} files scanned" => "{count} αρχεία ανιχνεύτηκαν",
 "error while scanning" => "σφάλμα κατά την ανίχνευση",
 "Name" => "Όνομα",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} φάκελοι",
 "1 file" => "1 αρχείο",
 "{count} files" => "{count} αρχεία",
-"seconds ago" => "δευτερόλεπτα πριν",
-"1 minute ago" => "1 λεπτό πριν",
-"{minutes} minutes ago" => "{minutes} λεπτά πριν",
-"today" => "σήμερα",
-"yesterday" => "χτες",
-"{days} days ago" => "{days} ημέρες πριν",
-"last month" => "τελευταίο μήνα",
-"months ago" => "μήνες πριν",
-"last year" => "τελευταίο χρόνο",
-"years ago" => "χρόνια πριν",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
 "max. possible: " => "μέγιστο δυνατό:",
@@ -58,11 +50,10 @@
 "New" => "Νέο",
 "Text file" => "Αρχείο κειμένου",
 "Folder" => "Φάκελος",
-"From url" => "Από την διεύθυνση",
+"From link" => "Από σύνδεσμο",
 "Upload" => "Αποστολή",
 "Cancel upload" => "Ακύρωση αποστολής",
 "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
-"Share" => "Διαμοιρασμός",
 "Download" => "Λήψη",
 "Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν το διακομιστή.",

apps/files/l10n/eo.php

@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alŝutita superas laregulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
 "The uploaded file was only partially uploaded" => "La alŝutita dosiero nur parte alŝutiĝis",
 "No file was uploaded" => "Neniu dosiero estas alŝutita",
 "Missing a temporary folder" => "Mankas tempa dosierujo",
@@ -10,29 +10,35 @@
 "Unshare" => "Malkunhavigi",
 "Delete" => "Forigi",
 "Rename" => "Alinomigi",
+"{new_name} already exists" => "{new_name} jam ekzistas",
 "replace" => "anstataŭigi",
 "suggest name" => "sugesti nomon",
 "cancel" => "nuligi",
+"replaced {new_name}" => "anstataŭiĝis {new_name}",
 "undo" => "malfari",
+"replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
+"unshared {files}" => "malkunhaviĝis {files}",
+"deleted {files}" => "foriĝis {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
 "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",
+"Close" => "Fermi",
 "Pending" => "Traktotaj",
 "1 file uploading" => "1 dosiero estas alŝutata",
+"{count} files uploading" => "{count} dosieroj alŝutatas",
 "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.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nevalida nomo de dosierujo. Uzo de “Shared” rezervitas de Owncloud",
+"{count} files scanned" => "{count} dosieroj skaniĝis",
 "error while scanning" => "eraro dum skano",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
-"seconds ago" => "sekundoj antaŭe",
+"1 folder" => "1 dosierujo",
-"today" => "hodiaŭ",
+"{count} folders" => "{count} dosierujoj",
-"yesterday" => "hieraŭ",
+"1 file" => "1 dosiero",
-"last month" => "lastamonate",
+"{count} files" => "{count} dosierujoj",
-"months ago" => "monatoj antaŭe",
-"last year" => "lastajare",
-"years ago" => "jaroj antaŭe",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
 "max. possible: " => "maks. ebla: ",
@@ -44,11 +50,10 @@
 "New" => "Nova",
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
-"From url" => "El URL",
+"From link" => "El ligilo",
 "Upload" => "Alŝuti",
 "Cancel upload" => "Nuligi alŝuton",
 "Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
-"Share" => "Kunhavigi",
 "Download" => "Elŝuti",
 "Upload too large" => "Elŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",

apps/files/l10n/es.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "No se ha producido ningún error, el archivo se ha subido con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
 "The uploaded file was only partially uploaded" => "El archivo que intentas subir solo se subió parcialmente",
 "No file was uploaded" => "No se ha subido ningún archivo",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "unshared {files}" => "{files} descompartidos",
 "deleted {files}" => "{files} eliminados",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
 "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",
 "Upload Error" => "Error al subir el archivo",
+"Close" => "cerrrar",
 "Pending" => "Pendiente",
 "1 file uploading" => "subiendo 1 archivo",
 "{count} files uploading" => "Subiendo {count} archivos",
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
-"Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nombre de la carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud",
 "{count} files scanned" => "{count} archivos escaneados",
 "error while scanning" => "error escaneando",
 "Name" => "Nombre",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} carpetas",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
-"seconds ago" => "hace segundos",
-"1 minute ago" => "hace 1 minuto",
-"{minutes} minutes ago" => "hace {minutes} minutos",
-"today" => "hoy",
-"yesterday" => "ayer",
-"{days} days ago" => "hace {days} días",
-"last month" => "mes pasado",
-"months ago" => "hace meses",
-"last year" => "año pasado",
-"years ago" => "hace años",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
@@ -58,11 +50,10 @@
 "New" => "Nuevo",
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
-"From url" => "Desde la URL",
+"From link" => "Desde el enlace",
 "Upload" => "Subir",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
-"Share" => "Compartir",
 "Download" => "Descargar",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",

apps/files/l10n/es_AR.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "No se han producido errores, el archivo se ha subido con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo que intentás subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
 "The uploaded file was only partially uploaded" => "El archivo que intentás subir solo se subió parcialmente",
 "No file was uploaded" => "El archivo no fue subido",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "unshared {files}" => "{files} se dejaron de compartir",
 "deleted {files}" => "{files} borrados",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
 "generating ZIP-file, it may take some time." => "generando un archivo ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes",
 "Upload Error" => "Error al subir el archivo",
+"Close" => "Cerrar",
 "Pending" => "Pendiente",
 "1 file uploading" => "Subiendo 1 archivo",
 "{count} files uploading" => "Subiendo {count} archivos",
 "Upload cancelled." => "La subida fue cancelada",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
-"Invalid name, '/' is not allowed." => "Nombre no válido, no se permite '/' en él.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nombre del directorio inválido. Usar \"Shared\" está reservado por ownCloud.",
 "{count} files scanned" => "{count} archivos escaneados",
 "error while scanning" => "error mientras se escaneaba",
 "Name" => "Nombre",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} directorios",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
-"seconds ago" => "segundos atrás",
-"1 minute ago" => "hace 1 minuto",
-"{minutes} minutes ago" => "hace {minutes} minutos",
-"today" => "hoy",
-"yesterday" => "ayer",
-"{days} days ago" => "hace {days} días",
-"last month" => "el mes pasado",
-"months ago" => "meses atrás",
-"last year" => "el año pasado",
-"years ago" => "años atrás",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
@@ -58,11 +50,10 @@
 "New" => "Nuevo",
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
-"From url" => "Desde la URL",
+"From link" => "Desde enlace",
 "Upload" => "Subir",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
-"Share" => "Compartir",
 "Download" => "Descargar",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",

apps/files/l10n/et_EE.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ühtegi viga pole, fail on üles laetud",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Üles laetud faili suurus ületab php.ini määratud upload_max_filesize suuruse",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse",
 "The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
@@ -19,15 +18,17 @@
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "unshared {files}" => "jagamata {files}",
 "deleted {files}" => "kustutatud {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
 "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",
+"Close" => "Sulge",
 "Pending" => "Ootel",
 "1 file uploading" => "1 faili üleslaadimisel",
 "{count} files uploading" => "{count} faili üleslaadimist",
 "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.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Vigane kausta nimi. Nime \"Jagatud\" kasutamine on Owncloudi poolt broneeritud ",
 "{count} files scanned" => "{count} faili skännitud",
 "error while scanning" => "viga skännimisel",
 "Name" => "Nimi",
@@ -37,16 +38,6 @@
 "{count} folders" => "{count} kausta",
 "1 file" => "1 fail",
 "{count} files" => "{count} faili",
-"seconds ago" => "sekundit tagasi",
-"1 minute ago" => "1 minut tagasi",
-"{minutes} minutes ago" => "{minutes} minutit tagasi",
-"today" => "täna",
-"yesterday" => "eile",
-"{days} days ago" => "{days} päeva tagasi",
-"last month" => "viimasel kuul",
-"months ago" => "kuu tagasi",
-"last year" => "viimasel aastal",
-"years ago" => "aastat tagasi",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
 "max. possible: " => "maks. võimalik: ",
@@ -58,11 +49,10 @@
 "New" => "Uus",
 "Text file" => "Tekstifail",
 "Folder" => "Kaust",
-"From url" => "URL-ilt",
+"From link" => "Allikast",
 "Upload" => "Lae üles",
 "Cancel upload" => "Tühista üleslaadimine",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
-"Share" => "Jaga",
 "Download" => "Lae alla",
 "Upload too large" => "Üleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",

apps/files/l10n/eu.php

@@ -1,38 +1,44 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategiaren tamaina php.ini-ko upload_max_filesize direktiban adierazitakoa  baino handiagoa da",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da",
 "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo",
 "No file was uploaded" => "Ez da fitxategirik igo",
 "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",
+"Unshare" => "Ez elkarbanatu",
 "Delete" => "Ezabatu",
 "Rename" => "Berrizendatu",
+"{new_name} already exists" => "{new_name} dagoeneko existitzen da",
 "replace" => "ordeztu",
 "suggest name" => "aholkatu izena",
 "cancel" => "ezeztatu",
+"replaced {new_name}" => "ordezkatua {new_name}",
 "undo" => "desegin",
+"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
+"unshared {files}" => "elkarbanaketa utzita {files}",
+"deleted {files}" => "ezabatuta {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
 "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",
+"Close" => "Itxi",
 "Pending" => "Zain",
 "1 file uploading" => "fitxategi 1 igotzen",
+"{count} files uploading" => "{count} fitxategi igotzen",
 "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. ",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Karpeta izen baliogabea. \"Shared\" karpetaren erabilera Owncloudek erreserbatuta dauka",
+"{count} files scanned" => "{count} fitxategi eskaneatuta",
 "error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
-"seconds ago" => "segundu",
+"1 folder" => "karpeta bat",
-"today" => "gaur",
+"{count} folders" => "{count} karpeta",
-"yesterday" => "atzo",
+"1 file" => "fitxategi bat",
-"last month" => "joan den hilabetean",
+"{count} files" => "{count} fitxategi",
-"months ago" => "hilabete",
-"last year" => "joan den urtean",
-"years ago" => "urte",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
@@ -44,11 +50,10 @@
 "New" => "Berria",
 "Text file" => "Testu fitxategia",
 "Folder" => "Karpeta",
-"From url" => "URLtik",
+"From link" => "Estekatik",
 "Upload" => "Igo",
 "Cancel upload" => "Ezeztatu igoera",
 "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
-"Share" => "Elkarbanatu",
 "Download" => "Deskargatu",
 "Upload too large" => "Igotakoa handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",

apps/files/l10n/fa.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "حداکثر حجم تعیین شده برای بارگذاری در php.ini قابل ویرایش است",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE",
 "The uploaded file was only partially uploaded" => "مقدار کمی از فایل بارگذاری شده",
 "No file was uploaded" => "هیچ فایلی بارگذاری نشده",
@@ -8,15 +7,16 @@
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Files" => "فایل ها",
 "Delete" => "پاک کردن",
+"Rename" => "تغییرنام",
 "replace" => "جایگزین",
 "cancel" => "لغو",
 "undo" => "بازگشت",
 "generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
 "Upload Error" => "خطا در بار گذاری",
+"Close" => "بستن",
 "Pending" => "در انتظار",
 "Upload cancelled." => "بار گذاری لغو شد",
-"Invalid name, '/' is not allowed." => "نام نامناسب '/' غیرفعال است",
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تغییر یافته",
@@ -27,14 +27,13 @@
 "Enable ZIP-download" => "فعال سازی بارگیری پرونده های فشرده",
 "0 is unlimited" => "0 نامحدود است",
 "Maximum input size for ZIP files" => "حداکثرمقدار برای بار گزاری پرونده های فشرده",
+"Save" => "ذخیره",
 "New" => "جدید",
 "Text file" => "فایل متنی",
 "Folder" => "پوشه",
-"From url" => "از نشانی",
 "Upload" => "بارگذاری",
 "Cancel upload" => "متوقف کردن بار گذاری",
 "Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
-"Share" => "به اشتراک گذاری",
 "Download" => "بارگیری",
 "Upload too large" => "حجم بارگذاری بسیار زیاد است",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",

apps/files/l10n/fi_FI.php

@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetty tiedosto ylittää upload_max_filesize-arvon rajan php.ini-tiedostossa",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan",
 "The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
 "No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
 "Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
 "Files" => "Tiedostot",
+"Unshare" => "Peru jakaminen",
 "Delete" => "Poista",
 "Rename" => "Nimeä uudelleen",
 "{new_name} already exists" => "{new_name} on jo olemassa",
@@ -14,13 +14,14 @@
 "suggest name" => "ehdota nimeä",
 "cancel" => "peru",
 "undo" => "kumoa",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
 "generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
 "Upload Error" => "Lähetysvirhe.",
+"Close" => "Sulje",
 "Pending" => "Odottaa",
 "Upload cancelled." => "Lähetys peruttu.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
-"Invalid name, '/' is not allowed." => "Virheellinen nimi, merkki '/' ei ole sallittu.",
 "Name" => "Nimi",
 "Size" => "Koko",
 "Modified" => "Muutettu",
@@ -28,16 +29,6 @@
 "{count} folders" => "{count} kansiota",
 "1 file" => "1 tiedosto",
 "{count} files" => "{count} tiedostoa",
-"seconds ago" => "sekuntia sitten",
-"1 minute ago" => "1 minuutti sitten",
-"{minutes} minutes ago" => "{minutes} minuuttia sitten",
-"today" => "tänään",
-"yesterday" => "eilen",
-"{days} days ago" => "{days} päivää sitten",
-"last month" => "viime kuussa",
-"months ago" => "kuukautta sitten",
-"last year" => "viime vuonna",
-"years ago" => "vuotta sitten",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
 "max. possible: " => "suurin mahdollinen:",
@@ -49,11 +40,9 @@
 "New" => "Uusi",
 "Text file" => "Tekstitiedosto",
 "Folder" => "Kansio",
-"From url" => "Verkko-osoitteesta",
 "Upload" => "Lähetä",
 "Cancel upload" => "Peru lähetys",
 "Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
-"Share" => "Jaa",
 "Download" => "Lataa",
 "Upload too large" => "Lähetettävä tiedosto on liian suuri",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",

apps/files/l10n/fr.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été téléversé avec succès",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Le fichier téléversé excède la valeur de upload_max_filesize spécifiée dans php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML",
 "The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement téléversé",
 "No file was uploaded" => "Aucun fichier n'a été téléversé",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
 "unshared {files}" => "Fichiers non partagés : {files}",
 "deleted {files}" => "Fichiers supprimés : {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
 "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.",
 "Upload Error" => "Erreur de chargement",
+"Close" => "Fermer",
 "Pending" => "En cours",
 "1 file uploading" => "1 fichier en cours de téléchargement",
 "{count} files uploading" => "{count} fichiers téléversés",
 "Upload cancelled." => "Chargement annulé.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
-"Invalid name, '/' is not allowed." => "Nom invalide, '/' n'est pas autorisé.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nom de répertoire invalide. \"Shared\" est réservé par ownCloud",
 "{count} files scanned" => "{count} fichiers indexés",
 "error while scanning" => "erreur lors de l'indexation",
 "Name" => "Nom",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} dossiers",
 "1 file" => "1 fichier",
 "{count} files" => "{count} fichiers",
-"seconds ago" => "secondes passées",
-"1 minute ago" => "Il y a une minute",
-"{minutes} minutes ago" => "Il y a {minutes} minutes",
-"today" => "aujourd'hui",
-"yesterday" => "hier",
-"{days} days ago" => "Il y a {days} jours",
-"last month" => "mois dernier",
-"months ago" => "mois passés",
-"last year" => "année dernière",
-"years ago" => "années passées",
 "File handling" => "Gestion des fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
 "max. possible: " => "Max. possible :",
@@ -58,11 +50,10 @@
 "New" => "Nouveau",
 "Text file" => "Fichier texte",
 "Folder" => "Dossier",
-"From url" => "Depuis URL",
+"From link" => "Depuis le lien",
 "Upload" => "Envoyer",
 "Cancel upload" => "Annuler l'envoi",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
-"Share" => "Partager",
 "Download" => "Téléchargement",
 "Upload too large" => "Fichier trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",

apps/files/l10n/gl.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Non hai erros, o ficheiro enviouse correctamente",
+"There is no error, the file uploaded with success" => "Non hai erros. O ficheiro enviouse correctamente",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro enviado supera a directiva upload_max_filesize no php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro subido excede a directiva indicada polo tamaño_máximo_de_subida de php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML",
 "The uploaded file was only partially uploaded" => "O ficheiro enviado foi só parcialmente enviado",
 "No file was uploaded" => "Non se enviou ningún ficheiro",
@@ -9,25 +9,40 @@
 "Files" => "Ficheiros",
 "Unshare" => "Deixar de compartir",
 "Delete" => "Eliminar",
+"Rename" => "Mudar o nome",
+"{new_name} already exists" => "xa existe un {new_name}",
 "replace" => "substituír",
-"suggest name" => "suxira nome",
+"suggest name" => "suxerir nome",
 "cancel" => "cancelar",
+"replaced {new_name}" => "substituír {new_name}",
 "undo" => "desfacer",
-"generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
+"replaced {new_name} with {old_name}" => "substituír {new_name} polo {old_name}",
+"unshared {files}" => "{files} sen compartir",
+"deleted {files}" => "{files} eliminados",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non válido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten.",
+"generating ZIP-file, it may take some time." => "xerando un ficheiro ZIP, o que 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",
+"Close" => "Pechar",
 "Pending" => "Pendentes",
+"1 file uploading" => "1 ficheiro subíndose",
+"{count} files uploading" => "{count} ficheiros subíndose",
 "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.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nome de cartafol non válido. O uso de \"compartido\" está reservado exclusivamente para ownCloud",
-"error while scanning" => "erro mentras analizaba",
+"{count} files scanned" => "{count} ficheiros escaneados",
+"error while scanning" => "erro mentres analizaba",
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
+"1 folder" => "1 cartafol",
+"{count} folders" => "{count} cartafoles",
+"1 file" => "1 ficheiro",
+"{count} files" => "{count} ficheiros",
 "File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo de envío",
 "max. possible: " => "máx. posible: ",
-"Needed for multi-file and folder downloads." => "Preciso para descarga de varios ficheiros e cartafoles.",
+"Needed for multi-file and folder downloads." => "Precísase para a descarga de varios ficheiros e cartafoles.",
 "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",
@@ -35,14 +50,13 @@
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Cartafol",
-"From url" => "Desde url",
+"From link" => "Dende a ligazón",
 "Upload" => "Enviar",
-"Cancel upload" => "Cancelar subida",
+"Cancel upload" => "Cancelar a subida",
-"Nothing in here. Upload something!" => "Nada por aquí. Envíe algo.",
+"Nothing in here. Upload something!" => "Nada por aquí. Envía algo.",
-"Share" => "Compartir",
 "Download" => "Descargar",
 "Upload too large" => "Envío demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor",
-"Files are being scanned, please wait." => "Estanse analizando os ficheiros, espere por favor.",
+"Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarda.",
-"Current scanning" => "Análise actual."
+"Current scanning" => "Análise actual"
 );

apps/files/l10n/he.php

@@ -1,22 +1,44 @@
 <?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 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" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
+"Unshare" => "הסר שיתוף",
 "Delete" => "מחיקה",
+"Rename" => "שינוי שם",
+"{new_name} already exists" => "{new_name} כבר קיים",
+"replace" => "החלפה",
+"suggest name" => "הצעת שם",
+"cancel" => "ביטול",
+"replaced {new_name}" => "{new_name} הוחלף",
+"undo" => "ביטול",
+"replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
+"unshared {files}" => "בוטל שיתופם של {files}",
+"deleted {files}" => "{files} נמחקו",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "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" => "שגיאת העלאה",
+"Close" => "סגירה",
 "Pending" => "ממתין",
+"1 file uploading" => "קובץ אחד נשלח",
+"{count} files uploading" => "{count} קבצים נשלחים",
 "Upload cancelled." => "ההעלאה בוטלה.",
-"Invalid name, '/' is not allowed." => "שם לא חוקי, '/' אסור לשימוש.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "שם התיקייה שגוי. השימוש בשם „Shared“ שמור לטובת Owncloud",
+"{count} files scanned" => "{count} קבצים נסרקו",
+"error while scanning" => "אירעה שגיאה במהלך הסריקה",
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
+"1 folder" => "תיקייה אחת",
+"{count} folders" => "{count} תיקיות",
+"1 file" => "קובץ אחד",
+"{count} files" => "{count} קבצים",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
 "max. possible: " => "המרבי האפשרי: ",
@@ -24,14 +46,14 @@
 "Enable ZIP-download" => "הפעלת הורדת ZIP",
 "0 is unlimited" => "0 - ללא הגבלה",
 "Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
+"Save" => "שמירה",
 "New" => "חדש",
 "Text file" => "קובץ טקסט",
 "Folder" => "תיקייה",
-"From url" => "מכתובת",
+"From link" => "מקישור",
 "Upload" => "העלאה",
 "Cancel upload" => "ביטול ההעלאה",
 "Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
-"Share" => "שיתוף",
 "Download" => "הורדה",
 "Upload too large" => "העלאה גדולה מידי",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",

apps/files/l10n/hr.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Datoteka je poslana uspješno i bez pogrešaka",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Poslana datoteka izlazi iz okvira upload_max_size direktive postavljene u php.ini konfiguracijskoj datoteci",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu",
 "The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomično",
 "No file was uploaded" => "Ni jedna datoteka nije poslana",
@@ -17,22 +16,15 @@
 "generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo može potrajati.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
 "Upload Error" => "Pogreška pri slanju",
+"Close" => "Zatvori",
 "Pending" => "U tijeku",
 "1 file uploading" => "1 datoteka se učitava",
 "Upload cancelled." => "Slanje poništeno.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
-"Invalid name, '/' is not allowed." => "Neispravan naziv, znak '/' nije dozvoljen.",
 "error while scanning" => "grečka prilikom skeniranja",
 "Name" => "Naziv",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
-"seconds ago" => "sekundi prije",
-"today" => "danas",
-"yesterday" => "jučer",
-"last month" => "prošli mjesec",
-"months ago" => "mjeseci",
-"last year" => "prošlu godinu",
-"years ago" => "godina",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
 "max. possible: " => "maksimalna moguća: ",
@@ -44,11 +36,9 @@
 "New" => "novo",
 "Text file" => "tekstualna datoteka",
 "Folder" => "mapa",
-"From url" => "od URL-a",
 "Upload" => "Pošalji",
 "Cancel upload" => "Prekini upload",
 "Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
-"Share" => "podjeli",
 "Download" => "Preuzmi",
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",

apps/files/l10n/hu_HU.php

@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltve.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött file meghaladja az upload_max_filesize direktívát a php.ini-ben.",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl meghaladja a MAX_FILE_SIZE direktívát ami meghatározott a HTML form-ban.",
 "The uploaded file was only partially uploaded" => "Az eredeti fájl csak részlegesen van feltöltve.",
 "No file was uploaded" => "Nem lett fájl feltöltve.",
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
 "Failed to write to disk" => "Nem írható lemezre",
 "Files" => "Fájlok",
+"Unshare" => "Nem oszt meg",
 "Delete" => "Törlés",
 "replace" => "cserél",
 "cancel" => "mégse",
@@ -14,9 +14,9 @@
 "generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
 "Upload Error" => "Feltöltési hiba",
+"Close" => "Bezár",
 "Pending" => "Folyamatban",
 "Upload cancelled." => "Feltöltés megszakítva",
-"Invalid name, '/' is not allowed." => "Érvénytelen név, a '/' nem megengedett",
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
@@ -27,14 +27,13 @@
 "Enable ZIP-download" => "ZIP-letöltés engedélyezése",
 "0 is unlimited" => "0 = korlátlan",
 "Maximum input size for ZIP files" => "ZIP file-ok maximum mérete",
+"Save" => "Mentés",
 "New" => "Új",
 "Text file" => "Szövegfájl",
 "Folder" => "Mappa",
-"From url" => "URL-ből",
 "Upload" => "Feltöltés",
 "Cancel upload" => "Feltöltés megszakítása",
 "Nothing in here. Upload something!" => "Töltsön fel egy fájlt.",
-"Share" => "Megosztás",
 "Download" => "Letöltés",
 "Upload too large" => "Feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren.",

apps/files/l10n/ia.php

@@ -1,12 +1,15 @@
 <?php $TRANSLATIONS = array(
 "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
 "No file was uploaded" => "Nulle file esseva incargate",
+"Missing a temporary folder" => "Manca un dossier temporari",
 "Files" => "Files",
 "Delete" => "Deler",
+"Close" => "Clauder",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
 "Maximum upload size" => "Dimension maxime de incargamento",
+"Save" => "Salveguardar",
 "New" => "Nove",
 "Text file" => "File de texto",
 "Folder" => "Dossier",

apps/files/l10n/id.php

@@ -1,12 +1,12 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "File yang diunggah melampaui directive upload_max_filesize di php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML.",
 "The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
 "No file was uploaded" => "Tidak ada berkas yang diunggah",
 "Missing a temporary folder" => "Kehilangan folder temporer",
 "Failed to write to disk" => "Gagal menulis ke disk",
 "Files" => "Berkas",
+"Unshare" => "batalkan berbagi",
 "Delete" => "Hapus",
 "replace" => "mengganti",
 "cancel" => "batalkan",
@@ -14,9 +14,9 @@
 "generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
 "Upload Error" => "Terjadi Galat Pengunggahan",
+"Close" => "tutup",
 "Pending" => "Menunggu",
 "Upload cancelled." => "Pengunggahan dibatalkan.",
-"Invalid name, '/' is not allowed." => "Kesalahan nama, '/' tidak diijinkan.",
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
@@ -27,14 +27,13 @@
 "Enable ZIP-download" => "Aktifkan unduhan ZIP",
 "0 is unlimited" => "0 adalah tidak terbatas",
 "Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP",
+"Save" => "simpan",
 "New" => "Baru",
 "Text file" => "Berkas teks",
 "Folder" => "Folder",
-"From url" => "Dari url",
 "Upload" => "Unggah",
 "Cancel upload" => "Batal mengunggah",
 "Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
-"Share" => "Bagikan",
 "Download" => "Unduh",
 "Upload too large" => "Unggahan terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini.",

apps/files/l10n/it.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Non ci sono errori, file caricato con successo",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Il file caricato supera il valore upload_max_filesize in php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML",
 "The uploaded file was only partially uploaded" => "Il file è stato parzialmente caricato",
 "No file was uploaded" => "Nessun file è stato caricato",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
 "unshared {files}" => "non condivisi {files}",
 "deleted {files}" => "eliminati {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
 "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",
 "Upload Error" => "Errore di invio",
+"Close" => "Chiudi",
 "Pending" => "In corso",
 "1 file uploading" => "1 file in fase di caricamento",
 "{count} files uploading" => "{count} file in fase di caricamentoe",
 "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",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nome della cartella non valido. L'uso di \"Shared\" è riservato a ownCloud",
 "{count} files scanned" => "{count} file analizzati",
 "error while scanning" => "errore durante la scansione",
 "Name" => "Nome",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} cartelle",
 "1 file" => "1 file",
 "{count} files" => "{count} file",
-"seconds ago" => "secondi fa",
-"1 minute ago" => "1 minuto fa",
-"{minutes} minutes ago" => "{minutes} minuti fa",
-"today" => "oggi",
-"yesterday" => "ieri",
-"{days} days ago" => "{days} giorni fa",
-"last month" => "mese scorso",
-"months ago" => "mesi fa",
-"last year" => "anno scorso",
-"years ago" => "anni fa",
 "File handling" => "Gestione file",
 "Maximum upload size" => "Dimensione massima upload",
 "max. possible: " => "numero mass.: ",
@@ -58,11 +50,10 @@
 "New" => "Nuovo",
 "Text file" => "File di testo",
 "Folder" => "Cartella",
-"From url" => "Da URL",
+"From link" => "Da collegamento",
 "Upload" => "Carica",
 "Cancel upload" => "Annulla invio",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
-"Share" => "Condividi",
 "Download" => "Scarica",
 "Upload too large" => "Il file caricato è troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",

apps/files/l10n/ja_JP.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードされたファイルはphp.iniのupload_max_filesizeに設定されたサイズを超えています",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています",
 "The uploaded file was only partially uploaded" => "ファイルは一部分しかアップロードされませんでした",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "unshared {files}" => "未共有 {files}",
 "deleted {files}" => "削除 {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
 "generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
-"Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません",
 "Upload Error" => "アップロードエラー",
+"Close" => "閉じる",
 "Pending" => "保留",
 "1 file uploading" => "ファイルを1つアップロード中",
 "{count} files uploading" => "{count} ファイルをアップロード中",
 "Upload cancelled." => "アップロードはキャンセルされました。",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
-"Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "無効なフォルダ名です。\"Shared\" の利用は ownCloud が予約済みです。",
 "{count} files scanned" => "{count} ファイルをスキャン",
 "error while scanning" => "スキャン中のエラー",
 "Name" => "名前",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} フォルダ",
 "1 file" => "1 ファイル",
 "{count} files" => "{count} ファイル",
-"seconds ago" => "秒前",
-"1 minute ago" => "1 分前",
-"{minutes} minutes ago" => "{minutes} 分前",
-"today" => "今日",
-"yesterday" => "昨日",
-"{days} days ago" => "{days} 日前",
-"last month" => "一月前",
-"months ago" => "月前",
-"last year" => "一年前",
-"years ago" => "年前",
 "File handling" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
 "max. possible: " => "最大容量: ",
@@ -58,11 +50,10 @@
 "New" => "新規",
 "Text file" => "テキストファイル",
 "Folder" => "フォルダ",
-"From url" => "URL",
+"From link" => "リンク",
 "Upload" => "アップロード",
 "Cancel upload" => "アップロードをキャンセル",
 "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
-"Share" => "共有",
 "Download" => "ダウンロード",
 "Upload too large" => "ファイルサイズが大きすぎます",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",

apps/files/l10n/ka_GE.php

@@ -1,6 +1,5 @@
 <?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" => "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში",
 "The uploaded file was only partially uploaded" => "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
 "No file was uploaded" => "ფაილი არ აიტვირთა",
@@ -22,12 +21,12 @@
 "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" => "შეცდომა ატვირთვისას",
+"Close" => "დახურვა",
 "Pending" => "მოცდის რეჟიმში",
 "1 file uploading" => "1 ფაილის ატვირთვა",
 "{count} files uploading" => "{count} ფაილი იტვირთება",
 "Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
-"Invalid name, '/' is not allowed." => "არასწორი სახელი, '/' არ დაიშვება.",
 "{count} files scanned" => "{count} ფაილი სკანირებულია",
 "error while scanning" => "შეცდომა სკანირებისას",
 "Name" => "სახელი",
@@ -37,16 +36,6 @@
 "{count} folders" => "{count} საქაღალდე",
 "1 file" => "1 ფაილი",
 "{count} files" => "{count} ფაილი",
-"seconds ago" => "წამის წინ",
-"1 minute ago" => "1 წუთის წინ",
-"{minutes} minutes ago" => "{minutes} წუთის წინ",
-"today" => "დღეს",
-"yesterday" => "გუშინ",
-"{days} days ago" => "{days} დღის წინ",
-"last month" => "გასულ თვეში",
-"months ago" => "თვის წინ",
-"last year" => "გასულ წელს",
-"years ago" => "წლის წინ",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
 "max. possible: " => "მაქს. შესაძლებელი:",
@@ -58,11 +47,9 @@
 "New" => "ახალი",
 "Text file" => "ტექსტური ფაილი",
 "Folder" => "საქაღალდე",
-"From url" => "მისამართიდან",
 "Upload" => "ატვირთვა",
 "Cancel upload" => "ატვირთვის გაუქმება",
 "Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
-"Share" => "გაზიარება",
 "Download" => "ჩამოტვირთვა",
 "Upload too large" => "ასატვირთი ფაილი ძალიან დიდია",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",

apps/files/l10n/ko.php

@@ -1,43 +1,62 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "업로드에 성공하였습니다.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "업로드한 파일이 php.ini에서 지정한 upload_max_filesize보다 더 큼",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼",
 "The uploaded file was only partially uploaded" => "파일이 부분적으로 업로드됨",
 "No file was uploaded" => "업로드된 파일 없음",
 "Missing a temporary folder" => "임시 폴더가 사라짐",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
 "Files" => "파일",
+"Unshare" => "공유 해제",
 "Delete" => "삭제",
-"replace" => "대체",
+"Rename" => "이름 바꾸기",
+"{new_name} already exists" => "{new_name}이(가) 이미 존재함",
+"replace" => "바꾸기",
+"suggest name" => "이름 제안",
 "cancel" => "취소",
-"undo" => "복구",
+"replaced {new_name}" => "{new_name}을(를) 대체함",
-"generating ZIP-file, it may take some time." => "ZIP파일 생성에 시간이 걸릴 수 있습니다.",
+"undo" => "실행 취소",
-"Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로드 할 수 없습니다.",
+"replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
-"Upload Error" => "업로드 에러",
+"unshared {files}" => "{files} 공유 해제됨",
+"deleted {files}" => "{files} 삭제됨",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
+"generating ZIP-file, it may take some time." => "ZIP 파일을 생성하고 있습니다. 시간이 걸릴 수도 있습니다.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다",
+"Upload Error" => "업로드 오류",
+"Close" => "닫기",
 "Pending" => "보류 중",
-"Upload cancelled." => "업로드 취소.",
+"1 file uploading" => "파일 1개 업로드 중",
-"Invalid name, '/' is not allowed." => "잘못된 이름, '/' 은 허용이 되지 않습니다.",
+"{count} files uploading" => "파일 {count}개 업로드 중",
+"Upload cancelled." => "업로드가 취소되었습니다.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "폴더 이름이 올바르지 않습니다. \"Shared\" 폴더는 ownCloud에서 예약되었습니다.",
+"{count} files scanned" => "파일 {count}개 검색됨",
+"error while scanning" => "검색 중 오류 발생",
 "Name" => "이름",
 "Size" => "크기",
 "Modified" => "수정됨",
+"1 folder" => "폴더 1개",
+"{count} folders" => "폴더 {count}개",
+"1 file" => "파일 1개",
+"{count} files" => "파일 {count}개",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
-"max. possible: " => "최대. 가능한:",
+"max. possible: " => "최대 가능:",
-"Needed for multi-file and folder downloads." => "멀티 파일 및 폴더 다운로드에 필요.",
+"Needed for multi-file and folder downloads." => "다중 파일 및 폴더 다운로드에 필요합니다.",
-"Enable ZIP-download" => "ZIP- 다운로드 허용",
+"Enable ZIP-download" => "ZIP 다운로드 허용",
-"0 is unlimited" => "0은 무제한 입니다",
+"0 is unlimited" => "0은 무제한입니다",
-"Maximum input size for ZIP files" => "ZIP 파일에 대한 최대 입력 크기",
+"Maximum input size for ZIP files" => "ZIP 파일 최대 크기",
+"Save" => "저장",
 "New" => "새로 만들기",
 "Text file" => "텍스트 파일",
 "Folder" => "폴더",
-"From url" => "URL 에서",
+"From link" => "링크에서",
 "Upload" => "업로드",
 "Cancel upload" => "업로드 취소",
 "Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
-"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." => "파일을 검색중입니다, 기다려 주십시오.",
+"Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
-"Current scanning" => "커런트 스캐닝"
+"Current scanning" => "현재 검색"
 );

apps/files/l10n/ku_IQ.php

@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Close" => "داخستن",
+"Name" => "ناو",
+"Save" => "پاشکه‌وتکردن",
+"Folder" => "بوخچه",
+"Upload" => "بارکردن",
+"Download" => "داگرتن"
+);

apps/files/l10n/lb.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Déi ropgelueden Datei ass méi grouss wei d'upload_max_filesize Eegenschaft an der php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
 "The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
 "No file was uploaded" => "Et ass keng Datei ropgelueden ginn",
@@ -14,9 +13,9 @@
 "generating ZIP-file, it may take some time." => "Et  gëtt eng ZIP-File generéiert, dëst ka bëssen daueren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
 "Upload Error" => "Fehler beim eroplueden",
+"Close" => "Zoumaachen",
 "Upload cancelled." => "Upload ofgebrach.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
-"Invalid name, '/' is not allowed." => "Ongültege Numm, '/' net erlaabt.",
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
@@ -27,14 +26,13 @@
 "Enable ZIP-download" => "ZIP-download erlaben",
 "0 is unlimited" => "0 ass onlimitéiert",
 "Maximum input size for ZIP files" => "Maximal Gréisst fir ZIP Fichieren",
+"Save" => "Späicheren",
 "New" => "Nei",
 "Text file" => "Text Fichier",
 "Folder" => "Dossier",
-"From url" => "From URL",
 "Upload" => "Eroplueden",
 "Cancel upload" => "Upload ofbriechen",
 "Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
-"Share" => "Share",
 "Download" => "Eroflueden",
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",

apps/files/l10n/lt_LT.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Klaidų nėra, failas įkeltas sėkmingai",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Įkeliamo failo dydis viršija upload_max_filesize parametrą php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje",
 "The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
 "No file was uploaded" => "Nebuvo įkeltas nė vienas failas",
@@ -22,12 +21,12 @@
 "generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
 "Upload Error" => "Įkėlimo klaida",
+"Close" => "Užverti",
 "Pending" => "Laukiantis",
 "1 file uploading" => "įkeliamas 1 failas",
 "{count} files uploading" => "{count}  įkeliami failai",
 "Upload cancelled." => "Įkėlimas atšauktas.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
-"Invalid name, '/' is not allowed." => "Pavadinime negali būti naudojamas ženklas \"/\".",
 "{count} files scanned" => "{count}  praskanuoti failai",
 "error while scanning" => "klaida skanuojant",
 "Name" => "Pavadinimas",
@@ -37,16 +36,6 @@
 "{count} folders" => "{count} aplankalai",
 "1 file" => "1 failas",
 "{count} files" => "{count} failai",
-"seconds ago" => "prieš sekundę",
-"1 minute ago" => "Prieš 1 minutę",
-"{minutes} minutes ago" => "Prieš {count} minutes",
-"today" => "šiandien",
-"yesterday" => "vakar",
-"{days} days ago" => "Prieš {days}  dienas",
-"last month" => "praeitą mėnesį",
-"months ago" => "prieš mėnesį",
-"last year" => "praeitais metais",
-"years ago" => "prieš metus",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
 "max. possible: " => "maks. galima:",
@@ -58,11 +47,9 @@
 "New" => "Naujas",
 "Text file" => "Teksto failas",
 "Folder" => "Katalogas",
-"From url" => "Iš adreso",
 "Upload" => "Įkelti",
 "Cancel upload" => "Atšaukti siuntimą",
 "Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
-"Share" => "Dalintis",
 "Download" => "Atsisiųsti",
 "Upload too large" => "Įkėlimui failas per didelis",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje",

apps/files/l10n/lv.php

@@ -1,9 +1,14 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Viss kārtībā, augšupielāde veiksmīga",
 "No file was uploaded" => "Neviens fails netika augšuplādēts",
+"Missing a temporary folder" => "Trūkst pagaidu mapes",
 "Failed to write to disk" => "Nav iespējams saglabāt",
 "Files" => "Faili",
+"Unshare" => "Pārtraukt līdzdalīšanu",
 "Delete" => "Izdzēst",
+"Rename" => "Pārdēvēt",
 "replace" => "aizvietot",
+"suggest name" => "Ieteiktais nosaukums",
 "cancel" => "atcelt",
 "undo" => "vienu soli atpakaļ",
 "generating ZIP-file, it may take some time." => "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida",
@@ -11,24 +16,26 @@
 "Upload Error" => "Augšuplādēšanas laikā radās kļūda",
 "Pending" => "Gaida savu kārtu",
 "Upload cancelled." => "Augšuplāde ir atcelta",
-"Invalid name, '/' is not allowed." => "Šis simbols '/', nav atļauts.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Izmainīts",
+"File handling" => "Failu pārvaldība",
 "Maximum upload size" => "Maksimālais failu augšuplādes apjoms",
 "max. possible: " => "maksīmālais iespējamais:",
+"Needed for multi-file and folder downloads." => "Vajadzīgs vairāku failu un mapju lejuplādei",
 "Enable ZIP-download" => "Iespējot ZIP lejuplādi",
 "0 is unlimited" => "0 ir neierobežots",
+"Save" => "Saglabāt",
 "New" => "Jauns",
 "Text file" => "Teksta fails",
 "Folder" => "Mape",
-"From url" => "No URL saites",
 "Upload" => "Augšuplādet",
 "Cancel upload" => "Atcelt augšuplādi",
 "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšuplādēt",
-"Share" => "Līdzdalīt",
 "Download" => "Lejuplādēt",
 "Upload too large" => "Fails ir par lielu lai to augšuplādetu",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Jūsu augšuplādējamie faili pārsniedz servera pieļaujamo failu augšupielādes apjomu",
 "Files are being scanned, please wait." => "Faili šobrīd tiek caurskatīti, nedaudz jāpagaida.",
 "Current scanning" => "Šobrīd tiek pārbaudīti"
 );

apps/files/l10n/mk.php

@@ -1,6 +1,5 @@
 <?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" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата",
 "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
 "No file was uploaded" => "Не беше подигната датотека",
@@ -11,9 +10,9 @@
 "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" => "Грешка при преземање",
+"Close" => "Затвои",
 "Pending" => "Чека",
 "Upload cancelled." => "Преземањето е прекинато.",
-"Invalid name, '/' is not allowed." => "неисправно име, '/' не е дозволено.",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
@@ -24,14 +23,13 @@
 "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" => "Откажи прикачување",
 "Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
-"Share" => "Сподели",
 "Download" => "Преземи",
 "Upload too large" => "Датотеката е премногу голема",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",

apps/files/l10n/ms_MY.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Tiada ralat, fail berjaya dimuat naik.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Fail yang dimuat naik melebihi penyata upload_max_filesize dalam php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML ",
 "The uploaded file was only partially uploaded" => "Sebahagian daripada fail telah dimuat naik. ",
 "No file was uploaded" => "Tiada fail yang dimuat naik",
@@ -13,9 +12,9 @@
 "generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
 "Upload Error" => "Muat naik ralat",
+"Close" => "Tutup",
 "Pending" => "Dalam proses",
 "Upload cancelled." => "Muatnaik dibatalkan.",
-"Invalid name, '/' is not allowed." => "penggunaa nama tidak sah, '/' tidak dibenarkan.",
 "Name" => "Nama ",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
@@ -26,14 +25,13 @@
 "Enable ZIP-download" => "Aktifkan muatturun ZIP",
 "0 is unlimited" => "0 adalah tanpa had",
 "Maximum input size for ZIP files" => "Saiz maksimum input untuk fail ZIP",
+"Save" => "Simpan",
 "New" => "Baru",
 "Text file" => "Fail teks",
 "Folder" => "Folder",
-"From url" => "Dari url",
 "Upload" => "Muat naik",
 "Cancel upload" => "Batal muat naik",
 "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
-"Share" => "Kongsi",
 "Download" => "Muat turun",
 "Upload too large" => "Muat naik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",

apps/files/l10n/nb_NO.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Det er ingen feil. Filen ble lastet opp.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet",
 "The uploaded file was only partially uploaded" => "Filopplastningen ble bare delvis gjennomført",
 "No file was uploaded" => "Ingen fil ble lastet opp",
@@ -10,29 +9,32 @@
 "Unshare" => "Avslutt deling",
 "Delete" => "Slett",
 "Rename" => "Omdøp",
+"{new_name} already exists" => "{new_name} finnes allerede",
 "replace" => "erstatt",
 "suggest name" => "foreslå navn",
 "cancel" => "avbryt",
+"replaced {new_name}" => "erstatt {new_name}",
 "undo" => "angre",
+"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
+"deleted {files}" => "slettet {files}",
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
 "Upload Error" => "Opplasting feilet",
+"Close" => "Lukk",
 "Pending" => "Ventende",
 "1 file uploading" => "1 fil lastes opp",
+"{count} files uploading" => "{count} filer laster opp",
 "Upload cancelled." => "Opplasting avbrutt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
-"Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
+"{count} files scanned" => "{count} filer lest inn",
 "error while scanning" => "feil under skanning",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
-"seconds ago" => "sekunder siden",
+"1 folder" => "1 mappe",
-"today" => "i dag",
+"{count} folders" => "{count} mapper",
-"yesterday" => "i går",
+"1 file" => "1 fil",
-"last month" => "forrige måned",
+"{count} files" => "{count} filer",
-"months ago" => "måneder siden",
-"last year" => "forrige år",
-"years ago" => "år siden",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
 "max. possible: " => "max. mulige:",
@@ -44,11 +46,9 @@
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
-"From url" => "Fra url",
 "Upload" => "Last opp",
 "Cancel upload" => "Avbryt opplasting",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
-"Share" => "Del",
 "Download" => "Last ned",
 "Upload too large" => "Opplasting for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",

apps/files/l10n/nl.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Het geüploade bestand is groter dan de upload_max_filesize instelling in php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier",
 "The uploaded file was only partially uploaded" => "Het bestand is slechts gedeeltelijk geupload",
 "No file was uploaded" => "Geen bestand geüpload",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
 "unshared {files}" => "delen gestopt {files}",
 "deleted {files}" => "verwijderde {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
 "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",
 "Upload Error" => "Upload Fout",
+"Close" => "Sluit",
 "Pending" => "Wachten",
 "1 file uploading" => "1 bestand wordt ge-upload",
 "{count} files uploading" => "{count} bestanden aan het uploaden",
 "Upload cancelled." => "Uploaden geannuleerd.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
-"Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Folder naam niet toegestaan.  Het gebruik van \"Shared\" is aan Owncloud voorbehouden",
 "{count} files scanned" => "{count} bestanden gescanned",
 "error while scanning" => "Fout tijdens het scannen",
 "Name" => "Naam",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} mappen",
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
-"seconds ago" => "seconden geleden",
-"1 minute ago" => "1 minuut geleden",
-"{minutes} minutes ago" => "{minutes} minuten geleden",
-"today" => "vandaag",
-"yesterday" => "gisteren",
-"{days} days ago" => "{days} dagen geleden",
-"last month" => "vorige maand",
-"months ago" => "maanden geleden",
-"last year" => "vorig jaar",
-"years ago" => "jaar geleden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "max. possible: " => "max. mogelijk: ",
@@ -58,11 +50,10 @@
 "New" => "Nieuw",
 "Text file" => "Tekstbestand",
 "Folder" => "Map",
-"From url" => "Van hyperlink",
+"From link" => "Vanaf link",
 "Upload" => "Upload",
 "Cancel upload" => "Upload afbreken",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
-"Share" => "Delen",
 "Download" => "Download",
 "Upload too large" => "Bestanden te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",

apps/files/l10n/nn_NO.php

@@ -1,16 +1,17 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den opplasta fila er større enn variabelen upload_max_filesize i php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
 "The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
 "No file was uploaded" => "Ingen filer vart lasta opp",
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
 "Files" => "Filer",
 "Delete" => "Slett",
+"Close" => "Lukk",
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
+"Save" => "Lagre",
 "New" => "Ny",
 "Text file" => "Tekst fil",
 "Folder" => "Mappe",

apps/files/l10n/oc.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Amontcargament capitat, pas d'errors",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lo fichièr amontcargat es tròp bèl per la directiva «upload_max_filesize » del php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML",
 "The uploaded file was only partially uploaded" => "Lo fichièr foguèt pas completament amontcargat",
 "No file was uploaded" => "Cap de fichièrs son estats amontcargats",
@@ -21,18 +20,10 @@
 "1 file uploading" => "1 fichièr al amontcargar",
 "Upload cancelled." => "Amontcargar anullat.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
-"Invalid name, '/' is not allowed." => "Nom invalid, '/' es pas permis.",
 "error while scanning" => "error pendant l'exploracion",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
-"seconds ago" => "secondas",
-"today" => "uèi",
-"yesterday" => "ièr",
-"last month" => "mes passat",
-"months ago" => "meses",
-"last year" => "an passat",
-"years ago" => "ans",
 "File handling" => "Manejament de fichièr",
 "Maximum upload size" => "Talha maximum d'amontcargament",
 "max. possible: " => "max. possible: ",
@@ -44,11 +35,9 @@
 "New" => "Nòu",
 "Text file" => "Fichièr de tèxte",
 "Folder" => "Dorsièr",
-"From url" => "Dempuèi l'URL",
 "Upload" => "Amontcarga",
 "Cancel upload" => " Anulla l'amontcargar",
 "Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
-"Share" => "Parteja",
 "Download" => "Avalcarga",
 "Upload too large" => "Amontcargament tròp gròs",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",

apps/files/l10n/pl.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Przesłano plik",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą w pliku php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Rozmiar przesłanego pliku przekracza maksymalną wartość dyrektywy upload_max_filesize, zawartą formularzu HTML",
 "The uploaded file was only partially uploaded" => "Plik przesłano tylko częściowo",
 "No file was uploaded" => "Nie przesłano żadnego pliku",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "zastąpiony {new_name} z {old_name}",
 "unshared {files}" => "Udostępniane wstrzymane {files}",
 "deleted {files}" => "usunięto {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'są niedozwolone.",
 "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",
 "Upload Error" => "Błąd wczytywania",
+"Close" => "Zamknij",
 "Pending" => "Oczekujące",
 "1 file uploading" => "1 plik wczytany",
 "{count} files uploading" => "{count} przesyłanie plików",
 "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.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Błędna nazwa folderu. Nazwa \"Shared\" jest zarezerwowana dla Owncloud",
 "{count} files scanned" => "{count} pliki skanowane",
 "error while scanning" => "Wystąpił błąd podczas skanowania",
 "Name" => "Nazwa",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} foldery",
 "1 file" => "1 plik",
 "{count} files" => "{count} pliki",
-"seconds ago" => "sekund temu",
-"1 minute ago" => "1 minute temu",
-"{minutes} minutes ago" => "{minutes} minut temu",
-"today" => "dziś",
-"yesterday" => "wczoraj",
-"{days} days ago" => "{days} dni temu",
-"last month" => "ostani miesiąc",
-"months ago" => "miesięcy temu",
-"last year" => "ostatni rok",
-"years ago" => "lat temu",
 "File handling" => "Zarządzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
 "max. possible: " => "max. możliwych",
@@ -58,11 +50,10 @@
 "New" => "Nowy",
 "Text file" => "Plik tekstowy",
 "Folder" => "Katalog",
-"From url" => "Z adresu",
+"From link" => "Z linku",
 "Upload" => "Prześlij",
 "Cancel upload" => "Przestań wysyłać",
 "Nothing in here. Upload something!" => "Brak zawartości. Proszę wysłać pliki!",
-"Share" => "Współdziel",
 "Download" => "Pobiera element",
 "Upload too large" => "Wysyłany plik ma za duży rozmiar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość.",

apps/files/l10n/pl_PL.php

@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Save" => "Zapisz"
+);

apps/files/l10n/pt_BR.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O tamanho do arquivo excede o limed especifiicado em upload_max_filesize no php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML",
 "The uploaded file was only partially uploaded" => "O arquivo foi transferido parcialmente",
 "No file was uploaded" => "Nenhum arquivo foi transferido",
@@ -10,29 +10,35 @@
 "Unshare" => "Descompartilhar",
 "Delete" => "Excluir",
 "Rename" => "Renomear",
+"{new_name} already exists" => "{new_name} já existe",
 "replace" => "substituir",
 "suggest name" => "sugerir nome",
 "cancel" => "cancelar",
+"replaced {new_name}" => "substituído {new_name}",
 "undo" => "desfazer",
+"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
+"unshared {files}" => "{files} não compartilhados",
+"deleted {files}" => "{files} apagados",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
 "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
 "Upload Error" => "Erro de envio",
+"Close" => "Fechar",
 "Pending" => "Pendente",
 "1 file uploading" => "enviando 1 arquivo",
+"{count} files uploading" => "Enviando {count} arquivos",
 "Upload cancelled." => "Envio cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
-"Invalid name, '/' is not allowed." => "Nome inválido, '/' não é permitido.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nome de pasta inválido. O nome \"Shared\" é reservado pelo Owncloud",
+"{count} files scanned" => "{count} arquivos scaneados",
 "error while scanning" => "erro durante verificação",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"seconds ago" => "segundos atrás",
+"1 folder" => "1 pasta",
-"today" => "hoje",
+"{count} folders" => "{count} pastas",
-"yesterday" => "ontem",
+"1 file" => "1 arquivo",
-"last month" => "último mês",
+"{count} files" => "{count} arquivos",
-"months ago" => "meses atrás",
-"last year" => "último ano",
-"years ago" => "anos atrás",
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "max. possible: " => "max. possível:",
@@ -44,11 +50,10 @@
 "New" => "Novo",
 "Text file" => "Arquivo texto",
 "Folder" => "Pasta",
-"From url" => "URL de origem",
+"From link" => "Do link",
 "Upload" => "Carregar",
 "Cancel upload" => "Cancelar upload",
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
-"Share" => "Compartilhar",
 "Download" => "Baixar",
 "Upload too large" => "Arquivo muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",

apps/files/l10n/pt_PT.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Sem erro, ficheiro enviado com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro enviado excede a directiva upload_max_filesize no php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML",
 "The uploaded file was only partially uploaded" => "O ficheiro enviado só foi enviado parcialmente",
 "No file was uploaded" => "Não foi enviado nenhum ficheiro",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
 "unshared {files}" => "{files} não partilhado(s)",
 "deleted {files}" => "{files} eliminado(s)",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
 "generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
 "Upload Error" => "Erro no envio",
+"Close" => "Fechar",
 "Pending" => "Pendente",
 "1 file uploading" => "A enviar 1 ficheiro",
 "{count} files uploading" => "A carregar {count} ficheiros",
 "Upload cancelled." => "O envio foi cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
-"Invalid name, '/' is not allowed." => "Nome inválido, '/' não permitido.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nome de pasta inválido! O uso de \"Shared\" (Partilhado) está reservado pelo OwnCloud",
 "{count} files scanned" => "{count} ficheiros analisados",
 "error while scanning" => "erro ao analisar",
 "Name" => "Nome",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
-"seconds ago" => "há segundos",
-"1 minute ago" => "há 1 minuto",
-"{minutes} minutes ago" => "há {minutes} minutos",
-"today" => "hoje",
-"yesterday" => "ontem",
-"{days} days ago" => "há {days} dias",
-"last month" => "mês passado",
-"months ago" => "há meses",
-"last year" => "ano passado",
-"years ago" => "há anos",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
 "max. possible: " => "max. possivel: ",
@@ -58,11 +50,10 @@
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Pasta",
-"From url" => "Do endereço",
+"From link" => "Da ligação",
 "Upload" => "Enviar",
 "Cancel upload" => "Cancelar envio",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
-"Share" => "Partilhar",
 "Download" => "Transferir",
 "Upload too large" => "Envio muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor.",

apps/files/l10n/ro.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Nicio eroare, fișierul a fost încărcat cu succes",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Fișierul are o dimensiune mai mare decât cea specificată în variabila upload_max_filesize din php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
 "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
 "No file was uploaded" => "Niciun fișier încărcat",
@@ -17,22 +16,15 @@
 "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",
+"Close" => "Închide",
 "Pending" => "În așteptare",
 "1 file uploading" => "un fișier se încarcă",
 "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.",
 "error while scanning" => "eroare la scanarea",
 "Name" => "Nume",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
-"seconds ago" => "secunde în urmă",
-"today" => "astăzi",
-"yesterday" => "ieri",
-"last month" => "ultima lună",
-"months ago" => "luni în urmă",
-"last year" => "ultimul an",
-"years ago" => "ani în urmă",
 "File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
 "max. possible: " => "max. posibil:",
@@ -44,11 +36,9 @@
 "New" => "Nou",
 "Text file" => "Fișier text",
 "Folder" => "Dosar",
-"From url" => "De la URL",
 "Upload" => "Încarcă",
 "Cancel upload" => "Anulează încărcarea",
 "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
-"Share" => "Partajează",
 "Download" => "Descarcă",
 "Upload too large" => "Fișierul încărcat este prea mare",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",

apps/files/l10n/ru.php

@@ -1,6 +1,6 @@
 <?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 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" => "Файл не был загружен",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "unshared {files}" => "не опубликованные {files}",
 "deleted {files}" => "удаленные {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
 "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" => "Ошибка загрузки",
+"Close" => "Закрыть",
 "Pending" => "Ожидание",
 "1 file uploading" => "загружается 1 файл",
 "{count} files uploading" => "{count} файлов загружается",
 "Upload cancelled." => "Загрузка отменена.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
-"Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Не правильное имя папки. Имя \"Shared\" резервировано в Owncloud",
 "{count} files scanned" => "{count} файлов просканировано",
 "error while scanning" => "ошибка во время санирования",
 "Name" => "Название",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлов",
-"seconds ago" => "несколько секунд назад",
-"1 minute ago" => "1 минуту назад",
-"{minutes} minutes ago" => "{minutes} минут назад",
-"today" => "сегодня",
-"yesterday" => "вчера",
-"{days} days ago" => "{days} дней назад",
-"last month" => "в прошлом месяце",
-"months ago" => "несколько месяцев назад",
-"last year" => "в прошлом году",
-"years ago" => "несколько лет назад",
 "File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "макс. возможно: ",
@@ -58,11 +50,10 @@
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
-"From url" => "С url",
+"From link" => "Из ссылки",
 "Upload" => "Загрузить",
 "Cancel upload" => "Отмена загрузки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
-"Share" => "Опубликовать",
 "Download" => "Скачать",
 "Upload too large" => "Файл слишком большой",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",

apps/files/l10n/ru_RU.php

@@ -1,6 +1,5 @@
 <?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" => "Файл не был загружен",
@@ -19,15 +18,17 @@
 "replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
 "unshared {files}" => "Cовместное использование прекращено {файлы}",
 "deleted {files}" => "удалено {файлы}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
 "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" => "Ошибка загрузки",
+"Close" => "Закрыть",
 "Pending" => "Ожидающий решения",
 "1 file uploading" => "загрузка 1 файла",
 "{count} files uploading" => "{количество} загружено файлов",
 "Upload cancelled." => "Загрузка отменена",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
-"Invalid name, '/' is not allowed." => "Неправильное имя, '/' не допускается.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Некорректное имя папки. Нименование \"Опубликовано\" зарезервировано ownCloud",
 "{count} files scanned" => "{количество} файлов отсканировано",
 "error while scanning" => "ошибка при сканировании",
 "Name" => "Имя",
@@ -37,16 +38,6 @@
 "{count} folders" => "{количество} папок",
 "1 file" => "1 файл",
 "{count} files" => "{количество} файлов",
-"seconds ago" => "секунд назад",
-"1 minute ago" => "1 минуту назад",
-"{minutes} minutes ago" => "{minutes} минут назад",
-"today" => "сегодня",
-"yesterday" => "вчера",
-"{days} days ago" => "{days} дней назад",
-"last month" => "в прошлом месяце",
-"months ago" => "месяцев назад",
-"last year" => "в прошлом году",
-"years ago" => "лет назад",
 "File handling" => "Работа с файлами",
 "Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "Максимально возможный",
@@ -58,11 +49,10 @@
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
-"From url" => "Из url",
+"From link" => "По ссылке",
 "Upload" => "Загрузить ",
 "Cancel upload" => "Отмена загрузки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
-"Share" => "Сделать общим",
 "Download" => "Загрузить",
 "Upload too large" => "Загрузка слишком велика",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.",

apps/files/l10n/si_LK.php

@@ -1,32 +1,48 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය",
 "The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
 "No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
+"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
 "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
 "Files" => "ගොනු",
+"Unshare" => "නොබෙදු",
 "Delete" => "මකන්න",
 "Rename" => "නැවත නම් කරන්න",
 "replace" => "ප්‍රතිස්ථාපනය කරන්න",
 "suggest name" => "නමක් යෝජනා කරන්න",
 "cancel" => "අත් හරින්න",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
+"generating ZIP-file, it may take some time." => "ගොනුවක් සෑදෙමින් පවතී. කෙටි වේලාවක් ගත විය හැක",
 "Upload Error" => "උඩුගත කිරීමේ දෝශයක්",
+"Close" => "වසන්න",
+"1 file uploading" => "1 ගොනුවක් උඩගත කෙරේ",
 "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
+"File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
+"error while scanning" => "පරීක්ෂා කිරීමේදී දෝෂයක්",
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
+"Modified" => "වෙනස් කළ",
+"1 folder" => "1 ෆොල්ඩරයක්",
 "1 file" => "1 ගොනුවක්",
-"today" => "අද",
-"yesterday" => "පෙර දින",
 "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 link" => "යොමුවෙන්",
 "Upload" => "උඩුගත කිරීම",
 "Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
 "Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
 "Download" => "බාගත කිරීම",
-"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය"
+"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" => "වර්තමාන පරික්ෂාව"
 );

apps/files/l10n/sk_SK.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Nahraný súbor presiahol direktívu upload_max_filesize v php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Nahraný súbor predčil  konfiguračnú direktívu upload_max_filesize v súbore php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári",
 "The uploaded file was only partially uploaded" => "Nahrávaný súbor bol iba čiastočne nahraný",
 "No file was uploaded" => "Žiaden súbor nebol nahraný",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
 "unshared {files}" => "zdieľanie zrušené pre {files}",
 "deleted {files}" => "zmazané {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
 "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 odosielania",
+"Close" => "Zavrieť",
 "Pending" => "Čaká sa",
 "1 file uploading" => "1 súbor sa posiela ",
 "{count} files uploading" => "{count} súborov odosielaných",
 "Upload cancelled." => "Odosielanie 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é",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nesprávne meno adresára. Použitie slova \"Shared\" (Zdieľané) je vyhradené službou ownCloud.",
 "{count} files scanned" => "{count} súborov prehľadaných",
 "error while scanning" => "chyba počas kontroly",
 "Name" => "Meno",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} priečinkov",
 "1 file" => "1 súbor",
 "{count} files" => "{count} súborov",
-"seconds ago" => "pred sekundami",
-"1 minute ago" => "pred minútou",
-"{minutes} minutes ago" => "pred {minutes} minútami",
-"today" => "dnes",
-"yesterday" => "včera",
-"{days} days ago" => "pred {days} dňami",
-"last month" => "minulý mesiac",
-"months ago" => "pred mesiacmi",
-"last year" => "minulý rok",
-"years ago" => "pred rokmi",
 "File handling" => "Nastavenie správanie k súborom",
 "Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
 "max. possible: " => "najväčšie možné:",
@@ -58,11 +50,10 @@
 "New" => "Nový",
 "Text file" => "Textový súbor",
 "Folder" => "Priečinok",
-"From url" => "Z url",
+"From link" => "Z odkazu",
 "Upload" => "Odoslať",
 "Cancel upload" => "Zrušiť odosielanie",
 "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
-"Share" => "Zdielať",
 "Download" => "Stiahnuť",
 "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.",

apps/files/l10n/sl.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Datoteka je uspešno naložena brez napak.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Naložena datoteka presega velikost, ki jo določa parameter upload_max_filesize v datoteki php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Naložena datoteka presega dovoljeno velikost. Le-ta je določena z vrstico upload_max_filesize v datoteki php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu",
 "The uploaded file was only partially uploaded" => "Datoteka je le delno naložena",
 "No file was uploaded" => "Nobena datoteka ni bila naložena",
@@ -17,28 +17,28 @@
 "replaced {new_name}" => "zamenjano je ime {new_name}",
 "undo" => "razveljavi",
 "replaced {new_name} with {old_name}" => "zamenjano ime {new_name} z imenom {old_name}",
+"unshared {files}" => "odstranjeno iz souporabe {files}",
+"deleted {files}" => "izbrisano {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
 "generating ZIP-file, it may take some time." => "Ustvarjanje datoteke ZIP. To lahko traja nekaj časa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
 "Upload Error" => "Napaka med nalaganjem",
+"Close" => "Zapri",
 "Pending" => "V čakanju ...",
 "1 file uploading" => "Pošiljanje 1 datoteke",
+"{count} files uploading" => "nalagam {count} datotek",
 "Upload cancelled." => "Pošiljanje je preklicano.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
-"Invalid name, '/' is not allowed." => "Neveljavno ime. Znak '/' ni dovoljen.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Neveljavno ime datoteke. Uporaba mape \"Share\" je rezervirana za ownCloud.",
+"{count} files scanned" => "{count} files scanned",
 "error while scanning" => "napaka med pregledovanjem datotek",
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
 "1 folder" => "1 mapa",
+"{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
-"seconds ago" => "sekund nazaj",
+"{count} files" => "{count} datotek",
-"1 minute ago" => "Pred 1 minuto",
-"today" => "danes",
-"yesterday" => "včeraj",
-"last month" => "zadnji mesec",
-"months ago" => "mesecev nazaj",
-"last year" => "lansko leto",
-"years ago" => "let nazaj",
 "File handling" => "Upravljanje z datotekami",
 "Maximum upload size" => "Največja velikost za pošiljanja",
 "max. possible: " => "največ mogoče:",
@@ -50,11 +50,10 @@
 "New" => "Nova",
 "Text file" => "Besedilna datoteka",
 "Folder" => "Mapa",
-"From url" => "Iz naslova URL",
+"From link" => "Iz povezave",
 "Upload" => "Pošlji",
 "Cancel upload" => "Prekliči pošiljanje",
 "Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!",
-"Share" => "Souporaba",
 "Download" => "Prejmi",
 "Upload too large" => "Nalaganje ni mogoče, ker je preveliko",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku.",

apps/files/l10n/sr.php

@@ -1,22 +1,62 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Нема грешке, фајл је успешно послат",
+"There is no error, the file uploaded with success" => "Није дошло до грешке. Датотека је успешно отпремљена.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Послати фајл превазилази директиву upload_max_filesize из ",
+"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 која је наведена у ХТМЛ форми",
+"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" => "Послати фајл је само делимично отпремљен!",
+"The uploaded file was only partially uploaded" => "Датотека је делимично отпремљена",
-"No file was uploaded" => "Ниједан фајл није послат",
+"No file was uploaded" => "Датотека није отпремљена",
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
-"Files" => "Фајлови",
+"Failed to write to disk" => "Не могу да пишем на диск",
+"Files" => "Датотеке",
+"Unshare" => "Укини дељење",
 "Delete" => "Обриши",
-"Name" => "Име",
+"Rename" => "Преименуј",
+"{new_name} already exists" => "{new_name} већ постоји",
+"replace" => "замени",
+"suggest name" => "предложи назив",
+"cancel" => "откажи",
+"replaced {new_name}" => "замењено {new_name}",
+"undo" => "опозови",
+"replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
+"unshared {files}" => "укинуто дељење {files}",
+"deleted {files}" => "обрисано {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
+"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" => "Грешка при отпремању",
+"Close" => "Затвори",
+"Pending" => "На чекању",
+"1 file uploading" => "Отпремам 1 датотеку",
+"{count} files uploading" => "Отпремам {count} датотеке/а",
+"Upload cancelled." => "Отпремање је прекинуто.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Неисправан назив фасцикле. „Дељено“ користи Оунклауд.",
+"{count} files scanned" => "Скенирано датотека: {count}",
+"error while scanning" => "грешка при скенирању",
+"Name" => "Назив",
 "Size" => "Величина",
-"Modified" => "Задња измена",
+"Modified" => "Измењено",
-"Maximum upload size" => "Максимална величина пошиљке",
+"1 folder" => "1 фасцикла",
-"New" => "Нови",
+"{count} folders" => "{count} фасцикле/и",
-"Text file" => "текстуални фајл",
+"1 file" => "1 датотека",
+"{count} files" => "{count} датотеке/а",
+"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" => "фасцикла",
-"Upload" => "Пошаљи",
+"From link" => "Са везе",
-"Nothing in here. Upload something!" => "Овде нема ничег. Пошаљите нешто!",
+"Upload" => "Отпреми",
+"Cancel upload" => "Прекини отпремање",
+"Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
 "Download" => "Преузми",
-"Upload too large" => "Пошиљка је превелика",
+"Upload too large" => "Датотека је превелика",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу."
+"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" => "Тренутно скенирање"
 );

apps/files/l10n/sr@latin.php

@@ -1,16 +1,17 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Nema greške, fajl je uspešno poslat",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Poslati fajl prevazilazi direktivu upload_max_filesize iz ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
 "The uploaded file was only partially uploaded" => "Poslati fajl je samo delimično otpremljen!",
 "No file was uploaded" => "Nijedan fajl nije poslat",
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
 "Delete" => "Obriši",
+"Close" => "Zatvori",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
+"Save" => "Snimi",
 "Upload" => "Pošalji",
 "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
 "Download" => "Preuzmi",

apps/files/l10n/sv.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uppladdade filen överskrider upload_max_filesize direktivet i php.ini",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär",
 "The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvis uppladdad",
 "No file was uploaded" => "Ingen fil blev uppladdad",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
 "unshared {files}" => "stoppad delning {files}",
 "deleted {files}" => "raderade {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
 "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.",
 "Upload Error" => "Uppladdningsfel",
+"Close" => "Stäng",
 "Pending" => "Väntar",
 "1 file uploading" => "1 filuppladdning",
 "{count} files uploading" => "{count} filer laddas upp",
 "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.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Ogiltigt mappnamn. Ordet \"Delad\" är reserverat av ownCloud.",
 "{count} files scanned" => "{count} filer skannade",
 "error while scanning" => "fel vid skanning",
 "Name" => "Namn",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} mappar",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
-"seconds ago" => "sekunder sedan",
-"1 minute ago" => "1 minut sedan",
-"{minutes} minutes ago" => "{minutes} minuter sedan",
-"today" => "i dag",
-"yesterday" => "i går",
-"{days} days ago" => "{days} dagar sedan",
-"last month" => "förra månaden",
-"months ago" => "månader sedan",
-"last year" => "förra året",
-"years ago" => "år sedan",
 "File handling" => "Filhantering",
 "Maximum upload size" => "Maximal storlek att ladda upp",
 "max. possible: " => "max. möjligt:",
@@ -58,11 +50,10 @@
 "New" => "Ny",
 "Text file" => "Textfil",
 "Folder" => "Mapp",
-"From url" => "Från webbadress",
+"From link" => "Från länk",
 "Upload" => "Ladda upp",
 "Cancel upload" => "Avbryt uppladdning",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
-"Share" => "Dela",
 "Download" => "Ladda ner",
 "Upload too large" => "För stor uppladdning",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",

apps/files/l10n/ta_LK.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "பதிவேற்றப்பட்ட கோப்பானது php.ini இலுள்ள upload_max_filesize  directive ஐ விட கூடியது",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது",
 "The uploaded file was only partially uploaded" => "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது",
 "No file was uploaded" => "எந்த கோப்பும் பதிவேற்றப்படவில்லை",
@@ -19,15 +18,17 @@
 "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
 "unshared {files}" => "பகிரப்படாதது  {கோப்புகள்}",
 "deleted {files}" => "நீக்கப்பட்டது  {கோப்புகள்}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "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" => "பதிவேற்றல் வழு",
+"Close" => "மூடுக",
 "Pending" => "நிலுவையிலுள்ள",
 "1 file uploading" => "1 கோப்பு பதிவேற்றப்படுகிறது",
 "{count} files uploading" => "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது",
 "Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
 "File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
-"Invalid name, '/' is not allowed." => "செல்லுபடியற்ற பெயர், '/ ' அனுமதிக்கப்படமாட்டாது",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "செல்லுபடியற்ற கோப்புறை பெயர். \"பகிர்வின்\" பாவனை Owncloud இனால் ஒதுக்கப்பட்டுள்ளது",
 "{count} files scanned" => "{எண்ணிக்கை} கோப்புகள் வருடப்பட்டது",
 "error while scanning" => "வருடும் போதான வழு",
 "Name" => "பெயர்",
@@ -37,16 +38,6 @@
 "{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
 "1 file" => "1 கோப்பு",
 "{count} files" => "{எண்ணிக்கை} கோப்புகள்",
-"seconds ago" => "செக்கன்களுக்கு முன்",
-"1 minute ago" => "1 நிமிடத்திற்கு முன் ",
-"{minutes} minutes ago" => "{நிமிடங்கள்} நிமிடங்களுக்கு முன் ",
-"today" => "இன்று",
-"yesterday" => "நேற்று",
-"{days} days ago" => "{நாட்கள்} நாட்களுக்கு முன்",
-"last month" => "கடந்த மாதம்",
-"months ago" => "மாதங்களுக்கு முன",
-"last year" => "கடந்த வருடம்",
-"years ago" => "வருடங்களுக்கு முன்",
 "File handling" => "கோப்பு கையாளுதல்",
 "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
 "max. possible: " => "ஆகக் கூடியது:",
@@ -58,11 +49,10 @@
 "New" => "புதிய",
 "Text file" => "கோப்பு உரை",
 "Folder" => "கோப்புறை",
-"From url" => "url இலிருந்து",
+"From link" => "இணைப்பிலிருந்து",
 "Upload" => "பதிவேற்றுக",
 "Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
 "Nothing in here. Upload something!" => "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
-"Share" => "பகிர்வு",
 "Download" => "பதிவிறக்குக",
 "Upload too large" => "பதிவேற்றல் மிகப்பெரியது",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",

apps/files/l10n/th_TH.php

@@ -1,6 +1,5 @@
 <?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" => "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML",
 "The uploaded file was only partially uploaded" => "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์",
 "No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด",
@@ -10,29 +9,35 @@
 "Unshare" => "ยกเลิกการแชร์ข้อมูล",
 "Delete" => "ลบ",
 "Rename" => "เปลี่ยนชื่อ",
+"{new_name} already exists" => "{new_name} มีอยู่แล้วในระบบ",
 "replace" => "แทนที่",
 "suggest name" => "แนะนำชื่อ",
 "cancel" => "ยกเลิก",
+"replaced {new_name}" => "แทนที่ {new_name} แล้ว",
 "undo" => "เลิกทำ",
+"replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
+"unshared {files}" => "ยกเลิกการแชร์แล้ว {files} ไฟล์",
+"deleted {files}" => "ลบไฟล์แล้ว {files} ไฟล์",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
 "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" => "เกิดข้อผิดพลาดในการอัพโหลด",
+"Close" => "ปิด",
 "Pending" => "อยู่ระหว่างดำเนินการ",
 "1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์",
+"{count} files uploading" => "กำลังอัพโหลด {count} ไฟล์",
 "Upload cancelled." => "การอัพโหลดถูกยกเลิก",
 "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
-"Invalid name, '/' is not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "ชื่อโฟลเดอร์ที่ใช้ไม่ถูกต้อง การใช้งาน \"ถูกแชร์\" ถูกสงวนไว้เฉพาะ Owncloud เท่านั้น",
+"{count} files scanned" => "สแกนไฟล์แล้ว {count} ไฟล์",
 "error while scanning" => "พบข้อผิดพลาดในระหว่างการสแกนไฟล์",
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
 "Modified" => "ปรับปรุงล่าสุด",
-"seconds ago" => "วินาที ก่อนหน้านี้",
+"1 folder" => "1 โฟลเดอร์",
-"today" => "วันนี้",
+"{count} folders" => "{count} โฟลเดอร์",
-"yesterday" => "เมื่อวานนี้",
+"1 file" => "1 ไฟล์",
-"last month" => "เดือนที่แล้ว",
+"{count} files" => "{count} ไฟล์",
-"months ago" => "เดือน ที่ผ่านมา",
-"last year" => "ปีที่แล้ว",
-"years ago" => "ปี ที่ผ่านมา",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
 "max. possible: " => "จำนวนสูงสุดที่สามารถทำได้: ",
@@ -44,11 +49,10 @@
 "New" => "อัพโหลดไฟล์ใหม่",
 "Text file" => "ไฟล์ข้อความ",
 "Folder" => "แฟ้มเอกสาร",
-"From url" => "จาก url",
+"From link" => "จากลิงก์",
 "Upload" => "อัพโหลด",
 "Cancel upload" => "ยกเลิกการอัพโหลด",
 "Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
-"Share" => "แชร์",
 "Download" => "ดาวน์โหลด",
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",

apps/files/l10n/tr.php

@@ -1,23 +1,31 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Bir hata yok, dosya başarıyla yüklendi",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Yüklenen dosya php.ini de belirtilen upload_max_filesize sınırını aşıyor",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor",
 "The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi",
 "No file was uploaded" => "Hiç dosya yüklenmedi",
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
+"Unshare" => "Paylaşılmayan",
 "Delete" => "Sil",
+"Rename" => "İsim değiştir.",
+"{new_name} already exists" => "{new_name} zaten mevcut",
 "replace" => "değiştir",
+"suggest name" => "Öneri ad",
 "cancel" => "iptal",
+"replaced {new_name}" => "değiştirilen {new_name}",
 "undo" => "geri al",
+"unshared {files}" => "paylaşılmamış {files}",
+"deleted {files}" => "silinen {files}",
 "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
 "Upload Error" => "Yükleme hatası",
+"Close" => "Kapat",
 "Pending" => "Bekliyor",
+"1 file uploading" => "1 dosya yüklendi",
 "Upload cancelled." => "Yükleme iptal edildi.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
-"Invalid name, '/' is not allowed." => "Geçersiz isim, '/' işaretine izin verilmiyor.",
+"error while scanning" => "tararamada hata oluşdu",
 "Name" => "Ad",
 "Size" => "Boyut",
 "Modified" => "Değiştirilme",
@@ -28,14 +36,13 @@
 "Enable ZIP-download" => "ZIP indirmeyi aktif et",
 "0 is unlimited" => "0 limitsiz demektir",
 "Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi sayısı",
+"Save" => "Kaydet",
 "New" => "Yeni",
 "Text file" => "Metin dosyası",
 "Folder" => "Klasör",
-"From url" => "Url'den",
 "Upload" => "Yükle",
 "Cancel upload" => "Yüklemeyi iptal et",
 "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
-"Share" => "Paylaş",
 "Download" => "İndir",
 "Upload too large" => "Yüklemeniz çok büyük",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",

apps/files/l10n/uk.php

@@ -1,33 +1,59 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Файл успішно відвантажено без помилок.",
+"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 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" => "Невдалося записати на диск",
 "Files" => "Файли",
+"Unshare" => "Заборонити доступ",
 "Delete" => "Видалити",
+"Rename" => "Перейменувати",
+"{new_name} already exists" => "{new_name} вже існує",
+"replace" => "заміна",
+"suggest name" => "запропонуйте назву",
+"cancel" => "відміна",
+"replaced {new_name}" => "замінено {new_name}",
 "undo" => "відмінити",
+"replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
+"unshared {files}" => "неопубліковано {files}",
+"deleted {files}" => "видалено {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
 "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" => "Помилка завантаження",
+"Close" => "Закрити",
 "Pending" => "Очікування",
+"1 file uploading" => "1 файл завантажується",
+"{count} files uploading" => "{count} файлів завантажується",
 "Upload cancelled." => "Завантаження перервано.",
-"Invalid name, '/' is not allowed." => "Некоректне ім'я, '/' не дозволено.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Невірне ім'я каталогу. Використання \"Shared\" зарезервовано Owncloud",
+"{count} files scanned" => "{count} файлів проскановано",
+"error while scanning" => "помилка при скануванні",
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
+"1 folder" => "1 папка",
+"{count} folders" => "{count} папок",
+"1 file" => "1 файл",
+"{count} files" => "{count} файлів",
+"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",
+"From link" => "З посилання",
 "Upload" => "Відвантажити",
 "Cancel upload" => "Перервати завантаження",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
-"Share" => "Поділитися",
 "Download" => "Завантажити",
 "Upload too large" => "Файл занадто великий",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",

apps/files/l10n/vi.php

@@ -1,11 +1,10 @@
 <?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",
+"Failed to write to disk" => "Không thể ghi ",
 "Files" => "Tập tin",
 "Unshare" => "Không chia sẽ",
 "Delete" => "Xóa",
@@ -19,15 +18,17 @@
 "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
 "unshared {files}" => "hủy chia sẽ {files}",
 "deleted {files}" => "đã xóa {files}",
-"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",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
+"generating ZIP-file, it may take some time." => "Tạo tập tin ZIP, điều này có thể làm mất một chú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",
+"Close" => "Đóng",
 "Pending" => "Chờ",
 "1 file uploading" => "1 tệp tin đang được tải lên",
 "{count} files uploading" => "{count} tập tin đang tải lên",
 "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 '/'",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Tên thư mục không hợp lệ. Sử dụng \"Chia sẻ\" được dành riêng bởi Owncloud",
 "{count} files scanned" => "{count} tập tin đã được quét",
 "error while scanning" => "lỗi trong khi quét",
 "Name" => "Tên",
@@ -37,19 +38,9 @@
 "{count} folders" => "{count} thư mục",
 "1 file" => "1 tập tin",
 "{count} files" => "{count} tập tin",
-"seconds ago" => "giây trước",
-"1 minute ago" => "1 phút trước",
-"{minutes} minutes ago" => "{minutes} phút trước",
-"today" => "hôm nay",
-"yesterday" => "hôm qua",
-"{days} days ago" => "{days} ngày trước",
-"last month" => "tháng trước",
-"months ago" => "tháng trước",
-"last year" => "năm trước",
-"years ago" => "năm trước",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
-"max. possible: " => "tối đa cho phép",
+"max. possible: " => "tối đa cho phép:",
 "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",
@@ -57,15 +48,14 @@
 "Save" => "Lưu",
 "New" => "Mới",
 "Text file" => "Tập tin văn bản",
-"Folder" => "Folder",
+"Folder" => "Thư mục",
-"From url" => "Từ url",
+"From link" => "Từ liên kết",
 "Upload" => "Tải lên",
 "Cancel upload" => "Hủy upload",
 "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
-"Share" => "Chia sẻ",
 "Download" => "Tải xuống",
-"Upload too large" => "File tải lên quá lớn",
+"Upload too large" => "Tập tin tải lên quá lớn",
-"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.",
+"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 tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
 "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"
 );

apps/files/l10n/zh_CN.GB2312.php

@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "没有任何错误,文件上传成功了",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件超过了php.ini指定的upload_max_filesize",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了HTML表单指定的MAX_FILE_SIZE",
 "The uploaded file was only partially uploaded" => "文件只有部分被上传",
 "No file was uploaded" => "没有上传完成的文件",
@@ -10,29 +9,33 @@
 "Unshare" => "取消共享",
 "Delete" => "删除",
 "Rename" => "重命名",
+"{new_name} already exists" => "{new_name} 已存在",
 "replace" => "替换",
 "suggest name" => "推荐名称",
 "cancel" => "取消",
+"replaced {new_name}" => "已替换 {new_name}",
 "undo" => "撤销",
+"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
+"unshared {files}" => "未分享的 {files}",
+"deleted {files}" => "已删除的 {files}",
 "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" => "上传错误",
+"Close" => "关闭",
 "Pending" => "Pending",
 "1 file uploading" => "1 个文件正在上传",
+"{count} files uploading" => "{count} 个文件正在上传",
 "Upload cancelled." => "上传取消了",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
-"Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
+"{count} files scanned" => "{count} 个文件已扫描",
 "error while scanning" => "扫描出错",
 "Name" => "名字",
 "Size" => "大小",
 "Modified" => "修改日期",
-"seconds ago" => "秒前",
+"1 folder" => "1 个文件夹",
-"today" => "今天",
+"{count} folders" => "{count} 个文件夹",
-"yesterday" => "昨天",
+"1 file" => "1 个文件",
-"last month" => "上个月",
+"{count} files" => "{count} 个文件",
-"months ago" => "月前",
-"last year" => "去年",
-"years ago" => "年前",
 "File handling" => "文件处理中",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大可能",
@@ -44,11 +47,10 @@
 "New" => "新建",
 "Text file" => "文本文档",
 "Folder" => "文件夹",
-"From url" => "从URL:",
+"From link" => "来自链接",
 "Upload" => "上传",
 "Cancel upload" => "取消上传",
 "Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
-"Share" => "分享",
 "Download" => "下载",
 "Upload too large" => "上传的文件太大了",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",

apps/files/l10n/zh_CN.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "没有发生错误，文件上传成功。",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上传的文件大小超过了php.ini 中指定的upload_max_filesize",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE",
 "The uploaded file was only partially uploaded" => "只上传了文件的一部分",
 "No file was uploaded" => "文件没有上传",
@@ -19,15 +19,17 @@
 "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
 "unshared {files}" => "取消了共享 {files}",
 "deleted {files}" => "删除了 {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
 "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" => "上传错误",
+"Close" => "关闭",
 "Pending" => "操作等待中",
 "1 file uploading" => "1个文件上传中",
 "{count} files uploading" => "{count} 个文件上传中",
 "Upload cancelled." => "上传已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
-"Invalid name, '/' is not allowed." => "非法的名称，不允许使用‘/’。",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "无效的文件夹名称。”Shared“ 是 Owncloud 保留字符。",
 "{count} files scanned" => "{count} 个文件已扫描。",
 "error while scanning" => "扫描时出错",
 "Name" => "名称",
@@ -37,16 +39,6 @@
 "{count} folders" => "{count} 个文件夹",
 "1 file" => "1 个文件",
 "{count} files" => "{count} 个文件",
-"seconds ago" => "秒前",
-"1 minute ago" => "一分钟前",
-"{minutes} minutes ago" => "{minutes} 分钟前",
-"today" => "今天",
-"yesterday" => "昨天",
-"{days} days ago" => "{days} 天前",
-"last month" => "上月",
-"months ago" => "月前",
-"last year" => "去年",
-"years ago" => "年前",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
 "max. possible: " => "最大允许: ",
@@ -58,11 +50,10 @@
 "New" => "新建",
 "Text file" => "文本文件",
 "Folder" => "文件夹",
-"From url" => "来自地址",
+"From link" => "来自链接",
 "Upload" => "上传",
 "Cancel upload" => "取消上传",
 "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",
-"Share" => "共享",
 "Download" => "下载",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",

apps/files/l10n/zh_TW.php

@@ -1,24 +1,37 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "無錯誤，檔案上傳成功",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "上傳的檔案超過了 php.ini 中的 upload_max_filesize 設定",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上傳黨案的超過 HTML 表單中指定 MAX_FILE_SIZE 限制",
 "The uploaded file was only partially uploaded" => "只有部分檔案被上傳",
 "No file was uploaded" => "無已上傳檔案",
 "Missing a temporary folder" => "遺失暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Files" => "檔案",
+"Unshare" => "取消共享",
 "Delete" => "刪除",
+"Rename" => "重新命名",
+"{new_name} already exists" => "{new_name} 已經存在",
 "replace" => "取代",
 "cancel" => "取消",
+"replaced {new_name}" => "已取代 {new_name}",
+"undo" => "復原",
+"replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
 "generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
 "Upload Error" => "上傳發生錯誤",
+"Close" => "關閉",
+"1 file uploading" => "1 個檔案正在上傳",
+"{count} files uploading" => "{count} 個檔案正在上傳",
 "Upload cancelled." => "上傳取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中. 離開此頁面將會取消上傳.",
-"Invalid name, '/' is not allowed." => "無效的名稱, '/'是不被允許的",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "無效的資料夾名稱. \"Shared\" 名稱已被 Owncloud 所保留使用",
+"error while scanning" => "掃描時發生錯誤",
 "Name" => "名稱",
 "Size" => "大小",
 "Modified" => "修改",
+"1 folder" => "1 個資料夾",
+"{count} folders" => "{count} 個資料夾",
+"1 file" => "1 個檔案",
+"{count} files" => "{count} 個檔案",
 "File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳容量",
 "max. possible: " => "最大允許: ",
@@ -26,14 +39,13 @@
 "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!" => "沒有任何東西。請上傳內容!",
-"Share" => "分享",
 "Download" => "下載",
 "Upload too large" => "上傳過大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你試圖上傳的檔案已超過伺服器的最大容量限制。　",

apps/files/templates/admin.php

@@ -1,16 +1,25 @@
-<?php OCP\Util::addscript('files','admin'); ?>
+<?php OCP\Util::addscript('files', 'admin'); ?>
 
 <form name="filesForm" action='#' method='post'>
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('File handling');?></strong></legend>
 		<?php if($_['uploadChangable']):?>
-			<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/>
+			<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label>
+			<input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>
+			(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/>
 		<?php endif;?>
-		<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"<?php if ($_['allowZipDownload']) echo ' checked="checked"'; ?> /> <label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label> <br/>
+		<input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1"
+			   title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"
+			   <?php if ($_['allowZipDownload']): ?> checked="checked"<?php endif; ?> />
+		<label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label><br/>
 
-			<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> />
+		<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>'
-			<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
+			   title="<?php echo $l->t( '0 is unlimited' ); ?>"
+			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> />
+		<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
 
-		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php echo $l->t( 'Save' ); ?>"/>
+		<input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" />
+		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
+			   value="<?php echo $l->t( 'Save' ); ?>"/>
 	</fieldset>
-</form>
+</form>

apps/files/templates/index.php

@@ -3,29 +3,47 @@
 	<?php echo($_['breadcrumb']); ?>
 	<?php if ($_['isCreatable']):?>
 		<div class="actions <?php if (isset($_['files']) and count($_['files'])==0):?>emptyfolder<?php endif; ?>">
-			<div id='new' class='button'>
+			<div id="new" class="button">
 				<a><?php echo $l->t('New');?></a>
 				<ul class="popup popupTop">
-					<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
+					<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')"
-					<li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
+						data-type='file'><p><?php echo $l->t('Text file');?></p></li>
-					<li style="background-image:url('<?php echo OCP\image_path('core','actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From url');?></p></li>
+					<li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')"
+						data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
+					<li style="background-image:url('<?php echo OCP\image_path('core', 'actions/public.png') ?>')"
+						data-type='web'><p><?php echo $l->t('From link');?></p></li>
 				</ul>
 			</div>
-			<div class="file_upload_wrapper svg">
+			<div id="upload" class="button">
-				<form data-upload-id='1' id="data-upload-form" class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
+				<form data-upload-id='1'
-					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+					  id="data-upload-form"
-					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+					  class="file_upload_form"
+					  action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>"
+					  method="post"
+					  enctype="multipart/form-data"
+					  target="file_upload_target_1">
+					<input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
+						   value="<?php echo $_['uploadMaxFilesize'] ?>">
+					<!-- Send the requesttoken, this is needed for older IE versions
+						 because they don't send the CSRF token via HTTP header in this case -->
+					<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
+					<input type="hidden" class="max_human_file_size"
+						   value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-					<input class="file_upload_start" type="file" name='files[]'/>
+					<input type="file" id="file_upload_start" 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="svg" onclick="return false;"
-					<button class="file_upload_filename"></button>
+					   title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
-					<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
+					
+					<iframe name="file_upload_target_1" class="file_upload_target" src=""></iframe>
 				</form>
 			</div>
-					<div id="upload">
+			<div id="uploadprogresswrapper">
-						<div id="uploadprogressbar"></div>
+				<div id="uploadprogressbar"></div>
-						<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Cancel upload');?>" onclick="javascript:Files.cancelUploads();" />
+				<input type="button" class="stop" style="display:none"
-					</div>
+					value="<?php echo $l->t('Cancel upload');?>"
+					onclick="javascript:Files.cancelUploads();"
+				/>
+			</div>
 
 		</div>
 		<div id="file_action_panel"></div>
@@ -47,21 +65,32 @@
 				<input type="checkbox" id="select_all" />
 				<span class='name'><?php echo $l->t( 'Name' ); ?></span>
 				<span class='selectedActions'>
-<!-- 					<a href="" class="share"><img class='svg' alt="Share" src="<?php echo OCP\image_path("core", "actions/share.svg"); ?>" /> <?php echo $l->t('Share')?></a> -->
 					<?php if($_['allowZipDownload']) : ?>
-						<a href="" class="download"><img class='svg' alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /> <?php echo $l->t('Download')?></a>
+						<a href="" class="download">
+							<img class="svg" alt="Download"
+								 src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" />
+							<?php echo $l->t('Download')?>
+						</a>
 					<?php endif; ?>
 				</span>
 			</th>
 			<th id="headerSize"><?php echo $l->t( 'Size' ); ?></th>
 			<th id="headerDate">
 				<span id="modified"><?php echo $l->t( 'Modified' ); ?></span>
-				<?php if ($_['permissions'] & OCP\Share::PERMISSION_DELETE): ?>
+				<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
 <!-- 					NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
 					<?php if ($_['dir'] == '/Shared'): ?>
-						<span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Unshare')?> <img class="svg" alt="<?php echo $l->t('Unshare')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span>
+						<span class="selectedActions"><a href="" class="delete">
+							<?php echo $l->t('Unshare')?>
+							<img class="svg" alt="<?php echo $l->t('Unshare')?>"
+								 src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" />
+						</a></span>
 					<?php else: ?>
-						<span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Delete')?> <img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span>
+						<span class="selectedActions"><a href="" class="delete">
+							<?php echo $l->t('Delete')?>
+							<img class="svg" alt="<?php echo $l->t('Delete')?>"
+								 src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" />
+						</a></span>
 					<?php endif; ?>
 				<?php endif; ?>
 			</th>
@@ -74,7 +103,7 @@
 <div id="editor"></div>
 <div id="uploadsize-message" title="<?php echo $l->t('Upload too large')?>">
 	<p>
-		<?php echo $l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.');?>
+	<?php echo $l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.');?>
 	</p>
 </div>
 <div id="scanning-message">

apps/files/templates/part.breadcrumb.php

@@ -1,6 +1,9 @@
 	<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
-        $crumb = $_["breadcrumb"][$i]; ?>
+	$crumb = $_["breadcrumb"][$i];
-		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
+	$dir = str_replace('+', '%20', urlencode($crumb["dir"])); ?>
-		<a href="<?php echo $_['baseURL'].urlencode($crumb["dir"]); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg"
+			 data-dir='<?php echo $dir;?>'
+			 style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
+		<a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
 		</div>
-	<?php endfor;?>
+	<?php endfor;

apps/files/templates/part.list.php

@@ -1,32 +1,49 @@
 		<script type="text/javascript">
-		<?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) {
+		<?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) :?>
-			echo "var publicListView = true;";
+				var publicListView = true;
-		} else {
+		<?php else: ?>
-			echo "var publicListView = false;";
+				var publicListView = false;
-		}
+		<?php endif; ?>
-		?>
 		</script>
 
 		<?php foreach($_['files'] as $file):
 			$simple_file_size = OCP\simple_file_size($file['size']);
-			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
+			// the bigger the file, the darker the shade of grey; megabytes*2
+			$simple_size_color = intval(200-$file['size']/(1024*1024)*2);
 			if($simple_size_color<0) $simple_size_color = 0;
 			$relative_modified_date = OCP\relative_modified_date($file['mtime']);
-			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
+			// the older the file, the brighter the shade of grey; days*14
+			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
 			if($relative_date_color>200) $relative_date_color = 200;
-			$name = str_replace('+','%20', urlencode($file['name']));
+			$name = str_replace('+', '%20', urlencode($file['name']));
-			$name = str_replace('%2F','/', $name);
+			$name = str_replace('%2F', '/', $name);
-			$directory = str_replace('+','%20', urlencode($file['directory']));
+			$directory = str_replace('+', '%20', urlencode($file['directory']));
-			$directory = str_replace('%2F','/', $directory); ?>
+			$directory = str_replace('%2F', '/', $directory); ?>
-			<tr data-id="<?php echo $file['id']; ?>" data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'>
+			<tr data-id="<?php echo $file['id']; ?>"
-				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo OCP\mimetype_icon('dir'); else echo OCP\mimetype_icon($file['mimetype']); ?>)">
+				data-file="<?php echo $name;?>"
-					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
+				data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>"
-					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
+				data-mime="<?php echo $file['mimetype']?>"
+				data-size='<?php echo $file['size'];?>'
+				data-permissions='<?php echo $file['permissions']; ?>'>
+				<td class="filename svg"
+				<?php if($file['type'] == 'dir'): ?>
+					style="background-image:url(<?php echo OCP\mimetype_icon('dir'); ?>)"
+				<?php else: ?>
+					style="background-image:url(<?php echo OCP\mimetype_icon($file['mimetype']); ?>)"
+				<?php endif; ?>
+					>
+				<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
+				<?php if($file['type'] == 'dir'): ?>
+					<a class="name" href="<?php $_['baseURL'].$directory.'/'.$name; ?>)" title="">
+				<?php else: ?>
+					<a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
+				<?php endif; ?>
 					<span class="nametext">
 						<?php if($file['type'] == 'dir'):?>
 							<?php echo htmlspecialchars($file['name']);?>
 						<?php else:?>
-							<?php echo htmlspecialchars($file['basename']);?><span class='extension'><?php echo $file['extension'];?></span>
+							<?php echo htmlspecialchars($file['basename']);?><span
+								class='extension'><?php echo $file['extension'];?></span>
 						<?php endif;?>
 					</span>
 					<?php if($file['type'] == 'dir'):?>
@@ -35,7 +52,19 @@
 					<?php endif;?>
 					</a>
 				</td>
-				<td class="filesize" title="<?php echo OCP\human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>
+				<td class="filesize"
-				<td class="date"><span class="modified" title="<?php echo $file['date']; ?>" style="color:rgb(<?php echo $relative_date_color.','.$relative_date_color.','.$relative_date_color ?>)"><?php echo $relative_modified_date; ?></span></td>
+					title="<?php echo OCP\human_file_size($file['size']); ?>"
+					style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)">
+						<?php echo $simple_file_size; ?>
+				</td>
+				<td class="date">
+					<span class="modified"
+						  title="<?php echo $file['date']; ?>"
+						  style="color:rgb(<?php echo $relative_date_color.','
+														.$relative_date_color.','
+														.$relative_date_color ?>)">
+						<?php echo $relative_modified_date; ?>
+					</span>
+				</td>
 			</tr>
-		<?php endforeach; ?>
+		<?php endforeach;

apps/files_encryption/appinfo/app.php

@@ -6,14 +6,16 @@ OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php
 
 OC_FileProxy::register(new OC_FileProxy_Encryption());
 
-OCP\Util::connectHook('OC_User','post_login','OC_Crypt','loginListener');
+OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener');
 
-stream_wrapper_register('crypt','OC_CryptStream');
+stream_wrapper_register('crypt', 'OC_CryptStream');
 
-if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
+// force the user to re-loggin if the encryption key isn't unlocked
+// (happens when a user is logged in before the encryption app is enabled)
+if ( ! isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {
 	OCP\User::logout();
 	header("Location: ".OC::$WEBROOT.'/');
 	exit();
 }
 
-OCP\App::registerAdmin('files_encryption', 'settings');
+OCP\App::registerAdmin('files_encryption', 'settings');

apps/files_encryption/l10n/ar.php

@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "التشفير",
+"Exclude the following file types from encryption" => "استبعد أنواع الملفات التالية من التشفير",
+"None" => "لا شيء",
+"Enable Encryption" => "تفعيل التشفير"
+);

apps/files_encryption/l10n/fa.php

@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "رمزگذاری",
+"Exclude the following file types from encryption" => "نادیده گرفتن فایل های زیر برای رمز گذاری",
 "None" => "هیچ‌کدام",
 "Enable Encryption" => "فعال کردن رمزگذاری"
 );

apps/files_encryption/l10n/gl.php

@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Encriptado",
+"Encryption" => "Cifrado",
-"Exclude the following file types from encryption" => "Excluír os seguintes tipos de ficheiro da encriptación",
+"Exclude the following file types from encryption" => "Excluír os seguintes tipos de ficheiro do cifrado",
 "None" => "Nada",
-"Enable Encryption" => "Habilitar encriptación"
+"Enable Encryption" => "Activar o cifrado"
 );

apps/files_encryption/l10n/ko.php

@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "암호화",
+"Exclude the following file types from encryption" => "다음 파일 형식은 암호화하지 않음",
+"None" => "없음",
+"Enable Encryption" => "암호화 사용"
+);

apps/files_encryption/l10n/sr.php

@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Шифровање",
+"Exclude the following file types from encryption" => "Не шифруј следеће типове датотека",
+"None" => "Ништа",
+"Enable Encryption" => "Омогући шифровање"
+);

apps/files_encryption/l10n/ta_LK.php

@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "மறைக்குறியீடு",
+"Exclude the following file types from encryption" => "மறைக்குறியாக்கலில் பின்வரும் கோப்பு வகைகளை நீக்கவும்",
+"None" => "ஒன்றுமில்லை",
+"Enable Encryption" => "மறைக்குறியாக்கலை இயலுமைப்படுத்துக"
+);

apps/files_encryption/l10n/vi.php

@@ -1,6 +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",
+"None" => "Không có gì hết",
 "Enable Encryption" => "BẬT mã hóa"
 );

apps/files_encryption/lib/crypt.php

@@ -27,7 +27,8 @@
 //  - Setting if crypto should be on by default
 //  - Add a setting "Don´t encrypt files larger than xx because of performance reasons"
 //  - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
-//  - Don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
+//  - Don't use a password directly as encryption key, but a key which is stored on the server and encrypted with the
+//    user password. -> password change faster
 //  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
 
 
@@ -40,18 +41,18 @@ class OC_Crypt {
 	static private $bf = null;
 
 	public static function loginListener($params) {
-		self::init($params['uid'],$params['password']);
+		self::init($params['uid'], $params['password']);
 	}
 
-	public static function init($login,$password) {
+	public static function init($login, $password) {
 		$view=new OC_FilesystemView('/');
-		if(!$view->file_exists('/'.$login)) {
+		if ( ! $view->file_exists('/'.$login)) {
 			$view->mkdir('/'.$login);
 		}
 
 		OC_FileProxy::$enabled=false;
-		if(!$view->file_exists('/'.$login.'/encryption.key')) {// does key exist?
+		if ( ! $view->file_exists('/'.$login.'/encryption.key')) {// does key exist?
-			OC_Crypt::createkey($login,$password);
+			OC_Crypt::createkey($login, $password);
 		}
 		$key=$view->file_get_contents('/'.$login.'/encryption.key');
 		OC_FileProxy::$enabled=true;
@@ -67,36 +68,36 @@ class OC_Crypt {
 	 * if the key is left out, the default handeler will be used
 	 */
 	public static function getBlowfish($key='') {
-		if($key) {
+		if ($key) {
 			return new Crypt_Blowfish($key);
-		}else{
+		} else {
-			if(!isset($_SESSION['enckey'])) {
+			if ( ! isset($_SESSION['enckey'])) {
 				return false;
 			}
-			if(!self::$bf) {
+			if ( ! self::$bf) {
 				self::$bf=new Crypt_Blowfish($_SESSION['enckey']);
 			}
 			return self::$bf;
 		}
 	}
 
-	public static function createkey($username,$passcode) {
+	public static function createkey($username, $passcode) {
 		// generate a random key
-		$key=mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999);
+		$key=mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999);
 
 		// encrypt the key with the passcode of the user
-		$enckey=OC_Crypt::encrypt($key,$passcode);
+		$enckey=OC_Crypt::encrypt($key, $passcode);
 
 		// Write the file
 		$proxyEnabled=OC_FileProxy::$enabled;
 		OC_FileProxy::$enabled=false;
 		$view=new OC_FilesystemView('/'.$username);
-		$view->file_put_contents('/encryption.key',$enckey);
+		$view->file_put_contents('/encryption.key', $enckey);
 		OC_FileProxy::$enabled=$proxyEnabled;
 	}
 
 	public static function changekeypasscode($oldPassword, $newPassword) {
-		if(OCP\User::isLoggedIn()) {
+		if (OCP\User::isLoggedIn()) {
 			$username=OCP\USER::getUser();
 			$view=new OC_FilesystemView('/'.$username);
 
@@ -151,7 +152,7 @@ class OC_Crypt {
 	*/
 	public static function encryptFile( $source, $target, $key='') {
 		$handleread  = fopen($source, "rb");
-		if($handleread!=false) {
+		if ($handleread!=false) {
 			$handlewrite = fopen($target, "wb");
 			while (!feof($handleread)) {
 				$content = fread($handleread, 8192);
@@ -174,12 +175,12 @@ class OC_Crypt {
 		*/
 	public static function decryptFile( $source, $target, $key='') {
 		$handleread  = fopen($source, "rb");
-		if($handleread!=false) {
+		if ($handleread!=false) {
 			$handlewrite = fopen($target, "wb");
 			while (!feof($handleread)) {
 				$content = fread($handleread, 8192);
 				$enccontent=OC_CRYPT::decrypt( $content, $key);
-				if(feof($handleread)) {
+				if (feof($handleread)) {
 					$enccontent=rtrim($enccontent, "\0");
 				}
 				fwrite($handlewrite, $enccontent);
@@ -194,9 +195,9 @@ class OC_Crypt {
 	 */
 	public static function blockEncrypt($data, $key='') {
 		$result='';
-		while(strlen($data)) {
+		while (strlen($data)) {
-			$result.=self::encrypt(substr($data,0,8192),$key);
+			$result.=self::encrypt(substr($data, 0, 8192), $key);
-			$data=substr($data,8192);
+			$data=substr($data, 8192);
 		}
 		return $result;
 	}
@@ -204,15 +205,15 @@ class OC_Crypt {
 	/**
 	 * decrypt data in 8192b sized blocks
 	 */
-	public static function blockDecrypt($data, $key='',$maxLength=0) {
+	public static function blockDecrypt($data, $key='', $maxLength=0) {
 		$result='';
-		while(strlen($data)) {
+		while (strlen($data)) {
-			$result.=self::decrypt(substr($data,0,8192),$key);
+			$result.=self::decrypt(substr($data, 0, 8192), $key);
-			$data=substr($data,8192);
+			$data=substr($data, 8192);
 		}
-		if($maxLength>0) {
+		if ($maxLength>0) {
-			return substr($result,0,$maxLength);
+			return substr($result, 0, $maxLength);
-		}else{
+		} else {
 			return rtrim($result, "\0");
 		}
 	}

apps/files_encryption/lib/cryptstream.php

@@ -23,8 +23,9 @@
 /**
  * transparently encrypted filestream
  *
- * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
+ * you can use it as wrapper around an existing stream by setting
- *   and then fopen('crypt://streams/foo');
+ * OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream)
+ * and then fopen('crypt://streams/foo');
  */
 
 class OC_CryptStream{
@@ -37,29 +38,29 @@ class OC_CryptStream{
 	private static $rootView;
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
-		if(!self::$rootView) {
+		if ( ! self::$rootView) {
 			self::$rootView=new OC_FilesystemView('');
 		}
-		$path=str_replace('crypt://','',$path);
+		$path=str_replace('crypt://', '', $path);
-		if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {
+		if (dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {
 			$this->source=self::$sourceStreams[basename($path)]['stream'];
 			$this->path=self::$sourceStreams[basename($path)]['path'];
 			$this->size=self::$sourceStreams[basename($path)]['size'];
-		}else{
+		} else {
 			$this->path=$path;
-			if($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
+			if ($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
 				$this->size=0;
-			}else{
+			} else {
-				$this->size=self::$rootView->filesize($path,$mode);
+				$this->size=self::$rootView->filesize($path, $mode);
 			}
 			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
-			$this->source=self::$rootView->fopen($path,$mode);
+			$this->source=self::$rootView->fopen($path, $mode);
 			OC_FileProxy::$enabled=true;
-			if(!is_resource($this->source)) {
+			if ( ! is_resource($this->source)) {
-				OCP\Util::writeLog('files_encryption','failed to open '.$path,OCP\Util::ERROR);
+				OCP\Util::writeLog('files_encryption', 'failed to open '.$path, OCP\Util::ERROR);
 			}
 		}
-		if(is_resource($this->source)) {
+		if (is_resource($this->source)) {
 			$this->meta=stream_get_meta_data($this->source);
 		}
 		return is_resource($this->source);
@@ -67,7 +68,7 @@ class OC_CryptStream{
 
 	public function stream_seek($offset, $whence=SEEK_SET) {
 		$this->flush();
-		fseek($this->source,$offset,$whence);
+		fseek($this->source, $offset, $whence);
 	}
 
 	public function stream_tell() {
@@ -78,20 +79,22 @@ class OC_CryptStream{
 		//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
 		//This makes this function a lot simpler but will breake everything the moment it's fixed
 		$this->writeCache='';
-		if($count!=8192) {
+		if ($count!=8192) {
-			OCP\Util::writeLog('files_encryption','php bug 21641 no longer holds, decryption will not work',OCP\Util::FATAL);
+			OCP\Util::writeLog('files_encryption',
+							   'php bug 21641 no longer holds, decryption will not work',
+							   OCP\Util::FATAL);
 			die();
 		}
 		$pos=ftell($this->source);
-		$data=fread($this->source,8192);
+		$data=fread($this->source, 8192);
-		if(strlen($data)) {
+		if (strlen($data)) {
 			$result=OC_Crypt::decrypt($data);
-		}else{
+		} else {
 			$result='';
 		}
 		$length=$this->size-$pos;
-		if($length<8192) {
+		if ($length<8192) {
-			$result=substr($result,0,$length);
+			$result=substr($result, 0, $length);
 		}
 		return $result;
 	}
@@ -99,44 +102,44 @@ class OC_CryptStream{
 	public function stream_write($data) {
 		$length=strlen($data);
 		$currentPos=ftell($this->source);
-		if($this->writeCache) {
+		if ($this->writeCache) {
 			$data=$this->writeCache.$data;
 			$this->writeCache='';
 		}
-		if($currentPos%8192!=0) {
+		if ($currentPos%8192!=0) {
 			//make sure we always start on a block start
-			fseek($this->source,-($currentPos%8192),SEEK_CUR);
+			fseek($this->source, -($currentPos%8192), SEEK_CUR);
-			$encryptedBlock=fread($this->source,8192);
+			$encryptedBlock=fread($this->source, 8192);
-			fseek($this->source,-($currentPos%8192),SEEK_CUR);
+			fseek($this->source, -($currentPos%8192), SEEK_CUR);
 			$block=OC_Crypt::decrypt($encryptedBlock);
-			$data=substr($block,0,$currentPos%8192).$data;
+			$data=substr($block, 0, $currentPos%8192).$data;
-			fseek($this->source,-($currentPos%8192),SEEK_CUR);
+			fseek($this->source, -($currentPos%8192), SEEK_CUR);
 		}
 		$currentPos=ftell($this->source);
-		while($remainingLength=strlen($data)>0) {
+		while ($remainingLength=strlen($data)>0) {
-			if($remainingLength<8192) {
+			if ($remainingLength<8192) {
 				$this->writeCache=$data;
 				$data='';
-			}else{
+			} else {
-				$encrypted=OC_Crypt::encrypt(substr($data,0,8192));
+				$encrypted=OC_Crypt::encrypt(substr($data, 0, 8192));
-				fwrite($this->source,$encrypted);
+				fwrite($this->source, $encrypted);
-				$data=substr($data,8192);
+				$data=substr($data, 8192);
 			}
 		}
-		$this->size=max($this->size,$currentPos+$length);
+		$this->size=max($this->size, $currentPos+$length);
 		return $length;
 	}
 
-	public function stream_set_option($option,$arg1,$arg2) {
+	public function stream_set_option($option, $arg1, $arg2) {
 		switch($option) {
 			case STREAM_OPTION_BLOCKING:
-				stream_set_blocking($this->source,$arg1);
+				stream_set_blocking($this->source, $arg1);
 				break;
 			case STREAM_OPTION_READ_TIMEOUT:
-				stream_set_timeout($this->source,$arg1,$arg2);
+				stream_set_timeout($this->source, $arg1, $arg2);
 				break;
 			case STREAM_OPTION_WRITE_BUFFER:
-				stream_set_write_buffer($this->source,$arg1,$arg2);
+				stream_set_write_buffer($this->source, $arg1, $arg2);
 		}
 	}
 
@@ -145,7 +148,7 @@ class OC_CryptStream{
 	}
 
 	public function stream_lock($mode) {
-		flock($this->source,$mode);
+		flock($this->source, $mode);
 	}
 
 	public function stream_flush() {
@@ -157,17 +160,17 @@ class OC_CryptStream{
 	}
 
 	private function flush() {
-		if($this->writeCache) {
+		if ($this->writeCache) {
 			$encrypted=OC_Crypt::encrypt($this->writeCache);
-			fwrite($this->source,$encrypted);
+			fwrite($this->source, $encrypted);
 			$this->writeCache='';
 		}
 	}
 
 	public function stream_close() {
 		$this->flush();
-		if($this->meta['mode']!='r' and $this->meta['mode']!='rb') {
+		if ($this->meta['mode']!='r' and $this->meta['mode']!='rb') {
-			OC_FileCache::put($this->path, array('encrypted'=>true,'size'=>$this->size),'');
+			OC_FileCache::put($this->path, array('encrypted'=>true, 'size'=>$this->size), '');
 		}
 		return fclose($this->source);
 	}

apps/files_encryption/lib/proxy.php

@@ -35,20 +35,22 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @return bool
 	 */
 	private static function shouldEncrypt($path) {
-		if(is_null(self::$enableEncryption)) {
+		if (is_null(self::$enableEncryption)) {
-			self::$enableEncryption=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
+			self::$enableEncryption=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
 		}
-		if(!self::$enableEncryption) {
+		if ( ! self::$enableEncryption) {
 			return false;
 		}
-		if(is_null(self::$blackList)) {
+		if (is_null(self::$blackList)) {
-			self::$blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+			self::$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
+																  'type_blacklist',
+																  'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
 		}
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
 			return true;
 		}
 		$extension=substr($path, strrpos($path, '.')+1);
-		if(array_search($extension, self::$blackList)===false) {
+		if (array_search($extension, self::$blackList)===false) {
 			return true;
 		}
 	}
@@ -59,71 +61,71 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @return bool
 	 */
 	private static function isEncrypted($path) {
-		$metadata=OC_FileCache_Cached::get($path,'');
+		$metadata=OC_FileCache_Cached::get($path, '');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
 
 	public function preFile_put_contents($path,&$data) {
-		if(self::shouldEncrypt($path)) {
+		if (self::shouldEncrypt($path)) {
-			if (!is_resource($data)) {//stream put contents should have been converter to fopen
+			if ( ! is_resource($data)) {//stream put contents should have been converter to fopen
 				$size=strlen($data);
 				$data=OC_Crypt::blockEncrypt($data);
-				OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size),'');
+				OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size), '');
 			}
 		}
 	}
 
-	public function postFile_get_contents($path,$data) {
+	public function postFile_get_contents($path, $data) {
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
-			$cached=OC_FileCache_Cached::get($path,'');
+			$cached=OC_FileCache_Cached::get($path, '');
-			$data=OC_Crypt::blockDecrypt($data,'',$cached['size']);
+			$data=OC_Crypt::blockDecrypt($data, '', $cached['size']);
 		}
 		return $data;
 	}
 
 	public function postFopen($path,&$result) {
-		if(!$result) {
+		if ( ! $result) {
 			return $result;
 		}
 		$meta=stream_get_meta_data($result);
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
 			fclose($result);
-			$result=fopen('crypt://'.$path,$meta['mode']);
+			$result=fopen('crypt://'.$path, $meta['mode']);
-		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
+		} elseif (self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
-			if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
+			if (OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
 				//first encrypt the target file so we don't end up with a half encrypted file
-				OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing',OCP\Util::DEBUG);
+				OCP\Util::writeLog('files_encryption', 'Decrypting '.$path.' before writing', OCP\Util::DEBUG);
 				$tmp=fopen('php://temp');
-				OCP\Files::streamCopy($result,$tmp);
+				OCP\Files::streamCopy($result, $tmp);
 				fclose($result);
-				OC_Filesystem::file_put_contents($path,$tmp);
+				OC_Filesystem::file_put_contents($path, $tmp);
 				fclose($tmp);
 			}
-			$result=fopen('crypt://'.$path,$meta['mode']);
+			$result=fopen('crypt://'.$path, $meta['mode']);
 		}
 		return $result;
 	}
 
-	public function postGetMimeType($path,$mime) {
+	public function postGetMimeType($path, $mime) {
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
-			$mime=OCP\Files::getMimeType('crypt://'.$path,'w');
+			$mime=OCP\Files::getMimeType('crypt://'.$path, 'w');
 		}
 		return $mime;
 	}
 
-	public function postStat($path,$data) {
+	public function postStat($path, $data) {
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
-			$cached=OC_FileCache_Cached::get($path,'');
+			$cached=OC_FileCache_Cached::get($path, '');
 			$data['size']=$cached['size'];
 		}
 		return $data;
 	}
 
-	public function postFileSize($path,$size) {
+	public function postFileSize($path, $size) {
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
-			$cached=OC_FileCache_Cached::get($path,'');
+			$cached=OC_FileCache_Cached::get($path, '');
 			return  $cached['size'];
-		}else{
+		} else {
 			return $size;
 		}
 	}

apps/files_encryption/settings.php

@@ -7,12 +7,14 @@
  */
 
 $tmpl = new OCP\Template( 'files_encryption', 'settings');
-$blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
-$enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
+												'type_blacklist',
-$tmpl->assign('blacklist',$blackList);
+												'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
-$tmpl->assign('encryption_enabled',$enabled);
+$enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
+$tmpl->assign('blacklist', $blackList);
+$tmpl->assign('encryption_enabled', $enabled);
 
-OCP\Util::addscript('files_encryption','settings');
+OCP\Util::addscript('files_encryption', 'settings');
-OCP\Util::addscript('core','multiselect');
+OCP\Util::addscript('core', 'multiselect');
 
-return $tmpl->fetchPage();
+return $tmpl->fetchPage();

apps/files_encryption/templates/settings.php

@@ -1,12 +1,14 @@
 <form id="calendar">
 	<fieldset class="personalblock">
 	<strong><?php echo $l->t('Encryption'); ?></strong>
-		<?php echo $l->t("Exclude the following file types from encryption"); ?>
+		<?php echo $l->t('Exclude the following file types from encryption'); ?>
 		<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
-			<?php foreach($_["blacklist"] as $type): ?>
+			<?php foreach ($_['blacklist'] as $type): ?>
 				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
 			<?php endforeach;?>
 		</select>
-		<input type='checkbox' id='enable_encryption' <?php if($_['encryption_enabled']) {echo 'checked="checked"';} ?>></input><label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
+		<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
+			   id='enable_encryption' ></input>
+		<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
 	</fieldset>
 </form>

apps/files_encryption/tests/encryption.php

@@ -11,46 +11,46 @@ class Test_Encryption extends UnitTestCase {
 		$key=uniqid();
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$source=file_get_contents($file); //nice large text file
-		$encrypted=OC_Crypt::encrypt($source,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertNotEqual($encrypted,$source);
+		$this->assertNotEqual($encrypted, $source);
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
-		$chunk=substr($source,0,8192);
+		$chunk=substr($source, 0, 8192);
-		$encrypted=OC_Crypt::encrypt($chunk,$key);
+		$encrypted=OC_Crypt::encrypt($chunk, $key);
 		$this->assertEqual(strlen($chunk), strlen($encrypted));
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$chunk);
+		$this->assertEqual($decrypted, $chunk);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
-		$this->assertNotEqual($encrypted,$source);
+		$this->assertNotEqual($encrypted, $source);
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
 		$tmpFileEncrypted=OCP\Files::tmpFile();
-		OC_Crypt::encryptfile($file,$tmpFileEncrypted,$key);
+		OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key);
 		$encrypted=file_get_contents($tmpFileEncrypted);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
-		$this->assertNotEqual($encrypted,$source);
+		$this->assertNotEqual($encrypted, $source);
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
 		$tmpFileDecrypted=OCP\Files::tmpFile();
-		OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
+		OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key);
 		$decrypted=file_get_contents($tmpFileDecrypted);
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
 		$file=OC::$SERVERROOT.'/core/img/weather-clear.png';
 		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
 	}
 
@@ -59,14 +59,14 @@ class Test_Encryption extends UnitTestCase {
 
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key, strlen($source));
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source));
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 	}
 }

apps/files_encryption/tests/proxy.php

@@ -13,8 +13,8 @@ class Test_CryptProxy extends UnitTestCase {
 	public function setUp() {
 		$user=OC_User::getUser();
 
-		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
+		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption', 'true');
-		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
+		OCP\Config::setAppValue('files_encryption', 'enable_encryption', 'true');
 		$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
 
 
@@ -30,7 +30,7 @@ class Test_CryptProxy extends UnitTestCase {
 
 		//set up temporary storage
 		OC_Filesystem::clearMounts();
-		OC_Filesystem::mount('OC_Filestorage_Temporary', array(),'/');
+		OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/');
 
 		OC_Filesystem::init('/'.$user.'/files');
 
@@ -41,8 +41,8 @@ class Test_CryptProxy extends UnitTestCase {
 	}
 
 	public function tearDown() {
-		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
+		OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig);
-		if(!is_null($this->oldKey)) {
+		if ( ! is_null($this->oldKey)) {
 			$_SESSION['enckey']=$this->oldKey;
 		}
 	}
@@ -51,16 +51,16 @@ class Test_CryptProxy extends UnitTestCase {
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$original=file_get_contents($file);
 
-		OC_Filesystem::file_put_contents('/file',$original);
+		OC_Filesystem::file_put_contents('/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
 
 		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$this->assertEqual(strlen($original), strlen($fromFile));
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 
 	}
 
@@ -72,46 +72,46 @@ class Test_CryptProxy extends UnitTestCase {
 		$view=new OC_FilesystemView('/'.OC_User::getUser());
 		$userDir='/'.OC_User::getUser().'/files';
 
-		$rootView->file_put_contents($userDir.'/file',$original);
+		$rootView->file_put_contents($userDir.'/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=$rootView->file_get_contents($userDir.'/file');
 		OC_FileProxy::$enabled=true;
 
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$fromFile=$rootView->file_get_contents($userDir.'/file');
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 
 		$fromFile=$view->file_get_contents('files/file');
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 	}
 
 	public function testBinary() {
 		$file=__DIR__.'/binary';
 		$original=file_get_contents($file);
 
-		OC_Filesystem::file_put_contents('/file',$original);
+		OC_Filesystem::file_put_contents('/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
 
 		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$this->assertEqual(strlen($original), strlen($fromFile));
-		$this->assertEqual($original,$fromFile);
+		$this->assertEqual($original, $fromFile);
 
 		$file=__DIR__.'/zeros';
 		$original=file_get_contents($file);
 
-		OC_Filesystem::file_put_contents('/file',$original);
+		OC_Filesystem::file_put_contents('/file', $original);
 
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
 
 		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original,$stored);
+		$this->assertNotEqual($original, $stored);
 		$this->assertEqual(strlen($original), strlen($fromFile));
 	}
 }

apps/files_encryption/tests/stream.php

@@ -10,27 +10,27 @@ class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
 
 	function testStream() {
-		$stream=$this->getStream('test1','w', strlen('foobar'));
+		$stream=$this->getStream('test1', 'w', strlen('foobar'));
-		fwrite($stream,'foobar');
+		fwrite($stream, 'foobar');
 		fclose($stream);
 
-		$stream=$this->getStream('test1','r', strlen('foobar'));
+		$stream=$this->getStream('test1', 'r', strlen('foobar'));
-		$data=fread($stream,6);
+		$data=fread($stream, 6);
 		fclose($stream);
-		$this->assertEqual('foobar',$data);
+		$this->assertEqual('foobar', $data);
 
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-		$source=fopen($file,'r');
+		$source=fopen($file, 'r');
-		$target=$this->getStream('test2','w',0);
+		$target=$this->getStream('test2', 'w', 0);
-		OCP\Files::streamCopy($source,$target);
+		OCP\Files::streamCopy($source, $target);
 		fclose($target);
 		fclose($source);
 
-		$stream=$this->getStream('test2','r', filesize($file));
+		$stream=$this->getStream('test2', 'r', filesize($file));
 		$data=stream_get_contents($stream);
 		$original=file_get_contents($file);
 		$this->assertEqual(strlen($original), strlen($data));
-		$this->assertEqual($original,$data);
+		$this->assertEqual($original, $data);
 	}
 
 	/**
@@ -40,46 +40,46 @@ class Test_CryptStream extends UnitTestCase {
 	 * @param int size
 	 * @return resource
 	 */
-	function getStream($id,$mode,$size) {
+	function getStream($id, $mode, $size) {
-		if($id==='') {
+		if ($id==='') {
 			$id=uniqid();
 		}
-		if(!isset($this->tmpFiles[$id])) {
+		if ( ! isset($this->tmpFiles[$id])) {
 			$file=OCP\Files::tmpFile();
 			$this->tmpFiles[$id]=$file;
-		}else{
+		} else {
 			$file=$this->tmpFiles[$id];
 		}
-		$stream=fopen($file,$mode);
+		$stream=fopen($file, $mode);
-		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
+		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size);
-		return fopen('crypt://streams/'.$id,$mode);
+		return fopen('crypt://streams/'.$id, $mode);
 	}
 
 	function testBinary() {
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file);
 
-		$stream=$this->getStream('test','w', strlen($source));
+		$stream=$this->getStream('test', 'w', strlen($source));
-		fwrite($stream,$source);
+		fwrite($stream, $source);
 		fclose($stream);
 
-		$stream=$this->getStream('test','r', strlen($source));
+		$stream=$this->getStream('test', 'r', strlen($source));
 		$data=stream_get_contents($stream);
 		fclose($stream);
 		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source,$data);
+		$this->assertEqual($source, $data);
 
 		$file=__DIR__.'/zeros';
 		$source=file_get_contents($file);
 
-		$stream=$this->getStream('test2','w', strlen($source));
+		$stream=$this->getStream('test2', 'w', strlen($source));
-		fwrite($stream,$source);
+		fwrite($stream, $source);
 		fclose($stream);
 
-		$stream=$this->getStream('test2','r', strlen($source));
+		$stream=$this->getStream('test2', 'r', strlen($source));
 		$data=stream_get_contents($stream);
 		fclose($stream);
 		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source,$data);
+		$this->assertEqual($source, $data);
 	}
 }