merge master into more-whitespace

2013-08-15 23:25:20 +02:00 · 2013-08-15 23:25:20 +02:00 · 3563eecfff
parent b44cab5acc bd1895bdf8
commit 3563eecfff
2568 changed files with 129383 additions and 40002 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,6 +15,13 @@
 !/apps/files_versions
 !/apps/user_ldap
 !/apps/user_webdavauth
+/apps/files_external/3rdparty/irodsphp/PHPUnitTest
+/apps/files_external/3rdparty/irodsphp/web
+/apps/files_external/3rdparty/irodsphp/prods/test
+/apps/files_external/3rdparty/irodsphp/prods/tutorials
+/apps/files_external/3rdparty/irodsphp/prods/test*
+
+

 # ignore themes except the README
 /themes/*
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 217626723957161191572ea50172a3943c30696d
+Subproject commit 2f3ae9f56a9838b45254393e13c14f8a8c380d6b
--- a/20
+++ b/20
@ -1,20 +0,0 @@
-ownCloud gives you freedom and control over your own data.
-A personal cloud which runs on your own server.
-
-http://ownCloud.org
-
-Installation instructions: http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
-Contribution Guidelines: http://owncloud.org/dev/contribute/
-
-Source code: https://github.com/owncloud
-Mailing list: https://mail.kde.org/mailman/listinfo/owncloud
-IRC channel: https://webchat.freenode.net/?channels=owncloud
-Diaspora: https://joindiaspora.com/u/owncloud
-Identi.ca: https://identi.ca/owncloud
-
-Important notice on translations:
-Please submit translations via Transifex:
-https://www.transifex.com/projects/p/owncloud/
-
-For more detailed information about translations:
-http://owncloud.org/dev/translation/
--- a/README.md
+++ b/README.md
@ -0,0 +1,26 @@
+# ownCloud
+
+[ownCloud](http://ownCloud.org) gives you freedom and control over your own data.
+A personal cloud which runs on your own server.
+
+### Build Status on [Jenkins CI](https://ci.owncloud.org/)
+Git master: [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=ownCloud-Server%28master%29)](https://ci.owncloud.org/job/ownCloud-Server%28master%29/)
+
+### Installation instructions
+http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
+
+### Contribution Guidelines
+http://owncloud.org/dev/contribute/
+
+### Get in touch
+* [Forum](http://forum.owncloud.org)
+* [Mailing list](https://mail.kde.org/mailman/listinfo/owncloud)
+* [IRC channel](https://webchat.freenode.net/?channels=owncloud)
+* [Twitter](https://twitter.com/ownClouders)
+
+### Important notice on translations
+Please submit translations via Transifex:
+https://www.transifex.com/projects/p/owncloud/
+
+For more detailed information about translations:
+http://owncloud.org/dev/translation/
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@ -35,7 +35,7 @@ $dir = $_GET["dir"];

 $files_list = json_decode($files);
 // in case we get only a single file
-if ($files_list === NULL ) {
+if (!is_array($files_list)) {
 	$files_list = array($files);
 }

--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@ -54,6 +54,8 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 	}
 }

+$target = $dir.'/'.$filename;
+
 if($source) {
 	if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') {
 		OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
@ -62,7 +64,6 @@ if($source) {

 	$ctx = stream_context_create(null, array('notification' =>'progress'));
 	$sourceStream=fopen($source, 'rb', false, $ctx);
-	$target=$dir.'/'.$filename;
 	$result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
 	if($result) {
 		$meta = \OC\Files\Filesystem::getFileInfo($target);
@ -75,20 +76,24 @@ if($source) {
 	$eventSource->close();
 	exit();
 } else {
+	$success = false;
 	if($content) {
-		if(\OC\Files\Filesystem::file_put_contents($dir.'/'.$filename, $content)) {
-			$meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename);
-			$id = $meta['fileid'];
-			OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
-			exit();
-		}
-	}elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
-		$meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename);
+		$success = \OC\Files\Filesystem::file_put_contents($target, $content);
+	} else {
+		$success = \OC\Files\Filesystem::touch($target);
+	}
+
+	if($success) {
+		$meta = \OC\Files\Filesystem::getFileInfo($target);
 		$id = $meta['fileid'];
-		OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype'])));
+		$mime = $meta['mimetype'];
+		OCP\JSON::success(array('data' => array(
+			'id' => $id,
+			'mime' => $mime,
+			'content' => $content,
+		)));
 		exit();
 	}
 }

-
 OCP\JSON::error(array("data" => array( "message" => "Error when creating the file" )));
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@ -16,72 +16,56 @@ if (isset($_GET['users'])) {
 }

 $eventSource = new OC_EventSource();
-ScanListener::$eventSource = $eventSource;
-ScanListener::$view = \OC\Files\Filesystem::getView();
-
-OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_folder', 'ScanListener', 'folder');
-OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_file', 'ScanListener', 'file');
+$listener = new ScanListener($eventSource);

 foreach ($users as $user) {
 	$eventSource->send('user', $user);
-	OC_Util::tearDownFS();
-	OC_Util::setupFS($user);
-
-	$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
-
-	$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
-	$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
-	$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
-
-	foreach ($mountPoints as $mountPoint) {
-		$storage = \OC\Files\Filesystem::getStorage($mountPoint);
-		if ($storage) {
-			ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
-			$scanner = $storage->getScanner();
-			if ($force) {
-				$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
-			} else {
-				$scanner->backgroundScan();
-			}
-		}
+	$scanner = new \OC\Files\Utils\Scanner($user);
+	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', array($listener, 'file'));
+	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', array($listener, 'folder'));
+	if ($force) {
+		$scanner->scan($dir);
+	} else {
+		$scanner->backgroundScan($dir);
 	}
 }

-$eventSource->send('done', ScanListener::$fileCount);
+$eventSource->send('done', $listener->getCount());
 $eventSource->close();

 class ScanListener {

-	static public $fileCount = 0;
-	static public $lastCount = 0;
-
-	/**
-	 * @var \OC\Files\View $view
-	 */
-	static public $view;
-
-	/**
-	 * @var array $mountPoints map storage ids to mountpoints
-	 */
-	static public $mountPoints = array();
+	private $fileCount = 0;
+	private $lastCount = 0;

 	/**
 	 * @var \OC_EventSource event source to pass events to
 	 */
-	static public $eventSource;
+	private $eventSource;

-	static function folder($params) {
-		$internalPath = $params['path'];
-		$mountPoint = self::$mountPoints[$params['storage']];
-		$path = self::$view->getRelativePath($mountPoint . $internalPath);
-		self::$eventSource->send('folder', $path);
+	/**
+	 * @param \OC_EventSource $eventSource
+	 */
+	public function __construct($eventSource) {
+		$this->eventSource = $eventSource;
 	}

-	static function file() {
-		self::$fileCount++;
-		if (self::$fileCount > self::$lastCount + 20) { //send a count update every 20 files
-			self::$lastCount = self::$fileCount;
-			self::$eventSource->send('count', self::$fileCount);
+	/**
+	 * @param string $path
+	 */
+	public function folder($path) {
+		$this->eventSource->send('folder', $path);
+	}
+
+	public function file() {
+		$this->fileCount++;
+		if ($this->fileCount > $this->lastCount + 20) { //send a count update every 20 files
+			$this->lastCount = $this->fileCount;
+			$this->eventSource->send('count', $this->fileCount);
 		}
 	}
+
+	public function getCount() {
+		return $this->fileCount;
+	}
 }
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@ -23,7 +23,7 @@
 *
 */
 // load needed apps
-$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
+$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging');

 OC_App::loadApps($RUNTIME_APPTYPES);

@ -35,15 +35,17 @@ $lockBackend = new OC_Connector_Sabre_Locks();
 $requestBackend = new OC_Connector_Sabre_Request();

 // Create ownCloud Dir
-$publicDir = new OC_Connector_Sabre_Directory('');
+$rootDir = new OC_Connector_Sabre_Directory('');
+$objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir);

 // Fire up server
-$server = new Sabre_DAV_Server($publicDir);
+$server = new Sabre_DAV_Server($objectTree);
 $server->httpRequest = $requestBackend;
 $server->setBaseUri($baseuri);

 // Load plugins
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
+$defaults = new OC_Defaults();
+$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
 $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());
--- a/apps/files/console/scan.php
+++ b/apps/files/console/scan.php
@ -0,0 +1,31 @@
+<?php
+
+if (count($argv) !== 2) {
+	echo "Usage:" . PHP_EOL;
+	echo " files:scan <user_id>" . PHP_EOL;
+	echo "  will rescan all files of the given user" . PHP_EOL;
+	echo " files:scan --all" . PHP_EOL;
+	echo "  will rescan all files of all known users" . PHP_EOL;
+	return;
+}
+
+function scanFiles($user) {
+	$scanner = new \OC\Files\Utils\Scanner($user);
+	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) {
+		echo "Scanning $path" . PHP_EOL;
+	});
+	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) {
+		echo "Scanning $path" . PHP_EOL;
+	});
+	$scanner->scan('');
+}
+
+if ($argv[1] === '--all') {
+	$users = OC_User::getUsers();
+} else {
+	$users = array($argv[1]);
+}
+
+foreach ($users as $user) {
+	scanFiles($user);
+}
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@ -24,7 +24,7 @@
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>form>input { padding:0.3em; margin:-0.3em; }

-#trash { height:17px; margin: 0 1em; z-index:1010; float: right; }
+#trash { margin: 0 1em; z-index:1010; float: right; }

 #upload {
 	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
@ -114,7 +114,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 	position:relative; width:100%;
 	-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
 }
-#select_all { float:left; margin:.3em 0.6em 0 .5em; }
+#select_all { float:left; margin:.4em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }

 /* File actions */
--- a/apps/files/index.php
+++ b/apps/files/index.php
@ -121,7 +121,17 @@ if ($needUpgrade) {
 	// information about storage capacities
 	$storageInfo=OC_Helper::getStorageInfo();
 	$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+	$publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
+	if (OC_App::isEnabled('files_encryption')) {
+		$publicUploadEnabled = 'no';
+	}

+	$trashEnabled = \OCP\App::isEnabled('files_trashbin');
+	$trashEmpty = true;
+	if ($trashEnabled) {
+		$trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
+	}
+	
 	OCP\Util::addscript('files', 'fileactions');
 	OCP\Util::addscript('files', 'files');
 	OCP\Util::addscript('files', 'keyboardshortcuts');
@ -132,11 +142,13 @@ if ($needUpgrade) {
 	$tmpl->assign('isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
 	$tmpl->assign('permissions', $permissions);
 	$tmpl->assign('files', $files);
-	$tmpl->assign('trash', \OCP\App::isEnabled('files_trashbin'));
+	$tmpl->assign('trash', $trashEnabled);
+	$tmpl->assign('trashEmpty', $trashEmpty);
 	$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 	$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 	$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 	$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
 	$tmpl->assign('isPublic', false);
+	$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
 	$tmpl->printPage();
 }
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@ -65,7 +65,7 @@ var FileActions = {
 		FileActions.currentFile = parent;
 		var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
 		var file = FileActions.getCurrentFile();
-		if ($('tr').filterAttr('data-file', file).data('renaming')) {
+		if ($('tr[data-file="'+file+'"]').data('renaming')) {
 			return;
 		}
 		parent.children('a.name').append('<span class="fileactions" />');
@ -164,10 +164,11 @@ $(document).ready(function () {
 			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'));
 	});
+	
+	$('#fileList').trigger(jQuery.Event("fileActionsReady"));

 });

--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@ -47,7 +47,7 @@ var FileList={

 		//size column
 		if(size!=t('files', 'Pending')){
-			simpleSize=simpleFileSize(size);
+			simpleSize = humanFileSize(size);
 		}else{
 			simpleSize=t('files', 'Pending');
 		}
@ -55,7 +55,6 @@ var FileList={
 		var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
 		td = $('<td></td>').attr({
 			"class": "filesize",
-			"title": humanFileSize(size),
 			"style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'
 		}).text(simpleSize);
 		tr.append(td);
@ -171,6 +170,8 @@ var FileList={
 			}
 		}else if(type=='dir' && $('tr[data-file]').length>0){
 			$('tr[data-file]').first().before(element);
+		} else if(type=='file' && $('tr[data-file]').length>0) {
+			$('tr[data-file]').last().before(element);
 		}else{
 			$('#fileList').append(element);
 		}
@ -391,6 +392,7 @@ var FileList={
 							files.removeClass('selected');
 						});
 						procesSelection();
+						checkTrashStatus();
 					} else {
 						$.each(files,function(index,file) {
 							var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
@ -450,13 +452,14 @@ $(document).ready(function(){
 				var currentUploads = parseInt(uploadtext.attr('currentUploads'));
 				currentUploads += 1;
 				uploadtext.attr('currentUploads', currentUploads);
+				var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
 				if(currentUploads === 1) {
 					var img = OC.imagePath('core', 'loading.gif');
 					data.context.find('td.filename').attr('style','background-image:url('+img+')');
-					uploadtext.text(t('files', '1 file uploading'));
+					uploadtext.text(translatedText);
 					uploadtext.show();
 				} else {
-					uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+					uploadtext.text(translatedText);
 				}
 			} else {
 				// add as stand-alone row to filelist
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@ -121,7 +121,7 @@ $(document).ready(function() {
 	});

 	// Show trash bin
-	$('#trash a').live('click', function() {
+	$('#trash').on('click', function() {
 		window.location=OC.filePath('files_trashbin', '', 'index.php');
 	});

@ -756,26 +756,16 @@ function procesSelection(){
 		for(var i=0;i<selectedFolders.length;i++){
 			totalSize+=selectedFolders[i].size;
 		};
-		simpleSize=simpleFileSize(totalSize);
-		$('#headerSize').text(simpleSize);
-		$('#headerSize').attr('title',humanFileSize(totalSize));
+		$('#headerSize').text(humanFileSize(totalSize));
 		var selection='';
 		if(selectedFolders.length>0){
-			if(selectedFolders.length==1){
-				selection+=t('files','1 folder');
-			}else{
-				selection+=t('files','{count} folders',{count: selectedFolders.length});
-			}
+			selection += n('files', '%n folder', '%n folders', selectedFolders.length);
 			if(selectedFiles.length>0){
 				selection+=' & ';
 			}
 		}
 		if(selectedFiles.length>0){
-			if(selectedFiles.length==1){
-				selection+=t('files','1 file');
-			}else{
-				selection+=t('files','{count} files',{count: selectedFiles.length});
-			}
+			selection += n('files', '%n file', '%n files', selectedFiles.length);
 		}
 		$('#headerName>span.name').text(selection);
 		$('#modified').text('');
@ -847,3 +837,11 @@ function getUniqueName(name){
 	}
 	return name;
 }
+
+function checkTrashStatus() {
+	$.post(OC.filePath('files_trashbin', 'ajax', 'isEmpty.php'), function(result){
+		if (result.data.isEmpty === false) {
+			$("input[type=button][id=trash]").removeAttr("disabled");
+		}
+	});
+}
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
 "Could not move %s" => "فشل في نقل %s",
 "No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
@ -29,7 +30,7 @@
 "replaced {new_name} with {old_name}" => "استبدل {new_name}  بـ  {old_name}",
 "undo" => "تراجع",
 "perform delete operation" => "جاري تنفيذ عملية الحذف",
-"1 file uploading" => "جاري رفع 1 ملف",
+"_Uploading %n file_::_Uploading %n files_" => array("","","","","",""),
 "'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.",
 "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
@ -40,10 +41,8 @@
 "Name" => "اسم",
 "Size" => "حجم",
 "Modified" => "معدل",
-"1 folder" => "مجلد عدد 1",
-"{count} folders" => "{count} مجلدات",
-"1 file" => "ملف واحد",
-"{count} files" => "{count} ملفات",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
 "Upload" => "رفع",
 "File handling" => "التعامل مع الملف",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
@ -69,3 +68,4 @@
 "Current scanning" => "الفحص الحالي",
 "Upgrading filesystem cache..." => "تحديث ذاكرة التخزين المؤقت(الكاش)  الخاصة بملفات النظام ..."
 );
+$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?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" => "Файлът който се опитвате да качите надвишава стойностите в MAX_FILE_SIZE в HTML формата.",
 "The uploaded file was only partially uploaded" => "Файлът е качен частично",
@ -17,13 +18,12 @@
 "replace" => "препокриване",
 "cancel" => "отказ",
 "undo" => "възтановяване",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 файл",
-"{count} files" => "{count} файла",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Качване",
 "Maximum upload size" => "Максимален размер за качване",
 "0 is unlimited" => "Ползвайте 0 за без ограничения",
@ -39,3 +39,4 @@
 "Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.",
 "file" => "файл"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s কে স্থানান্তর করা সম্ভব হলো না -  এই নামের ফাইল বিদ্যমান",
 "Could not move %s" => "%s  কে স্থানান্তর করা সম্ভব হলো না",
 "No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।",
@ -27,7 +28,7 @@
 "cancel" => "বাতিল",
 "replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
 "undo" => "ক্রিয়া প্রত্যাহার",
-"1 file uploading" => "১টি ফাইল আপলোড করা হচ্ছে",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
 "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
@ -35,10 +36,8 @@
 "Name" => "রাম",
 "Size" => "আকার",
 "Modified" => "পরিবর্তিত",
-"1 folder" => "১টি ফোল্ডার",
-"{count} folders" => "{count} টি ফোল্ডার",
-"1 file" => "১টি ফাইল",
-"{count} files" => "{count} টি ফাইল",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "আপলোড",
 "File handling" => "ফাইল হ্যার্ডলিং",
 "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
@ -61,3 +60,4 @@
 "Files are being scanned, please wait." => "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।",
 "Current scanning" => "বর্তমান স্ক্যানিং"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
 "Could not move %s" => " No s'ha pogut moure %s",
 "Unable to set upload directory." => "No es pot establir la carpeta de pujada.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
 "undo" => "desfés",
 "perform delete operation" => "executa d'operació d'esborrar",
-"1 file uploading" => "1 fitxer pujant",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fitxers pujant",
 "'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.",
 "File name cannot be empty." => "El nom del fitxer no pot ser buit.",
@ -45,10 +46,8 @@
 "Name" => "Nom",
 "Size" => "Mida",
 "Modified" => "Modificat",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetes",
-"1 file" => "1 fitxer",
-"{count} files" => "{count} fitxers",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s no es pot canviar el nom",
 "Upload" => "Puja",
 "File handling" => "Gestió de fitxers",
@ -79,3 +78,4 @@
 "files" => "fitxers",
 "Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@ -1,12 +1,13 @@
-<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Nelze přesunout %s - existuje soubor se stejným názvem",
+<?php
+$TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem",
 "Could not move %s" => "Nelze přesunout %s",
 "Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.",
 "Invalid Token" => "Neplatný token",
-"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
+"No file was uploaded. Unknown error" => "Žádný soubor nebyl odeslán. Neznámá chyba",
 "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: " => "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 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ý ve 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",
 "Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
@ -14,11 +15,11 @@
 "Not enough storage available" => "Nedostatek dostupného úložného prostoru",
 "Invalid directory." => "Neplatný adresář",
 "Files" => "Soubory",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů",
-"Not enough space available" => "Nedostatek dostupného místa",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů",
+"Not enough space available" => "Nedostatek volného místa",
 "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í.",
-"URL cannot be empty." => "URL nemůže být prázdná",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
+"URL cannot be empty." => "URL nemůže být prázdná.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno",
 "Error" => "Chyba",
 "Share" => "Sdílet",
@ -31,24 +32,23 @@
 "suggest name" => "navrhnout název",
 "cancel" => "zrušit",
 "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
-"undo" => "zpět",
+"undo" => "vrátit zpět",
 "perform delete operation" => "provést smazání",
-"1 file uploading" => "odesílá se 1 soubor",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "soubory se odesílají",
 "'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
 "File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud",
+"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud",
 "Name" => "Název",
 "Size" => "Velikost",
 "Modified" => "Upraveno",
-"1 folder" => "1 složka",
-"{count} folders" => "{count} složky",
-"1 file" => "1 soubor",
-"{count} files" => "{count} soubory",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"%s could not be renamed" => "%s nemůže být přejmenován",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
 "Maximum upload size" => "Maximální velikost pro odesílání",
@ -72,7 +72,10 @@
 "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.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
 "Current scanning" => "Aktuální prohledávání",
+"directory" => "adresář",
+"directories" => "adresáře",
 "file" => "soubor",
 "files" => "soubory",
 "Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
 "Could not move %s" => "Methwyd symud %s",
 "No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
 "undo" => "dadwneud",
 "perform delete operation" => "cyflawni gweithred dileu",
-"1 file uploading" => "1 ffeil yn llwytho i fyny",
+"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
 "files uploading" => "ffeiliau'n llwytho i fyny",
 "'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
 "File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.",
@ -42,10 +43,8 @@
 "Name" => "Enw",
 "Size" => "Maint",
 "Modified" => "Addaswyd",
-"1 folder" => "1 blygell",
-"{count} folders" => "{count} plygell",
-"1 file" => "1 ffeil",
-"{count} files" => "{count} ffeil",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
 "Upload" => "Llwytho i fyny",
 "File handling" => "Trafod ffeiliau",
 "Maximum upload size" => "Maint mwyaf llwytho i fyny",
@ -71,3 +70,4 @@
 "Current scanning" => "Sganio cyfredol",
 "Upgrading filesystem cache..." => "Uwchraddio storfa system ffeiliau..."
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
 "Could not move %s" => "Kunne ikke flytte %s",
+"Unable to set upload directory." => "Ude af stand til at vælge upload mappe.",
+"Invalid Token" => "Ugyldig Token ",
 "No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
 "There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
 "undo" => "fortryd",
 "perform delete operation" => "udfør slet operation",
-"1 file uploading" => "1 fil uploades",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "uploader filer",
 "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
 "File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
@ -43,10 +46,9 @@
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "%s kunne ikke omdøbes",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
@ -70,7 +72,10 @@
 "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.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
 "Current scanning" => "Indlæser",
+"directory" => "mappe",
+"directories" => "Mapper",
 "file" => "fil",
 "files" => "filer",
 "Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
 "Could not move %s" => "Konnte %s nicht verschieben",
+"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
+"Invalid Token" => "Ungültiges Merkmal",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
 "perform delete operation" => "Löschvorgang ausführen",
-"1 file uploading" => "1 Datei wird hochgeladen",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
@ -43,10 +46,9 @@
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
@ -70,7 +72,10 @@
 "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",
+"directory" => "Verzeichnis",
+"directories" => "Verzeichnisse",
 "file" => "Datei",
 "files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@ -1,5 +1,6 @@
-<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
+<?php
+$TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
 "Could not move %s" => "Konnte %s nicht verschieben",
 "Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
 "Invalid Token" => "Ungültiges Merkmal",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
 "perform delete operation" => "Löschvorgang ausführen",
-"1 file uploading" => "1 Datei wird hochgeladen",
+"_Uploading %n file_::_Uploading %n files_" => array("Es werden %n Dateien hochgeladen","Es werden %n Dateien hochgeladen"),
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
@ -45,10 +46,8 @@
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Geändert",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s konnte nicht umbenannt werden",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
@ -79,3 +78,4 @@
 "files" => "Dateien",
 "Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα",
 "Could not move %s" => "Αδυναμία μετακίνησης του %s",
+"Unable to set upload directory." => "Αδυναμία ορισμού καταλόγου αποστολής.",
+"Invalid Token" => "Μη έγκυρο Token",
 "No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
 "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",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
 "undo" => "αναίρεση",
 "perform delete operation" => "εκτέλεση της διαδικασίας διαγραφής",
-"1 file uploading" => "1 αρχείο ανεβαίνει",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "αρχεία ανεβαίνουν",
 "'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
 "File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
@ -43,10 +46,9 @@
 "Name" => "Όνομα",
 "Size" => "Μέγεθος",
 "Modified" => "Τροποποιήθηκε",
-"1 folder" => "1 φάκελος",
-"{count} folders" => "{count} φάκελοι",
-"1 file" => "1 αρχείο",
-"{count} files" => "{count} αρχεία",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
 "Upload" => "Μεταφόρτωση",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
@ -76,3 +78,4 @@
 "files" => "αρχεία",
 "Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/en@pirate.php
+++ b/apps/files/l10n/en@pirate.php
@ -1,3 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Download" => "Download"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
 "Could not move %s" => "Ne eblis movi %s",
 "No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
@ -31,7 +32,7 @@
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
 "perform delete operation" => "plenumi forigan operacion",
-"1 file uploading" => "1 dosiero estas alŝutata",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "dosieroj estas alŝutataj",
 "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
 "File name cannot be empty." => "Dosiernomo devas ne malpleni.",
@ -43,10 +44,8 @@
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
-"1 folder" => "1 dosierujo",
-"{count} folders" => "{count} dosierujoj",
-"1 file" => "1 dosiero",
-"{count} files" => "{count} dosierujoj",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
@ -74,3 +73,4 @@
 "files" => "dosieroj",
 "Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con ese nombre ya existe.",
 "Could not move %s" => "No se pudo mover %s",
 "Unable to set upload directory." => "Incapaz de crear directorio de subida.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "undo" => "deshacer",
 "perform delete operation" => "Realizar operación de borrado",
-"1 file uploading" => "subiendo 1 archivo",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "subiendo archivos",
 "'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
@ -45,10 +46,8 @@
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetas",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s no se pudo renombrar",
 "Upload" => "Subir",
 "File handling" => "Manejo de archivos",
@ -79,3 +78,4 @@
 "files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@ -1,26 +1,29 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
 "Could not move %s" => "No se pudo mover %s ",
+"Unable to set upload directory." => "No fue posible crear el directorio de subida.",
+"Invalid Token" => "Token Inválido",
 "No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
 "There is no error, the file uploaded with success" => "No hay errores, el archivo fue subido con éxito",
 "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 subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
 "The uploaded file was only partially uploaded" => "El archivo fue subido parcialmente",
 "No file was uploaded" => "No se subió ningún archivo ",
-"Missing a temporary folder" => "Error en la carpera temporal",
+"Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "Error al escribir en el disco",
-"Not enough storage available" => "No hay suficiente capacidad de almacenamiento",
-"Invalid directory." => "Directorio invalido.",
+"Not enough storage available" => "No hay suficiente almacenamiento",
+"Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
 "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",
 "Not enough space available" => "No hay suficiente espacio disponible",
 "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á.",
 "URL cannot be empty." => "La URL no puede estar vacía",
-"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud",
 "Error" => "Error",
 "Share" => "Compartir",
-"Delete permanently" => "Borrar de manera permanente",
+"Delete permanently" => "Borrar permanentemente",
 "Delete" => "Borrar",
 "Rename" => "Cambiar nombre",
 "Pending" => "Pendientes",
@ -28,30 +31,29 @@
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
-"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
+"replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
 "undo" => "deshacer",
-"perform delete operation" => "Eliminar",
-"1 file uploading" => "Subiendo 1 archivo",
+"perform delete operation" => "Llevar a cabo borrado",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "Subiendo archivos",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
 "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
 "Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
+"Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"1 folder" => "1 directorio",
-"{count} folders" => "{count} directorios",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "No se pudo renombrar %s",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
-"Needed for multi-file and folder downloads." => "Es necesario para descargas multi-archivo y de carpetas",
+"Needed for multi-file and folder downloads." => "Es necesario para descargas multi-archivo y de directorios.",
 "Enable ZIP-download" => "Habilitar descarga en formato ZIP",
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
@ -60,7 +62,7 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
-"Deleted files" => "Archivos Borrados",
+"Deleted files" => "Archivos borrados",
 "Cancel upload" => "Cancelar subida",
 "You don’t have write permissions here." => "No tenés permisos de escritura acá.",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
@ -70,7 +72,10 @@
 "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 ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
 "Current scanning" => "Escaneo actual",
+"directory" => "directorio",
+"directories" => "directorios",
 "file" => "archivo",
 "files" => "archivos",
 "Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
 "Could not move %s" => "%s liigutamine ebaõnnestus",
 "Unable to set upload directory." => "Üleslaadimiste kausta määramine ebaõnnestus.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "undo" => "tagasi",
 "perform delete operation" => "teosta kustutamine",
-"1 file uploading" => "1 fail üleslaadimisel",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "faili üleslaadimisel",
 "'.' is an invalid file name." => "'.' on vigane failinimi.",
 "File name cannot be empty." => "Faili nimi ei saa olla tühi.",
@ -45,10 +46,8 @@
 "Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
-"1 folder" => "1 kaust",
-"{count} folders" => "{count} kausta",
-"1 file" => "1 fail",
-"{count} files" => "{count} faili",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
 "Upload" => "Lae üles",
 "File handling" => "Failide käsitlemine",
@ -79,3 +78,4 @@
 "files" => "faili",
 "Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
 "Could not move %s" => "Ezin dira fitxategiak mugitu %s",
+"Unable to set upload directory." => "Ezin da igoera direktorioa ezarri.",
+"Invalid Token" => "Lekuko baliogabea",
 "No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo 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:",
@ -17,6 +20,7 @@
 "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.",
 "URL cannot be empty." => "URLa ezin da hutsik egon.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago.",
 "Error" => "Errorea",
 "Share" => "Elkarbanatu",
 "Delete permanently" => "Ezabatu betirako",
@ -30,7 +34,7 @@
 "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
 "undo" => "desegin",
 "perform delete operation" => "Ezabatu",
-"1 file uploading" => "fitxategi 1 igotzen",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fitxategiak igotzen",
 "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
 "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
@ -42,10 +46,9 @@
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
-"1 folder" => "karpeta bat",
-"{count} folders" => "{count} karpeta",
-"1 file" => "fitxategi bat",
-"{count} files" => "{count} fitxategi",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "%s ezin da berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
@ -69,7 +72,10 @@
 "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.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
 "Current scanning" => "Orain eskaneatzen ari da",
+"directory" => "direktorioa",
+"directories" => "direktorioak",
 "file" => "fitxategia",
 "files" => "fitxategiak",
 "Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
 "Could not move %s" => "%s نمی تواند حرکت کند ",
 "Unable to set upload directory." => "قادر به تنظیم پوشه آپلود نمی باشد.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
 "undo" => "بازگشت",
 "perform delete operation" => "انجام عمل حذف",
-"1 file uploading" => "1 پرونده آپلود شد.",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "بارگذاری فایل ها",
 "'.' is an invalid file name." => "'.'   یک نام پرونده نامعتبر است.",
 "File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.",
@ -45,10 +46,8 @@
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تاریخ",
-"1 folder" => "1 پوشه",
-"{count} folders" => "{ شمار} پوشه ها",
-"1 file" => "1 پرونده",
-"{count} files" => "{ شمار } فایل ها",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
 "Upload" => "بارگزاری",
 "File handling" => "اداره پرونده ها",
@ -79,3 +78,4 @@
 "files" => "پرونده ها",
 "Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/fi.php
+++ b/apps/files/l10n/fi.php
@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Save" => "tallentaa"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
 "Could not move %s" => "Kohteen %s siirto ei onnistunut",
 "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
@ -29,6 +30,7 @@
 "cancel" => "peru",
 "undo" => "kumoa",
 "perform delete operation" => "suorita poistotoiminto",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
 "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
@ -38,10 +40,8 @@
 "Name" => "Nimi",
 "Size" => "Koko",
 "Modified" => "Muokattu",
-"1 folder" => "1 kansio",
-"{count} folders" => "{count} kansiota",
-"1 file" => "1 tiedosto",
-"{count} files" => "{count} tiedostoa",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Lähetä",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
@ -65,7 +65,10 @@
 "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.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
 "Current scanning" => "Tämänhetkinen tutkinta",
+"directory" => "kansio",
+"directories" => "kansiota",
 "file" => "tiedosto",
 "files" => "tiedostoa",
 "Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
 "Could not move %s" => "Impossible de déplacer %s",
 "Unable to set upload directory." => "Impossible de définir le dossier pour l'upload, charger.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
 "undo" => "annuler",
 "perform delete operation" => "effectuer l'opération de suppression",
-"1 file uploading" => "1 fichier en cours d'envoi",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fichiers en cours d'envoi",
 "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
 "File name cannot be empty." => "Le nom de fichier ne peut être vide.",
@ -45,10 +46,8 @@
 "Name" => "Nom",
 "Size" => "Taille",
 "Modified" => "Modifié",
-"1 folder" => "1 dossier",
-"{count} folders" => "{count} dossiers",
-"1 file" => "1 fichier",
-"{count} files" => "{count} fichiers",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s ne peut être renommé",
 "Upload" => "Envoyer",
 "File handling" => "Gestion des fichiers",
@ -73,7 +72,10 @@
 "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.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
 "Current scanning" => "Analyse en cours",
+"directory" => "dossier",
+"directories" => "dossiers",
 "file" => "fichier",
 "files" => "fichiers",
 "Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Non se moveu %s - Xa existe un ficheiro con ese nome.",
 "Could not move %s" => "Non foi posíbel mover %s",
 "Unable to set upload directory." => "Non é posíbel configurar o directorio de envíos.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}",
 "undo" => "desfacer",
 "perform delete operation" => "realizar a operación de eliminación",
-"1 file uploading" => "Enviándose 1 ficheiro",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "ficheiros enviándose",
 "'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
 "File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
@ -45,10 +46,8 @@
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"1 folder" => "1 cartafol",
-"{count} folders" => "{count} cartafoles",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s non pode cambiar de nome",
 "Upload" => "Enviar",
 "File handling" => "Manexo de ficheiro",
@ -79,3 +78,4 @@
 "files" => "ficheiros",
 "Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
 "Could not move %s" => "לא ניתן להעביר את %s",
 "No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
@ -29,16 +30,14 @@
 "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
 "undo" => "ביטול",
 "perform delete operation" => "ביצוע פעולת מחיקה",
-"1 file uploading" => "קובץ אחד נשלח",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "קבצים בהעלאה",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
-"1 folder" => "תיקייה אחת",
-"{count} folders" => "{count} תיקיות",
-"1 file" => "קובץ אחד",
-"{count} files" => "{count} קבצים",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "העלאה",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
@ -63,3 +62,4 @@
 "file" => "קובץ",
 "files" => "קבצים"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "त्रुटि",
 "Share" => "साझा करें",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Save" => "सहेजें"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
 "The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
@ -18,11 +19,13 @@
 "suggest name" => "predloži ime",
 "cancel" => "odustani",
 "undo" => "vrati",
-"1 file uploading" => "1 datoteka se učitava",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "datoteke se učitavaju",
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Učitaj",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
@ -46,3 +49,4 @@
 "file" => "datoteka",
 "files" => "datoteke"
 );
+$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
 "Could not move %s" => "Nem sikerült %s áthelyezése",
+"Unable to set upload directory." => "Nem található a mappa, ahova feltölteni szeretne.",
+"Invalid Token" => "Hibás mappacím",
 "No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
 "There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel:  {old_name}",
 "undo" => "visszavonás",
 "perform delete operation" => "a törlés végrehajtása",
-"1 file uploading" => "1 fájl töltődik föl",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fájl töltődik föl",
 "'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
 "File name cannot be empty." => "A fájlnév nem lehet semmi.",
@ -43,10 +46,9 @@
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} mappa",
-"1 file" => "1 fájl",
-"{count} files" => "{count} fájl",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "%s átnevezése nem sikerült",
 "Upload" => "Feltöltés",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
@ -70,7 +72,10 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
 "Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
 "Current scanning" => "Ellenőrzés alatt",
+"directory" => "mappa",
+"directories" => "mappa",
 "file" => "fájl",
 "files" => "fájlok",
 "Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/hy.php
+++ b/apps/files/l10n/hy.php
@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Delete" => "Ջնջել",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Save" => "Պահպանել",
 "Download" => "Բեռնել"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?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",
@ -6,9 +7,12 @@
 "Error" => "Error",
 "Share" => "Compartir",
 "Delete" => "Deler",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Incargar",
 "Maximum upload size" => "Dimension maxime de incargamento",
 "Save" => "Salveguardar",
@ -19,3 +23,4 @@
 "Download" => "Discargar",
 "Upload too large" => "Incargamento troppo longe"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
 "Could not move %s" => "Tidak dapat memindahkan %s",
 "No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
 "undo" => "urungkan",
 "perform delete operation" => "Lakukan operasi penghapusan",
-"1 file uploading" => "1 berkas diunggah",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "berkas diunggah",
 "'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
 "File name cannot be empty." => "Nama berkas tidak boleh kosong.",
@ -42,10 +43,8 @@
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} folder",
-"1 file" => "1 berkas",
-"{count} files" => "{count} berkas",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
@ -73,3 +72,4 @@
 "files" => "berkas-berkas",
 "Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
 "Could not move %s" => "Gat ekki fært %s",
 "No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
@ -27,7 +28,7 @@
 "cancel" => "hætta við",
 "replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
 "undo" => "afturkalla",
-"1 file uploading" => "1 skrá innsend",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
 "File name cannot be empty." => "Nafn skráar má ekki vera tómt",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
@ -35,10 +36,8 @@
 "Name" => "Nafn",
 "Size" => "Stærð",
 "Modified" => "Breytt",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} möppur",
-"1 file" => "1 skrá",
-"{count} files" => "{count} skrár",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Senda inn",
 "File handling" => "Meðhöndlun skrár",
 "Maximum upload size" => "Hámarks stærð innsendingar",
@ -61,3 +60,4 @@
 "Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu.",
 "Current scanning" => "Er að skima"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
 "Could not move %s" => "Impossibile spostare %s",
 "Unable to set upload directory." => "Impossibile impostare una cartella di caricamento.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
 "undo" => "annulla",
 "perform delete operation" => "esegui l'operazione di eliminazione",
-"1 file uploading" => "1 file in fase di caricamento",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "caricamento file",
 "'.' is an invalid file name." => "'.' non è un nome file valido.",
 "File name cannot be empty." => "Il nome del file non può essere vuoto.",
@ -45,10 +46,8 @@
 "Name" => "Nome",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
-"1 folder" => "1 cartella",
-"{count} folders" => "{count} cartelle",
-"1 file" => "1 file",
-"{count} files" => "{count} file",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s non può essere rinominato",
 "Upload" => "Carica",
 "File handling" => "Gestione file",
@ -79,3 +78,4 @@
 "files" => "file",
 "Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
 "Could not move %s" => "%s を移動できませんでした",
 "Unable to set upload directory." => "アップロードディレクトリを設定出来ません。",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "undo" => "元に戻す",
 "perform delete operation" => "削除を実行",
-"1 file uploading" => "ファイルを1つアップロード中",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "ファイルをアップロード中",
 "'.' is an invalid file name." => "'.' は無効なファイル名です。",
 "File name cannot be empty." => "ファイル名を空にすることはできません。",
@ -45,10 +46,8 @@
 "Name" => "名前",
 "Size" => "サイズ",
 "Modified" => "変更",
-"1 folder" => "1 フォルダ",
-"{count} folders" => "{count} フォルダ",
-"1 file" => "1 ファイル",
-"{count} files" => "{count} ファイル",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "%s could not be renamed" => "%sの名前を変更できませんでした",
 "Upload" => "アップロード",
 "File handling" => "ファイル操作",
@ -79,3 +78,4 @@
 "files" => "ファイル",
 "Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/ka.php
+++ b/apps/files/l10n/ka.php
@ -1,4 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Files" => "ფაილები",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Download" => "გადმოწერა"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
 "Could not move %s" => "%s –ის გადატანა ვერ მოხერხდა",
 "No file was uploaded. Unknown error" => "ფაილი არ აიტვირთა. უცნობი შეცდომა",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
 "undo" => "დაბრუნება",
 "perform delete operation" => "მიმდინარეობს წაშლის ოპერაცია",
-"1 file uploading" => "1 ფაილის ატვირთვა",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "ფაილები იტვირთება",
 "'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.",
 "File name cannot be empty." => "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
@ -42,10 +43,8 @@
 "Name" => "სახელი",
 "Size" => "ზომა",
 "Modified" => "შეცვლილია",
-"1 folder" => "1 საქაღალდე",
-"{count} folders" => "{count} საქაღალდე",
-"1 file" => "1 ფაილი",
-"{count} files" => "{count} ფაილი",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "ატვირთვა",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
@ -71,3 +70,4 @@
 "Current scanning" => "მიმდინარე სკანირება",
 "Upgrading filesystem cache..." => "ფაილური სისტემის ქეშის განახლება...."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함",
 "Could not move %s" => "%s 항목을 이딩시키지 못하였음",
 "No file was uploaded. Unknown error" => "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
 "undo" => "되돌리기",
 "perform delete operation" => "삭제 작업중",
-"1 file uploading" => "파일 1개 업로드 중",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "파일 업로드중",
 "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
 "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
@ -42,10 +43,8 @@
 "Name" => "이름",
 "Size" => "크기",
 "Modified" => "수정됨",
-"1 folder" => "폴더 1개",
-"{count} folders" => "폴더 {count}개",
-"1 file" => "파일 1개",
-"{count} files" => "파일 {count}개",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "업로드",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
@ -73,3 +72,4 @@
 "files" => "파일",
 "Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@ -1,9 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.",
 "Error" => "هه‌ڵه",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "ناو",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "بارکردن",
 "Save" => "پاشکه‌وتکردن",
 "Folder" => "بوخچه",
 "Download" => "داگرتن"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
 "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",
@ -15,9 +16,12 @@
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
 "undo" => "réckgängeg man",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Eroplueden",
 "File handling" => "Fichier handling",
 "Maximum upload size" => "Maximum Upload Gréisst ",
@ -41,3 +45,4 @@
 "file" => "Datei",
 "files" => "Dateien"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
 "Could not move %s" => "Nepavyko perkelti %s",
 "No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties",
@ -31,7 +32,7 @@
 "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
 "undo" => "anuliuoti",
 "perform delete operation" => "ištrinti",
-"1 file uploading" => "įkeliamas 1 failas",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "įkeliami failai",
 "'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
 "File name cannot be empty." => "Failo pavadinimas negali būti tuščias.",
@ -43,10 +44,8 @@
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
-"1 folder" => "1 aplankalas",
-"{count} folders" => "{count} aplankalai",
-"1 file" => "1 failas",
-"{count} files" => "{count} failai",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Įkelti",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@ -74,3 +73,4 @@
 "files" => "failai",
 "Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
 "Could not move %s" => "Nevarēja pārvietot %s",
 "No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
 "undo" => "atsaukt",
 "perform delete operation" => "veikt dzēšanas darbību",
-"1 file uploading" => "Augšupielādē 1 datni",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
 "File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
@ -41,10 +42,8 @@
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Mainīts",
-"1 folder" => "1 mape",
-"{count} folders" => "{count} mapes",
-"1 file" => "1 datne",
-"{count} files" => "{count} datnes",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Augšupielādēt",
 "File handling" => "Datņu pārvaldība",
 "Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
@ -72,3 +71,4 @@
 "files" => "faili",
 "Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
 "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:",
@ -23,15 +24,13 @@
 "cancel" => "откажи",
 "replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
 "undo" => "врати",
-"1 file uploading" => "1 датотека се подига",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеки",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Подигни",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
@ -56,3 +55,4 @@
 "file" => "датотека",
 "files" => "датотеки"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
 "There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
@ -15,9 +16,12 @@
 "Pending" => "Dalam proses",
 "replace" => "ganti",
 "cancel" => "Batal",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "Name" => "Nama",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "Muat naik",
 "File handling" => "Pengendalian fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
@ -40,3 +44,4 @@
 "file" => "fail",
 "files" => "fail"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/my_MM.php
+++ b/apps/files/l10n/my_MM.php
@ -1,4 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Files" => "ဖိုင်များ",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Download" => "ဒေါင်းလုတ်"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
 "Could not move %s" => "Kunne ikke flytte %s",
+"Unable to set upload directory." => "Kunne ikke sette opplastingskatalog.",
 "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
 "There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
@ -31,7 +33,7 @@
 "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
 "undo" => "angre",
 "perform delete operation" => "utfør sletting",
-"1 file uploading" => "1 fil lastes opp",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "filer lastes opp",
 "'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
 "File name cannot be empty." => "Filnavn kan ikke være tomt.",
@ -43,10 +45,8 @@
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
@ -70,7 +70,10 @@
 "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.",
 "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
 "Current scanning" => "Pågående skanning",
+"directory" => "katalog",
+"directories" => "kataloger",
 "file" => "fil",
 "files" => "filer",
 "Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
 "Could not move %s" => "Kon %s niet verplaatsen",
 "Unable to set upload directory." => "Kan upload map niet instellen.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
 "undo" => "ongedaan maken",
 "perform delete operation" => "uitvoeren verwijderactie",
-"1 file uploading" => "1 bestand wordt ge-upload",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "bestanden aan het uploaden",
 "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
 "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
@ -45,10 +46,9 @@
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",
-"1 folder" => "1 map",
-"{count} folders" => "{count} mappen",
-"1 file" => "1 bestand",
-"{count} files" => "{count} bestanden",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "%s kon niet worden hernoemd",
 "Upload" => "Uploaden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
@ -72,7 +72,10 @@
 "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.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
 "Current scanning" => "Er wordt gescand",
+"directory" => "directory",
+"directories" => "directories",
 "file" => "bestand",
 "files" => "bestanden",
 "Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
 "Could not move %s" => "Klarte ikkje flytta %s",
 "No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
@ -31,7 +32,7 @@
 "replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
 "undo" => "angre",
 "perform delete operation" => "utfør sletting",
-"1 file uploading" => "1 fil lastar opp",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "filer lastar opp",
 "'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
 "File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
@ -43,10 +44,8 @@
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Last opp",
 "File handling" => "Filhandtering",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
@ -72,3 +71,4 @@
 "Current scanning" => "Køyrande skanning",
 "Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Amontcargament capitat, pas d'errors",
 "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",
@ -18,11 +19,13 @@
 "suggest name" => "nom prepausat",
 "cancel" => "anulla",
 "undo" => "defar",
-"1 file uploading" => "1 fichièr al amontcargar",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "fichièrs al amontcargar",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Amontcarga",
 "File handling" => "Manejament de fichièr",
 "Maximum upload size" => "Talha maximum d'amontcargament",
@ -46,3 +49,4 @@
 "file" => "fichièr",
 "files" => "fichièrs"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
 "Could not move %s" => "Nie można było przenieść %s",
 "Unable to set upload directory." => "Nie można ustawić katalog wczytywania.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}",
 "undo" => "cofnij",
 "perform delete operation" => "wykonaj operację usunięcia",
-"1 file uploading" => "1 plik wczytywany",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "pliki wczytane",
 "'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.",
 "File name cannot be empty." => "Nazwa pliku nie może być pusta.",
@ -45,10 +46,8 @@
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
 "Modified" => "Modyfikacja",
-"1 folder" => "1 folder",
-"{count} folders" => "Ilość folderów: {count}",
-"1 file" => "1 plik",
-"{count} files" => "Ilość plików: {count}",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s nie można zmienić nazwy",
 "Upload" => "Wyślij",
 "File handling" => "Zarządzanie plikami",
@ -79,3 +78,4 @@
 "files" => "pliki",
 "Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/pl_PL.php
+++ b/apps/files/l10n/pl_PL.php
@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Save" => "Zapisz"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
 "Could not move %s" => "Impossível mover %s",
 "Unable to set upload directory." => "Impossível configurar o diretório de upload",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
 "undo" => "desfazer",
 "perform delete operation" => "realizar operação de exclusão",
-"1 file uploading" => "enviando 1 arquivo",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "enviando arquivos",
 "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
 "File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
@ -45,10 +46,8 @@
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 arquivo",
-"{count} files" => "{count} arquivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s não pode ser renomeado",
 "Upload" => "Upload",
 "File handling" => "Tratamento de Arquivo",
@ -79,3 +78,4 @@
 "files" => "arquivos",
 "Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome",
 "Could not move %s" => "Não foi possível move o ficheiro %s",
+"Unable to set upload directory." => "Não foi possível criar o diretório de upload",
+"Invalid Token" => "Token inválido",
 "No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
 "There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi submetido com sucesso",
 "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",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
 "undo" => "desfazer",
 "perform delete operation" => "Executar a tarefa de apagar",
-"1 file uploading" => "A enviar 1 ficheiro",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "A enviar os ficheiros",
 "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
 "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
@ -43,10 +46,9 @@
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "%s não pode ser renomeada",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
@ -70,7 +72,10 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
 "Current scanning" => "Análise actual",
+"directory" => "diretório",
+"directories" => "diretórios",
 "file" => "ficheiro",
 "files" => "ficheiros",
 "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s nu se poate muta - Fișierul cu acest nume există deja ",
 "Could not move %s" => "Nu s-a putut muta %s",
 "Unable to set upload directory." => "Imposibil de a seta directorul pentru incărcare.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
 "undo" => "Anulează ultima acțiune",
 "perform delete operation" => "efectueaza operatiunea de stergere",
-"1 file uploading" => "un fișier se încarcă",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "fișiere se încarcă",
 "'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
 "File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
@ -45,10 +46,8 @@
 "Name" => "Nume",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} foldare",
-"1 file" => "1 fisier",
-"{count} files" => "{count} fisiere",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s nu a putut fi redenumit",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
@ -79,3 +78,4 @@
 "files" => "fișiere",
 "Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Невозможно переместить %s - файл с таким именем уже существует",
 "Could not move %s" => "Невозможно переместить %s",
 "Unable to set upload directory." => "Не удалось установить каталог загрузки.",
@ -32,8 +33,8 @@
 "cancel" => "отмена",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "undo" => "отмена",
-"perform delete operation" => "выполняется операция удаления",
-"1 file uploading" => "загружается 1 файл",
+"perform delete operation" => "выполнить операцию удаления",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "файлы загружаются",
 "'.' is an invalid file name." => "'.' - неправильное имя файла.",
 "File name cannot be empty." => "Имя файла не может быть пустым.",
@ -45,10 +46,8 @@
 "Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменён",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлов",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "%s could not be renamed" => "%s не может быть переименован",
 "Upload" => "Загрузка",
 "File handling" => "Управление файлами",
@ -79,3 +78,4 @@
 "files" => "файлы",
 "Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
 "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" => "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме",
@ -14,3 +15,4 @@
 "Save" => "Сохранить",
 "Download" => "Загрузка"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්",
 "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 විශාලත්වයට වඩා වැඩිය",
@ -18,12 +19,12 @@
 "suggest name" => "නමක් යෝජනා කරන්න",
 "cancel" => "අත් හරින්න",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
-"1 file uploading" => "1 ගොනුවක් උඩගත කෙරේ",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
-"1 folder" => "1 ෆොල්ඩරයක්",
-"1 file" => "1 ගොනුවක්",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "උඩුගත කරන්න",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
@ -48,3 +49,4 @@
 "file" => "ගොනුව",
 "files" => "ගොනු"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie je možné presunúť %s - súbor s týmto menom už existuje",
 "Could not move %s" => "Nie je možné presunúť %s",
+"Unable to set upload directory." => "Nemožno nastaviť priečinok pre nahrané súbory.",
+"Invalid Token" => "Neplatný token",
 "No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
 "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 predčil  konfiguračnú direktívu upload_max_filesize v súbore php.ini:",
@ -10,13 +13,13 @@
 "Missing a temporary folder" => "Chýba dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Not enough storage available" => "Nedostatok dostupného úložného priestoru",
-"Invalid directory." => "Neplatný priečinok",
+"Invalid directory." => "Neplatný priečinok.",
 "Files" => "Súbory",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov",
 "Not enough space available" => "Nie je k dispozícii dostatok miesta",
-"Upload cancelled." => "Odosielanie zrušené",
+"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.",
-"URL cannot be empty." => "URL nemôže byť prázdne",
+"URL cannot be empty." => "URL nemôže byť prázdne.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud",
 "Error" => "Chyba",
 "Share" => "Zdieľať",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
 "undo" => "vrátiť",
 "perform delete operation" => "vykonať zmazanie",
-"1 file uploading" => "1 súbor sa posiela ",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "nahrávanie súborov",
 "'.' is an invalid file name." => "'.' je neplatné meno súboru.",
 "File name cannot be empty." => "Meno súboru nemôže byť prázdne",
@ -43,10 +46,9 @@
 "Name" => "Názov",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
-"1 folder" => "1 priečinok",
-"{count} folders" => "{count} priečinkov",
-"1 file" => "1 súbor",
-"{count} files" => "{count} súborov",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"%s could not be renamed" => "%s nemohol byť premenovaný",
 "Upload" => "Odoslať",
 "File handling" => "Nastavenie správania sa k súborom",
 "Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
@ -70,7 +72,10 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
 "Current scanning" => "Práve prezerané",
+"directory" => "priečinok",
+"directories" => "priečinky",
 "file" => "súbor",
 "files" => "súbory",
 "Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s ni mogoče premakniti  - datoteka s tem imenom že obstaja",
 "Could not move %s" => "Ni mogoče premakniti %s",
 "Unable to set upload directory." => "Mapo, v katero boste prenašali dokumente, ni mogoče določiti",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}",
 "undo" => "razveljavi",
 "perform delete operation" => "izvedi opravilo brisanja",
-"1 file uploading" => "Pošiljanje 1 datoteke",
+"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
 "files uploading" => "poteka pošiljanje datotek",
 "'.' is an invalid file name." => "'.' je neveljavno ime datoteke.",
 "File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.",
@ -45,10 +46,8 @@
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
-"1 folder" => "1 mapa",
-"{count} folders" => "{count} map",
-"1 file" => "1 datoteka",
-"{count} files" => "{count} datotek",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
 "%s could not be renamed" => "%s ni bilo mogoče preimenovati",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",
@ -79,3 +78,4 @@
 "files" => "datoteke",
 "Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër",
 "Could not move %s" => "%s nuk u spostua",
 "No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}",
 "undo" => "anulo",
 "perform delete operation" => "ekzekuto operacionin e eliminimit",
-"1 file uploading" => "Po ngarkohet 1 skedar",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "po ngarkoj skedarët",
 "'.' is an invalid file name." => "'.' është emër i pavlefshëm.",
 "File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.",
@ -42,10 +43,8 @@
 "Name" => "Emri",
 "Size" => "Dimensioni",
 "Modified" => "Modifikuar",
-"1 folder" => "1 dosje",
-"{count} folders" => "{count} dosje",
-"1 file" => "1 skedar",
-"{count} files" => "{count} skedarë",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "Ngarko",
 "File handling" => "Trajtimi i skedarit",
 "Maximum upload size" => "Dimensioni maksimal i ngarkimit",
@ -71,3 +70,4 @@
 "Current scanning" => "Analizimi aktual",
 "Upgrading filesystem cache..." => "Po përmirësoj memorjen e filesystem-it..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Не могу да преместим %s – датотека с овим именом већ постоји",
 "Could not move %s" => "Не могу да преместим %s",
 "No file was uploaded. Unknown error" => "Ниједна датотека није отпремљена услед непознате грешке",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
 "undo" => "опозови",
 "perform delete operation" => "обриши",
-"1 file uploading" => "Отпремам 1 датотеку",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "датотеке се отпремају",
 "'.' is an invalid file name." => "Датотека „.“ је неисправног имена.",
 "File name cannot be empty." => "Име датотеке не може бити празно.",
@ -42,10 +43,8 @@
 "Name" => "Име",
 "Size" => "Величина",
 "Modified" => "Измењено",
-"1 folder" => "1 фасцикла",
-"{count} folders" => "{count} фасцикле/и",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеке/а",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Отпреми",
 "File handling" => "Управљање датотекама",
 "Maximum upload size" => "Највећа величина датотеке",
@ -71,3 +70,4 @@
 "Current scanning" => "Тренутно скенирање",
 "Upgrading filesystem cache..." => "Дограђујем кеш система датотека…"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?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 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!",
@ -6,9 +7,12 @@
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
 "Delete" => "Obriši",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Upload" => "Pošalji",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
 "Save" => "Snimi",
@ -17,3 +21,4 @@
 "Upload too large" => "Pošiljka je prevelika",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunde inte flytta %s - Det finns redan en fil med detta namn",
 "Could not move %s" => "Kan inte flytta %s",
 "Unable to set upload directory." => "Kan inte sätta mapp för uppladdning.",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
 "undo" => "ångra",
 "perform delete operation" => "utför raderingen",
-"1 file uploading" => "1 filuppladdning",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "filer laddas upp",
 "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
 "File name cannot be empty." => "Filnamn kan inte vara tomt.",
@ -45,10 +46,8 @@
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
-"1 folder" => "1 mapp",
-"{count} folders" => "{count} mappar",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "%s could not be renamed" => "%s kunde inte namnändras",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
@ -79,3 +78,4 @@
 "files" => "filer",
 "Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு",
 "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  directive ஐ விட கூடியது",
@ -22,15 +23,13 @@
 "cancel" => "இரத்து செய்க",
 "replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
 "undo" => "முன் செயல் நீக்கம் ",
-"1 file uploading" => "1 கோப்பு பதிவேற்றப்படுகிறது",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "Name" => "பெயர்",
 "Size" => "அளவு",
 "Modified" => "மாற்றப்பட்டது",
-"1 folder" => "1 கோப்புறை",
-"{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
-"1 file" => "1 கோப்பு",
-"{count} files" => "{எண்ணிக்கை} கோப்புகள்",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Upload" => "பதிவேற்றுக",
 "File handling" => "கோப்பு கையாளுதல்",
 "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
@ -53,3 +52,4 @@
 "Files are being scanned, please wait." => "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்.",
 "Current scanning" => "தற்போது வருடப்படுபவை"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@ -1,10 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "పొరపాటు",
 "Delete permanently" => "శాశ్వతంగా తొలగించు",
 "Delete" => "తొలగించు",
 "cancel" => "రద్దుచేయి",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Name" => "పేరు",
 "Size" => "పరిమాణం",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Save" => "భద్రపరచు",
 "Folder" => "సంచయం"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
 "Could not move %s" => "ไม่สามารถย้าย %s ได้",
 "No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
@ -29,7 +30,7 @@
 "replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
 "undo" => "เลิกทำ",
 "perform delete operation" => "ดำเนินการตามคำสั่งลบ",
-"1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "การอัพโหลดไฟล์",
 "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
 "File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
@ -41,10 +42,8 @@
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
 "Modified" => "แก้ไขแล้ว",
-"1 folder" => "1 โฟลเดอร์",
-"{count} folders" => "{count} โฟลเดอร์",
-"1 file" => "1 ไฟล์",
-"{count} files" => "{count} ไฟล์",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "อัพโหลด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@ -70,3 +69,4 @@
 "files" => "ไฟล์",
 "Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
 "Could not move %s" => "%s taşınamadı",
+"Unable to set upload directory." => "Yükleme dizini tanımlanamadı.",
+"Invalid Token" => "Geçeriz simge",
 "No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
 "There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi",
 "undo" => "geri al",
 "perform delete operation" => "Silme işlemini gerçekleştir",
-"1 file uploading" => "1 dosya yüklendi",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
 "files uploading" => "Dosyalar yükleniyor",
 "'.' is an invalid file name." => "'.' geçersiz dosya adı.",
 "File name cannot be empty." => "Dosya adı boş olamaz.",
@ -43,10 +46,9 @@
 "Name" => "İsim",
 "Size" => "Boyut",
 "Modified" => "Değiştirilme",
-"1 folder" => "1 dizin",
-"{count} folders" => "{count} dizin",
-"1 file" => "1 dosya",
-"{count} files" => "{count} dosya",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"%s could not be renamed" => "%s yeniden adlandırılamadı",
 "Upload" => "Yükle",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
@ -70,7 +72,10 @@
 "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.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
 "Current scanning" => "Güncel tarama",
+"directory" => "dizin",
+"directories" => "dizinler",
 "file" => "dosya",
 "files" => "dosyalar",
 "Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s" => "%s يۆتكىيەلمەيدۇ",
 "No file was uploaded. Unknown error" => "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
 "No file was uploaded" => "ھېچقانداق ھۆججەت يۈكلەنمىدى",
@ -20,14 +21,13 @@
 "suggest name" => "تەۋسىيە ئات",
 "cancel" => "ۋاز كەچ",
 "undo" => "يېنىۋال",
-"1 file uploading" => "1 ھۆججەت يۈكلىنىۋاتىدۇ",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
 "Name" => "ئاتى",
 "Size" => "چوڭلۇقى",
 "Modified" => "ئۆزگەرتكەن",
-"1 folder" => "1 قىسقۇچ",
-"1 file" => "1 ھۆججەت",
-"{count} files" => "{count} ھۆججەت",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "يۈكلە",
 "Save" => "ساقلا",
 "New" => "يېڭى",
@ -41,3 +41,4 @@
 "Upload too large" => "يۈكلەندىغىنى بەك چوڭ",
 "Upgrading filesystem cache..." => "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
 "Could not move %s" => "Не вдалося перемістити %s",
 "No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
 "undo" => "відмінити",
 "perform delete operation" => "виконати операцію видалення",
-"1 file uploading" => "1 файл завантажується",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
 "files uploading" => "файли завантажуються",
 "'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
 "File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
@ -42,10 +43,9 @@
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлів",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"%s could not be renamed" => "%s не може бути перейменований",
 "Upload" => "Вивантажити",
 "File handling" => "Робота з файлами",
 "Maximum upload size" => "Максимальний розмір відвантажень",
@ -69,7 +69,10 @@
 "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" => "Поточне сканування",
+"directory" => "каталог",
+"directories" => "каталоги",
 "file" => "файл",
 "files" => "файли",
 "Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@ -1,4 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "ایرر",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Unshare" => "شئیرنگ ختم کریں"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
 "Could not move %s" => "Không thể di chuyển %s",
 "No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
@ -30,7 +31,7 @@
 "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
 "undo" => "lùi lại",
 "perform delete operation" => "thực hiện việc xóa",
-"1 file uploading" => "1 tệp tin đang được tải lên",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "tệp tin đang được tải lên",
 "'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
 "File name cannot be empty." => "Tên file không được rỗng",
@ -42,10 +43,8 @@
 "Name" => "Tên",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
-"1 folder" => "1 thư mục",
-"{count} folders" => "{count} thư mục",
-"1 file" => "1 tập tin",
-"{count} files" => "{count} tập tin",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "Tải lên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@ -73,3 +72,4 @@
 "files" => "files",
 "Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@ -1,18 +1,29 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "无法移动 %s - 存在同名文件",
+"Could not move %s" => "无法移动 %s",
+"Unable to set upload directory." => "无法设置上传文件夹",
+"Invalid Token" => "非法Token",
 "No file was uploaded. Unknown error" => "没有上传文件。未知错误",
 "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" => "写磁盘失败",
+"Not enough storage available" => "容量不足",
+"Invalid directory." => "无效文件夹",
 "Files" => "文件",
 "Unable to upload your file as it is a directory or has 0 bytes" => "不能上传您的文件，由于它是文件夹或者为空文件",
+"Not enough space available" => "容量不足",
 "Upload cancelled." => "上传取消了",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
 "URL cannot be empty." => "网址不能为空。",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效文件夹名。“Shared”已经被系统保留。",
 "Error" => "出错",
 "Share" => "分享",
+"Delete permanently" => "永久删除",
 "Delete" => "删除",
 "Rename" => "重命名",
 "Pending" => "等待中",
@ -22,15 +33,22 @@
 "cancel" => "取消",
 "replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
 "undo" => "撤销",
-"1 file uploading" => "1 个文件正在上传",
+"perform delete operation" => "执行删除",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "个文件正在上传",
+"'.' is an invalid file name." => "'.' 文件名不正确",
+"File name cannot be empty." => "文件名不能为空",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "文件名内不能包含以下符号：\\ / < > : \" | ?和 *",
+"Your storage is full, files can not be updated or synced anymore!" => "容量已满，不能再同步/上传文件了！",
+"Your storage is almost full ({usedSpacePercent}%)" => "你的空间快用满了 ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "正在下载，可能会花点时间，跟文件大小有关",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "不正确文件夹名。Shared是保留名，不能使用。",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
-"1 folder" => "1 个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"%s could not be renamed" => "不能重命名 %s",
 "Upload" => "上传",
 "File handling" => "文件处理中",
 "Maximum upload size" => "最大上传大小",
@ -44,7 +62,9 @@
 "Text file" => "文本文档",
 "Folder" => "文件夹",
 "From link" => "来自链接",
+"Deleted files" => "已删除的文件",
 "Cancel upload" => "取消上传",
+"You don’t have write permissions here." => "您没有写入权限。",
 "Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
 "Download" => "下载",
 "Unshare" => "取消分享",
@ -52,6 +72,10 @@
 "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" => "正在扫描",
+"directory" => "文件夹",
+"directories" => "文件夹",
 "file" => "文件",
-"files" => "文件"
+"files" => "文件",
+"Upgrading filesystem cache..." => "升级系统缓存..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "无法移动 %s - 同名文件已存在",
 "Could not move %s" => "无法移动 %s",
 "Unable to set upload directory." => "无法设置上传文件夹。",
@ -33,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
 "undo" => "撤销",
 "perform delete operation" => "进行删除操作",
-"1 file uploading" => "1个文件上传中",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "文件上传中",
 "'.' is an invalid file name." => "'.' 是一个无效的文件名。",
 "File name cannot be empty." => "文件名不能为空。",
@ -45,10 +46,8 @@
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
-"1 folder" => "1个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "%s could not be renamed" => "%s 不能被重命名",
 "Upload" => "上传",
 "File handling" => "文件处理",
@ -77,3 +76,4 @@
 "files" => "文件",
 "Upgrading filesystem cache..." => "正在更新文件系统缓存..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@ -1,12 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Files" => "文件",
 "Error" => "錯誤",
 "Share" => "分享",
 "Delete" => "刪除",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "Name" => "名稱",
-"{count} folders" => "{}文件夾",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Upload" => "上傳",
 "Save" => "儲存",
 "Download" => "下載",
 "Unshare" => "取消分享"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "無法移動 %s - 同名的檔案已經存在",
 "Could not move %s" => "無法移動 %s",
+"Unable to set upload directory." => "無法設定上傳目錄。",
+"Invalid Token" => "無效的 token",
 "No file was uploaded. Unknown error" => "沒有檔案被上傳。未知的錯誤。",
 "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 參數的設定：",
@ -31,7 +34,7 @@
 "replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
 "undo" => "復原",
 "perform delete operation" => "進行刪除動作",
-"1 file uploading" => "1 個檔案正在上傳",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
 "files uploading" => "檔案正在上傳中",
 "'.' is an invalid file name." => "'.' 是不合法的檔名。",
 "File name cannot be empty." => "檔名不能為空。",
@ -43,10 +46,9 @@
 "Name" => "名稱",
 "Size" => "大小",
 "Modified" => "修改",
-"1 folder" => "1 個資料夾",
-"{count} folders" => "{count} 個資料夾",
-"1 file" => "1 個檔案",
-"{count} files" => "{count} 個檔案",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"%s could not be renamed" => "無法重新命名 %s",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳檔案大小",
@ -70,5 +72,10 @@
 "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" => "目前掃描",
+"directory" => "目錄",
+"directories" => "目錄",
+"file" => "檔案",
+"files" => "檔案",
 "Upgrading filesystem cache..." => "正在升級檔案系統快取..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@ -38,9 +38,7 @@
 				</form>
 			</div>
 			<?php if ($_['trash'] ): ?>
-			<div id="trash" class="button">
-				<a><?php p($l->t('Deleted files'));?></a>
-			</div>
+			<input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
 			<?php endif; ?>
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar"></div>
@ -61,7 +59,7 @@
 	<div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
 <?php endif; ?>

-<table id="filestable">
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>">
 	<thead>
 		<tr>
 			<th id='headerName'>
@ -77,7 +75,7 @@
 					<?php endif; ?>
 				</span>
 			</th>
-			<th id="headerSize"><?php p($l->t( 'Size' )); ?></th>
+			<th id="headerSize"><?php p($l->t('Size')); ?></th>
 			<th id="headerDate">
 				<span id="modified"><?php p($l->t( 'Modified' )); ?></span>
 				<?php if ($_['permissions'] & OCP\PERMISSION_DELETE): ?>
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@ -9,7 +9,6 @@ $totalsize = 0; ?>
 	} else {
 		$totalfiles++;
 	}
-	$simple_file_size = OCP\simple_file_size($file['size']);
 	// the bigger the file, the darker the shade of grey; megabytes*2
 	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
 	if($simple_size_color<0) $simple_size_color = 0;
@ -52,9 +51,8 @@ $totalsize = 0; ?>
 			</a>
 		</td>
 		<td class="filesize"
-			title="<?php p(OCP\human_file_size($file['size'])); ?>"
 			style="color:rgb(<?php p($simple_size_color.','.$simple_size_color.','.$simple_size_color) ?>)">
-				<?php print_unescaped($simple_file_size); ?>
+				<?php print_unescaped(OCP\human_file_size($file['size'])); ?>
 		</td>
 		<td class="date">
 			<span class="modified"
@ -91,7 +89,7 @@ $totalsize = 0; ?>
 			} ?>
 		</span></td>
 		<td class="filesize">
-		<?php print_unescaped(OCP\simple_file_size($totalsize)); ?>
+		<?php print_unescaped(OCP\human_file_size($totalsize)); ?>
 		</td>
 		<td></td>
 	</tr>
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. After the app was enabled you need to re-login to initialize your encryption keys</description>
+	<description>The new ownCloud 5 files encryption system. After the app was enabled you need to re-login to initialize your encryption keys.</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<require>4</require>
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@ -1,6 +1,6 @@
 <?php
 if (!isset($_)) { //also provide standalone error page
-	require_once '../../../lib/base.php';
+	require_once __DIR__ . '/../../../lib/base.php';

 	$l = OC_L10N::get('files_encryption');

--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@ -40,9 +40,9 @@ class Hooks {
 	public static function login($params) {
 		$l = new \OC_L10N('files_encryption');
 		//check if all requirements are met
-		if(!Helper::checkRequirements() ) {
+		if(!Helper::checkRequirements() || !Helper::checkConfiguration() ) {
 			$error_msg = $l->t("Missing requirements.");
-			$hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
+			$hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
 			\OC_App::disable('files_encryption');
 			\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
 			\OCP\Template::printErrorPage($error_msg, $hint);
@ -238,6 +238,7 @@ class Hooks {
 	 */
 	public static function preShared($params) {

+		$l = new \OC_L10N('files_encryption');
 		$users = array();
 		$view = new \OC\Files\View('/public-keys/');

@ -250,21 +251,18 @@ class Hooks {
 				break;
 		}

-		$error = false;
+		$notConfigured = array();
 		foreach ($users as $user) {
 			if (!$view->file_exists($user . '.public.key')) {
-				$error = true;
-				break;
+				$notConfigured[] = $user;
 			}
 		}

-		if ($error) // Set flag var 'run' to notify emitting
-			// script that hook execution failed
-		{
-			$params['run']->run = false;
+		if (count($notConfigured) > 0) {
+			$params['run'] = false;
+			$params['error'] = $l->t('Following users are not set up for encryption:') . ' ' . join(', ' , $notConfigured);
 		}
-		// TODO: Make sure files_sharing provides user
-		// feedback on failed share
+		
 	}

 	/**
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "جاري الحفظ...",
 "Encryption" => "التشفير"
 );
+$PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Записване...",
 "Encryption" => "Криптиране"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "সংরক্ষণ করা হচ্ছে..",
 "Encryption" => "সংকেতায়ন"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "La clau de recuperació s'ha activat",
 "Could not enable recovery key. Please check your recovery key password!" => "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
 "Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
@ -9,7 +10,8 @@
 "Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
 "Missing requirements." => "Manca de requisits.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lada la versió de PHP 5.3.3 o posterior, i que teniu l'extensió OpenSSL PHP activada i configurada correctament. Per ara, l'aplicació de xifrat esta desactivada.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
+"Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
 "Saving..." => "Desant...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora.",
 "You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
@ -34,3 +36,4 @@
 "File recovery settings updated" => "S'han  actualitzat els arranjaments de recuperació de fitxers",
 "Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@ -1,19 +1,39 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Záchranný klíč byl úspěšně povolen",
 "Could not enable recovery key. Please check your recovery key password!" => "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
 "Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
-"Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče.",
+"Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
 "Password successfully changed." => "Heslo bylo úspěšně změněno.",
-"Could not change the password. Maybe the old password was not correct." => "Nelze změnit heslo. Pravděpodobně nebylo stávající heslo zadáno správně.",
+"Could not change the password. Maybe the old password was not correct." => "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
 "Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno vně systému ownCloud (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
+"Missing requirements." => "Nesplněné závislosti.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější, a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
+"Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
 "Saving..." => "Ukládám...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno zvenčí.",
+"You can unlock your private key in your " => "Můžete odemknout váš soukromý klíč ve vašem",
+"personal settings" => "osobní nastavení",
 "Encryption" => "Šifrování",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
+"Recovery key password" => "Heslo klíče pro obnovu",
 "Enabled" => "Povoleno",
 "Disabled" => "Zakázáno",
+"Change recovery key password:" => "Změna hesla klíče pro obnovu:",
+"Old Recovery key password" => "Původní heslo klíče pro obnovu",
+"New Recovery key password" => "Nové heslo klíče pro obnovu",
 "Change Password" => "Změnit heslo",
+"Your private key password no longer match your log-in password:" => "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem:",
+"Set your old private key password to your current log-in password." => "Změňte heslo vaše soukromého klíče na stejné jako vaše přihlašovací heslo.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.",
+"Old log-in password" => "Původní přihlašovací heslo",
+"Current log-in password" => "Aktuální přihlašovací heslo",
+"Update Private Key Password" => "Změnit heslo soukromého klíče",
 "Enable password recovery:" => "Povolit obnovu hesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
-"File recovery settings updated" => "Možnosti obnovy souborů aktualizovány",
-"Could not update file recovery" => "Nelze aktualizovat obnovu souborů"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
+"File recovery settings updated" => "Možnosti záchrany souborů aktualizovány",
+"Could not update file recovery" => "Nelze nastavit záchranu souborů"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
--- a/apps/files_encryption/l10n/cy_GB.php
+++ b/apps/files_encryption/l10n/cy_GB.php
@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Yn cadw...",
 "Encryption" => "Amgryptiad"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@ -1,4 +1,39 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Gendannelsesnøgle aktiveret med succes",
+"Could not enable recovery key. Please check your recovery key password!" => "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
+"Recovery key successfully disabled" => "Gendannelsesnøgle deaktiveret succesfuldt",
+"Could not disable recovery key. Please check your recovery key password!" => "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
+"Password successfully changed." => "Kodeordet blev ændret succesfuldt",
+"Could not change the password. Maybe the old password was not correct." => "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+"Private key password successfully updated." => "Privat nøgle kodeord succesfuldt opdateret.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøgle er gyldig! Sandsynligvis blev dit kodeord ændre uden for ownCloud systemet (f.eks. dit firmas register). Du kan opdatere dit private nøgle kodeord under personlige indstillinger, for at generhverve adgang til dine krypterede filer.",
+"Missing requirements." => "Manglende betingelser.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
+"Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
 "Saving..." => "Gemmer...",
-"Encryption" => "Kryptering"
+"Your private key is not valid! Maybe the your password was changed from outside." => "Din private nøgle er ikke gyldig. Måske blev dit kodeord ændre udefra.",
+"You can unlock your private key in your " => "Du kan låse din private nøgle op i din ",
+"personal settings" => "Personlige indstillinger",
+"Encryption" => "Kryptering",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
+"Recovery key password" => "Gendannelsesnøgle kodeord",
+"Enabled" => "Aktiveret",
+"Disabled" => "Deaktiveret",
+"Change recovery key password:" => "Skift gendannelsesnøgle kodeord:",
+"Old Recovery key password" => "Gammel Gendannelsesnøgle kodeord",
+"New Recovery key password" => "Ny Gendannelsesnøgle kodeord",
+"Change Password" => "Skift Kodeord",
+"Your private key password no longer match your log-in password:" => "Dit private nøgle kodeord stemmer ikke længere overens med dit login kodeord:",
+"Set your old private key password to your current log-in password." => "Sæt dit gamle private nøgle kodeord til at være dit nuværende login kodeord. ",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
+"Old log-in password" => "Gammelt login kodeord",
+"Current log-in password" => "Nuvrende login kodeord",
+"Update Private Key Password" => "Opdater Privat Nøgle Kodeord",
+"Enable password recovery:" => "Aktiver kodeord gendannelse:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord",
+"File recovery settings updated" => "Filgendannelsesindstillinger opdateret",
+"Could not update file recovery" => "Kunne ikke opdatere filgendannelse"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
 "Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
 "Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
@ -6,13 +7,33 @@
 "Password successfully changed." => "Dein Passwort wurde geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
 "Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
+"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen.",
+"Missing requirements." => "Fehlende Vorraussetzungen",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Saving..." => "Speichern...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Eventuell wurde Ihr Passwort von außerhalb geändert.",
+"You can unlock your private key in your " => "Du kannst den privaten Schlüssel ändern und zwar in deinem",
 "personal settings" => "Private Einstellungen",
 "Encryption" => "Verschlüsselung",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
+"Recovery key password" => "Wiederherstellungsschlüssel-Passwort",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
+"Change recovery key password:" => "Wiederherstellungsschlüssel-Passwort ändern:",
+"Old Recovery key password" => "Altes Wiederherstellungsschlüssel-Passwort",
+"New Recovery key password" => "Neues Wiederherstellungsschlüssel-Passwort",
 "Change Password" => "Passwort ändern",
+"Your private key password no longer match your log-in password:" => "Ihr Passwort für ihren privaten Schlüssel stimmt nicht mehr mit ihrem Loginpasswort überein.",
+"Set your old private key password to your current log-in password." => "Setzen Sie ihr altes Passwort für ihren privaten Schlüssel auf ihr aktuelles Login-Passwort",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Wenn Sie Ihr altes Passwort vergessen haben, können Sie den Administrator bitten, Ihre Daten wiederherzustellen.",
 "Old log-in password" => "Altes login Passwort",
 "Current log-in password" => "Aktuelles Passwort",
-"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
+"Update Private Key Password" => "Passwort für den privaten Schlüssel aktualisieren",
+"Enable password recovery:" => "Passwortwiederherstellung aktivvieren:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Wenn Sie diese Option aktivieren, können Sie Ihre verschlüsselten Dateien wiederherstellen, falls Sie Ihr Passwort vergessen",
+"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
+"Could not update file recovery" => "Dateiwiederherstellung konnte nicht aktualisiert werden"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
 "Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
@ -9,7 +10,8 @@
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
 "Missing requirements." => "Fehlende Voraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und die PHP-Erweiterung OpenSSL aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Saving..." => "Speichern...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
 "You can unlock your private key in your " => "Sie können den privaten Schlüssel ändern und zwar in Ihrem",
@ -29,8 +31,9 @@
 "Old log-in password" => "Altes Login-Passwort",
 "Current log-in password" => "Momentanes Login-Passwort",
 "Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
-"Enable password recovery:" => "Passwort-Wiederherstellung aktivieren:",
+"Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
 "File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
 "Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
 "Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
 "Saving..." => "Γίνεται αποθήκευση...",
@ -9,3 +10,4 @@
 "Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
 "File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
--- a/Show More
+++ b/Show More