diff --git a/.gitignore b/.gitignore
index 43f33783e3979f99a7eed0a278ab0eea7afaa89c..43f3cab9121ba3a64d453d6e51d82c0498ef94c0 100644
--- 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/*
diff --git a/3rdparty b/3rdparty
index 217626723957161191572ea50172a3943c30696d..2f3ae9f56a9838b45254393e13c14f8a8c380d6b 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 217626723957161191572ea50172a3943c30696d
+Subproject commit 2f3ae9f56a9838b45254393e13c14f8a8c380d6b
diff --git a/README b/README
deleted file mode 100644
index 5f5d190cb0152dc5d85541614b71de81468ea298..0000000000000000000000000000000000000000
--- a/README
+++ /dev/null
@@ -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/
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ca7b04a925a940f808ea95efdacf2b2802816333
--- /dev/null
+++ 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/
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index 7c8dcb372e24c5d4517b1ac5459e1c03feb9744a..b2bfd53506d66697482f645e1f40cb6e5bff298d 100644
--- 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);
 }
 
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 8548fc95ddf963d6ef131b8b94fa808a5d547e21..8c1aad8668c300ccbcbc11217a7efa3eaf0ea9cd 100644
--- 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" )));
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 0706d4e78296b0afdd677e8072cd61266bdcdfce..5b32b6db9b72ad27b8c383ec3acc243c1b7fe891 100644
--- 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;
+	private $fileCount = 0;
+	private $lastCount = 0;
 
 	/**
-	 * @var \OC\Files\View $view
+	 * @var \OC_EventSource event source to pass events to
 	 */
-	static public $view;
+	private $eventSource;
 
 	/**
-	 * @var array $mountPoints map storage ids to mountpoints
+	 * @param \OC_EventSource $eventSource
 	 */
-	static public $mountPoints = array();
+	public function __construct($eventSource) {
+		$this->eventSource = $eventSource;
+	}
 
 	/**
-	 * @var \OC_EventSource event source to pass events to
+	 * @param string $path
 	 */
-	static public $eventSource;
-
-	static function folder($params) {
-		$internalPath = $params['path'];
-		$mountPoint = self::$mountPoints[$params['storage']];
-		$path = self::$view->getRelativePath($mountPoint . $internalPath);
-		self::$eventSource->send('folder', $path);
+	public function folder($path) {
+		$this->eventSource->send('folder', $path);
 	}
 
-	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);
+	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;
+	}
 }
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 6c92cc80b69830bc46fa6b4889a5df5140e0b283..9b114ca2e37209ddc8fd739ff99c5456c6341f23 100644
--- 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());
diff --git a/apps/files/console/scan.php b/apps/files/console/scan.php
new file mode 100644
index 0000000000000000000000000000000000000000..70183fc888af90e21b912de1b85927afe866f031
--- /dev/null
+++ 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);
+}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f2ca1065ecad4fc977a0135dfefb0bf85fcfb699..86fb0dc60466dea0ce176af43c11002dabfa78d6 100644
--- 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 */
diff --git a/apps/files/index.php b/apps/files/index.php
index 2338cf439e4c625ce2f4d655b832bf0a6fef4827..4f9e881eb2da08b0c567c8ae99e6139c6c8682a6 100644
--- 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();
 }
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index aa66a57a7b5e994eb0d04041761eb1a62c770306..de67d13559e2807e11f33639285618a24e71d97a 100644
--- 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"));
 
 });
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cf3ce2e508950c0823c573f6f8b239ca8edca698..f7cc3767b2557de8901dc59c3f3ce728770e5dec 100644
--- 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
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 51b3f31fb961f65d8f721311810bff937ac884d8..53fc25f41b0d24ffc9085bd91453a52052357469 100644
--- 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");
+		}
+	});
+}
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index e000bc966c150b5c4168ec4f50a39d61e3671568..a83420584c45dc23f9afbb1a9812ef33f5339ba7 100644
--- 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;";
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index f4424f925774b5c8d5ca9381c14e0b94a119249d..551a85ef9f4034016ac5093c3a5d41dc32eb3b26 100644
--- 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);";
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 6d755bccc8af45e3305e6bf20f1173ac9e2861db..655b6f2266293963f303c1c4a56658399f50866c 100644
--- 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);";
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 8d5f69f33184da19368df9b830fa157c77882ce5..177790ab997a25910c7dfa2feba529fb0a524c21 100644
--- 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);";
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index c16d32e9c28e81e505f755b5ef8400b4141ede43..b88be983df3841ab2b7888790cd285891d9624a2 100644
--- 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;";
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 0aab1a18bc5da97120d00d1b941973a82f77871d..ca8d3c52c0ff4e42e855a974dcc858044e65675e 100644
--- 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;";
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index c2f200e476fe956b2b9247b966b2a982840d4a6a..43dde685f3122881489dc94d51b560cc971acdc0 100644
--- 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);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 98214d6a1b23a9872b2238ff8b8ccb9d71c5dfdf..debfac152a753db55e8eab19e2591f162e3a5b11 100644
--- 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);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index f9c347b45da4d3aca74810336a8b2fcb1ea4f455..8efb9642828bd94932a566617cf66816ec42fd9a 100644
--- 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);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 7291dbbf1569a183b7aa3fc410beaa828ec887a4..9eaad889d104953f92a36d9154e718331c6082d8 100644
--- 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);";
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
index fdd1850da900c44cc2536ae2082becbf96f51e66..83351f265f09031629b06b63f476892adfdbb7af 100644
--- 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);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 561545ec6aeef5d7a6a1d33922fcf94229eb34bf..d6916a9a8db9949aa6eb92638c4cf6295589e8b8 100644
--- 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);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 78740d5150726cad47c6d324c35e1b07aa75546c..363636612327c9c28a80f2ee3bb9b78e353dc75c 100644
--- 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);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index d5ae7ae53d28c8065f20d935a2ab54d205166e6d..8c5decaeb1067c600a62d6f38699543bf998a6b7 100644
--- 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);";
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index c58b066e28719c9fe934f15cd83834971e251fae..13dd4a78d34440ab64c9b6d4eaaab722234b5410 100644
--- 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);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index c87e20b1ff66e4e322f97aeb1ac6e11d633f632e..02b2730ddcd7e98b69ab19560aa668f7189e4fc4 100644
--- 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);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 73f4b493b4d88b3d02edf3fe8819169444a2d6ba..e749f7bf0e9bacf481710eebb34e7465f01988e3 100644
--- 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;";
diff --git a/apps/files/l10n/fi.php b/apps/files/l10n/fi.php
index c5ce878aded2fb3a742cc65acd12f3112d59a4ab..437708293970f8a275acde96105145a00c51cd6b 100644
--- 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);";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 22e448c01db5b2452bec6dcaa7e853e67ac520b4..cc20d8bb3aebb4caafee6d610c67cac820175a6a 100644
--- 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);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 646373d4aae33309b9eb96270c51fb4a06e8dc85..1f6dff8ce992320d7feb7915fbecbd175bfb6e9c 100644
--- 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);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index bba6335ae053d9c617b1fdd21020422b54a09164..92c9a9d5c25981be6f8c2883d6927e93a735a21b 100644
--- 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);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 52946bc6d0b9cfa39d806c3218964f5b7a94493c..2f66e3ece3189dae76ed95cf44ef74b713e33dbc 100644
--- 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);";
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index 151d1f497c7963a9d9d6690e27e08cc6d3dd5dab..7fb5a5b09d3c98629a280914bab27f3295451256 100644
--- 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);";
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index abe8c40bd53fda2abf018eeb061919968385d39f..b1f1f6dcada7f9f9711382ea1ae67893167363bf 100644
--- 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;";
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index f0e5b1befc544d5e6a8a6b6d25aaede73674a749..1bb46703903640105a5f82c6a4da601e09984ab5 100644
--- 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);";
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
index 22edf32c6e68ed17c7a4c3761d4b0006f4f496bc..9e9658de0e5ff0495a089efa9270c8ec8576f69f 100644
--- 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);";
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 5970a4cd55a182975b80791a367c1b2b7069f756..b2addebc2f6bf9aa771386166d93d375be3ad85a 100644
--- 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);";
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index bacdcc8f496e997739d4a927a924b8fb63019f0e..e07aa2e069ef21fc75d0e28974453269b88e989a 100644
--- 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;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 97b19ae93794a4e6c76be0f4cc491b56cd644f27..dc90483dea9c59c68c232eeebd06e863f6fa3bde 100644
--- 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);";
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 28b33795aeba64200dcb4b34c7b4e28840d222d5..37b7cecb123df915b95d0ed33b6fa78247aba420 100644
--- 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);";
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index e4be3133fb0bcd72d53e33477a58d617bd84d4af..d7959988062d0408b3e47b6c510be82bb1e7a5fd 100644
--- 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;";
diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php
index 148e688547a77524b2b5d762b2b1946469b54eac..527a2c49b1cc3446cfc2816d1e69303dea949c36 100644
--- 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;";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index b04e1b4536d9773a4965cd1073fb6f657391129a..40068f36d1f4f8d50e7eabf79725703bd9c69e61 100644
--- 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;";
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 069c209ee58caf9e23b4b037598068aa9c1492d1..323ba9556bdb86fae43b457188192200bb19d72c 100644
--- 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;";
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 7b36c3b710b7a426734832e0aea9cb8dd7888603..81177f9bea07221749f112997e332ad5e91a1dce 100644
--- 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);";
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 9b209a4d5cc010f70f5d4d915f7a127e6c930e01..c9b7c3462e5b6d354a652412bad5cfdeea5a43ea 100644
--- 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);";
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 43fb4657dbb0239a9c1e74e7fe8d9a21b569db9b..54fe271f2eb91a04de58c1f24a8ebe9197bfe30e 100644
--- 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);";
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index b0def1e707d7d5164b1d888c267f1e1d46c96f84..0eb0b8ceb3d4284effa8d67ce38c11b2ddd4ab70 100644
--- 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);";
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 2dd75f14338a92407d386d3ff6d3f786624817a9..faeaca9ae966bc5dee14d1bcda5d34865d1933e6 100644
--- 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;";
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index f96d4d48014eee9d67a5e8979a78d43215c51d52..b67a4d886dea72ab20d3559ba3b218df63d0ddc6 100644
--- 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;";
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
index b791a134ccce079a6f7c47dbc4b5bb61eb1586fc..4dc63ffee2d7b03637e751ca3e61c686c9810786 100644
--- 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;";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 769dfe33ffe3e35416de4e31b49f68749eab74b6..dfd197d9205af9e44ade583b33f9705ab46c2fcd 100644
--- 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);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 914d5087af10a3253f02487b1b08de453dd6fd87..6385dcee75bfe4580ed96b30ff3e2e58131e6c58 100644
--- 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);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index dcc3373bea0510bf7d019c2e4135430566f98418..fcaaa7d3331ff3370edee0fe7504962a198db361 100644
--- 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);";
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 703aeb3fbad97037fe3ff6ef68494b6638a899d9..89aeeee9a856f27387aa7e5f5de999d51c66d709 100644
--- 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);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index a3acfea6618b65e48c6382fa8a86dc59eb506a50..15e746176f6737586a7dbb7a24bddb9b79bdca10 100644
--- 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);";
diff --git a/apps/files/l10n/pl_PL.php b/apps/files/l10n/pl_PL.php
index 157d9a41e4d097fc664eec8002145d1ff975abe8..b67f67b972e26e1a1ca7cb514b240285adbf1e62 100644
--- 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);";
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 3ad679f87646cc426cccfbf00ffad669ee138f12..0728436d25652c9106b050c352d6345e6b2ecae3 100644
--- 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);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 4273de9c47841f374dc61ee79cbdd48b6f5dcde6..4684a2d60525b0880f8f36bc2e0bda3848622e87 100644
--- 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);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index b0cca7d7a8289cc10d0dd2368398c5977fc479b0..d62525f205e8d56d56376502009478855366398e 100644
--- 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));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 34eca54f493d77529d06164ceea901f35afdd5ef..28893b4a6326d5036a47a041aac6477dad4ec3cf 100644
--- 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);";
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index e0bfab33215ff8036017e3b024630f40c148fe63..bbc06fe1a5c360cb9e98098efba069504beaf1bc 100644
--- 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);";
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 82fca4bc75d6e720b0749b4869054daca096e79f..8341fdec665f7f01fd1e25aaa85e2570aaf6c6ce 100644
--- 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);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index b8382c7b0b4efd0bd96104fa906477b07f83616e..51491bbc13f0f55b8b48662566ac52b9645b6572 100644
--- 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;";
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index bb01e5475d50541d702939d5de5e961685cb5f55..f71991d080ace6253df9182cb7779f86e29b9ad0 100644
--- 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);";
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 2daca10a416cf8b426b019e3952d9d8210c47ef0..85bf22507e4fa2011643314b95793ab17013093a 100644
--- 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);";
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 68f2f5a93b67df5d097877c1924ce966d2417e94..5de6e32300e9728d6dd88fa8b30b2463e00598a7 100644
--- 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);";
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index fb08bca2cae91733e2c1501ed3bace48110858ec..856f3d46559b9eee67a6de964469f205bc68d17c 100644
--- 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);";
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 70f3121a20c78a94e20714d51ab34d16ed44a4ce..141bf02c3c97b809fda4991b1fdde204a93c5dd9 100644
--- 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);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index e03b88569b76d903b393a1ec1f3a7eae54c8ed4f..cc0180fe4633dd97762006ab67f53e1b07b7a607 100644
--- 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);";
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index 710034de12e114d5e1cb0a802d2fcb2097239f57..eb431b6c100cd810368505f6170342d8397f880c 100644
--- 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);";
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 5b2eab6b3a1256cab59425a1bfcf3ead2bd0819f..bd91056b09b79cd08f8180a154fcca841c574cb2 100644
--- 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;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 0b2dbb12dd9fc496b422dde6515f50dd7f08b9a7..4762ad0b82903a8ce5d9517912652db61a488a37 100644
--- 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);";
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index c11ffe7b9bf850471ac1c847ff52f3fbab319d53..068c953ee1a600af42a1b7a01e4f19621652cc81 100644
--- 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;";
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 261853ef202a15c702f0dfbfb1ea9e6a85d642bd..4cc49c65085a5f0a8ad7bed8e0044fcece7e094e 100644
--- 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);";
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index aa87eeda385efc7fd0a155e28808004f47a2b8c8..15c24700df0bb02f3dba942e2b67ae19615e9983 100644
--- 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);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index e3c9fd5488a4c84664ab87bfc7837b5c9c0cf831..3684df65958fb72c490415a27d9e4208d87232e0 100644
--- 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;";
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 4108516cda1ce5003f34e154dbc5f54e5de0a770..090b73cc54ad7704bfaf4e67a7fd178ce494ebb2 100644
--- 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;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 68680676a1953356a6017f6921e1d9ad3b2cd54e..e9fb20c69cb9335f5605524892c134e0d361ba58 100644
--- 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;";
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index 4402812f2b69ad10b71f4243c17620ea729ef7fd..52f23f4a5d7124940fb8c55f8b387393e3032588 100644
--- 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;";
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 59a332f628fa11a60731a1d3b85b039ee45f5f2e..2ee6116b132c803bdcf387ca89331408b89750be 100644
--- 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;";
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index b9119f2cb62a0e551fe58e0f859a13b4c1d7a351..79c283dc336149ff5d2663518537d53bb584c50c 100644
--- 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): ?>
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 97a9026860bc9ed87d085f1417d3ed247c0cfed6..0c7d6936697fb5ce09222a47896710307ce15308 100644
--- 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>
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 1e97b1b2217fd8042a5d93b5e8c2345d1bb957d6..46f1375c9875a41bc558a29e49db1db619d93b8e 100644
--- 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>
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index f93c67d920a427f486b4e6adc452ee1547454428..2dd27257abe45381c9cf357ffa51e23da9f1df91 100644
--- 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');
 
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index b2a17f6bca5e344646a76a8e42354d765f439ed4..07da839e8a2203c4018405537f0ffa49ef54a2b9 100644
--- 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
+		
 	}
 
 	/**
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 1adc158c6b8d0bf36286c999883d76b1736ec7cb..45a0c4616f4c791d030d96d4184fc41535ac4d62 100644
--- 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;";
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index f21f7641c1a58ce1a1994dff92f7a399f60ff0e2..9060c92ed43fcf8535104a38cf1c837bca05d64d 100644
--- 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);";
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 068de46e7a18d45c52e24a5d98fc69e1b703629c..5fc4f6a13f3b2da94b4dc40ab263a68d49b26e97 100644
--- 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);";
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index d9d3d7b4fa58f9b006dfc8aadea185ca61ec54fb..14d7992ad5da4773ce995209e3a9af8b63ce98df 100644
--- 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);";
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index a402b96a51b584d8dec30fb8c6c0886089a2ebcc..e2b3be3261a04a45a6bfb2efa3e4795e0692d440 100644
--- 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;";
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
index 6e18a7913c84afb6d279d58be1766c1e1d79e8c8..ea8b19963b02a4b835eb50b01dc7d139534ee2b5 100644
--- 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;";
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index 1cd43390aa3c289413c65f9e2390be265c0338dc..1b7069b6784574ae1d4305364b362cd24a484609 100644
--- 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);";
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index ed9b8d6c16e3f7e1bbed1c56bd21f6f32094b5ee..4c36d31ed6bf131275518840d2f107874b4a3172 100644
--- 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);";
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 2d7512354d582403395d2e0be10b13dd9cda6f73..200001e6ebfbbd569024ba366d9665e4b4133c84 100644
--- 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);";
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 990f464bc1a17b4b116e6a72c12a18d13ca7e2bf..70f778f0a5038d6d8a194eb269f89e85892102cc 100644
--- 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);";
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index 997b60f8ac3c2d126f37dd46398db5606b79f437..d68812530228f5adf2f5268e704165014c702b03 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password successfully changed." => "La pasvorto sukcese ÅanÄiÄis.",
 "Could not change the password. Maybe the old password was not correct." => "Ne eblis ÅanÄi la pasvorton. Eble la malnova pasvorto malÄustis.",
 "Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ÄisdatiÄis.",
@@ -13,3 +14,4 @@
 "Current log-in password" => "Nuna ensaluta pasvorto",
 "Update Private Key Password" => "Äœisdatigi la pasvorton de la malpublika klavo"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 0b49edbd2af62ca9cdfce5abd710a6834af4ebcd..8341bafc9fdab992bdc942f13d6cf41f1b29e8bb 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Se ha habilitado la recuperaciÃ³n de archivos",
 "Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperaciÃ³n. Por favor compruebe su contraseÃ±a.",
 "Recovery key successfully disabled" => "Clave de recuperaciÃ³n deshabilitada",
@@ -9,7 +10,6 @@
 "Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseÃ±a. Puede que la contraseÃ±a antigua no sea 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." => "Â¡Su clave privada no es vÃ¡lida! Tal vez su contraseÃ±a ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
 "Missing requirements." => "Requisitos incompletos.",
-"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." => "Por favor, asegÃºrese de que PHP 5.3.3 o posterior estÃ¡ instalado y que la extensiÃ³n OpenSSL de PHP estÃ¡ habilitada y configurada correctamente. Por el momento, la aplicaciÃ³n de cifrado ha sido deshabilitada.",
 "Saving..." => "Guardando...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Â¡Su clave privada no es vÃ¡lida! Tal vez su contraseÃ±a ha sido cambiada desde fuera.",
 "You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
@@ -34,3 +34,4 @@
 "File recovery settings updated" => "Opciones de recuperaciÃ³n de archivos actualizada",
 "Could not update file recovery" => "No se pudo actualizar la recuperaciÃ³n de archivos"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index b6f3fed8a6a3456fff72d4dfc47634117e4d1746..cac8c465362b83b47dc5b0b1064ede90814c3aa8 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Se habilitÃ³ la recuperaciÃ³n de archivos",
 "Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperaciÃ³n. Por favor, comprobÃ¡ tu contraseÃ±a.",
 "Recovery key successfully disabled" => "Clave de recuperaciÃ³n deshabilitada",
@@ -6,13 +7,15 @@
 "Password successfully changed." => "Tu contraseÃ±a fue cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseÃ±a. ComprobÃ¡ que la contraseÃ±a actual sea correcta.",
 "Private key password successfully updated." => "ContraseÃ±a de clave privada actualizada con Ã©xito.",
-"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseÃ±a de la clave privada. Tal vez la contraseÃ±a antigua no es correcta.",
+"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseÃ±a de clave privada. Tal vez la contraseÃ±a anterior no es 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." => "Â¡Tu clave privada no es vÃ¡lida! Tal vez tu contraseÃ±a fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). PodÃ©s actualizar tu clave privada en la secciÃ³n de \"configuraciÃ³n personal\", para recuperar el acceso a tus archivos.",
+"Missing requirements." => "Requisitos incompletos.",
 "Saving..." => "Guardando...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Â¡Tu clave privada no es vÃ¡lida! Tal vez tu contraseÃ±a fue cambiada desde afuera.",
 "You can unlock your private key in your " => "PodÃ©s desbloquear tu clave privada en tu",
 "personal settings" => "ConfiguraciÃ³n personal",
 "Encryption" => "EncriptaciÃ³n",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperaciÃ³n (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseÃ±a):",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperaciÃ³n (te permite recuperar los archivos de usuario en el caso que pierdas la contraseÃ±a):",
 "Recovery key password" => "ContraseÃ±a de recuperaciÃ³n de clave",
 "Enabled" => "Habilitado",
 "Disabled" => "Deshabilitado",
@@ -20,14 +23,15 @@
 "Old Recovery key password" => "ContraseÃ±a antigua de recuperaciÃ³n de clave",
 "New Recovery key password" => "Nueva contraseÃ±a de recuperaciÃ³n de clave",
 "Change Password" => "Cambiar contraseÃ±a",
-"Your private key password no longer match your log-in password:" => "Tu contraseÃ±a de recuperaciÃ³n de clave ya no coincide con la contraseÃ±a de ingreso:",
-"Set your old private key password to your current log-in password." => "UsÃ¡ tu contraseÃ±a de recuperaciÃ³n de clave antigua para tu contraseÃ±a de ingreso actual.",
+"Your private key password no longer match your log-in password:" => "Tu contraseÃ±a de clave privada ya no coincide con la contraseÃ±a de ingreso:",
+"Set your old private key password to your current log-in password." => "UsÃ¡ tu contraseÃ±a de clave privada antigua para tu contraseÃ±a de ingreso actual.",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Si no te acordÃ¡s de tu contraseÃ±a antigua, pedile al administrador que recupere tus archivos",
 "Old log-in password" => "ContraseÃ±a anterior",
 "Current log-in password" => "ContraseÃ±a actual",
 "Update Private Key Password" => "Actualizar contraseÃ±a de la clave privada",
-"Enable password recovery:" => "Habilitar contraseÃ±a de recuperaciÃ³n:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opciÃ³n te va a permitir tener acceso a tus archivos encriptados incluso si perdÃ©s la contraseÃ±a",
+"Enable password recovery:" => "Habilitar recuperaciÃ³n de contraseÃ±a:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opciÃ³n, vas a tener acceso a tus archivos encriptados, incluso si perdÃ©s la contraseÃ±a",
 "File recovery settings updated" => "Las opciones de recuperaciÃ³n de archivos fueron actualizadas",
 "Could not update file recovery" => "No fue posible actualizar la recuperaciÃ³n de archivos"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index c1c8164b8104238810937d41b1f2eef5720b034a..3edb7299c201efff6e0c554658d32715d9fd3da0 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "TaastevÃµtme lubamine Ãµnnestus",
 "Could not enable recovery key. Please check your recovery key password!" => "Ei suutnud lubada taastevÃµtit. Palun kontrolli oma taastevÃµtme parooli!",
 "Recovery key successfully disabled" => "TaastevÃµtme keelamine Ãµnnestus",
@@ -9,7 +10,8 @@
 "Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse vÃµtme parooli. VÃµib-olla polnud vana parool Ãµige.",
 "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." => "Sinu privaatne vÃµti pole toimiv! TÃµenÃ¤oliselt on sinu parool muutunud vÃ¤ljaspool ownCloud sÃ¼steemi (nÃ¤iteks ettevÃµtte keskhaldus). Sa saad uuendada oma privaatse vÃµtme parooli seadete all taastamaks ligipÃ¤Ã¤su oma krÃ¼pteeritud failidele.",
 "Missing requirements." => "NÃµutavad on puudu.",
-"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." => "Veendu, et kasutusel oleks PHP 5.3.3 vÃµi uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krÃ¼pteerimise rakenduse kasutamine peatatud.",
+"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." => "Palun veendu, et on paigaldatud PHP 5.3.3 vÃµi uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krÃ¼pteerimise rakendus on peatatud.",
+"Following users are not set up for encryption:" => "JÃ¤rgmised kasutajad pole seadistatud krÃ¼pteeringuks:",
 "Saving..." => "Salvestamine...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Sinu privaatne vÃµti ei ole Ãµige. VÃµib-olla on parool vahetatud sÃ¼steemi vÃ¤liselt.",
 "You can unlock your private key in your " => "Saad avada oma privaatse vÃµtme oma",
@@ -34,3 +36,4 @@
 "File recovery settings updated" => "Faili taaste seaded uuendatud",
 "Could not update file recovery" => "Ei suuda uuendada taastefaili"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 22fe7932688894b779294b14687088f4a3c14a75..e750c850688d190d78d435a60bcc860312f5599c 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Berreskuratze gakoa behar bezala gaitua",
 "Could not enable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
 "Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
@@ -7,9 +8,14 @@
 "Could not change the password. Maybe the old password was not correct." => "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
 "Private key password successfully updated." => "Gako pasahitz pribatu behar bezala eguneratu da.",
 "Could not update the private key password. Maybe the old password was not correct." => "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
+"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." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza ownCloud sistematik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
+"Missing requirements." => "Eskakizun batzuk ez dira betetzen.",
 "Saving..." => "Gordetzen...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Zure gako pribatua ez da egokia! Agian zure pasahitza kanpotik aldatu da.",
+"You can unlock your private key in your " => "Zure gako pribatua desblokeatu dezakezu zure",
 "personal settings" => "ezarpen pertsonalak",
 "Encryption" => "Enkriptazioa",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
 "Recovery key password" => "Berreskuratze gako pasahitza",
 "Enabled" => "Gaitua",
 "Disabled" => "Ez-gaitua",
@@ -17,8 +23,15 @@
 "Old Recovery key password" => "Berreskuratze gako pasahitz zaharra",
 "New Recovery key password" => "Berreskuratze gako pasahitz berria",
 "Change Password" => "Aldatu Pasahitza",
+"Your private key password no longer match your log-in password:" => "Zure gako pribatuaren pasahitza ez da dagoeneko zure sarrera pasahitza:",
+"Set your old private key password to your current log-in password." => "Ezarri zure gako pribatu zaharraren pasahitza zure oraingo sarrerako psahitzara.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
+"Old log-in password" => "Sartzeko pasahitz zaharra",
+"Current log-in password" => "Sartzeko oraingo pasahitza",
 "Update Private Key Password" => "Eguneratu gako pribatu pasahitza",
 "Enable password recovery:" => "Gaitu pasahitz berreskuratzea:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan",
 "File recovery settings updated" => "Fitxategi berreskuratze ezarpenak eguneratuak",
 "Could not update file recovery" => "Ezin da fitxategi berreskuratzea eguneratu"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index af2e36b2a83d9c09778dfb538d7215f1e5898512..461ec2b92cbaea91ca7e7b8e1b65c1f2d0b2bba4 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,4 +1,37 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+"Could not enable recovery key. Please check your recovery key password!" => "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ÙØ¹Ø§Ù„ Ø´ÙˆØ¯. Ù„Ø·ÙØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ù†Ù…Ø§ÛŒÛŒØ¯!",
+"Recovery key successfully disabled" => "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ØºÛŒØ± ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+"Could not disable recovery key. Please check your recovery key password!" => "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ØºÛŒØ±ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒØ¯. Ù„Ø·ÙØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯!",
+"Password successfully changed." => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ØªØºÛŒÛŒØ± ÛŒØ§ÙØª.",
+"Could not change the password. Maybe the old password was not correct." => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø±Ø§ Ù†Ù…ÛŒØªÙˆØ§Ù†Ø¯ ØªØºÛŒÛŒØ± Ø¯Ù‡Ø¯. Ø´Ø§ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±Ù‚Ø¯ÛŒÙ…ÛŒ ØµØÛŒØ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯.",
+"Private key password successfully updated." => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ù‡ Ø±ÙˆØ² Ø´Ø¯.",
+"Could not update the private key password. Maybe the old password was not correct." => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø¨Ù‡ Ø±ÙˆØ² Ú©Ù†Ø¯. Ø´Ø§ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ ØµØÛŒØ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯.",
+"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." => "Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ù…Ø§ Ù…Ø¹ØªØ¨Ø± Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯!  Ø¸Ø§Ù‡Ø±Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø´Ù…Ø§ Ø¨ÛŒØ±ÙˆÙ† Ø§Ø² Ø³ÛŒØ³ØªÙ… ownCloud ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª( Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø«Ø§Ù„ Ù¾ÙˆØ´Ù‡ Ø³Ø§Ø²Ù…Ø§Ù† Ø´Ù…Ø§ ). Ø´Ù…Ø§ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø®ØµÛŒØªØ§Ù† Ø¨Ù‡ Ø±ÙˆØ² Ú©Ù†ÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ù‡  ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡ Ø®ÙˆØ¯ Ø±Ø§ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯.",
+"Missing requirements." => "Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ÛŒ Ù‡Ø§ÛŒ Ú¯Ù…Ø´Ø¯Ù‡",
 "Saving..." => "Ø¯Ø± ØØ§Ù„ Ø°Ø®ÛŒØ±Ù‡ Ø³Ø§Ø²ÛŒ...",
-"Encryption" => "Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ"
+"Your private key is not valid! Maybe the your password was changed from outside." => "Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ù…Ø§ Ù…Ø¹ØªØ¨Ø± Ù†ÛŒØ³Øª! Ø´Ø§ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±Ø§Ø² Ø¨ÛŒØ±ÙˆÙ† ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª.",
+"You can unlock your private key in your " => "Ø´Ù…Ø§ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø§Ø² Ù†Ù…Ø§ÛŒÛŒØ¯.",
+"personal settings" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø®ØµÛŒ",
+"Encryption" => "Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ",
+"Enable recovery key (allow to recover users files in case of password loss):" => "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ(Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯Ø± ØµÙˆØ±Øª Ø§Ø² Ø¯Ø³Øª Ø¯Ø§Ø¯Ù† Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±):",
+"Recovery key password" => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ",
+"Enabled" => "ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡",
+"Disabled" => "ØºÛŒØ±ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡",
+"Change recovery key password:" => "ØªØºÛŒÛŒØ± Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ:",
+"Old Recovery key password" => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ  Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ",
+"New Recovery key password" => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¬Ø¯ÛŒØ¯ Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ",
+"Change Password" => "ØªØºÛŒÛŒØ± Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±",
+"Your private key password no longer match your log-in password:" => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ù…Ø§ Ø¨Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø´Ù…Ø§ ÛŒÚ©Ø³Ø§Ù† Ù†ÛŒØ³Øª :",
+"Set your old private key password to your current log-in password." => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ  Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± ÙØ¹Ù„ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ù…Ø§ÛŒÛŒØ¯.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Ø§Ú¯Ø± Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ Ø±Ø§ ÙØ±Ø§Ù…ÙˆØ´ Ú©Ø±Ø¯Ù‡ Ø§ÛŒØ¯ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ø§Ø² Ù…Ø¯ÛŒØ± Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒØªØ§Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù†Ù…Ø§ÛŒÛŒØ¯.",
+"Old log-in password" => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ",
+"Current log-in password" => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± ÙØ¹Ù„ÛŒ",
+"Update Private Key Password" => "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ",
+"Enable password recovery:" => "ÙØ¹Ø§Ù„ Ø³Ø§Ø²ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø§ÛŒÙ† Ú¯Ø²ÛŒÙ†Ù‡ Ø¨Ù‡ Ø´Ù…Ø§ Ø§Ø¬Ø§Ø²Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø¯Ø§Ø¯ Ø¯Ø± ØµÙˆØ±Øª Ø§Ø² Ø¯Ø³Øª Ø¯Ø§Ø¯Ù† Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡ Ø®ÙˆØ¯ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯.",
+"File recovery settings updated" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ø¨Ù‡ Ø±ÙˆØ² Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+"Could not update file recovery" => "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø§Ù†Ø¬Ø§Ù… Ø¯Ù‡Ø¯."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index a00cc8ab96e09e3339f2326dc9a81e55b1501516..53b0a6b25cd9e8cbb785ee47cd69ee0488fa49de 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
 "Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epÃ¤onnistui. Kenties vanha salasana oli vÃ¤Ã¤rin.",
 "Saving..." => "Tallennetaan...",
@@ -7,3 +8,4 @@
 "Disabled" => "Ei kÃ¤ytÃ¶ssÃ¤",
 "Change Password" => "Vaihda salasana"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 44f65436722ebea9f32940e7d2e475f1498b2d64..12af810139434711b7fa653b28921c3589d127c4 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "ClÃ© de rÃ©cupÃ©ration activÃ©e avec succÃ¨s",
 "Could not enable recovery key. Please check your recovery key password!" => "Impossible d'activer la clÃ© de rÃ©cupÃ©ration. Veuillez vÃ©rifier votre mot de passe de clÃ© de rÃ©cupÃ©ration !",
 "Recovery key successfully disabled" => "ClÃ© de rÃ©cupÃ©ration dÃ©sactivÃ©e avec succÃ¨s",
@@ -8,6 +9,7 @@
 "Private key password successfully updated." => "Mot de passe de la clÃ© privÃ© mis Ã  jour avec succÃ¨s.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre Ã  jour le mot de passe de la clÃ© privÃ©. Peut-Ãªtre que l'ancien mot de passe n'Ã©tait pas correcte.",
 "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." => "Votre clÃ© de sÃ©curitÃ© privÃ©e n'est pas valide! Il est probable que votre mot de passe ait Ã©tÃ© changÃ© sans passer par le systÃ¨me ownCloud (par Ã©xemple: le serveur de votre entreprise). Ain d'avoir Ã  nouveau accÃ¨s Ã  vos fichiers cryptÃ©s, vous pouvez mettre Ã  jour votre clÃ© de sÃ©curitÃ© privÃ©e dans les paramÃ¨tres personnels de votre compte.",
+"Missing requirements." => "SystÃ¨me minimum requis non respectÃ©.",
 "Saving..." => "Enregistrement...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privÃ©e est invalide ! Votre mot de passe a peut-Ãªtre Ã©tÃ© modifiÃ© depuis l'extÃ©rieur.",
 "You can unlock your private key in your " => "Vous pouvez dÃ©verrouiller votre clÃ© privÃ©e dans votre",
@@ -32,3 +34,4 @@
 "File recovery settings updated" => "ParamÃ¨tres de rÃ©cupÃ©ration de fichiers mis Ã  jour",
 "Could not update file recovery" => "Ne peut pas remettre Ã  jour les fichiers de rÃ©cupÃ©ration"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index db6f57bb36d1650e83bfe86616d8fd2447e86983..abf12d73d577483a05c1c3d55fda81e24cfe9447 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperaciÃ³n",
 "Could not enable recovery key. Please check your recovery key password!" => "Non foi posÃbel activar a chave de recuperaciÃ³n. Comprobe o contrasinal da chave de recuperaciÃ³n!",
 "Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperaciÃ³n",
@@ -9,7 +10,8 @@
 "Could not update the private key password. Maybe the old password was not correct." => "Non foi posÃbel actualizar o contrasinal da chave privada. Ã‰ probÃ¡bel que o contrasinal antigo non sexa correcto.",
 "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." => "A chave privada non Ã© correcta! Ã‰ probÃ¡bel que o seu contrasinal teÃ±a sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da sÃºa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
 "Missing requirements." => "Non se cumpren os requisitos.",
-"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." => "AsegÃºrese de que estÃ¡ instalado o  PHP 5.3.3 ou posterior e de que a extensiÃ³n OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
+"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." => "AsegÃºrese de que estÃ¡ instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensiÃ³n PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
+"Following users are not set up for encryption:" => "Os seguintes usuarios non teÃ±en configuraciÃ³n para o cifrado:",
 "Saving..." => "Gardando...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non Ã© correcta! Ã‰ probÃ¡bel que o seu contrasinal teÃ±a sido cambiado desde o exterior. ",
 "You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus",
@@ -34,3 +36,4 @@
 "File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperaciÃ³n",
 "Could not update file recovery" => "Non foi posÃbel actualizar o ficheiro de recuperaciÃ³n"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index 7a80cfa2f9f07af3dca60f85539559762b72a093..cdf29c9b0ac46c7c675987cb8abaad0feed4c92a 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "×©×ž×™×¨×”â€¦",
 "Encryption" => "×”×¦×¤× ×”"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
index 9b9284ddc5eaec498397034f55e74681f620a241..60ee610bd3e93756dee01726c620711714f25ef7 100644
--- a/apps/files_encryption/l10n/hr.php
+++ b/apps/files_encryption/l10n/hr.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Spremanje..."
 );
+$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;";
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index bf95c31f2c5fa61a459b58b0b882d23465c068ce..49dcf817fb7680c486b8021179f00eb3758ab27c 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "MentÃ©s...",
 "Encryption" => "TitkosÃtÃ¡s"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index ad827b537910c58755d2825e024f9286604ee946..32c348bd8babe2edf83c80fa86402102fc7a04f7 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Menyimpan...",
 "Encryption" => "Enkripsi"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index 0f98c6bd3bff6c7c602358919e478ab2b6c1487a..27c0904a532093fb3e5a38ef5f5767da2477abbb 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Er aÃ° vista ...",
 "Encryption" => "DulkÃ³Ã°un"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 8d15d1ced363fd7fef203d78cd3dd23cb5731f89..f9534d7eca3e152823b1cb5c143c6ee82d7bf808 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Chiave di ripristino abilitata correttamente",
 "Could not enable recovery key. Please check your recovery key password!" => "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
 "Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
@@ -9,7 +10,8 @@
 "Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
 "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 chiave privata non Ã¨ valida! Forse la password Ã¨ stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
 "Missing requirements." => "Requisiti mancanti.",
-"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." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura Ã¨ disabilitata.",
+"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." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura Ã¨ disabilitata.",
+"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
 "Saving..." => "Salvataggio in corso...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non Ã¨ valida! Forse Ã¨ stata modifica dall'esterno.",
 "You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue",
@@ -34,3 +36,4 @@
 "File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
 "Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index a1fcbd5c5443604f035cbc9216273b32c21c9279..d1f8303bda741c9a6a5dca5e1f1cb6cce3e781ea 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "ãƒªã‚«ãƒãƒªç”¨ã®ã‚ãƒ¼ã¯æ£å¸¸ã«æœ‰åŠ¹åŒ–ã•ã‚Œã¾ã—ãŸ",
 "Could not enable recovery key. Please check your recovery key password!" => "ãƒªã‚«ãƒãƒªç”¨ã®ã‚ãƒ¼ã‚’æœ‰åŠ¹ã«ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ãƒªã‚«ãƒãƒªç”¨ã®ã‚ãƒ¼ã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ç¢ºèªã—ã¦ä¸‹ã•ã„ï¼",
 "Recovery key successfully disabled" => "ãƒªã‚«ãƒãƒªç”¨ã®ã‚ãƒ¼ã‚’æ£å¸¸ã«ç„¡åŠ¹åŒ–ã—ã¾ã—ãŸ",
@@ -9,7 +10,8 @@
 "Could not update the private key password. Maybe the old password was not correct." => "ç§˜å¯†éµã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚å¤ã„ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãŒæ£ç¢ºã§ãªã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚",
 "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." => "ç§˜å¯†éµãŒæœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãŒownCloudã‚·ã‚¹ãƒ†ãƒ ã®å¤–éƒ¨(ä¾‹ãˆã°ã€ä¼æ¥ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª)ã‹ã‚‰å¤‰æ›´ã•ã‚ŒãŸæã‚ŒãŒã‚ã‚Šã¾ã™ã€‚å€‹äººè¨å®šã§ç§˜å¯†éµã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’æ›´æ–°ã—ã¦ã€æš—å·åŒ–ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å›žå¾©å‡ºæ¥ã¾ã™ã€‚",
 "Missing requirements." => "å¿…è¦è¦ä»¶ãŒæº€ãŸã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
-"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." => "å¿…ãšã€PHP 5.3.3ä»¥ä¸Šã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã€OpenSSLã®PHPæ‹¡å¼µã‚’æœ‰åŠ¹ã«ã—ã¦é©åˆ‡ã«è¨å®šã—ã¦ãã ã•ã„ã€‚ç¾æ™‚ç‚¹ã§ã¯æš—å·åŒ–ã‚¢ãƒ—ãƒªã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚",
+"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." => "å¿…ãšã€PHP 5.3.3ã‚‚ã—ãã¯ãã‚Œä»¥ä¸Šã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã€åŒæ™‚ã«OpenSSLã®PHPæ‹¡å¼µã‚’æœ‰åŠ¹ã«ã—ãŸä¸Šã§OpenSSLã‚‚åŒæ§˜ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€é©åˆ‡ã«è¨å®šã—ã¦ãã ã•ã„ã€‚ç¾æ™‚ç‚¹ã§ã¯æš—å·åŒ–ã‚¢ãƒ—ãƒªã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚",
+"Following users are not set up for encryption:" => "ä»¥ä¸‹ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€æš—å·åŒ–è¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼š",
 "Saving..." => "ä¿å˜ä¸...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "ç§˜å¯†éµãŒæœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãŒå¤–éƒ¨ã‹ã‚‰å¤‰æ›´ã•ã‚ŒãŸæã‚ŒãŒã‚ã‚Šã¾ã™ã€‚",
 "You can unlock your private key in your " => "å€‹äººè¨å®šã§",
@@ -34,3 +36,4 @@
 "File recovery settings updated" => "ãƒ•ã‚¡ã‚¤ãƒ«å¾©æ—§è¨å®šãŒæ›´æ–°ã•ã‚Œã¾ã—ãŸ",
 "Could not update file recovery" => "ãƒ•ã‚¡ã‚¤ãƒ«å¾©æ—§ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index 55a59f44341af0c3a7a1485e2779807de11deb4e..bbabd44964800a5cafbec267b2a77d136751968b 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "áƒ¨áƒ”áƒœáƒáƒ®áƒ•áƒ...",
 "Encryption" => "áƒ”áƒœáƒ™áƒ áƒ˜áƒžáƒªáƒ˜áƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index cf8149da3abf724b6c02b9f0b878bd1c1195aabc..cfe9f99fa194d7a42df1a8349f2b05756a593aef 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,20 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Password successfully changed." => "ì•”í˜¸ê°€ ì„±ê³µì ìœ¼ë¡œ ë³€ê²½ë˜ì—ˆìŠµë‹ˆë‹¤",
+"Could not change the password. Maybe the old password was not correct." => "ì•”í˜¸ë¥¼ ë³€ê²½í• ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì•„ë§ˆë„ ì˜ˆì „ ì•”í˜¸ê°€ ì •í™•í•˜ì§€ ì•Šì€ê²ƒ ê°™ìŠµë‹ˆë‹¤.",
+"Private key password successfully updated." => "ê°œì¸í‚¤ ì•”í˜¸ê°€ ì„±ê³µì ìœ¼ë¡œ ì—…ë°ì´íŠ¸ ë¨.",
 "Saving..." => "ì €ìž¥ ì¤‘...",
-"Encryption" => "ì•”í˜¸í™”"
+"personal settings" => "ê°œì¸ ì„¤ì •",
+"Encryption" => "ì•”í˜¸í™”",
+"Recovery key password" => "í‚¤ ë¹„ë°€ë²ˆí˜¸ ë³µêµ¬",
+"Change recovery key password:" => "ë³µêµ¬ í‚¤ ë¹„ë°€ë²ˆí˜¸ ë³€ê²½",
+"Old Recovery key password" => "ì˜ˆì „ ë³µêµ¬ í‚¤ ë¹„ë°€ë²ˆí˜¸",
+"New Recovery key password" => "ìƒˆ ë³µêµ¬ í‚¤ ë¹„ë°€ë²ˆí˜¸",
+"Change Password" => "ì•”í˜¸ ë³€ê²½",
+"Old log-in password" => "ì˜ˆì „ ë¡œê·¸ì¸ ì•”í˜¸",
+"Current log-in password" => "í˜„ìž¬ ë¡œê·¸ì¸ ì•”í˜¸",
+"Update Private Key Password" => "ê°œì¸ í‚¤ ì•”í˜¸ ì—…ë°ì´íŠ¸",
+"File recovery settings updated" => "íŒŒì¼ ë³µêµ¬ ì„¤ì • ì—…ë°ì´íŠ¸ë¨",
+"Could not update file recovery" => "íŒŒì¼ ë³µêµ¬ë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index 61b720372ec0ac322422ae32d1e7745a11404b8d..d971350b4c7fc6f156d1b153c9effd54de862899 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Ù¾Ø§Ø´Ú©Ù‡â€ŒÙˆØªØ¯Ù‡â€ŒÚ©Ø§Øª...",
 "Encryption" => "Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù†"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lb.php b/apps/files_encryption/l10n/lb.php
index 77bad681732931b2d094e3a5b1bffcea7770604b..a33f4969b0949733e45270d406cd0c6a326fc12a 100644
--- a/apps/files_encryption/l10n/lb.php
+++ b/apps/files_encryption/l10n/lb.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Speicheren..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 84fa902dc655369c802cdef1b6aeafd0da6f36af..9fbf7b296046029bc85f376afdd9b90df55cfdc3 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "AtkÅ«rimo raktas sÄ—kmingai Ä¯jungtas",
 "Could not enable recovery key. Please check your recovery key password!" => "NeiÅ¡Ä—jo Ä¯jungti jÅ«sÅ³ atkÅ«rimo rakto. PraÅ¡ome jÄ¯ patikrinti!",
 "Recovery key successfully disabled" => "AtkÅ«rimo raktas sÄ—kmingai iÅ¡jungtas",
@@ -13,3 +14,4 @@
 "File recovery settings updated" => "FailÅ³ atstatymo nustatymai pakeisti",
 "Could not update file recovery" => "NeiÅ¡Ä—jo atnaujinti failÅ³ atkÅ«rimo"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index 04922854ceba7938a57ddd7e041f35105b7afff9..b8414174a745f0e9e69512438ad558aab35683c6 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "SaglabÄ...",
 "Encryption" => "Å ifrÄ“Å¡ana"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index a7216f205adbee12a97fd0b208deeed3958e956f..fd8dd4e51c1cb71fd4dc35897f1d393efc7029d7 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Ð¡Ð½Ð¸Ð¼Ð°Ð¼...",
 "Encryption" => "Ð•Ð½ÐºÑ€Ð¸Ð¿Ñ†Ð¸Ñ˜Ð°"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_encryption/l10n/ms_MY.php b/apps/files_encryption/l10n/ms_MY.php
index bb963cb72d26e8c91fd52d77c707b6dfa3c8dc96..f73e61c167411eb90e814ec3bab86bd70f87a739 100644
--- a/apps/files_encryption/l10n/ms_MY.php
+++ b/apps/files_encryption/l10n/ms_MY.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Simpan..."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index d4e2b1ffb50a8ef55643cfd438e1a6d54a019804..26956c410a3301578e95ff82ae95afcbe5c4b840 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Lagrer...",
 "Encryption" => "Kryptering"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 093ed2c29c8d29ad5ba1dfb778e3587f372bc477..e37ccf54d6dc375d46f155af464789ca4f9bf3cb 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
 "Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
 "Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
@@ -7,6 +8,10 @@
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
 "Private key password successfully updated." => "PrivÃ©sleutel succesvol bijgewerkt.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privÃ©sleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+"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." => "Uw privÃ©sleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privÃ©sleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren.",
+"Missing requirements." => "Missende benodigdheden.",
+"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." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geÃ¯stalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
+"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
 "Saving..." => "Opslaan",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Uw privÃ©sleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
 "You can unlock your private key in your " => "U kunt uw privÃ©sleutel deblokkeren in uw",
@@ -31,3 +36,4 @@
 "File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
 "Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
index 97b3a27a9d0b7c772d640610beae89c6b2a16ea2..b99d0751540d4008389f1b53ebb8b775d0a24f1f 100644
--- a/apps/files_encryption/l10n/nn_NO.php
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Lagrar â€¦"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/oc.php b/apps/files_encryption/l10n/oc.php
index 0a34c4cda12199ca891d94bb33cc6c2b34169cab..87d1e6ceffb79e302346e413ed3b23aac43adde5 100644
--- a/apps/files_encryption/l10n/oc.php
+++ b/apps/files_encryption/l10n/oc.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Enregistra..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 3928afb1d5c65be919b2d6cb91de3b0668ef52bb..ca4502ff6aa0219e7466657c0b41ba623770d07b 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Klucz odzyskiwania wÅ‚Ä…czony",
 "Could not enable recovery key. Please check your recovery key password!" => "Nie moÅ¼na wÅ‚Ä…czyÄ‡ klucza odzyskiwania. ProszÄ™ sprawdziÄ‡ swoje hasÅ‚o odzyskiwania!",
 "Recovery key successfully disabled" => "Klucz odzyskiwania wyÅ‚Ä…czony",
@@ -7,6 +8,10 @@
 "Could not change the password. Maybe the old password was not correct." => "Nie moÅ¼na zmieniÄ‡ hasÅ‚a. MoÅ¼e stare hasÅ‚o nie byÅ‚o poprawne.",
 "Private key password successfully updated." => "PomyÅ›lnie zaktualizowano hasÅ‚o klucza prywatnego.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nie moÅ¼na zmieniÄ‡ prywatnego hasÅ‚a. MoÅ¼e stare hasÅ‚o nie byÅ‚o poprawne.",
+"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." => "Klucz prywatny nie jest waÅ¼ny! Prawdopodobnie Twoje hasÅ‚o zostaÅ‚o zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskaÄ‡ dostÄ™p do zaszyfrowanych plikÃ³w moÅ¼na zaktualizowaÄ‡ hasÅ‚o klucza prywatnego w ustawieniach osobistych.",
+"Missing requirements." => "Brak wymagaÅ„.",
+"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." => "ProszÄ™ upewniÄ‡ siÄ™, Å¼e PHP 5.3.3 lub nowszy jest zainstalowany i Å¼e OpenSSL oraz rozszerzenie PHP jest wÅ‚Ä…czone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostaÅ‚o wyÅ‚Ä…czone.",
+"Following users are not set up for encryption:" => "NastÄ™pujÄ…cy uÅ¼ytkownicy nie majÄ… skonfigurowanego szyfrowania:",
 "Saving..." => "Zapisywanie...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! MoÅ¼e Twoje hasÅ‚o zostaÅ‚o zmienione z zewnÄ…trz.",
 "You can unlock your private key in your " => "MoÅ¼esz odblokowaÄ‡ swÃ³j klucz prywatny w swojej",
@@ -31,3 +36,4 @@
 "File recovery settings updated" => "Ustawienia odzyskiwania plikÃ³w zmienione",
 "Could not update file recovery" => "Nie moÅ¼na zmieniÄ‡ pliku odzyskiwania"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 1563243c9931185b2a742e2672fc327435ef1300..5b8a68657b78d2a5d88c174b9925048b864db970 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "RecuperaÃ§Ã£o de chave habilitada com sucesso",
 "Could not enable recovery key. Please check your recovery key password!" => "ImpossÃvel habilitar recuperaÃ§Ã£o de chave. Por favor verifique sua senha para recuperaÃ§Ã£o de chave!",
 "Recovery key successfully disabled" => "RecuperaÃ§Ã£o de chave desabilitada com sucesso",
@@ -8,8 +9,9 @@
 "Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
 "Could not update the private key password. Maybe the old password was not correct." => "NÃ£o foi possÃvel atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
 "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." => "Sua chave privada nÃ£o Ã© vÃ¡lida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretÃ³rio corporativo). VocÃª pode atualizar sua senha de chave privada em suas configuraÃ§Ãµes pessoais para recuperar o acesso a seus arquivos criptografados.",
-"Missing requirements." => "Requisitos em falta.",
-"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." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente estÃ¡ instalado e que a extensÃ£o PHP OpenSSL estÃ¡ habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
+"Missing requirements." => "Requisitos nÃ£o encontrados.",
+"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." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente estÃ¡ instalado e que a extensÃ£o PHP OpenSSL estÃ¡ habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
+"Following users are not set up for encryption:" => "Seguintes usuÃ¡rios nÃ£o estÃ£o configurados para criptografia:",
 "Saving..." => "Salvando...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada nÃ£o Ã© vÃ¡lida! Talvez sua senha tenha sido mudada.",
 "You can unlock your private key in your " => "VocÃª pode desbloquear sua chave privada nas suas",
@@ -17,7 +19,7 @@
 "Encryption" => "Criptografia",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperaÃ§Ã£o (permite recuperar arquivos de usuÃ¡rios em caso de perda de senha):",
 "Recovery key password" => "Senha da chave de recuperaÃ§Ã£o",
-"Enabled" => "Habilidado",
+"Enabled" => "Habilitado",
 "Disabled" => "Desabilitado",
 "Change recovery key password:" => "Mudar a senha da chave de recuperaÃ§Ã£o:",
 "Old Recovery key password" => "Senha antiga da chave de recuperaÃ§Ã£o",
@@ -27,10 +29,11 @@
 "Set your old private key password to your current log-in password." => "Configure sua antiga senha de chave privada para sua atual senha de login.",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Se vocÃª nÃ£o se lembra de sua antiga senha vocÃª pode pedir ao administrador que recupere seus arquivos.",
 "Old log-in password" => "Senha antiga de login",
-"Current log-in password" => "Atual senha de login",
+"Current log-in password" => "Senha de login atual",
 "Update Private Key Password" => "Atualizar senha de chave privada",
 "Enable password recovery:" => "Habilitar recuperaÃ§Ã£o de senha:",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opÃ§Ã£o vai permitir que vocÃª obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha",
 "File recovery settings updated" => "ConfiguraÃ§Ãµes de recuperaÃ§Ã£o de arquivo atualizado",
 "Could not update file recovery" => "NÃ£o foi possÃvel atualizar a recuperaÃ§Ã£o de arquivos"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index f485f373a5346850da99dd461c5419859549cdb2..53335ab7297e70e608593396f0a6899ca4cb1293 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,15 +1,30 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Chave de recuperaÃ§Ã£o activada com sucesso",
 "Could not enable recovery key. Please check your recovery key password!" => "NÃ£o foi possÃvel activar a chave de recuperaÃ§Ã£o. Por favor verifique a password da chave de recuperaÃ§Ã£o!",
 "Recovery key successfully disabled" => "Chave de recuperaÃ§Ã£o descativada com sucesso",
 "Could not disable recovery key. Please check your recovery key password!" => "NÃ£o foi possÃvel desactivar a chave de recuperaÃ§Ã£o. Por favor verifique a password da chave de recuperaÃ§Ã£o.",
 "Password successfully changed." => "Password alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "NÃ£o foi possivel alterar a password. Possivelmente a password antiga nÃ£o estÃ¡ correcta.",
+"Could not update the private key password. Maybe the old password was not correct." => "NÃ£o foi possÃvel alterar a chave. Possivelmente a password antiga nÃ£o estÃ¡ 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." => "Chave privada nÃ£o Ã© vÃ¡lida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretÃ³rio corporativo). Pode atualizar password da chave privada em configuraÃ§Ãµes personalizadas para recuperar o acesso aos seus arquivos encriptados.",
+"Missing requirements." => "Faltam alguns requisitos.",
 "Saving..." => "A guardar...",
+"personal settings" => "configuraÃ§Ãµes personalizadas ",
 "Encryption" => "EncriptaÃ§Ã£o",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperaÃ§Ã£o (permite recuperar os ficheiros no caso de perda da password):",
+"Recovery key password" => "Chave de recuperaÃ§Ã£o da conta",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
+"Change recovery key password:" => "Alterar a chave de recuperaÃ§Ã£o:",
+"Old Recovery key password" => "Chave anterior de recuperaÃ§Ã£o da conta",
+"New Recovery key password" => "Nova chave de recuperaÃ§Ã£o da conta",
 "Change Password" => "Mudar a Password",
+"Old log-in password" => "Password anterior da conta",
+"Current log-in password" => "Password actual da conta",
+"Enable password recovery:" => "ativar recuperaÃ§Ã£o do password:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao activar esta opÃ§Ã£o, tornar-lhe-a possÃvel a obtenÃ§Ã£o de acesso aos seus ficheiros encriptados caso perca a password.",
 "File recovery settings updated" => "Actualizadas as definiÃ§Ãµes de recuperaÃ§Ã£o de ficheiros",
 "Could not update file recovery" => "NÃ£o foi possÃvel actualizar a recuperaÃ§Ã£o de ficheiros"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index 9e04b627c42688174e7bd239a30b06d67eae872a..3dcdce324184ff6c362474f5131d98d474918511 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Se salveazÄƒ...",
 "Encryption" => "ÃŽncriptare"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 5bb803de2d0a8f14746aca00444dda2f5768cc57..76fd8c5ba53d68e086873049b3b33154e0bf370d 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "ÐšÐ»ÑŽÑ‡ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½",
 "Could not enable recovery key. Please check your recovery key password!" => "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ. ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ÑÑ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¾Ñ‚ ÐºÐ»ÑŽÑ‡Ð°!",
 "Recovery key successfully disabled" => "ÐšÐ»ÑŽÑ‡ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½",
@@ -9,7 +10,6 @@
 "Could not update the private key password. Maybe the old password was not correct." => "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¾Ñ‚ ÑÐµÐºÑ€ÐµÑ‚Ð½Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°. Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, ÑÑ‚Ð°Ñ€Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÑƒÐºÐ°Ð·Ð°Ð½ Ð½ÐµÐ²ÐµÑ€Ð½Ð¾.",
 "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." => "Ð’Ð°Ñˆ ÑÐµÐºÑ€ÐµÑ‚Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð½Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÐµÐ½! Ð’ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, Ð²Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð±Ñ‹Ð» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ Ð²Ð½Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ OwnCloud (Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, ÐºÐ¾Ñ€Ð¿Ð¾Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³). Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐµÐºÑ€ÐµÑ‚Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð² Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°Ñ… Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¼ Ñ„Ð°Ð¹Ð»Ð°Ð¼. ",
 "Missing requirements." => "Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‚.",
-"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." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑƒÐ±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ PHP 5.3.3 Ð¸Ð»Ð¸ Ð½Ð¾Ð²ÐµÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ Ñ‡Ñ‚Ð¾ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ OpenSSL PHP Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½ Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½. Ð’ Ð½Ð°ÑÑ‚Ð¾ÑÑ‰ÐµÐµ Ð²Ñ€ÐµÐ¼Ñ, ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾.",
 "Saving..." => "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Ð¡ÐµÐºÑ€ÐµÑ‚Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð½ÐµÐ´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÐµÐ½! Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð’Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð±Ñ‹Ð» Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½ Ð² Ð´Ñ€ÑƒÐ³Ð¾Ð¹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ.",
 "You can unlock your private key in your " => "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð² ÑÐ²Ð¾Ñ‘Ð¼ ",
@@ -34,3 +34,4 @@
 "File recovery settings updated" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð° Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹",
 "Could not update file recovery" => "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
 );
+$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);";
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
index 1351f63f89b8e87ba4b736fc449e52cabed6f1f6..438e6fb5e9767ac3f1805e3516230378e7354e9c 100644
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ"
 );
+$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);";
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index 6c678bb3a4f93ba7dafa670e571d742969a2bc76..5f5330df54746f6a2b71e120149036581ff86e54 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "à·ƒà·”à¶»à·à¶šà·™à¶¸à·’à¶±à·Š à¶´à·€à¶à·“...",
 "Encryption" => "à¶œà·”à¶´à·Šà¶ à¶šà·šà¶à¶±à¶º"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index d8894e537061533dceeb8a21743df3f2a47d759f..a723d80773b6751b7fb9f465995f2a2c56a55aec 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "ZÃ¡chrannÃ½ kÄ¾ÃºÄ bol ÃºspeÅ¡ne povolenÃ½",
 "Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliÅ¥ zÃ¡chrannÃ½ kÄ¾ÃºÄ. Skontrolujte prosÃm VaÅ¡e heslo zÃ¡chrannÃ©ho kÄ¾ÃºÄa!",
 "Recovery key successfully disabled" => "ZÃ¡chrannÃ½ kÄ¾ÃºÄ bol ÃºspeÅ¡ne zakÃ¡zanÃ½",
@@ -25,3 +26,4 @@
 "File recovery settings updated" => "Nastavenie obnovy sÃºborov aktualizovanÃ©",
 "Could not update file recovery" => "NemoÅ¾no aktualizovaÅ¥ obnovenie sÃºborov"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 8b28ba011558afb74eae6f4af23926550322336f..8b2f264c62e92935d58e1150b49b193cb1806d2e 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "KljuÄ za obnovitev gesla je bil uspeÅ¡no nastavljen",
 "Could not enable recovery key. Please check your recovery key password!" => "KljuÄa za obnovitev gesla ni bilo mogoÄe nastaviti. Preverite kljuÄ!",
 "Recovery key successfully disabled" => "KljuÄ za obnovitev gesla je bil uspeÅ¡no onemogoÄen",
@@ -8,6 +9,9 @@
 "Private key password successfully updated." => "Zasebni kljuÄ za geslo je bil uspeÅ¡no posodobljen.",
 "Could not update the private key password. Maybe the old password was not correct." => "Zasebnega kljuÄa za geslo ni bilo mogoÄe posodobiti. Morda vnos starega gesla ni bil pravilen.",
 "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." => "VaÅ¡ zasebni kljuÄ ni veljaven. Morda je bilo vaÅ¡e geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni kljuÄ, ki vam bo omogoÄil dostop do Å¡ifriranih dokumentov, lahko posodobite v osebnih nastavitvah.",
+"Missing requirements." => "ManjkajoÄe zahteve",
+"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." => "Preverite, da imate na streÅ¾niku nameÅ¡Äen paket PHP 5.3.3 ali novejÅ¡i in da je omogoÄen in pravilno nastavljen PHP OpenSSL . Zaenkrat je Å¡ifriranje onemogoÄeno.",
+"Following users are not set up for encryption:" => "Naslednji uporabniki Å¡e nimajo nastavljenega Å¡ifriranja:",
 "Saving..." => "Poteka shranjevanje ...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "VaÅ¡ zasebni kljuÄ ni veljaven. Morda je bilo vaÅ¡e geslo spremenjeno.",
 "You can unlock your private key in your " => "Svoj zasebni kljuÄ lahko odklenite v",
@@ -32,3 +36,4 @@
 "File recovery settings updated" => "Nastavitve obnavljanja dokumentov so bile posodobljene",
 "Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni bilo mogoÄe posodobiti"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index a36e37c1790f1e7158feb4d1c3fcdaea563058a4..cbf87dcf4d27e717945b18604afd7acdb111912c 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Ð§ÑƒÐ²Ð°ÑšÐµ Ñƒ Ñ‚Ð¾ÐºÑƒ...",
 "Encryption" => "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐµ"
 );
+$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);";
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 3659e22bb4ea133940492a327947885338908573..88ba6b471597312f046379199e75f53ea096e868 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Ã…terstÃ¤llningsnyckeln har framgÃ¥ngsrikt aktiverats",
 "Could not enable recovery key. Please check your recovery key password!" => "Kunde inte aktivera Ã¥terstÃ¤llningsnyckeln. VÃ¤nligen kontrollera ditt lÃ¶senord fÃ¶r Ã¥terstÃ¤llningsnyckeln!",
 "Recovery key successfully disabled" => "Ã…terstÃ¤llningsnyckeln har framgÃ¥ngsrikt inaktiverats",
@@ -8,6 +9,9 @@
 "Private key password successfully updated." => "Den privata lÃ¶senordsnyckeln uppdaterades utan problem.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lÃ¶senordsnyckeln. Kanske var det gamla lÃ¶senordet fel.",
 "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 privata lÃ¶senordsnyckel Ã¤r inte giltig! Troligen har ditt lÃ¶senord Ã¤ndrats utanfÃ¶r ownCloud (t.ex. i fÃ¶retagets katalogtjÃ¤nst). Du kan uppdatera den privata lÃ¶senordsnyckeln under dina personliga instÃ¤llningar fÃ¶r att Ã¥terfÃ¥ tillgÃ¥ng till dina filer.",
+"Missing requirements." => "Krav som saknas",
+"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." => "Kontrollera att PHP 5.3.3 eller senare Ã¤r installerad och att tillÃ¤gget OpenSSL PHP Ã¤r aktiverad och korrekt konfigurerad. Kryptering Ã¤r tillsvidare inaktiverad.",
+"Following users are not set up for encryption:" => "FÃ¶ljande anvÃ¤ndare har inte aktiverat kryptering:",
 "Saving..." => "Sparar...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lÃ¶senordsnyckel Ã¤r inte giltig! Kanske byttes ditt lÃ¶senord frÃ¥n utsidan.",
 "You can unlock your private key in your " => "Du kan lÃ¥sa upp din privata nyckel i dina",
@@ -32,3 +36,4 @@
 "File recovery settings updated" => "InstÃ¤llningarna fÃ¶r filÃ¥terstÃ¤llning har uppdaterats",
 "Could not update file recovery" => "Kunde inte uppdatera filÃ¥terstÃ¤llning"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 63fe9ecde86944b117bd14a603506940ddd76e6a..9dec6de3acb361bac78191a586bc43f0de256478 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "à®šà¯‡à®®à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯...",
 "Encryption" => "à®®à®±à¯ˆà®•à¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index 6cab4370ccf2413b2140c49bbd0fdfb4ea39edc1..7bf3e2765aada2e77738fb41477e38e7557e8406 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—à¸¶à¸à¸‚à¹‰à¸à¸¡à¸¹à¸¥...",
 "Encryption" => "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 24c6fa472782376a2373f1709b05038253cb9cdc..7fdda1a5bf6e6b0d6aa6cd721bbcd1f4b0ef5c66 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Kurtarma anahtarÄ± baÅŸarÄ±yla etkinleÅŸtirildi",
 "Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarÄ± etkinleÅŸtirilemedi. LÃ¼tfen kurtarma anahtarÄ± parolanÄ±zÄ± kontrol edin!",
 "Recovery key successfully disabled" => "Kurtarma anahtarÄ± baÅŸarÄ±yla devre dÄ±ÅŸÄ± bÄ±rakÄ±ldÄ±",
@@ -13,3 +14,4 @@
 "File recovery settings updated" => "Dosya kurtarma ayarlarÄ± gÃ¼ncellendi",
 "Could not update file recovery" => "Dosya kurtarma gÃ¼ncellenemedi"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
index 954d95b4132977305ae13648d6c430b91157ac08..25b3f68634b3a6e273259804f7590043a59098fe 100644
--- a/apps/files_encryption/l10n/ug.php
+++ b/apps/files_encryption/l10n/ug.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Ø³Ø§Ù‚Ù„Ø§Û‹Ø§ØªÙ‰Ø¯Û‡â€¦",
 "Encryption" => "Ø´Ù‰ÙÙ‰Ø±Ù„Ø§Ø´"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 1c176a391423e5abf4e8d6332bd7a14b0d62c7d2..680beddfe680f72a72753efa561323cf9c0f19ff 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°ÑŽ...",
 "Encryption" => "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ"
 );
+$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);";
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index d11569bb94c443a971dc08716f9467a2571cdad8..18882be63a198b583e23af8ba9d2016ec16a0efd 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password successfully changed." => "ÄÃ£ Ä‘á»•i máºt kháº©u.",
 "Could not change the password. Maybe the old password was not correct." => "KhÃ´ng thá»ƒ Ä‘á»•i máºt kháº©u. CÃ³ láº½ do máºt kháº©u cÅ© khÃ´ng Ä‘Ãºng.",
 "Saving..." => "Äang lÆ°u...",
@@ -7,3 +8,4 @@
 "Disabled" => "Táº¯t",
 "Change Password" => "Äá»•i Máºt kháº©u"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 3c405a81ace8ddfb0ee74281b823a911faa19477..0f9f459c771ab3145b7983b4148c37c566483d10 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "ä¿å˜ä¸...",
 "Encryption" => "åŠ å¯†"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index a3939165c7a74d247a61ddf9f3d16f5caf6a44fa..c4c52f4ac2e72e46112e739e5cdc90d345175528 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Recovery key successfully enabled" => "æ¢å¤å¯†é’¥æˆåŠŸå¯ç”¨",
 "Could not enable recovery key. Please check your recovery key password!" => "ä¸èƒ½å¯ç”¨æ¢å¤å¯†é’¥ã€‚è¯·æ£€æŸ¥æ¢å¤å¯†é’¥å¯†ç ï¼",
 "Recovery key successfully disabled" => "æ¢å¤å¯†é’¥æˆåŠŸç¦ç”¨",
@@ -32,3 +33,4 @@
 "File recovery settings updated" => "æ–‡ä»¶æ¢å¤è®¾ç½®å·²æ›´æ–°",
 "Could not update file recovery" => "ä¸èƒ½æ›´æ–°æ–‡ä»¶æ¢å¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index 0a38a2ddf856ddb1e460af9821642559a44d6e5d..edbeb0f1c66b83a4ce6bc0840e7892202cbf769d 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Encryption" => "åŠ å¯†"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index d34f51c4870bb6ad4f4217c49b8c68e70bbe63fe..02dc49cc3d944f70f54b84dfaa8636a80610dd97 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,11 +1,17 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password successfully changed." => "æˆåŠŸè®Šæ›´å¯†ç¢¼ã€‚",
 "Could not change the password. Maybe the old password was not correct." => "ç„¡æ³•è®Šæ›´å¯†ç¢¼ï¼Œæˆ–è¨±æ˜¯è¼¸å…¥çš„èˆŠå¯†ç¢¼ä¸æ£ç¢ºã€‚",
+"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." => "æ‚¨çš„ç§é‘°ä¸æ£ç¢º! æ„Ÿè¦ºåƒæ˜¯å¯†ç¢¼åœ¨ ownCloud ç³»çµ±ä¹‹å¤–è¢«æ”¹è®Š(ä¾‹ï¼šæ‚¨çš„ç›®éŒ„)ã€‚ æ‚¨å¯ä»¥åœ¨å€‹äººè¨å®šä¸æ›´æ–°ç§é‘°å¯†ç¢¼å–å›žå·²åŠ å¯†çš„æª”æ¡ˆã€‚",
 "Saving..." => "å„²å˜ä¸...",
 "Encryption" => "åŠ å¯†",
 "Enabled" => "å·²å•“ç”¨",
 "Disabled" => "å·²åœç”¨",
 "Change Password" => "è®Šæ›´å¯†ç¢¼",
+" If you don't remember your old password you can ask your administrator to recover your files." => "å¦‚æžœæ‚¨å¿˜è¨˜èˆŠå¯†ç¢¼ï¼Œå¯ä»¥è«‹æ±‚ç®¡ç†å“¡å”åŠ©å–å›žæª”æ¡ˆã€‚",
+"Old log-in password" => "èˆŠç™»å…¥å¯†ç¢¼",
+"Current log-in password" => "ç›®å‰çš„ç™»å…¥å¯†ç¢¼",
 "File recovery settings updated" => "æª”æ¡ˆé‚„åŽŸè¨å®šå·²æ›´æ–°",
 "Could not update file recovery" => "ç„¡æ³•æ›´æ–°æª”æ¡ˆé‚„åŽŸè¨å®š"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 6543a0de5f3b94b8a059e0bf01f1b1a32260041d..c3e88e5944e6b11ebe67b56f673b2f06f39f7c4b 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -57,7 +57,9 @@ class Crypt {
 
 		if ($res === false) {
 			\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
-			\OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
+			while ($msg = openssl_error_string()) {
+				\OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails:  ' . $msg, \OCP\Util::ERROR);
+			}
 		} elseif (openssl_pkey_export($res, $privateKey)) {
 			// Get public key
 			$keyDetails = openssl_pkey_get_details($res);
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 6eee8fed6a63932b01071dc0b173ee8041dc6f1a..b09c584c0b8fe4852128a3440e8ff9762dd53072 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -232,6 +232,21 @@ class Helper {
 
 		return (bool) $result;
 	}
+	
+	/**
+	 * check some common errors if the server isn't configured properly for encryption
+	 * @return bool true if configuration seems to be OK
+	 */
+	public static function checkConfiguration() {
+		if(openssl_pkey_new(array('private_key_bits' => 4096))) {
+			return true;
+		} else {
+			while ($msg = openssl_error_string()) {
+				\OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails:  ' . $msg, \OCP\Util::ERROR);
+			}
+			return false;
+		}
+	}
 
 	/**
 	 * @brief glob uses different pattern than regular expressions, escape glob pattern only
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 19ba9a8117f1ce509304408afe2dd9c73c44e060..b644856d95d35df68af1c6e29abcd1a92a52d915 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -14,6 +14,7 @@ require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
 require_once realpath(dirname(__FILE__) . '/../lib/util.php');
 require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
 require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
 
 use OCA\Encryption;
 
@@ -22,6 +23,8 @@ use OCA\Encryption;
  */
 class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
+	const TEST_USER = "test-keymanager-user";
+
 	public $userId;
 	public $pass;
 	public $stateFilesTrashbin;
@@ -47,17 +50,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		// disable file proxy by default
 		\OC_FileProxy::$enabled = false;
 
-		// setup filesystem
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS('admin');
-		\OC_User::setUserId('admin');
-
-		// login admin
-		$params['uid'] = 'admin';
-		$params['password'] = 'admin';
-		OCA\Encryption\Hooks::login($params);
+		// create test user
+		\OC_User::deleteUser(\Test_Encryption_Keymanager::TEST_USER);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Keymanager::TEST_USER, true);
 	}
 
 	function setUp() {
@@ -75,9 +70,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 		$this->view = new \OC_FilesystemView('/');
 
-		\OC_User::setUserId('admin');
-		$this->userId = 'admin';
-		$this->pass = 'admin';
+		\OC_User::setUserId(\Test_Encryption_Keymanager::TEST_USER);
+		$this->userId = \Test_Encryption_Keymanager::TEST_USER;
+		$this->pass = \Test_Encryption_Keymanager::TEST_USER;
 
 		$userHome = \OC_User::getHome($this->userId);
 		$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
@@ -101,6 +96,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 	public static function tearDownAfterClass() {
 		\OC_FileProxy::$enabled = true;
+
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Keymanager::TEST_USER);
 	}
 
 	/**
@@ -226,9 +224,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		$filename = '/tmp-' . time() . '.txt';
 
 		// create folder structure
-		$this->view->mkdir('/admin/files/folder1');
-		$this->view->mkdir('/admin/files/folder1/subfolder');
-		$this->view->mkdir('/admin/files/folder1/subfolder/subsubfolder');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder/subsubfolder');
 
 		// enable encryption proxy
 		$proxyStatus = \OC_FileProxy::$enabled;
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 6b5303158595974fb815fa1435663535b7e8c1fb..5f3d500509007b1fd2be7b400961d31fcd1fb99b 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -751,6 +751,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	 * @large
 	 */
 	function testRecoveryForUser() {
+		$this->markTestIncomplete(
+			'This test drives Jenkins crazy - "Cannot modify header information - headers already sent" - line 811'
+		);
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
@@ -878,8 +881,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
-
+		try {
+			\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+		} catch (Exception $e) {
+			$this->assertEquals(0, strpos($e->getMessage(), "Following users are not set up for encryption"));
+		}
+		
+		
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Aws.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Aws.php
new file mode 100644
index 0000000000000000000000000000000000000000..bd3175be59156917b47378a8f306670ae743c503
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Aws.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common;
+
+use Guzzle\Service\Builder\ServiceBuilder;
+use Guzzle\Service\Builder\ServiceBuilderLoader;
+
+/**
+ * Base class for interacting with web service clients
+ */
+class Aws extends ServiceBuilder
+{
+    /**
+     * @var string Current version of the SDK
+     */
+    const VERSION = '2.4.0';
+
+    /**
+     * Create a new service locator for the AWS SDK
+     *
+     * You can configure the service locator is four different ways:
+     *
+     * 1. Use the default configuration file shipped with the SDK that wires class names with service short names and
+     *    specify global parameters to add to every definition (e.g. key, secret, credentials, etc)
+     *
+     * 2. Use a custom configuration file that extends the default config and supplies credentials for each service.
+     *
+     * 3. Use a custom config file that wires services to custom short names for services.
+     *
+     * 4. If you are on Amazon EC2, you can use the default configuration file and not provide any credentials so that
+     *    you are using InstanceProfile credentials.
+     *
+     * @param array|string $config           The full path to a .php or .js|.json file, or an associative array of data
+     *                                       to use as global parameters to pass to each service.
+     * @param array        $globalParameters Global parameters to pass to every service as it is instantiated.
+     *
+     * @return Aws
+     */
+    public static function factory($config = null, array $globalParameters = array())
+    {
+        if (!$config) {
+            // If nothing is passed in, then use the default configuration file with credentials from the environment
+            $config = self::getDefaultServiceDefinition();
+        } elseif (is_array($config)) {
+            // If an array was passed, then use the default configuration file with parameter overrides
+            $globalParameters = $config;
+            $config = self::getDefaultServiceDefinition();
+        }
+
+        $loader = new ServiceBuilderLoader();
+        $loader->addAlias('_aws', self::getDefaultServiceDefinition())
+            ->addAlias('_sdk1', __DIR__  . '/Resources/sdk1-config.php');
+
+        return $loader->load($config, $globalParameters);
+    }
+
+    /**
+     * Get the full path to the default service builder definition file
+     *
+     * @return string
+     */
+    public static function getDefaultServiceDefinition()
+    {
+        return __DIR__  . '/Resources/aws-config.php';
+    }
+
+    /**
+     * Returns the configuration for the service builder
+     *
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $this->builderConfig;
+    }
+
+    /**
+     * Enables the facades for the clients defined in the service builder
+     *
+     * @param string|null $namespace The namespace that the facades should be mounted to. Defaults to global namespace
+     *
+     * @return Aws
+     */
+    public function enableFacades($namespace = null)
+    {
+        $facadeClass = 'Aws\\Common\\Facade\\Facade';
+        if (class_exists($facadeClass)) {
+            $facadeClass::mountFacades($this, $namespace);
+        }
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/AbstractClient.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/AbstractClient.php
new file mode 100644
index 0000000000000000000000000000000000000000..0187cdb15c33df5482fb5c5b0626eec26039a2fd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/AbstractClient.php
@@ -0,0 +1,273 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Aws\Common\Aws;
+use Aws\Common\Credentials\Credentials;
+use Aws\Common\Credentials\CredentialsInterface;
+use Aws\Common\Enum\ClientOptions as Options;
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Signature\EndpointSignatureInterface;
+use Aws\Common\Signature\SignatureInterface;
+use Aws\Common\Signature\SignatureListener;
+use Aws\Common\Waiter\WaiterClassFactory;
+use Aws\Common\Waiter\CompositeWaiterFactory;
+use Aws\Common\Waiter\WaiterFactoryInterface;
+use Aws\Common\Waiter\WaiterConfigFactory;
+use Guzzle\Common\Collection;
+use Guzzle\Service\Client;
+use Guzzle\Service\Description\ServiceDescriptionInterface;
+
+/**
+ * Abstract AWS client
+ */
+abstract class AbstractClient extends Client implements AwsClientInterface
+{
+    /**
+     * @var CredentialsInterface AWS credentials
+     */
+    protected $credentials;
+
+    /**
+     * @var SignatureInterface Signature implementation of the service
+     */
+    protected $signature;
+
+    /**
+     * @var WaiterFactoryInterface Factory used to create waiter classes
+     */
+    protected $waiterFactory;
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getAllEvents()
+    {
+        return array_merge(Client::getAllEvents(), array(
+            'client.region_changed',
+            'client.credentials_changed',
+        ));
+    }
+
+    /**
+     * @param CredentialsInterface $credentials AWS credentials
+     * @param SignatureInterface   $signature   Signature implementation
+     * @param Collection           $config      Configuration options
+     *
+     * @throws InvalidArgumentException if an endpoint provider isn't provided
+     */
+    public function __construct(CredentialsInterface $credentials, SignatureInterface $signature, Collection $config)
+    {
+        // Bootstrap with Guzzle
+        parent::__construct($config->get(Options::BASE_URL), $config);
+        $this->credentials = $credentials;
+        $this->signature = $signature;
+
+        // Make sure the user agent is prefixed by the SDK version
+        $this->setUserAgent('aws-sdk-php2/' . Aws::VERSION, true);
+
+        // Add the event listener so that requests are signed before they are sent
+        $dispatcher = $this->getEventDispatcher();
+        $dispatcher->addSubscriber(new SignatureListener($credentials, $signature));
+
+        if ($backoff = $config->get(Options::BACKOFF)) {
+            $dispatcher->addSubscriber($backoff, -255);
+        }
+    }
+
+    public function __call($method, $args)
+    {
+        if (substr($method, 0, 3) === 'get' && substr($method, -8) === 'Iterator') {
+            // Allow magic method calls for iterators (e.g. $client->get<CommandName>Iterator($params))
+            $commandOptions = isset($args[0]) ? $args[0] : null;
+            $iteratorOptions = isset($args[1]) ? $args[1] : array();
+            return $this->getIterator(substr($method, 3, -8), $commandOptions, $iteratorOptions);
+        } elseif (substr($method, 0, 9) == 'waitUntil') {
+            // Allow magic method calls for waiters (e.g. $client->waitUntil<WaiterName>($params))
+            return $this->waitUntil(substr($method, 9), isset($args[0]) ? $args[0]: array());
+        } else {
+            return parent::__call(ucfirst($method), $args);
+        }
+    }
+
+    /**
+     * Get an endpoint for a specific region from a service description
+     *
+     * @param ServiceDescriptionInterface $description Service description
+     * @param string                      $region      Region of the endpoint
+     * @param string                      $scheme      URL scheme
+     *
+     * @return string
+     * @throws InvalidArgumentException
+     */
+    public static function getEndpoint(ServiceDescriptionInterface $description, $region, $scheme)
+    {
+        $service = $description->getData('serviceFullName');
+        // Lookup the region in the service description
+        if (!($regions = $description->getData('regions'))) {
+            throw new InvalidArgumentException("No regions found in the {$service} description");
+        }
+        // Ensure that the region exists for the service
+        if (!isset($regions[$region])) {
+            throw new InvalidArgumentException("{$region} is not a valid region for {$service}");
+        }
+        // Ensure that the scheme is valid
+        if ($regions[$region][$scheme] == false) {
+            throw new InvalidArgumentException("{$scheme} is not a valid URI scheme for {$service} in {$region}");
+        }
+
+        return $scheme . '://' . $regions[$region]['hostname'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCredentials()
+    {
+        return $this->credentials;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setCredentials(CredentialsInterface $credentials)
+    {
+        $formerCredentials = $this->credentials;
+        $this->credentials = $credentials;
+
+        // Dispatch an event that the credentials have been changed
+        $this->dispatch('client.credentials_changed', array(
+            'credentials'        => $credentials,
+            'former_credentials' => $formerCredentials,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSignature()
+    {
+        return $this->signature;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRegions()
+    {
+        return $this->serviceDescription->getData('regions');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRegion()
+    {
+        return $this->getConfig(Options::REGION);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setRegion($region)
+    {
+        $config = $this->getConfig();
+        $formerRegion = $config->get(Options::REGION);
+        $global = $this->serviceDescription->getData('globalEndpoint');
+
+        // Only change the region if the service does not have a global endpoint
+        if (!$global || $this->serviceDescription->getData('namespace') === 'S3') {
+            $baseUrl = self::getEndpoint($this->serviceDescription, $region, $config->get(Options::SCHEME));
+            $this->setBaseUrl($baseUrl);
+            $config->set(Options::BASE_URL, $baseUrl)->set(Options::REGION, $region);
+
+            // Update the signature if necessary
+            $signature = $this->getSignature();
+            if ($signature instanceof EndpointSignatureInterface) {
+                /** @var $signature EndpointSignatureInterface */
+                $signature->setRegionName($region);
+            }
+
+            // Dispatch an event that the region has been changed
+            $this->dispatch('client.region_changed', array(
+                'region'        => $region,
+                'former_region' => $formerRegion,
+            ));
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function waitUntil($waiter, array $input = array())
+    {
+        $this->getWaiter($waiter, $input)->wait();
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWaiter($waiter, array $input = array())
+    {
+        return $this->getWaiterFactory()->build($waiter)
+            ->setClient($this)
+            ->setConfig($input);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setWaiterFactory(WaiterFactoryInterface $waiterFactory)
+    {
+        $this->waiterFactory = $waiterFactory;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWaiterFactory()
+    {
+        if (!$this->waiterFactory) {
+            $clientClass = get_class($this);
+            // Use a composite factory that checks for classes first, then config waiters
+            $this->waiterFactory = new CompositeWaiterFactory(array(
+                new WaiterClassFactory(substr($clientClass, 0, strrpos($clientClass, '\\')) . '\\Waiter')
+            ));
+            if ($this->getDescription()) {
+                $this->waiterFactory->addFactory(new WaiterConfigFactory($this->getDescription()->getData('waiters')));
+            }
+        }
+
+        return $this->waiterFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getApiVersion()
+    {
+        return $this->serviceDescription->getApiVersion();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/AwsClientInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/AwsClientInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..4c0579f64ad6b85f079da52d3e398d3c875a315c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/AwsClientInterface.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Aws\Common\Signature\SignatureInterface;
+use Aws\Common\Waiter\WaiterFactoryInterface;
+use Aws\Common\Waiter\WaiterInterface;
+use Guzzle\Service\ClientInterface;
+
+/**
+ * Interface that all AWS clients implement
+ */
+interface AwsClientInterface extends ClientInterface
+{
+    /**
+     * Returns the AWS credentials associated with the client
+     *
+     * @return CredentialsInterface
+     */
+    public function getCredentials();
+
+    /**
+     * Sets the credentials object associated with the client
+     *
+     * @param CredentialsInterface $credentials Credentials object to use
+     *
+     * @return self
+     */
+    public function setCredentials(CredentialsInterface $credentials);
+
+    /**
+     * Returns the signature implementation used with the client
+     *
+     * @return SignatureInterface
+     */
+    public function getSignature();
+
+    /**
+     * Get a list of available regions and region data
+     *
+     * @return array
+     */
+    public function getRegions();
+
+    /**
+     * Get the name of the region to which the client is configured to send requests
+     *
+     * @return string
+     */
+    public function getRegion();
+
+    /**
+     * Change the region to which the client is configured to send requests
+     *
+     * @param string $region Name of the region
+     *
+     * @return self
+     */
+    public function setRegion($region);
+
+    /**
+     * Get the waiter factory being used by the client
+     *
+     * @return WaiterFactoryInterface
+     */
+    public function getWaiterFactory();
+
+    /**
+     * Set the waiter factory to use with the client
+     *
+     * @param WaiterFactoryInterface $waiterFactory Factory used to create waiters
+     *
+     * @return self
+     */
+    public function setWaiterFactory(WaiterFactoryInterface $waiterFactory);
+
+    /**
+     * Wait until a resource is available or an associated waiter returns true
+     *
+     * @param string $waiter Name of the waiter
+     * @param array  $input  Values used as input for the underlying operation and to control the waiter
+     *
+     * @return self
+     */
+    public function waitUntil($waiter, array $input = array());
+
+    /**
+     * Get a named waiter object
+     *
+     * @param string $waiter Name of the waiter
+     * @param array  $input  Values used as input for the underlying operation and to control the waiter
+     *
+     * @return WaiterInterface
+     */
+    public function getWaiter($waiter, array $input = array());
+
+    /**
+     * Get the API version of the client (e.g. 2006-03-01)
+     *
+     * @return string
+     */
+    public function getApiVersion();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ClientBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ClientBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..478aa0e09502e5a4fd57354e40cc9e9f900a3b46
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ClientBuilder.php
@@ -0,0 +1,454 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Aws\Common\Credentials\Credentials;
+use Aws\Common\Enum\ClientOptions as Options;
+use Aws\Common\Enum\Region;
+use Aws\Common\Exception\ExceptionListener;
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Exception\NamespaceExceptionFactory;
+use Aws\Common\Exception\Parser\DefaultXmlExceptionParser;
+use Aws\Common\Exception\Parser\ExceptionParserInterface;
+use Aws\Common\Iterator\AwsResourceIteratorFactory;
+use Aws\Common\Signature\EndpointSignatureInterface;
+use Aws\Common\Signature\SignatureInterface;
+use Aws\Common\Signature\SignatureV2;
+use Aws\Common\Signature\SignatureV3;
+use Aws\Common\Signature\SignatureV3Https;
+use Aws\Common\Signature\SignatureV4;
+use Guzzle\Common\Collection;
+use Guzzle\Plugin\Backoff\BackoffPlugin;
+use Guzzle\Plugin\Backoff\CurlBackoffStrategy;
+use Guzzle\Plugin\Backoff\ExponentialBackoffStrategy;
+use Guzzle\Plugin\Backoff\HttpBackoffStrategy;
+use Guzzle\Plugin\Backoff\TruncatedBackoffStrategy;
+use Guzzle\Service\Client;
+use Guzzle\Service\Description\ServiceDescription;
+use Guzzle\Service\Resource\ResourceIteratorClassFactory;
+use Guzzle\Log\LogAdapterInterface;
+use Guzzle\Log\ClosureLogAdapter;
+use Guzzle\Plugin\Backoff\BackoffLogger;
+
+/**
+ * Builder for creating AWS service clients
+ */
+class ClientBuilder
+{
+    /**
+     * @var array Default client config
+     */
+    protected static $commonConfigDefaults = array('scheme' => 'https');
+
+    /**
+     * @var array Default client requirements
+     */
+    protected static $commonConfigRequirements = array(Options::SERVICE_DESCRIPTION);
+
+    /**
+     * @var string The namespace of the client
+     */
+    protected $clientNamespace;
+
+    /**
+     * @var array The config options
+     */
+    protected $config = array();
+
+    /**
+     * @var array The config defaults
+     */
+    protected $configDefaults = array();
+
+    /**
+     * @var array The config requirements
+     */
+    protected $configRequirements = array();
+
+    /**
+     * @var ExceptionParserInterface The Parser interface for the client
+     */
+    protected $exceptionParser;
+
+    /**
+     * @var array Array of configuration data for iterators available for the client
+     */
+    protected $iteratorsConfig = array();
+
+    /**
+     * Factory method for creating the client builder
+     *
+     * @param string $namespace The namespace of the client
+     *
+     * @return ClientBuilder
+     */
+    public static function factory($namespace = null)
+    {
+        return new static($namespace);
+    }
+
+    /**
+     * Constructs a client builder
+     *
+     * @param string $namespace The namespace of the client
+     */
+    public function __construct($namespace = null)
+    {
+        $this->clientNamespace = $namespace;
+    }
+
+    /**
+     * Sets the config options
+     *
+     * @param array|Collection $config The config options
+     *
+     * @return ClientBuilder
+     */
+    public function setConfig($config)
+    {
+        $this->config = $this->processArray($config);
+
+        return $this;
+    }
+
+    /**
+     * Sets the config options' defaults
+     *
+     * @param array|Collection $defaults The default values
+     *
+     * @return ClientBuilder
+     */
+    public function setConfigDefaults($defaults)
+    {
+        $this->configDefaults = $this->processArray($defaults);
+
+        return $this;
+    }
+
+    /**
+     * Sets the required config options
+     *
+     * @param array|Collection $required The required config options
+     *
+     * @return ClientBuilder
+     */
+    public function setConfigRequirements($required)
+    {
+        $this->configRequirements = $this->processArray($required);
+
+        return $this;
+    }
+
+    /**
+     * Sets the exception parser. If one is not provided the builder will use
+     * the default XML exception parser.
+     *
+     * @param ExceptionParserInterface $parser The exception parser
+     *
+     * @return ClientBuilder
+     */
+    public function setExceptionParser(ExceptionParserInterface $parser)
+    {
+        $this->exceptionParser = $parser;
+
+        return $this;
+    }
+
+    /**
+     * Set the configuration for the client's iterators
+     *
+     * @param array $config Configuration data for client's iterators
+     *
+     * @return ClientBuilder
+     */
+    public function setIteratorsConfig(array $config)
+    {
+        $this->iteratorsConfig = $config;
+
+        return $this;
+    }
+
+    /**
+     * Performs the building logic using all of the parameters that have been
+     * set and falling back to default values. Returns an instantiate service
+     * client with credentials prepared and plugins attached.
+     *
+     * @return AwsClientInterface
+     * @throws InvalidArgumentException
+     */
+    public function build()
+    {
+        // Resolve configuration
+        $config = Collection::fromConfig(
+            $this->config,
+            array_merge(self::$commonConfigDefaults, $this->configDefaults),
+            (self::$commonConfigRequirements + $this->configRequirements)
+        );
+
+        // Resolve endpoint and signature from the config and service description
+        $description = $this->updateConfigFromDescription($config);
+        $signature = $this->getSignature($description, $config);
+
+        // Resolve credentials
+        if (!$credentials = $config->get('credentials')) {
+            $credentials = Credentials::factory($config);
+        }
+
+        // Resolve exception parser
+        if (!$this->exceptionParser) {
+            $this->exceptionParser = new DefaultXmlExceptionParser();
+        }
+
+        // Resolve backoff strategy
+        $backoff = $config->get(Options::BACKOFF);
+        if ($backoff === null) {
+            $backoff = new BackoffPlugin(
+                // Retry failed requests up to 3 times if it is determined that the request can be retried
+                new TruncatedBackoffStrategy(3,
+                    // Retry failed requests with 400-level responses due to throttling
+                    new ThrottlingErrorChecker($this->exceptionParser,
+                        // Retry failed requests with 500-level responses
+                        new HttpBackoffStrategy(array(500, 503, 509),
+                            // Retry failed requests due to transient network or cURL problems
+                            new CurlBackoffStrategy(null,
+                                // Retry requests that failed due to expired credentials
+                                new ExpiredCredentialsChecker($this->exceptionParser,
+                                    new ExponentialBackoffStrategy()
+                                )
+                            )
+                        )
+                    )
+                )
+            );
+            $config->set(Options::BACKOFF, $backoff);
+        }
+
+        if ($backoff) {
+            $this->addBackoffLogger($backoff, $config);
+        }
+
+        // Determine service and class name
+        $clientClass = 'Aws\Common\Client\DefaultClient';
+        if ($this->clientNamespace) {
+            $serviceName = substr($this->clientNamespace, strrpos($this->clientNamespace, '\\') + 1);
+            $clientClass = $this->clientNamespace . '\\' . $serviceName . 'Client';
+        }
+
+        /** @var $client AwsClientInterface */
+        $client = new $clientClass($credentials, $signature, $config);
+        $client->setDescription($description);
+
+        // Add exception marshaling so that more descriptive exception are thrown
+        if ($this->clientNamespace) {
+            $exceptionFactory = new NamespaceExceptionFactory(
+                $this->exceptionParser,
+                "{$this->clientNamespace}\\Exception",
+                "{$this->clientNamespace}\\Exception\\{$serviceName}Exception"
+            );
+            $client->addSubscriber(new ExceptionListener($exceptionFactory));
+        }
+
+        // Add the UserAgentPlugin to append to the User-Agent header of requests
+        $client->addSubscriber(new UserAgentListener());
+
+        // Filters used for the cache plugin
+        $client->getConfig()->set(
+            'params.cache.key_filter',
+            'header=date,x-amz-date,x-amz-security-token,x-amzn-authorization'
+        );
+
+        // Set the iterator resource factory based on the provided iterators config
+        $client->setResourceIteratorFactory(new AwsResourceIteratorFactory(
+            $this->iteratorsConfig,
+            new ResourceIteratorClassFactory($this->clientNamespace . '\\Iterator')
+        ));
+
+        // Disable parameter validation if needed
+        if ($config->get(Options::VALIDATION) === false) {
+            $params = $config->get('command.params') ?: array();
+            $params['command.disable_validation'] = true;
+            $config->set('command.params', $params);
+        }
+
+        return $client;
+    }
+
+    /**
+     * Add backoff logging to the backoff plugin if needed
+     *
+     * @param BackoffPlugin $plugin Backoff plugin
+     * @param Collection    $config Configuration settings
+     *
+     * @throws InvalidArgumentException
+     */
+    protected function addBackoffLogger(BackoffPlugin $plugin, Collection $config)
+    {
+        // The log option can be set to `debug` or an instance of a LogAdapterInterface
+        if ($logger = $config->get(Options::BACKOFF_LOGGER)) {
+            $format = $config->get(Options::BACKOFF_LOGGER_TEMPLATE);
+            if ($logger === 'debug') {
+                $logger = new ClosureLogAdapter(function ($message) {
+                    trigger_error($message . "\n");
+                });
+            } elseif (!($logger instanceof LogAdapterInterface)) {
+                throw new InvalidArgumentException(
+                    Options::BACKOFF_LOGGER . ' must be set to `debug` or an instance of '
+                        . 'Guzzle\\Common\\Log\\LogAdapterInterface'
+                );
+            }
+            // Create the plugin responsible for logging exponential backoff retries
+            $logPlugin = new BackoffLogger($logger);
+            // You can specify a custom format or use the default
+            if ($format) {
+                $logPlugin->setTemplate($format);
+            }
+            $plugin->addSubscriber($logPlugin);
+        }
+    }
+
+    /**
+     * Ensures that an array (e.g. for config data) is actually in array form
+     *
+     * @param array|Collection $array The array data
+     *
+     * @return array
+     * @throws InvalidArgumentException if the arg is not an array or Collection
+     */
+    protected function processArray($array)
+    {
+        if ($array instanceof Collection) {
+            $array = $array->getAll();
+        }
+
+        if (!is_array($array)) {
+            throw new InvalidArgumentException('The config must be provided as an array or Collection.');
+        }
+
+        return $array;
+    }
+
+    /**
+     * Update a configuration object from a service description
+     *
+     * @param Collection $config Config to update
+     *
+     * @return ServiceDescription
+     * @throws InvalidArgumentException
+     */
+    protected function updateConfigFromDescription(Collection $config)
+    {
+        $description = $config->get(Options::SERVICE_DESCRIPTION);
+        if (!($description instanceof ServiceDescription)) {
+            // Inject the version into the sprintf template if it is a string
+            if (is_string($description)) {
+                $description = sprintf($description, $config->get(Options::VERSION));
+            }
+            $description = ServiceDescription::factory($description);
+            $config->set(Options::SERVICE_DESCRIPTION, $description);
+        }
+
+        if (!$config->get(Options::SERVICE)) {
+            $config->set(Options::SERVICE, $description->getData('endpointPrefix'));
+        }
+
+        if ($iterators = $description->getData('iterators')) {
+            $this->setIteratorsConfig($iterators);
+        }
+
+        // Ensure that the service description has regions
+        if (!$description->getData('regions')) {
+            throw new InvalidArgumentException(
+                'No regions found in the ' . $description->getData('serviceFullName'). ' description'
+            );
+        }
+
+        // Make sure a valid region is set
+        $region = $config->get(Options::REGION);
+        $global = $description->getData('globalEndpoint');
+        if (!$global && !$region) {
+            throw new InvalidArgumentException(
+                'A region is required when using ' . $description->getData('serviceFullName')
+                . '. Set "region" to one of: ' . implode(', ', array_keys($description->getData('regions')))
+            );
+        } elseif ($global && (!$region || $description->getData('namespace') !== 'S3')) {
+            $region = Region::US_EAST_1;
+            $config->set(Options::REGION, $region);
+        }
+
+        if (!$config->get(Options::BASE_URL)) {
+            // Set the base URL using the scheme and hostname of the service's region
+            $config->set(Options::BASE_URL, AbstractClient::getEndpoint(
+                $description,
+                $region,
+                $config->get(Options::SCHEME)
+            ));
+        }
+
+        return $description;
+    }
+
+    /**
+     * Return an appropriate signature object for a a client based on a description
+     *
+     * @param ServiceDescription $description Description that holds a signature option
+     * @param Collection         $config      Configuration options
+     *
+     * @return SignatureInterface
+     * @throws InvalidArgumentException
+     */
+    protected function getSignature(ServiceDescription $description, Collection $config)
+    {
+        if (!$signature = $config->get(Options::SIGNATURE)) {
+            switch ($description->getData('signatureVersion')) {
+                case 'v2':
+                    $signature = new SignatureV2();
+                    break;
+                case 'v3':
+                    $signature = new SignatureV3();
+                    break;
+                case 'v3https':
+                    $signature = new SignatureV3Https();
+                    break;
+                case 'v4':
+                    $signature = new SignatureV4();
+                    break;
+                default:
+                    throw new InvalidArgumentException('Service description does not specify a valid signatureVersion');
+            }
+        }
+
+        // Allow a custom service name or region value to be provided
+        if ($signature instanceof EndpointSignatureInterface) {
+
+            // Determine the service name to use when signing
+            if (!$service = $config->get(Options::SIGNATURE_SERVICE)) {
+                if (!$service = $description->getData('signingName')) {
+                    $service = $description->getData('endpointPrefix');
+                }
+            }
+            $signature->setServiceName($service);
+
+            // Determine the region to use when signing requests
+            if (!$region = $config->get(Options::SIGNATURE_REGION)) {
+                $region = $config->get(Options::REGION);
+            }
+            $signature->setRegionName($region);
+        }
+
+        return $signature;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/DefaultClient.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/DefaultClient.php
new file mode 100644
index 0000000000000000000000000000000000000000..4bc257a4e94ef0f83ce3a98f7535e9254fb00c50
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/DefaultClient.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Aws\Common\Enum\ClientOptions as Options;
+use Guzzle\Common\Collection;
+
+/**
+ * Generic client for interacting with an AWS service
+ */
+class DefaultClient extends AbstractClient
+{
+    /**
+     * Factory method to create a default client using an array of configuration options.
+     *
+     * The following array keys and values are available options:
+     *
+     * - Credential options (`key`, `secret`, and optional `token` OR `credentials` is required)
+     *     - key: AWS Access Key ID
+     *     - secret: AWS secret access key
+     *     - credentials: You can optionally provide a custom `Aws\Common\Credentials\CredentialsInterface` object
+     *     - token: Custom AWS security token to use with request authentication
+     *     - token.ttd: UNIX timestamp for when the custom credentials expire
+     *     - credentials.cache: Used to cache credentials when using providers that require HTTP requests. Set the true
+     *           to use the default APC cache or provide a `Guzzle\Cache\CacheAdapterInterface` object.
+     *     - credentials.cache.key: Optional custom cache key to use with the credentials
+     *     - credentials.client: Pass this option to specify a custom `Guzzle\Http\ClientInterface` to use if your
+     *           credentials require a HTTP request (e.g. RefreshableInstanceProfileCredentials)
+     * - Region and Endpoint options (a `region` and optional `scheme` OR a `base_url` is required)
+     *     - region: Region name (e.g. 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', etc...)
+     *     - scheme: URI Scheme of the base URL (e.g. 'https', 'http').
+     *     - service: Specify the name of the service
+     *     - base_url: Instead of using a `region` and `scheme`, you can specify a custom base URL for the client
+     * - Signature options
+     *     - signature: You can optionally provide a custom signature implementation used to sign requests
+     *     - signature.service: Set to explicitly override the service name used in signatures
+     *     - signature.region:  Set to explicitly override the region name used in signatures
+     * - Exponential backoff options
+     *     - client.backoff.logger: `Guzzle\Log\LogAdapterInterface` object used to log backoff retries. Use
+     *           'debug' to emit PHP warnings when a retry is issued.
+     *     - client.backoff.logger.template: Optional template to use for exponential backoff log messages. See
+     *           `Guzzle\Plugin\Backoff\BackoffLogger` for formatting information.
+     * - Generic client options
+     *     - ssl.certificate_authority: Set to true to use the bundled CA cert (default), system to use the certificate
+     *       bundled with your system, or pass the full path to an SSL certificate bundle. This option should be used
+     *       when you encounter curl error code 60.
+     *     - curl.CURLOPT_VERBOSE: Set to true to output curl debug information during transfers
+     *     - curl.*: Prefix any available cURL option with `curl.` to add cURL options to each request.
+     *           See: http://www.php.net/manual/en/function.curl-setopt.php
+     *
+     * @param array|Collection $config Client configuration data
+     *
+     * @return self
+     */
+    public static function factory($config = array())
+    {
+        return ClientBuilder::factory()
+            ->setConfig($config)
+            ->setConfigDefaults(array(Options::SCHEME => 'https'))
+            ->build();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ExpiredCredentialsChecker.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ExpiredCredentialsChecker.php
new file mode 100644
index 0000000000000000000000000000000000000000..d20f7f829d12be82fd7ced70eef013e0dbb156ef
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ExpiredCredentialsChecker.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Aws\Common\Credentials\AbstractRefreshableCredentials;
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Exception\Parser\ExceptionParserInterface;
+use Guzzle\Http\Exception\HttpException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Plugin\Backoff\BackoffStrategyInterface;
+use Guzzle\Plugin\Backoff\AbstractBackoffStrategy;
+
+/**
+ * Backoff logic that handles retrying requests when credentials expire
+ */
+class ExpiredCredentialsChecker extends AbstractBackoffStrategy
+{
+    /**
+     * @var array Array of known retrying exception codes
+     */
+    protected $retryable = array(
+        'RequestExpired' => true,
+        'ExpiredTokenException' => true,
+        'ExpiredToken' => true
+    );
+
+    /**
+     * @var ExceptionParserInterface Exception parser used to parse exception responses
+     */
+    protected $exceptionParser;
+
+    public function __construct(ExceptionParserInterface $exceptionParser, BackoffStrategyInterface $next = null) {
+        $this->exceptionParser = $exceptionParser;
+        $this->next = $next;
+    }
+
+    public function makesDecision()
+    {
+        return true;
+    }
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        if ($response && $response->isClientError()) {
+
+            $parts = $this->exceptionParser->parse($request, $response);
+            if (!isset($this->retryable[$parts['code']]) || !$request->getClient()) {
+                return null;
+            }
+
+            /** @var $client AwsClientInterface */
+            $client = $request->getClient();
+            // Only retry if the credentials can be refreshed
+            if (!($client->getCredentials() instanceof AbstractRefreshableCredentials)) {
+                return null;
+            }
+
+            // Resign the request using new credentials
+            $client->getSignature()->signRequest($request, $client->getCredentials()->setExpiration(-1));
+
+            // Retry immediately with no delay
+            return 0;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ThrottlingErrorChecker.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ThrottlingErrorChecker.php
new file mode 100644
index 0000000000000000000000000000000000000000..a35cbcb157c46176fc34045a6e35cf2af9232a58
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/ThrottlingErrorChecker.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Aws\Common\Exception\Parser\ExceptionParserInterface;
+use Guzzle\Http\Exception\HttpException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Plugin\Backoff\BackoffStrategyInterface;
+use Guzzle\Plugin\Backoff\AbstractBackoffStrategy;
+
+/**
+ * Backoff logic that handles throttling exceptions from services
+ */
+class ThrottlingErrorChecker extends AbstractBackoffStrategy
+{
+    /** @var array Whitelist of exception codes (as indexes) that indicate throttling */
+    protected static $throttlingExceptions = array(
+        'RequestLimitExceeded'                   => true,
+        'Throttling'                             => true,
+        'ThrottlingException'                    => true,
+        'ProvisionedThroughputExceededException' => true,
+        'RequestThrottled'                       => true,
+    );
+
+    /**
+     * @var ExceptionParserInterface Exception parser used to parse exception responses
+     */
+    protected $exceptionParser;
+
+    public function __construct(ExceptionParserInterface $exceptionParser, BackoffStrategyInterface $next = null)
+    {
+        $this->exceptionParser = $exceptionParser;
+        if ($next) {
+            $this->setNext($next);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function makesDecision()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDelay(
+        $retries,
+        RequestInterface $request,
+        Response $response = null,
+        HttpException $e = null
+    ) {
+        if ($response && $response->isClientError()) {
+            $parts = $this->exceptionParser->parse($request, $response);
+            return isset(self::$throttlingExceptions[$parts['code']]) ? true : null;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/UploadBodyListener.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/UploadBodyListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..e559d4826a6975aa26339211dfcd6f60340eff91
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/UploadBodyListener.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Guzzle\Common\Event;
+use Guzzle\Http\EntityBody;
+use Guzzle\Service\Command\AbstractCommand as Command;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Prepares the body parameter of a command such that the parameter is more flexible (e.g. accepts file handles) with
+ * the value it accepts but converts it to the correct format for the command. Also looks for a "Filename" parameter.
+ */
+class UploadBodyListener implements EventSubscriberInterface
+{
+    /**
+     * @var array The names of the commands of which to modify the body parameter
+     */
+    protected $commands;
+
+    /**
+     * @var string The key for the upload body parameter
+     */
+    protected $bodyParameter;
+
+    /**
+     * @var string The key for the source file parameter
+     */
+    protected $sourceParameter;
+
+    /**
+     * @param array  $commands        The commands to modify
+     * @param string $bodyParameter   The key for the body parameter
+     * @param string $sourceParameter The key for the source file parameter
+     */
+    public function __construct(array $commands, $bodyParameter = 'Body', $sourceParameter = 'SourceFile')
+    {
+        $this->commands = $commands;
+        $this->bodyParameter = (string) $bodyParameter;
+        $this->sourceParameter = (string) $sourceParameter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array('command.before_prepare' => array('onCommandBeforePrepare'));
+    }
+
+    /**
+     * Converts filenames and file handles into EntityBody objects before the command is validated
+     *
+     * @param Event $event Event emitted
+     */
+    public function onCommandBeforePrepare(Event $event)
+    {
+        /** @var $command Command */
+        $command = $event['command'];
+        if (in_array($command->getName(), $this->commands)) {
+            // Get the interesting parameters
+            $source = $command->get($this->sourceParameter);
+            $body = $command->get($this->bodyParameter);
+
+            // If a file path is passed in then get the file handle
+            if (is_string($source) && file_exists($source)) {
+                $body = fopen($source, 'r');
+            }
+
+            if (null !== $body) {
+                $body = EntityBody::factory($body);
+            }
+
+            // Prepare the body parameter and remove the source file parameter
+            $command->remove($this->sourceParameter);
+            $command->set($this->bodyParameter, $body);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/UserAgentListener.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/UserAgentListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..cc7e312c064d6d4db70cdfd2b32e42323e0bd4fe
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Client/UserAgentListener.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Client;
+
+use Guzzle\Common\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Listener used to append strings to the User-Agent header of a request based
+ * on the `ua.append` option. `ua.append` can contain a string or array of values.
+ */
+class UserAgentListener implements EventSubscriberInterface
+{
+    /**
+     * @var string Option used to store User-Agent modifiers
+     */
+    const OPTION = 'ua.append';
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array('command.before_send' => 'onBeforeSend');
+    }
+
+    /**
+     * Adds strings to the User-Agent header using the `ua.append` parameter of a command
+     *
+     * @param Event $event Event emitted
+     */
+    public function onBeforeSend(Event $event)
+    {
+        $command = $event['command'];
+        if ($userAgentAppends = $command->get(self::OPTION)) {
+            $request = $command->getRequest();
+            $userAgent = (string) $request->getHeader('User-Agent');
+            foreach ((array) $userAgentAppends as $append) {
+                $append = ' ' . $append;
+                if (strpos($userAgent, $append) === false) {
+                    $userAgent .= $append;
+                }
+            }
+            $request->setHeader('User-Agent', $userAgent);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/AwsQueryVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/AwsQueryVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..b6d14099eec3a91848cdb32fdf551a517c64b4cf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/AwsQueryVisitor.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Aws\Common\Command;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Command\LocationVisitor\Request\AbstractRequestVisitor;
+
+/**
+ * Location visitor used to serialize AWS query parameters (e.g. EC2, SES, SNS, SQS, etc) as POST fields
+ */
+class AwsQueryVisitor extends AbstractRequestVisitor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $query = array();
+        $this->customResolver($value, $param, $query, $param->getWireName());
+        $request->addPostFields($query);
+    }
+
+    /**
+     * Map nested parameters into the location_key based parameters
+     *
+     * @param array     $value  Value to map
+     * @param Parameter $param  Parameter that holds information about the current key
+     * @param array     $query  Built up query string values
+     * @param string    $prefix String to prepend to sub query values
+     */
+    protected function customResolver($value, Parameter $param, array &$query, $prefix = '')
+    {
+        switch ($param->getType()) {
+            case 'object':
+                $this->resolveObject($param, $value, $prefix, $query);
+                break;
+            case 'array':
+                $this->resolveArray($param, $value, $prefix, $query);
+                break;
+            default:
+                $query[$prefix] = $param->filter($value);
+        }
+    }
+
+    /**
+     * Custom handling for objects
+     *
+     * @param Parameter $param  Parameter for the object
+     * @param array     $value  Value that is set for this parameter
+     * @param string    $prefix Prefix for the resulting key
+     * @param array     $query  Query string array passed by reference
+     */
+    protected function resolveObject(Parameter $param, array $value, $prefix, array &$query)
+    {
+        // Maps are implemented using additional properties
+        $hasAdditionalProperties = ($param->getAdditionalProperties() instanceof Parameter);
+        $additionalPropertyCount = 0;
+
+        foreach ($value as $name => $v) {
+            if ($subParam = $param->getProperty($name)) {
+                // if the parameter was found by name as a regular property
+                $key = $prefix . '.' . $subParam->getWireName();
+                $this->customResolver($v, $subParam, $query, $key);
+            } elseif ($hasAdditionalProperties) {
+                // Handle map cases like &Attribute.1.Name=<name>&Attribute.1.Value=<value>
+                $additionalPropertyCount++;
+                $query["{$prefix}.{$additionalPropertyCount}.Name"] = $name;
+                $newPrefix = "{$prefix}.{$additionalPropertyCount}.Value";
+                if (is_array($v)) {
+                    $this->customResolver($v, $param->getAdditionalProperties(), $query, $newPrefix);
+                } else {
+                    $query[$newPrefix] = $param->filter($v);
+                }
+            }
+        }
+    }
+
+    /**
+     * Custom handling for arrays
+     *
+     * @param Parameter $param  Parameter for the object
+     * @param array     $value  Value that is set for this parameter
+     * @param string    $prefix Prefix for the resulting key
+     * @param array     $query  Query string array passed by reference
+     */
+    protected function resolveArray(Parameter $param, array $value, $prefix, array &$query)
+    {
+        $offset = $param->getData('offset') ?: 1;
+        foreach ($value as $index => $v) {
+            $index += $offset;
+            if (is_array($v) && $items = $param->getItems()) {
+                $this->customResolver($v, $items, $query, $prefix . '.' . $index);
+            } else {
+                $query[$prefix . '.' . $index] = $param->filter($v);
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/JsonCommand.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/JsonCommand.php
new file mode 100644
index 0000000000000000000000000000000000000000..15ad5936d7c10ca1c3c4debe5179680cb0e3e21e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/JsonCommand.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Command;
+
+use Guzzle\Service\Command\OperationCommand;
+use Guzzle\Http\Curl\CurlHandle;
+
+/**
+ * Adds AWS JSON body functionality to dynamically generated HTTP requests
+ */
+class JsonCommand extends OperationCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function build()
+    {
+        parent::build();
+
+        // Ensure that the body of the request ALWAYS includes some JSON. By default, this is an empty object.
+        if (!$this->request->getBody()) {
+            $this->request->setBody('{}');
+        }
+
+        // Never send the Expect header when interacting with a JSON query service
+        $this->request->removeHeader('Expect');
+
+        // Always send JSON requests as a raw string rather than using streams to avoid issues with
+        // cURL error code 65: "necessary data rewind wasn't possible".
+        // This could be removed after PHP addresses https://bugs.php.net/bug.php?id=47204
+        $this->request->getCurlOptions()->set(CurlHandle::BODY_AS_STRING, true);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/QueryCommand.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/QueryCommand.php
new file mode 100644
index 0000000000000000000000000000000000000000..63eb8e80dbe2c394f88b3deeba193fc177e5e20d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/QueryCommand.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Command;
+
+use Guzzle\Service\Command\OperationCommand;
+
+/**
+ * Adds AWS Query service serialization
+ */
+class QueryCommand extends OperationCommand
+{
+    /**
+     * @var AwsQueryVisitor
+     */
+    protected static $queryVisitor;
+
+    /**
+     * @var XmlResponseLocationVisitor
+     */
+    protected static $xmlVisitor;
+
+    /**
+     * Register the aws.query visitor
+     */
+    protected function init()
+    {
+        // @codeCoverageIgnoreStart
+        if (!self::$queryVisitor) {
+            self::$queryVisitor = new AwsQueryVisitor();
+        }
+        if (!self::$xmlVisitor) {
+            self::$xmlVisitor = new XmlResponseLocationVisitor();
+        }
+        // @codeCoverageIgnoreEnd
+
+        $this->getRequestSerializer()->addVisitor('aws.query', self::$queryVisitor);
+        $this->getResponseParser()->addVisitor('xml', self::$xmlVisitor);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/XmlResponseLocationVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/XmlResponseLocationVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..ad229fde3d2dd36d65dfbf634945bd734fcb633e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Command/XmlResponseLocationVisitor.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Aws\Common\Command;
+
+use Guzzle\Service\Description\Operation;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\LocationVisitor\Response\XmlVisitor;
+
+/**
+ * Class used for custom AWS XML response parsing of query services
+ */
+class XmlResponseLocationVisitor extends XmlVisitor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function before(CommandInterface $command, array &$result)
+    {
+        parent::before($command, $result);
+
+        // Unwrapped wrapped responses
+        $operation = $command->getOperation();
+        if ($operation->getServiceDescription()->getData('resultWrapped')) {
+            $wrappingNode = $operation->getName() . 'Result';
+            if (isset($result[$wrappingNode])) {
+                $result = $result[$wrappingNode] + $result;
+                unset($result[$wrappingNode]);
+            }
+        }
+    }
+
+    /**
+     * Accounts for wrapper nodes
+     * {@inheritdoc}
+     */
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {
+        parent::visit($command, $response, $param, $value, $context);
+
+        // Account for wrapper nodes (e.g. RDS, ElastiCache, etc)
+        if ($param->getData('wrapper')) {
+            $wireName = $param->getWireName();
+            $value += $value[$wireName];
+            unset($value[$wireName]);
+        }
+    }
+
+    /**
+     * Filter used when converting XML maps into associative arrays in service descriptions
+     *
+     * @param array  $value     Value to filter
+     * @param string $entryName Name of each entry
+     * @param string $keyName   Name of each key
+     * @param string $valueName Name of each value
+     *
+     * @return array Returns the map of the XML data
+     */
+    public static function xmlMap($value, $entryName, $keyName, $valueName)
+    {
+        $result = array();
+        foreach ($value as $entry) {
+            $result[$entry[$keyName]] = $entry[$valueName];
+        }
+
+        return $result;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/AbstractCredentialsDecorator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/AbstractCredentialsDecorator.php
new file mode 100644
index 0000000000000000000000000000000000000000..b3a1df967ec84d61451b56dd544a6d36b5e16acc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/AbstractCredentialsDecorator.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Credentials;
+
+/**
+ * Abstract credentials decorator
+ */
+class AbstractCredentialsDecorator implements CredentialsInterface
+{
+    /**
+     * @var CredentialsInterface Wrapped credentials object
+     */
+    protected $credentials;
+
+    /**
+     * Constructs a new BasicAWSCredentials object, with the specified AWS
+     * access key and AWS secret key
+     *
+     * @param CredentialsInterface $credentials
+     */
+    public function __construct(CredentialsInterface $credentials)
+    {
+        $this->credentials = $credentials;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        return $this->credentials->serialize();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
+    {
+        $this->credentials = new Credentials('', '');
+        $this->credentials->unserialize($serialized);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessKeyId()
+    {
+        return $this->credentials->getAccessKeyId();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSecretKey()
+    {
+        return $this->credentials->getSecretKey();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSecurityToken()
+    {
+        return $this->credentials->getSecurityToken();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExpiration()
+    {
+        return $this->credentials->getExpiration();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isExpired()
+    {
+        return $this->credentials->isExpired();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setAccessKeyId($key)
+    {
+        $this->credentials->setAccessKeyId($key);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setSecretKey($secret)
+    {
+        $this->credentials->setSecretKey($secret);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setSecurityToken($token)
+    {
+        $this->credentials->setSecurityToken($token);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setExpiration($timestamp)
+    {
+        $this->credentials->setExpiration($timestamp);
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/AbstractRefreshableCredentials.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/AbstractRefreshableCredentials.php
new file mode 100644
index 0000000000000000000000000000000000000000..235bf9deef54f4567eae4c9cac7afc857a8e7043
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/AbstractRefreshableCredentials.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Credentials;
+
+/**
+ * Abstract decorator to provide a foundation for refreshable credentials
+ */
+abstract class AbstractRefreshableCredentials extends AbstractCredentialsDecorator
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessKeyId()
+    {
+        if ($this->credentials->isExpired()) {
+            $this->refresh();
+        }
+
+        return $this->credentials->getAccessKeyId();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSecretKey()
+    {
+        if ($this->credentials->isExpired()) {
+            $this->refresh();
+        }
+
+        return $this->credentials->getSecretKey();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSecurityToken()
+    {
+        if ($this->credentials->isExpired()) {
+            $this->refresh();
+        }
+
+        return $this->credentials->getSecurityToken();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        if ($this->credentials->isExpired()) {
+            $this->refresh();
+        }
+
+        return $this->credentials->serialize();
+    }
+
+    /**
+     * Attempt to get new credentials
+     */
+    abstract protected function refresh();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/CacheableCredentials.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/CacheableCredentials.php
new file mode 100644
index 0000000000000000000000000000000000000000..fbebf7815b94cd90a60ab28e484e790eb70baca6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/CacheableCredentials.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Credentials;
+
+use Guzzle\Cache\CacheAdapterInterface;
+
+/**
+ * Credentials decorator used to implement caching credentials
+ */
+class CacheableCredentials extends AbstractRefreshableCredentials
+{
+    /**
+     * @var CacheAdapterInterface Cache adapter used to store credentials
+     */
+    protected $cache;
+
+    /**
+     * @var string Cache key used to store the credentials
+     */
+    protected $cacheKey;
+
+    /**
+     * CacheableCredentials is a decorator that decorates other credentials
+     *
+     * @param CredentialsInterface  $credentials Credentials to adapt
+     * @param CacheAdapterInterface $cache       Cache to use to store credentials
+     * @param string                $cacheKey    Cache key of the credentials
+     */
+    public function __construct(CredentialsInterface $credentials, CacheAdapterInterface $cache, $cacheKey)
+    {
+        $this->credentials = $credentials;
+        $this->cache = $cache;
+        $this->cacheKey = $cacheKey;
+    }
+
+    /**
+     * Attempt to get new credentials from cache or from the adapted object
+     */
+    protected function refresh()
+    {
+        if (!$cache = $this->cache->fetch($this->cacheKey)) {
+            // The credentials were not found, so try again and cache if new
+            $this->credentials->getAccessKeyId();
+            if (!$this->credentials->isExpired()) {
+                // The credentials were updated, so cache them
+                $this->cache->save($this->cacheKey, $this->credentials, $this->credentials->getExpiration() - time());
+            }
+        } else {
+            // The credentials were found in cache, so update the adapter object
+            // if the cached credentials are not expired
+            if (!$cache->isExpired()) {
+                $this->credentials->setAccessKeyId($cache->getAccessKeyId());
+                $this->credentials->setSecretKey($cache->getSecretKey());
+                $this->credentials->setSecurityToken($cache->getSecurityToken());
+                $this->credentials->setExpiration($cache->getExpiration());
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/Credentials.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/Credentials.php
new file mode 100644
index 0000000000000000000000000000000000000000..dfb19c942249e3fb737993e8b05c93475a5a183a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/Credentials.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Credentials;
+
+use Aws\Common\Enum\ClientOptions as Options;
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Exception\RequiredExtensionNotLoadedException;
+use Aws\Common\Exception\RuntimeException;
+use Guzzle\Http\ClientInterface;
+use Guzzle\Common\FromConfigInterface;
+use Guzzle\Cache\CacheAdapterInterface;
+use Guzzle\Cache\DoctrineCacheAdapter;
+
+/**
+ * Basic implementation of the AWSCredentials interface that allows callers to
+ * pass in the AWS access key and secret access in the constructor.
+ */
+class Credentials implements CredentialsInterface, FromConfigInterface
+{
+    const ENV_KEY = 'AWS_ACCESS_KEY_ID';
+    const ENV_SECRET = 'AWS_SECRET_KEY';
+
+    /**
+     * @var string AWS Access key ID
+     */
+    protected $key;
+
+    /**
+     * @var string AWS Secret access key
+     */
+    protected $secret;
+
+    /**
+     * @var string Security token
+     */
+    protected $token;
+
+    /**
+     * @var int Time to die of token
+     */
+    protected $ttd;
+
+    /**
+     * Get the available keys for the factory method
+     *
+     * @return array
+     */
+    public static function getConfigDefaults()
+    {
+        return array(
+            Options::KEY                   => null,
+            Options::SECRET                => null,
+            Options::TOKEN                 => null,
+            Options::TOKEN_TTD             => null,
+            Options::CREDENTIALS_CACHE     => null,
+            Options::CREDENTIALS_CACHE_KEY => null,
+            Options::CREDENTIALS_CLIENT    => null
+        );
+    }
+
+    /**
+     * Factory method for creating new credentials.  This factory method will
+     * create the appropriate credentials object with appropriate decorators
+     * based on the passed configuration options.
+     *
+     * @param array $config Options to use when instantiating the credentials
+     *
+     * @return CredentialsInterface
+     * @throws InvalidArgumentException If the caching options are invalid
+     * @throws RuntimeException         If using the default cache and APC is disabled
+     */
+    public static function factory($config = array())
+    {
+        // Add default key values
+        foreach (self::getConfigDefaults() as $key => $value) {
+            if (!isset($config[$key])) {
+                $config[$key] = $value;
+            }
+        }
+
+        // Start tracking the cache key
+        $cacheKey = $config[Options::CREDENTIALS_CACHE_KEY];
+
+        // Create the credentials object
+        if (!$config[Options::KEY] || !$config[Options::SECRET]) {
+            // No keys were provided, so attempt to retrieve some from the environment
+            $envKey = isset($_SERVER[self::ENV_KEY]) ? $_SERVER[self::ENV_KEY] : getenv(self::ENV_KEY);
+            $envSecret = isset($_SERVER[self::ENV_SECRET]) ? $_SERVER[self::ENV_SECRET] : getenv(self::ENV_SECRET);
+            if ($envKey && $envSecret) {
+                // Use credentials set in the environment variables
+                $credentials = new static($envKey, $envSecret);
+            } else {
+                // Use instance profile credentials (available on EC2 instances)
+                $credentials = new RefreshableInstanceProfileCredentials(
+                    new static('', '', '', 1),
+                    $config[Options::CREDENTIALS_CLIENT]
+                );
+            }
+            // If no cache key was set, use the crc32 hostname of the server
+            $cacheKey = $cacheKey ?: 'credentials_' . crc32(gethostname());
+        } else {
+            // Instantiate using short or long term credentials
+            $credentials = new static(
+                $config[Options::KEY],
+                $config[Options::SECRET],
+                $config[Options::TOKEN],
+                $config[Options::TOKEN_TTD]
+            );
+            // If no cache key was set, use the access key ID
+            $cacheKey = $cacheKey ?: 'credentials_' . $config[Options::KEY];
+        }
+
+        // Check if the credentials are refreshable, and if so, configure caching
+        $cache = $config[Options::CREDENTIALS_CACHE];
+        if ($cacheKey && $cache) {
+            if ($cache === 'true' || $cache === true) {
+                // If no cache adapter was provided, then create one for the user
+                // @codeCoverageIgnoreStart
+                if (!extension_loaded('apc')) {
+                    throw new RequiredExtensionNotLoadedException('PHP has not been compiled with APC. Unable to cache '
+                        . 'the credentials.');
+                } elseif (!class_exists('Doctrine\Common\Cache\ApcCache')) {
+                    throw new RuntimeException(
+                        'Cannot set ' . Options::CREDENTIALS_CACHE . ' to true because the Doctrine cache component is '
+                        . 'not installed. Either install doctrine/cache or pass in an instantiated '
+                        . 'Guzzle\Cache\CacheAdapterInterface object'
+                    );
+                }
+                // @codeCoverageIgnoreEnd
+                $cache = new DoctrineCacheAdapter(new \Doctrine\Common\Cache\ApcCache());
+            } elseif (!($cache instanceof CacheAdapterInterface)) {
+                throw new InvalidArgumentException('Unable to utilize caching with the specified options');
+            }
+            // Decorate the credentials with a cache
+            $credentials = new CacheableCredentials($credentials, $cache, $cacheKey);
+        }
+
+        return $credentials;
+    }
+
+    /**
+     * Constructs a new BasicAWSCredentials object, with the specified AWS
+     * access key and AWS secret key
+     *
+     * @param string $accessKeyId     AWS access key ID
+     * @param string $secretAccessKey AWS secret access key
+     * @param string $token           Security token to use
+     * @param int    $expiration      UNIX timestamp for when credentials expire
+     */
+    public function __construct($accessKeyId, $secretAccessKey, $token = null, $expiration = null)
+    {
+        $this->key = trim($accessKeyId);
+        $this->secret = trim($secretAccessKey);
+        $this->token = $token;
+        $this->ttd = $expiration;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        return json_encode(array(
+            Options::KEY       => $this->key,
+            Options::SECRET    => $this->secret,
+            Options::TOKEN     => $this->token,
+            Options::TOKEN_TTD => $this->ttd
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
+    {
+        $data = json_decode($serialized, true);
+        $this->key    = $data[Options::KEY];
+        $this->secret = $data[Options::SECRET];
+        $this->token  = $data[Options::TOKEN];
+        $this->ttd    = $data[Options::TOKEN_TTD];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessKeyId()
+    {
+        return $this->key;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSecretKey()
+    {
+        return $this->secret;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSecurityToken()
+    {
+        return $this->token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExpiration()
+    {
+        return $this->ttd;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isExpired()
+    {
+        return $this->ttd !== null && time() >= $this->ttd;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setAccessKeyId($key)
+    {
+        $this->key = $key;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setSecretKey($secret)
+    {
+        $this->secret = $secret;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setSecurityToken($token)
+    {
+        $this->token = $token;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setExpiration($timestamp)
+    {
+        $this->ttd = $timestamp;
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/CredentialsInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/CredentialsInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..dd4303767aa27a8083618a96b48bc397242f2238
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/CredentialsInterface.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Credentials;
+
+/**
+ * Provides access to the AWS credentials used for accessing AWS services: AWS
+ * access key ID, secret access key, and security token. These credentials are
+ * used to securely sign requests to AWS services.
+ */
+interface CredentialsInterface extends \Serializable
+{
+    /**
+     * Returns the AWS access key ID for this credentials object.
+     *
+     * @return string
+     */
+    public function getAccessKeyId();
+
+    /**
+     * Returns the AWS secret access key for this credentials object.
+     *
+     * @return string
+     */
+    public function getSecretKey();
+
+    /**
+     * Get the associated security token if available
+     *
+     * @return string|null
+     */
+    public function getSecurityToken();
+
+    /**
+     * Get the UNIX timestamp in which the credentials will expire
+     *
+     * @return int|null
+     */
+    public function getExpiration();
+
+    /**
+     * Set the AWS access key ID for this credentials object.
+     *
+     * @param string $key AWS access key ID
+     *
+     * @return self
+     */
+    public function setAccessKeyId($key);
+
+    /**
+     * Set the AWS secret access key for this credentials object.
+     *
+     * @param string $secret AWS secret access key
+     *
+     * @return CredentialsInterface
+     */
+    public function setSecretKey($secret);
+
+    /**
+     * Set the security token to use with this credentials object
+     *
+     * @param string $token Security token
+     *
+     * @return self
+     */
+    public function setSecurityToken($token);
+
+    /**
+     * Set the UNIX timestamp in which the credentials will expire
+     *
+     * @param int $timestamp UNIX timestamp expiration
+     *
+     * @return self
+     */
+    public function setExpiration($timestamp);
+
+    /**
+     * Check if the credentials are expired
+     *
+     * @return bool
+     */
+    public function isExpired();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/RefreshableInstanceProfileCredentials.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/RefreshableInstanceProfileCredentials.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4a9ef6962467a06cab4e2e9286be35d918016a5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Credentials/RefreshableInstanceProfileCredentials.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Credentials;
+
+use Aws\Common\InstanceMetadata\InstanceMetadataClient;
+use Aws\Common\Exception\InstanceProfileCredentialsException;
+
+/**
+ * Credentials decorator used to implement retrieving credentials from the
+ * EC2 metadata server
+ */
+class RefreshableInstanceProfileCredentials extends AbstractRefreshableCredentials
+{
+    /**
+     * @var InstanceMetadataClient
+     */
+    protected $client;
+
+    /**
+     * Constructs a new instance profile credentials decorator
+     *
+     * @param CredentialsInterface   $credentials Credentials to adapt
+     * @param InstanceMetadataClient $client      Client used to get new credentials
+     */
+    public function __construct(CredentialsInterface $credentials, InstanceMetadataClient $client = null)
+    {
+        $this->credentials = $credentials;
+        $this->client = $client ?: InstanceMetadataClient::factory();
+    }
+
+    /**
+     * Attempt to get new credentials from the instance profile
+     *
+     * @throws InstanceProfileCredentialsException On error
+     */
+    protected function refresh()
+    {
+        $credentials = $this->client->getInstanceProfileCredentials();
+        // Expire the token 1 minute before it actually expires to pre-fetch before expiring
+        $this->credentials->setAccessKeyId($credentials->getAccessKeyId())
+            ->setSecretKey($credentials->getSecretKey())
+            ->setSecurityToken($credentials->getSecurityToken())
+            ->setExpiration($credentials->getExpiration());
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f4d35672b45756648789e58edfa9223d4cf93d4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common;
+
+/**
+ * Represents an enumerable set of values
+ */
+abstract class Enum
+{
+    /**
+     * @var array A cache of all enum values to increase performance
+     */
+    protected static $cache = array();
+
+    /**
+     * Returns the names (or keys) of all of constants in the enum
+     *
+     * @return array
+     */
+    public static function keys()
+    {
+        return array_keys(static::values());
+    }
+
+    /**
+     * Return the names and values of all the constants in the enum
+     *
+     * @return array
+     */
+    public static function values()
+    {
+        $class = get_called_class();
+
+        if (!isset(self::$cache[$class])) {
+            $reflected = new \ReflectionClass($class);
+            self::$cache[$class] = $reflected->getConstants();
+        }
+
+        return self::$cache[$class];
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/ClientOptions.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/ClientOptions.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a94adcffcb2c7cd94247e77ca1bfb337effd198
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/ClientOptions.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable default factory options that can be passed to a client's factory method
+ */
+class ClientOptions extends Enum
+{
+    /**
+     * @var string AWS Access Key ID
+     */
+    const KEY = 'key';
+
+    /**
+     * @var string AWS secret access key
+     */
+    const SECRET = 'secret';
+
+    /**
+     * @var string You can optionally provide a custom `Aws\Common\Credentials\CredentialsInterface` object
+     */
+    const CREDENTIALS = 'credentials';
+
+    /**
+     * @var string Custom AWS security token to use with request authentication
+     */
+    const TOKEN = 'token';
+
+    /**
+     * @var string UNIX timestamp for when the custom credentials expire
+     */
+    const TOKEN_TTD = 'token.ttd';
+
+    /**
+     * @var string Used to cache credentials when using providers that require HTTP requests. Set the trueto use the
+     *             default APC cache or provide a `Guzzle\Cache\CacheAdapterInterface` object.
+     */
+    const CREDENTIALS_CACHE = 'credentials.cache';
+
+    /**
+     * @var string Optional custom cache key to use with the credentials
+     */
+    const CREDENTIALS_CACHE_KEY = 'credentials.cache.key';
+
+    /**
+     * @var string Pass this option to specify a custom `Guzzle\Http\ClientInterface` to use if your credentials require
+     *             a HTTP request (e.g. RefreshableInstanceProfileCredentials)
+     */
+    const CREDENTIALS_CLIENT = 'credentials.client';
+
+    /**
+     * @var string Region name (e.g. 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', etc...)
+     */
+    const REGION = 'region';
+
+    /**
+     * @var string URI Scheme of the base URL (e.g. 'https', 'http').
+     */
+    const SCHEME = 'scheme';
+
+    /**
+     * @var string Specify the name of the service
+     */
+    const SERVICE = 'service';
+
+    /**
+     * @var string Instead of using a `region` and `scheme`, you can specify a custom base URL for the client
+     */
+    const BASE_URL = 'base_url';
+
+    /**
+     * @var string You can optionally provide a custom signature implementation used to sign requests
+     */
+    const SIGNATURE = 'signature';
+
+    /**
+     * @var string Set to explicitly override the service name used in signatures
+     */
+    const SIGNATURE_SERVICE = 'signature.service';
+
+    /**
+     * @var string Set to explicitly override the region name used in signatures
+     */
+    const SIGNATURE_REGION = 'signature.region';
+
+    /**
+     * @var string Option key holding an exponential backoff plugin
+     */
+    const BACKOFF = 'client.backoff';
+
+    /**
+     * @var string `Guzzle\Log\LogAdapterInterface` object used to log backoff retries. Use 'debug' to emit PHP
+     *             warnings when a retry is issued.
+     */
+    const BACKOFF_LOGGER = 'client.backoff.logger';
+
+    /**
+     * @var string Optional template to use for exponential backoff log messages. See
+     *             `Guzzle\Plugin\Backoff\BackoffLogger` for formatting information.
+     */
+    const BACKOFF_LOGGER_TEMPLATE = 'client.backoff.logger.template';
+
+    /**
+     * @var string Set to true to use the bundled CA cert or pass the full path to an SSL certificate bundle. This
+     *             option should be modified when you encounter curl error code 60. Set to "system" to use the cacert
+     *             bundle on your system.
+     */
+    const SSL_CERT = 'ssl.certificate_authority';
+
+    /**
+     * @var string Service description to use with the client
+     */
+    const SERVICE_DESCRIPTION = 'service.description';
+
+    /**
+     * @var string Whether or not modeled responses have transformations applied to them
+     */
+    const MODEL_PROCESSING = 'command.model_processing';
+
+    /**
+     * @var bool Set to false to disable validation
+     */
+    const VALIDATION = 'validation';
+
+    /**
+     * @var string API version used by the client
+     */
+    const VERSION = 'version';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/DateFormat.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/DateFormat.php
new file mode 100644
index 0000000000000000000000000000000000000000..784ae92e037b4306e99185a051b646b6f99ac997
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/DateFormat.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable date format values used in the SDK
+ */
+class DateFormat extends Enum
+{
+    const ISO8601    = 'Ymd\THis\Z';
+    const ISO8601_S3 = 'Y-m-d\TH:i:s\Z';
+    const RFC1123    = 'D, d M Y H:i:s \G\M\T';
+    const RFC2822    = \DateTime::RFC2822;
+    const SHORT      = 'Ymd';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Region.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Region.php
new file mode 100644
index 0000000000000000000000000000000000000000..4cbcef902d306b0a35697d5c06fe743aa44137e9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Region.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable region code values. These should be useful in most cases,
+ * with Amazon S3 being the most notable exception
+ *
+ * @link http://docs.amazonwebservices.com/general/latest/gr/rande.html AWS Regions and Endpoints
+ */
+class Region extends Enum
+{
+    const US_EAST_1           = 'us-east-1';
+    const VIRGINIA            = 'us-east-1';
+    const NORTHERN_VIRGINIA   = 'us-east-1';
+
+    const US_WEST_1           = 'us-west-1';
+    const CALIFORNIA          = 'us-west-1';
+    const NORTHERN_CALIFORNIA = 'us-west-1';
+
+    const US_WEST_2           = 'us-west-2';
+    const OREGON              = 'us-west-2';
+
+    const EU_WEST_1           = 'eu-west-1';
+    const IRELAND             = 'eu-west-1';
+
+    const AP_SOUTHEAST_1      = 'ap-southeast-1';
+    const SINGAPORE           = 'ap-southeast-1';
+
+    const AP_SOUTHEAST_2      = 'ap-southeast-2';
+    const SYDNEY              = 'ap-southeast-2';
+
+    const AP_NORTHEAST_1      = 'ap-northeast-1';
+    const TOKYO               = 'ap-northeast-1';
+
+    const SA_EAST_1           = 'sa-east-1';
+    const SAO_PAULO           = 'sa-east-1';
+
+    const US_GOV_WEST_1       = 'us-gov-west-1';
+    const GOV_CLOUD_US        = 'us-gov-west-1';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Size.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Size.php
new file mode 100644
index 0000000000000000000000000000000000000000..01deab688c83275913aec54f47d3129efd60c7bf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Size.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable byte-size values
+ */
+class Size extends Enum
+{
+    const B         = 1;
+    const BYTE      = 1;
+    const BYTES     = 1;
+
+    const KB        = 1024;
+    const KILOBYTE  = 1024;
+    const KILOBYTES = 1024;
+
+    const MB        = 1048576;
+    const MEGABYTE  = 1048576;
+    const MEGABYTES = 1048576;
+
+    const GB        = 1073741824;
+    const GIGABYTE  = 1073741824;
+    const GIGABYTES = 1073741824;
+
+    const TB        = 1099511627776;
+    const TERABYTE  = 1099511627776;
+    const TERABYTES = 1099511627776;
+
+    const PB        = 1125899906842624;
+    const PETABYTE  = 1125899906842624;
+    const PETABYTES = 1125899906842624;
+
+    const EB        = 1152921504606846976;
+    const EXABYTE   = 1152921504606846976;
+    const EXABYTES  = 1152921504606846976;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Time.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Time.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b5a8f5b19ff59b6609b341cc616db767bd39a1d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/Time.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable time values
+ */
+class Time extends Enum
+{
+    const SECOND  = 1;
+    const SECONDS = 1;
+
+    const MINUTE  = 60;
+    const MINUTES = 60;
+
+    const HOUR    = 3600;
+    const HOURS   = 3600;
+
+    const DAY     = 86400;
+    const DAYS    = 86400;
+
+    const WEEK    = 604800;
+    const WEEKS   = 604800;
+
+    const MONTH   = 2592000;
+    const MONTHS  = 2592000;
+
+    const YEAR    = 31557600;
+    const YEARS   = 31557600;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/UaString.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/UaString.php
new file mode 100644
index 0000000000000000000000000000000000000000..8f1cb1ef28f1b840ac8610b57825b5309e71da3a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Enum/UaString.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * User-Agent header strings for various high level operations
+ */
+class UaString extends Enum
+{
+    /**
+     * @var string Name of the option used to add to the UA string
+     */
+    const OPTION = 'ua.append';
+
+    /**
+     * @var string Resource iterator
+     */
+    const ITERATOR = 'ITR';
+
+    /**
+     * @var string Resource waiter
+     */
+    const WAITER = 'WTR';
+
+    /**
+     * @var string Session handlers (e.g. Amazon DynamoDB session handler)
+     */
+    const SESSION = 'SES';
+
+    /**
+     * @var string Multipart upload helper for Amazon S3
+     */
+    const MULTIPART_UPLOAD = 'MUP';
+
+    /**
+     * @var string Command executed during a batch transfer
+     */
+    const BATCH = 'BAT';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/AwsExceptionInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/AwsExceptionInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..36f84935b12d44fb86a3eb8b46f7e2222f5930f9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/AwsExceptionInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * "Marker Interface" implemented by every exception in the AWS SDK
+ */
+interface AwsExceptionInterface
+{
+    public function getCode();
+    public function getLine();
+    public function getFile();
+    public function getMessage();
+    public function getPrevious();
+    public function getTrace();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/BadMethodCallException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/BadMethodCallException.php
new file mode 100644
index 0000000000000000000000000000000000000000..1a233eebb68ea03c57c40aebdb59c0434b7d6383
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/BadMethodCallException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL BadMethodCallException.
+ */
+class BadMethodCallException extends \BadMethodCallException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/DomainException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/DomainException.php
new file mode 100644
index 0000000000000000000000000000000000000000..137e1afe6df27775228700c2a74f67a6ff2346f4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/DomainException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL DomainException.
+ */
+class DomainException extends \DomainException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ExceptionFactoryInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ExceptionFactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..08a4c2cea7b62721faa40a7f080f0da978dcba80
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ExceptionFactoryInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Interface used to create AWS exception
+ */
+interface ExceptionFactoryInterface
+{
+    /**
+     * Returns an AWS service specific exception
+     *
+     * @param RequestInterface $request  Unsuccessful request
+     * @param Response         $response Unsuccessful response that was encountered
+     *
+     * @return \Exception|AwsExceptionInterface
+     */
+    public function fromResponse(RequestInterface $request, Response $response);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ExceptionListener.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ExceptionListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..94d5ee4303e7fe109d58153750c535e19c209546
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ExceptionListener.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+use Guzzle\Common\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Converts generic Guzzle response exceptions into AWS specific exceptions
+ */
+class ExceptionListener implements EventSubscriberInterface
+{
+    /**
+     * @var ExceptionFactoryInterface Factory used to create new exceptions
+     */
+    protected $factory;
+
+    /**
+     * @param ExceptionFactoryInterface $factory Factory used to create exceptions
+     */
+    public function __construct(ExceptionFactoryInterface $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array('request.error' => array('onRequestError', -1));
+    }
+
+    /**
+     * Throws a more meaningful request exception if available
+     *
+     * @param Event $event Event emitted
+     */
+    public function onRequestError(Event $event)
+    {
+        $e = $this->factory->fromResponse($event['request'], $event['response']);
+        $event->stopPropagation();
+        throw $e;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/InstanceProfileCredentialsException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/InstanceProfileCredentialsException.php
new file mode 100644
index 0000000000000000000000000000000000000000..fb1dcf1dc31f874cd4c17ad2da9f0e4f8e610e2a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/InstanceProfileCredentialsException.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+use Aws\Common\Exception\RuntimeException;
+
+/**
+ * Exception thrown when an error occurs with instance profile credentials
+ */
+class InstanceProfileCredentialsException extends RuntimeException
+{
+    /**
+     * @var string
+     */
+    protected $statusCode;
+
+    /**
+     * Set the error response code received from the instance metadata
+     *
+     * @param string $code Response code
+     */
+    public function setStatusCode($code)
+    {
+        $this->statusCode = $code;
+    }
+
+    /**
+     * Get the error response code from the service
+     *
+     * @return string|null
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/InvalidArgumentException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..4360a00847162c3d08374eddf4e2fb32a77c0641
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/InvalidArgumentException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL InvalidArgumentException.
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/LogicException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/LogicException.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d6589321442118bac5a2048a1e09796138b9187
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/LogicException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL LogicException.
+ */
+class LogicException extends \LogicException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/MultipartUploadException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/MultipartUploadException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3019361dd8e47884dd80d123eb809c69b6bca482
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/MultipartUploadException.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+use Aws\Common\Model\MultipartUpload\TransferStateInterface;
+
+/**
+ * Thrown when a {@see Aws\Common\MultipartUpload\TransferInterface} object encounters an error during transfer
+ */
+class MultipartUploadException extends RuntimeException
+{
+    /**
+     * @var TransferStateInterface State of the transfer when the error was encountered
+     */
+    protected $state;
+
+    /**
+     * @param TransferStateInterface $state     Transfer state
+     * @param \Exception             $exception Last encountered exception
+     */
+    public function __construct(TransferStateInterface $state, \Exception $exception = null)
+    {
+        parent::__construct(
+            'An error was encountered while performing a multipart upload: ' . $exception->getMessage(),
+            0,
+            $exception
+        );
+
+        $this->state = $state;
+    }
+
+    /**
+     * Get the state of the transfer
+     *
+     * @return TransferStateInterface
+     */
+    public function getState()
+    {
+        return $this->state;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/NamespaceExceptionFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/NamespaceExceptionFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..648906943063cc31b3a0a05063b442feeaf52fba
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/NamespaceExceptionFactory.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+use Aws\Common\Exception\Parser\ExceptionParserInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Attempts to create exceptions by inferring the name from the code and a base
+ * namespace that contains exceptions.  Exception classes are expected to be in
+ * upper camelCase and always end in 'Exception'. 'Exception' will be appended
+ * if it is not present in the exception code.
+ */
+class NamespaceExceptionFactory implements ExceptionFactoryInterface
+{
+    /**
+     * @var ExceptionParserInterface $parser Parser used to parse responses
+     */
+    protected $parser;
+
+    /**
+     * @var string Base namespace containing exception classes
+     */
+    protected $baseNamespace;
+
+    /**
+     * @var string Default class to instantiate if a match is not found
+     */
+    protected $defaultException;
+
+    /**
+     * @param ExceptionParserInterface $parser           Parser used to parse exceptions
+     * @param string                   $baseNamespace    Namespace containing exceptions
+     * @param string                   $defaultException Default class to use if one is not mapped
+     */
+    public function __construct(
+        ExceptionParserInterface $parser,
+        $baseNamespace,
+        $defaultException = 'Aws\Common\Exception\ServiceResponseException'
+    ) {
+        $this->parser = $parser;
+        $this->baseNamespace = $baseNamespace;
+        $this->defaultException = $defaultException;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fromResponse(RequestInterface $request, Response $response)
+    {
+        $parts = $this->parser->parse($request, $response);
+
+        // Removing leading 'AWS.' and embedded periods
+        $className = $this->baseNamespace . '\\' . str_replace(array('AWS.', '.'), '', $parts['code']);
+        if (substr($className, -9) !== 'Exception') {
+            $className .= 'Exception';
+        }
+
+        $className = class_exists($className) ? $className : $this->defaultException;
+
+        return $this->createException($className, $request, $response, $parts);
+    }
+
+    /**
+     * Create an prepare an exception object
+     *
+     * @param string           $className Name of the class to create
+     * @param RequestInterface $request   Request
+     * @param Response         $response  Response received
+     * @param array            $parts     Parsed exception data
+     *
+     * @return \Exception
+     */
+    protected function createException($className, RequestInterface $request, Response $response, array $parts)
+    {
+        $class = new $className($parts['message']);
+
+        if ($class instanceof ServiceResponseException) {
+            $class->setExceptionCode($parts['code']);
+            $class->setExceptionType($parts['type']);
+            $class->setResponse($response);
+            $class->setRequest($request);
+            $class->setRequestId($parts['request_id']);
+        }
+
+        return $class;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/OutOfBoundsException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/OutOfBoundsException.php
new file mode 100644
index 0000000000000000000000000000000000000000..6738c0c3ee65abdc8913a1a754c01438ed8c86e3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/OutOfBoundsException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL OverflowException.
+ */
+class OutOfBoundsException extends \OutOfBoundsException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/OverflowException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/OverflowException.php
new file mode 100644
index 0000000000000000000000000000000000000000..63e631cb2fee1aea1354485766dec5f7279c44dc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/OverflowException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL OverflowException.
+ */
+class OverflowException extends \OverflowException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/AbstractJsonExceptionParser.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/AbstractJsonExceptionParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..1e68d31405b933fbc0b25848bb3bd144818a3373
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/AbstractJsonExceptionParser.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception\Parser;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Parses JSON encoded exception responses
+ */
+abstract class AbstractJsonExceptionParser implements ExceptionParserInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function parse(RequestInterface $request, Response $response)
+    {
+        // Build array of default error data
+        $data = array(
+            'code'       => null,
+            'message'    => null,
+            'type'       => $response->isClientError() ? 'client' : 'server',
+            'request_id' => (string) $response->getHeader('x-amzn-RequestId'),
+            'parsed'     => null
+        );
+
+        // Parse the json and normalize key casings
+        if (null !== $json = json_decode($response->getBody(true), true)) {
+            $data['parsed'] = array_change_key_case($json);
+        }
+
+        // Do additional, protocol-specific parsing and return the result
+        $data = $this->doParse($data, $response);
+
+        // Remove "Fault" suffix from exception names
+        if (isset($data['code']) && strpos($data['code'], 'Fault')) {
+            $data['code'] = preg_replace('/^([a-zA-Z]+)Fault$/', '$1', $data['code']);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Pull relevant exception data out of the parsed json
+     *
+     * @param array    $data     The exception data
+     * @param Response $response The response from the service containing the error
+     *
+     * @return array
+     */
+    abstract protected function doParse(array $data, Response $response);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/DefaultXmlExceptionParser.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/DefaultXmlExceptionParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9fda69d82705cf4925480b8c32bbaf899ed6643
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/DefaultXmlExceptionParser.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception\Parser;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Parses default XML exception responses
+ */
+class DefaultXmlExceptionParser implements ExceptionParserInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function parse(RequestInterface $request, Response $response)
+    {
+        $data = array(
+            'code'       => null,
+            'message'    => null,
+            'type'       => $response->isClientError() ? 'client' : 'server',
+            'request_id' => null,
+            'parsed'     => null
+        );
+
+        if ($body = $response->getBody(true)) {
+            $this->parseBody(new \SimpleXMLElement($body), $data);
+        } else {
+            $this->parseHeaders($request, $response, $data);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Parses additional exception information from the response headers
+     *
+     * @param RequestInterface $request  Request that was issued
+     * @param Response         $response The response from the request
+     * @param array            $data     The current set of exception data
+     */
+    protected function parseHeaders(RequestInterface $request, Response $response, array &$data)
+    {
+        $data['message'] = $response->getStatusCode() . ' ' . $response->getReasonPhrase();
+        if ($requestId = $response->getHeader('x-amz-request-id')) {
+            $data['request_id'] = $requestId;
+            $data['message'] .= " (Request-ID: $requestId)";
+        }
+    }
+
+    /**
+     * Parses additional exception information from the response body
+     *
+     * @param \SimpleXMLElement $body The response body as XML
+     * @param array             $data The current set of exception data
+     */
+    protected function parseBody(\SimpleXMLElement $body, array &$data)
+    {
+        $data['parsed'] = $body;
+
+        $namespaces = $body->getDocNamespaces();
+        if (isset($namespaces[''])) {
+            // Account for the default namespace being defined and PHP not being able to handle it :(
+            $body->registerXPathNamespace('ns', $namespaces['']);
+            $prefix = 'ns:';
+        } else {
+            $prefix = '';
+        }
+
+        if ($tempXml = $body->xpath("//{$prefix}Code[1]")) {
+            $data['code'] = (string) $tempXml[0];
+        }
+
+        if ($tempXml = $body->xpath("//{$prefix}Message[1]")) {
+            $data['message'] = (string) $tempXml[0];
+        }
+
+        $tempXml = $body->xpath("//{$prefix}RequestId[1]");
+        if (empty($tempXml)) {
+            $tempXml = $body->xpath("//{$prefix}RequestID[1]");
+        }
+        if (isset($tempXml[0])) {
+            $data['request_id'] = (string) $tempXml[0];
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/ExceptionParserInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/ExceptionParserInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b25d96f1f14abe5582ae80c3642209f68e56354
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/ExceptionParserInterface.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception\Parser;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Interface used to parse exceptions into an associative array of data
+ */
+interface ExceptionParserInterface
+{
+    /**
+     * Parses an exception into an array of data containing at minimum the
+     * following array keys:
+     * - type:       Exception type
+     * - code:       Exception code
+     * - message:    Exception message
+     * - request_id: Request ID
+     * - parsed:     The parsed representation of the data (array, SimpleXMLElement, etc)
+     *
+     * @param RequestInterface $request
+     * @param Response         $response Unsuccessful response
+     *
+     * @return array
+     */
+    public function parse(RequestInterface $request, Response $response);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/JsonQueryExceptionParser.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/JsonQueryExceptionParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..10af528bda479a36cb9d106e56b39f46fc46f7b1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/JsonQueryExceptionParser.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception\Parser;
+
+use Guzzle\Http\Message\Response;
+
+/**
+ * Parses JSON encoded exception responses from query services
+ */
+class JsonQueryExceptionParser extends AbstractJsonExceptionParser
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function doParse(array $data, Response $response)
+    {
+        if ($json = $data['parsed']) {
+            $parts = explode('#', $json['__type']);
+            $data['code'] = isset($parts[1]) ? $parts[1] : $parts[0];
+            $data['message'] = isset($json['message']) ? $json['message'] : null;
+        }
+
+        return $data;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/JsonRestExceptionParser.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/JsonRestExceptionParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..5634f46b60eb076362ddbc726d6fa2af809eb392
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/Parser/JsonRestExceptionParser.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception\Parser;
+
+use Guzzle\Http\Message\Response;
+
+/**
+ * Parses JSON encoded exception responses from REST services
+ */
+class JsonRestExceptionParser extends AbstractJsonExceptionParser
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function doParse(array $data, Response $response)
+    {
+        // Merge in error data from the JSON body
+        if ($json = $data['parsed']) {
+            $data = array_replace($data, $json);
+        }
+
+        // Correct error type from services like Amazon Glacier
+        if (!empty($data['type'])) {
+            $data['type'] = strtolower($data['type']);
+        }
+
+        // Retrieve the error code from services like Amazon Elastic Transcoder
+        if ($code = (string) $response->getHeader('x-amzn-ErrorType')) {
+            $data['code'] = substr($code, 0, strpos($code, ':'));
+        }
+
+        return $data;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/RequiredExtensionNotLoadedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/RequiredExtensionNotLoadedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4a072ca48d4c28a7f5fba2d933fcbec27d163a4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/RequiredExtensionNotLoadedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * Thrown when a particular PHP extension is required to execute the guarded logic, but the extension is not loaded
+ */
+class RequiredExtensionNotLoadedException extends RuntimeException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/RuntimeException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/RuntimeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5f3bce611f46a4dbab93d9a0d7ef9c25f06eee0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/RuntimeException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL RuntimeException.
+ */
+class RuntimeException extends \RuntimeException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ServiceResponseException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ServiceResponseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..76d831ddd7bc23ef819d44a30619b345b26187ae
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/ServiceResponseException.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Default AWS exception
+ */
+class ServiceResponseException extends RuntimeException
+{
+    /**
+     * @var Response Response
+     */
+    protected $response;
+
+    /**
+     * @var RequestInterface Request
+     */
+    protected $request;
+
+    /**
+     * @var string Request ID
+     */
+    protected $requestId;
+
+    /**
+     * @var string Exception type (client / server)
+     */
+    protected $exceptionType;
+
+    /**
+     * @var string Exception code
+     */
+    protected $exceptionCode;
+
+    /**
+     * Set the exception code
+     *
+     * @param string $code Exception code
+     */
+    public function setExceptionCode($code)
+    {
+        $this->exceptionCode = $code;
+    }
+
+    /**
+     * Get the exception code
+     *
+     * @return string|null
+     */
+    public function getExceptionCode()
+    {
+        return $this->exceptionCode;
+    }
+
+    /**
+     * Set the exception type
+     *
+     * @param string $type Exception type
+     */
+    public function setExceptionType($type)
+    {
+        $this->exceptionType = $type;
+    }
+
+    /**
+     * Get the exception type (one of client or server)
+     *
+     * @return string|null
+     */
+    public function getExceptionType()
+    {
+        return $this->exceptionType;
+    }
+
+    /**
+     * Set the request ID
+     *
+     * @param string $id Request ID
+     */
+    public function setRequestId($id)
+    {
+        $this->requestId = $id;
+    }
+
+    /**
+     * Get the Request ID
+     *
+     * @return string|null
+     */
+    public function getRequestId()
+    {
+        return $this->requestId;
+    }
+
+    /**
+     * Set the associated response
+     *
+     * @param Response $response Response
+     */
+    public function setResponse(Response $response)
+    {
+        $this->response = $response;
+    }
+
+    /**
+     * Get the associated response object
+     *
+     * @return Response|null
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+    /**
+     * Set the associated request
+     *
+     * @param RequestInterface $request
+     */
+    public function setRequest(RequestInterface $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Get the associated request object
+     *
+     * @return RequestInterface|null
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * Get the status code of the response
+     *
+     * @return int|null
+     */
+    public function getStatusCode()
+    {
+        return $this->response ? $this->response->getStatusCode() : null;
+    }
+
+    /**
+     * Cast to a string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $message = get_class($this) . ': '
+            . 'AWS Error Code: ' . $this->getExceptionCode() . ', '
+            . 'Status Code: ' . $this->getStatusCode() . ', '
+            . 'AWS Request ID: ' . $this->getRequestId() . ', '
+            . 'AWS Error Type: ' . $this->getExceptionType() . ', '
+            . 'AWS Error Message: ' . $this->getMessage();
+
+        // Add the User-Agent if available
+        if ($this->request) {
+            $message .= ', ' . 'User-Agent: ' . $this->request->getHeader('User-Agent');
+        }
+
+        return $message;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/UnexpectedValueException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/UnexpectedValueException.php
new file mode 100644
index 0000000000000000000000000000000000000000..2de6fc6f71d3324327bfa8b80dbde94644689e8b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Exception/UnexpectedValueException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Exception;
+
+/**
+ * AWS SDK namespaced version of the SPL UnexpectedValueException.
+ */
+class UnexpectedValueException extends \UnexpectedValueException implements AwsExceptionInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/Facade.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/Facade.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a13e4d4d9dab17e713413219830fb289f201b6d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/Facade.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Facade;
+
+use Aws\Common\Aws;
+
+/**
+ * Base facade class that handles the delegation logic
+ */
+abstract class Facade implements FacadeInterface
+{
+    /** @var Aws */
+    protected static $serviceBuilder;
+
+    /**
+     * Mounts the facades by extracting information from the service builder config and using creating class aliases
+     *
+     * @param string|null $targetNamespace Namespace that the facades should be mounted to. Defaults to global namespace
+     *
+     * @param Aws $serviceBuilder
+     */
+    public static function mountFacades(Aws $serviceBuilder, $targetNamespace = null)
+    {
+        self::$serviceBuilder = $serviceBuilder;
+        require_once __DIR__ . '/facade-classes.php';
+        foreach ($serviceBuilder->getConfig() as $service) {
+            if (isset($service['alias'], $service['class'])) {
+                $facadeClass = __NAMESPACE__ . '\\' . $service['alias'];
+                $facadeAlias = ltrim($targetNamespace . '\\' . $service['alias'], '\\');
+                if (!class_exists($facadeAlias)) {
+                    // @codeCoverageIgnoreStart
+                    class_alias($facadeClass, $facadeAlias);
+                    // @codeCoverageIgnoreEnd
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the instance of the client that the facade operates on
+     *
+     * @return \Aws\Common\Client\AwsClientInterface
+     */
+    public static function getClient()
+    {
+        return self::$serviceBuilder->get(static::getServiceBuilderKey());
+    }
+
+    public static function __callStatic($method, $args)
+    {
+        return call_user_func_array(array(self::getClient(), $method), $args);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/FacadeInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/FacadeInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1325bbd2929bbf1d364be4de99fddb481aab8da
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/FacadeInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Facade;
+
+/**
+ * Interface that defines a client facade. Facades are convenient static classes that allow you to run client methods
+ * statically on a default instance from the service builder. The facades themselves are aliased into the global
+ * namespace for ease of use.
+ */
+interface FacadeInterface
+{
+    /**
+     * Returns the key used to access the client instance from the Service Builder
+     *
+     * @return string
+     */
+    public static function getServiceBuilderKey();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/facade-classes.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/facade-classes.php
new file mode 100644
index 0000000000000000000000000000000000000000..5cb8e10b7ccfd2e234181c4d8c7f6e85289fe1bd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Facade/facade-classes.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Facade;
+
+/**
+ * The following classes are used to implement the static client facades and are aliased into the global namespaced. We
+ * discourage the use of these classes directly by their full namespace since they are not autoloaded and are considered
+ * an implementation detail that could possibly be changed in the future.
+ */
+
+// @codeCoverageIgnoreStart
+
+class AutoScaling extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'autoscaling';
+    }
+}
+
+class CloudFormation extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'cloudformation';
+    }
+}
+
+class CloudFront extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'cloudfront';
+    }
+}
+
+class CloudSearch extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'cloudsearch';
+    }
+}
+
+class CloudWatch extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'cloudwatch';
+    }
+}
+
+class DataPipeline extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'datapipeline';
+    }
+}
+
+class DirectConnect extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'directconnect';
+    }
+}
+
+class DynamoDb extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'dynamodb';
+    }
+}
+
+class Ec2 extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'ec2';
+    }
+}
+
+class ElastiCache extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'elasticache';
+    }
+}
+
+class ElasticBeanstalk extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'elasticbeanstalk';
+    }
+}
+
+class ElasticLoadBalancing extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'elasticloadbalancing';
+    }
+}
+
+class ElasticTranscoder extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'elastictranscoder';
+    }
+}
+
+class Emr extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'emr';
+    }
+}
+
+class Glacier extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'glacier';
+    }
+}
+
+class Iam extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'iam';
+    }
+}
+
+class ImportExport extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'importexport';
+    }
+}
+
+class OpsWorks extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'opsworks';
+    }
+}
+
+class Rds extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'rds';
+    }
+}
+
+class Redshift extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'redshift';
+    }
+}
+
+class Route53 extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'route53';
+    }
+}
+
+class S3 extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 's3';
+    }
+}
+
+class SimpleDb extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'sdb';
+    }
+}
+
+class Ses extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'ses';
+    }
+}
+
+class Sns extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'sns';
+    }
+}
+
+class Sqs extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'sqs';
+    }
+}
+
+class StorageGateway extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'storagegateway';
+    }
+}
+
+class Sts extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'sts';
+    }
+}
+
+class Support extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'support';
+    }
+}
+
+class Swf extends Facade
+{
+    public static function getServiceBuilderKey()
+    {
+        return 'swf';
+    }
+}
+
+// @codeCoverageIgnoreEnd
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/ChunkHash.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/ChunkHash.php
new file mode 100644
index 0000000000000000000000000000000000000000..c57c3e4cb07b62ea0b0a4c7c10f68aba551db217
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/ChunkHash.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Hash;
+
+use Aws\Common\Exception\LogicException;
+
+/**
+ * Encapsulates the creation of a hash from streamed chunks of data
+ */
+class ChunkHash implements ChunkHashInterface
+{
+    /**
+     * @var resource The hash context as created by `hash_init()`
+     */
+    protected $context;
+
+    /**
+     * @var string The resulting hash in hex form
+     */
+    protected $hash;
+
+    /**
+     * @var string The resulting hash in binary form
+     */
+    protected $hashRaw;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($algorithm = self::DEFAULT_ALGORITHM)
+    {
+        HashUtils::validateAlgorithm($algorithm);
+        $this->context = hash_init($algorithm);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addData($data)
+    {
+        if (!$this->context) {
+            throw new LogicException('You may not add more data to a finalized chunk hash.');
+        }
+
+        hash_update($this->context, $data);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHash($returnBinaryForm = false)
+    {
+        if (!$this->hash) {
+            $this->hashRaw = hash_final($this->context, true);
+            $this->hash = HashUtils::binToHex($this->hashRaw);
+            $this->context = null;
+        }
+
+        return $returnBinaryForm ? $this->hashRaw : $this->hash;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __clone()
+    {
+        if ($this->context) {
+            $this->context = hash_copy($this->context);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/ChunkHashInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/ChunkHashInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..5fcf9a56436fc0214de9c55590e34b197fc9ad71
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/ChunkHashInterface.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Hash;
+
+/**
+ * Interface for objects that encapsulate the creation of a hash from streamed chunks of data
+ */
+interface ChunkHashInterface
+{
+    const DEFAULT_ALGORITHM = 'sha256';
+
+    /**
+     * Constructs the chunk hash and sets the algorithm to use for hashing
+     *
+     * @param string $algorithm A valid hash algorithm name as returned by `hash_algos()`
+     *
+     * @return self
+     */
+    public function __construct($algorithm = 'sha256');
+
+    /**
+     * Add a chunk of data to be hashed
+     *
+     * @param string $data Data to be hashed
+     *
+     * @return self
+     */
+    public function addData($data);
+
+    /**
+     * Return the results of the hash
+     *
+     * @param bool $returnBinaryForm If true, returns the hash in binary form instead of hex form
+     *
+     * @return string
+     */
+    public function getHash($returnBinaryForm = false);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/HashUtils.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/HashUtils.php
new file mode 100644
index 0000000000000000000000000000000000000000..dd82ff75edd70f11a76874bcdf88fbb51ef1b819
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/HashUtils.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Hash;
+
+use Aws\Common\Exception\InvalidArgumentException;
+
+/**
+ * Contains hashing utilities
+ */
+class HashUtils
+{
+    /**
+     * Converts a hash in hex form to binary form
+     *
+     * @param string $hash Hash in hex form
+     *
+     * @return string Hash in binary form
+     */
+    public static function hexToBin($hash)
+    {
+        // If using PHP 5.4, there is a native function to convert from hex to binary
+        static $useNative;
+        if ($useNative === null) {
+            $useNative = function_exists('hex2bin');
+        }
+
+        return $useNative ? hex2bin($hash) : pack("H*", $hash);
+    }
+
+    /**
+     * Converts a hash in binary form to hex form
+     *
+     * @param string $hash Hash in binary form
+     *
+     * @return string Hash in hex form
+     */
+    public static function binToHex($hash)
+    {
+        return bin2hex($hash);
+    }
+
+    /**
+     * Checks if the algorithm specified exists and throws an exception if it does not
+     *
+     * @param string $algorithm Name of the algorithm to validate
+     *
+     * @return bool
+     * @throws InvalidArgumentException if the algorithm doesn't exist
+     */
+    public static function validateAlgorithm($algorithm)
+    {
+        if (!in_array($algorithm, hash_algos(), true)) {
+            throw new InvalidArgumentException("The hashing algorithm specified ({$algorithm}) does not exist.");
+        }
+
+        return true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/TreeHash.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/TreeHash.php
new file mode 100644
index 0000000000000000000000000000000000000000..26ce69286c0d0fc6d408111ab81cf8c17fa63f66
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Hash/TreeHash.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Hash;
+
+use Aws\Common\Enum\Size;
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Exception\LogicException;
+use Guzzle\Http\EntityBody;
+
+/**
+ * Encapsulates the creation of a tree hash from streamed chunks of data
+ */
+class TreeHash implements ChunkHashInterface
+{
+    /**
+     * @var string The algorithm used for hashing
+     */
+    protected $algorithm;
+
+    /**
+     * @var array Set of binary checksums from which the tree hash is derived
+     */
+    protected $checksums = array();
+
+    /**
+     * @var string The resulting hash in hex form
+     */
+    protected $hash;
+
+    /**
+     * @var string The resulting hash in binary form
+     */
+    protected $hashRaw;
+
+    /**
+     * Create a tree hash from an array of existing tree hash checksums
+     *
+     * @param array  $checksums    Set of checksums
+     * @param bool   $inBinaryForm Whether or not the checksums are already in binary form
+     * @param string $algorithm    A valid hash algorithm name as returned by `hash_algos()`
+     *
+     * @return TreeHash
+     */
+    public static function fromChecksums(array $checksums, $inBinaryForm = false, $algorithm = self::DEFAULT_ALGORITHM)
+    {
+        $treeHash = new self($algorithm);
+
+        // Convert checksums to binary form if provided in hex form and add them to the tree hash
+        $treeHash->checksums = $inBinaryForm ? $checksums : array_map('Aws\Common\Hash\HashUtils::hexToBin', $checksums);
+
+        // Pre-calculate hash
+        $treeHash->getHash();
+
+        return $treeHash;
+    }
+
+    /**
+     * Create a tree hash from a content body
+     *
+     * @param string|resource|EntityBody $content   Content to create a tree hash for
+     * @param string                     $algorithm A valid hash algorithm name as returned by `hash_algos()`
+     *
+     * @return TreeHash
+     */
+    public static function fromContent($content, $algorithm = self::DEFAULT_ALGORITHM)
+    {
+        $treeHash = new self($algorithm);
+
+        // Read the data in 1MB chunks and add to tree hash
+        $content = EntityBody::factory($content);
+        while ($data = $content->read(Size::MB)) {
+            $treeHash->addData($data);
+        }
+
+        // Pre-calculate hash
+        $treeHash->getHash();
+
+        return $treeHash;
+    }
+
+    /**
+     * Validates an entity body with a tree hash checksum
+     *
+     * @param string|resource|EntityBody $content   Content to create a tree hash for
+     * @param string                     $checksum  The checksum to use for validation
+     * @param string                     $algorithm A valid hash algorithm name as returned by `hash_algos()`
+     *
+     * @return bool
+     */
+    public static function validateChecksum($content, $checksum, $algorithm = self::DEFAULT_ALGORITHM)
+    {
+        $treeHash = self::fromContent($content, $algorithm);
+
+        return ($checksum === $treeHash->getHash());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($algorithm = self::DEFAULT_ALGORITHM)
+    {
+        HashUtils::validateAlgorithm($algorithm);
+        $this->algorithm = $algorithm;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws LogicException           if the root tree hash is already calculated
+     * @throws InvalidArgumentException if the data is larger than 1MB
+     */
+    public function addData($data)
+    {
+        // Error if hash is already calculated
+        if ($this->hash) {
+            throw new LogicException('You may not add more data to a finalized tree hash.');
+        }
+
+        // Make sure that only 1MB chunks or smaller get passed in
+        if (strlen($data) > Size::MB) {
+            throw new InvalidArgumentException('The chunk of data added is too large for tree hashing.');
+        }
+
+        // Store the raw hash of this data segment
+        $this->checksums[] = hash($this->algorithm, $data, true);
+
+        return $this;
+    }
+
+    /**
+     * Add a checksum to the tree hash directly
+     *
+     * @param string $checksum     The checksum to add
+     * @param bool   $inBinaryForm Whether or not the checksum is already in binary form
+     *
+     * @return self
+     * @throws LogicException if the root tree hash is already calculated
+     */
+    public function addChecksum($checksum, $inBinaryForm = false)
+    {
+        // Error if hash is already calculated
+        if ($this->hash) {
+            throw new LogicException('You may not add more checksums to a finalized tree hash.');
+        }
+
+        // Convert the checksum to binary form if necessary
+        $this->checksums[] = $inBinaryForm ? $checksum : HashUtils::hexToBin($checksum);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHash($returnBinaryForm = false)
+    {
+        if (!$this->hash) {
+            // Perform hashes up the tree to arrive at the root checksum of the tree hash
+            $hashes = $this->checksums;
+            while (count($hashes) > 1) {
+                $sets = array_chunk($hashes, 2);
+                $hashes = array();
+                foreach ($sets as $set) {
+                    $hashes[] = (count($set) === 1) ? $set[0] : hash($this->algorithm, $set[0] . $set[1], true);
+                }
+            }
+
+            $this->hashRaw = $hashes[0];
+            $this->hash = HashUtils::binToHex($this->hashRaw);
+        }
+
+        return $returnBinaryForm ? $this->hashRaw : $this->hash;
+    }
+
+    /**
+     * @return array Array of raw checksums composing the tree hash
+     */
+    public function getChecksums()
+    {
+        return $this->checksums;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/HostNameUtils.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/HostNameUtils.php
new file mode 100644
index 0000000000000000000000000000000000000000..460bc770a12b9e0f6d8de15fa24fb18427d90bad
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/HostNameUtils.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common;
+
+use Guzzle\Http\Url;
+
+/**
+ * Utility class for parsing regions and services from URLs
+ */
+class HostNameUtils
+{
+    const DEFAULT_REGION = 'us-east-1';
+    const DEFAULT_GOV_REGION = 'us-gov-west-1';
+
+    /**
+     * Parse the AWS region name from a URL
+     *
+     *
+     * @param Url $url HTTP URL
+     *
+     * @return string
+     * @link http://docs.amazonwebservices.com/general/latest/gr/rande.html
+     */
+    public static function parseRegionName(Url $url)
+    {
+        // If we don't recognize the domain, just return the default
+        if (substr($url->getHost(), -14) != '.amazonaws.com') {
+            return self::DEFAULT_REGION;
+        }
+
+        $serviceAndRegion = substr($url->getHost(), 0, -14);
+        // Special handling for S3 regions
+        $separator = strpos($serviceAndRegion, 's3') === 0 ? '-' : '.';
+        $separatorPos = strpos($serviceAndRegion, $separator);
+
+        // If don't detect a separator, then return the default region
+        if ($separatorPos === false) {
+            return self::DEFAULT_REGION;
+        }
+
+        $region = substr($serviceAndRegion, $separatorPos + 1);
+
+        // All GOV regions currently use the default GOV region
+        if ($region == 'us-gov') {
+            return self::DEFAULT_GOV_REGION;
+        }
+
+        return $region;
+    }
+
+    /**
+     * Parse the AWS service name from a URL
+     *
+     * @param Url $url HTTP URL
+     *
+     * @return string Returns a service name (or empty string)
+     * @link http://docs.amazonwebservices.com/general/latest/gr/rande.html
+     */
+    public static function parseServiceName(Url $url)
+    {
+        // The service name is the first part of the host
+        $parts = explode('.', $url->getHost(), 2);
+
+        // Special handling for S3
+        if (stripos($parts[0], 's3') === 0) {
+            return 's3';
+        }
+
+        return $parts[0];
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/InstanceMetadata/InstanceMetadataClient.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/InstanceMetadata/InstanceMetadataClient.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a2e6333829b8e04445dc11f83fe2cc589821ab0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/InstanceMetadata/InstanceMetadataClient.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\InstanceMetadata;
+
+use Aws\Common\Enum\ClientOptions as Options;
+use Aws\Common\Exception\InstanceProfileCredentialsException;
+use Aws\Common\Credentials\Credentials;
+use Aws\Common\Client\AbstractClient;
+use Guzzle\Common\Collection;
+use Guzzle\Http\Message\RequestFactory;
+
+/**
+ * Client used for interacting with the Amazon EC2 instance metadata server
+ */
+class InstanceMetadataClient extends AbstractClient
+{
+    /**
+     * Factory method to create a new InstanceMetadataClient using an array
+     * of configuration options.
+     *
+     * The configuration options accepts the following array keys and values:
+     * - base_url: Override the base URL of the instance metadata server
+     * - version:  Version of the metadata server to interact with
+     *
+     * @param array|Collection $config Configuration options
+     *
+     * @return InstanceMetadataClient
+     */
+    public static function factory($config = array())
+    {
+        $config = Collection::fromConfig($config, array(
+            Options::BASE_URL => 'http://169.254.169.254/{version}/',
+            'version'         => 'latest',
+        ), array('base_url', 'version'));
+
+        return new self($config);
+    }
+
+    /**
+     * Constructor override
+     */
+    public function __construct(Collection $config)
+    {
+        $this->setConfig($config);
+        $this->setBaseUrl($config->get(Options::BASE_URL));
+        $this->defaultHeaders = new Collection();
+        $this->setRequestFactory(RequestFactory::getInstance());
+    }
+
+    /**
+     * Get instance profile credentials
+     *
+     * @return Credentials
+     * @throws InstanceProfileCredentialsException
+     */
+    public function getInstanceProfileCredentials()
+    {
+        try {
+            $request = $this->get('meta-data/iam/security-credentials/');
+            $request->getCurlOptions()->set(CURLOPT_TIMEOUT, 1)->set(CURLOPT_CONNECTTIMEOUT, 1);
+            $credentials = trim($request->send()->getBody(true));
+            $result = $this->get("meta-data/iam/security-credentials/{$credentials}")->send()->json();
+        } catch (\Exception $e) {
+            $message = 'Error retrieving credentials from the instance profile metadata server.  When you are not'
+                . ' running inside of Amazon EC2, you must provide your AWS access key ID and secret access key in'
+                . ' the "key" and "secret" options when creating a client or provide an instantiated'
+                . ' Aws\\Common\\Credentials\\CredentialsInterface object.';
+            throw new InstanceProfileCredentialsException($message, $e->getCode(), $e);
+        }
+
+        // Ensure that the status code was successful
+        if ($result['Code'] !== 'Success') {
+            $e = new InstanceProfileCredentialsException('Unexpected response code: ' . $result['Code']);
+            $e->setStatusCode($result['Code']);
+            throw $e;
+        }
+
+        return new Credentials(
+            $result['AccessKeyId'],
+            $result['SecretAccessKey'],
+            $result['Token'],
+            strtotime($result['Expiration'])
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/InstanceMetadata/Waiter/ServiceAvailable.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/InstanceMetadata/Waiter/ServiceAvailable.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac305c3d91685cbe7de9865a58e34eb0383a437d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/InstanceMetadata/Waiter/ServiceAvailable.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\InstanceMetadata\Waiter;
+
+use Aws\Common\Waiter\AbstractResourceWaiter;
+use Guzzle\Http\Exception\CurlException;
+
+/**
+ * Waits until the instance metadata service is responding.  Will send up to
+ * 4 requests with a 5 second delay between each try.  Each try can last up to
+ * 11 seconds to complete if the service is not responding.
+ *
+ * @codeCoverageIgnore
+ */
+class ServiceAvailable extends AbstractResourceWaiter
+{
+    protected $interval = 5;
+    protected $maxAttempts = 4;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doWait()
+    {
+        $request = $this->client->get();
+        try {
+            $request->getCurlOptions()->set(CURLOPT_CONNECTTIMEOUT, 10)
+                ->set(CURLOPT_TIMEOUT, 10);
+            $request->send();
+
+            return true;
+        } catch (CurlException $e) {
+            return false;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Iterator/AwsResourceIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Iterator/AwsResourceIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..a384617b51cb70a6c0a463aa08d8a590fecccc41
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Iterator/AwsResourceIterator.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Iterator;
+
+use Aws\Common\Enum\UaString as Ua;
+use Aws\Common\Exception\RuntimeException;
+Use Guzzle\Service\Resource\Model;
+use Guzzle\Service\Resource\ResourceIterator;
+
+/**
+ * Iterate over a client command
+ */
+class AwsResourceIterator extends ResourceIterator
+{
+    /**
+     * @var Model Result of a command
+     */
+    protected $lastResult = null;
+
+    /**
+     * Provides access to the most recent result obtained by the iterator.
+     *
+     * @return Model|null
+     */
+    public function getLastResult()
+    {
+        return $this->lastResult;
+    }
+
+    /**
+     * {@inheritdoc}
+     * This AWS specific version of the resource iterator provides a default implementation of the typical AWS iterator
+     * process. It relies on configuration and extension to implement the operation-specific logic of handling results
+     * and nextTokens. This method will loop until resources are acquired or there are no more iterations available.
+     */
+    protected function sendRequest()
+    {
+        do {
+            // Prepare the request including setting the next token
+            $this->prepareRequest();
+            if ($this->nextToken) {
+                $this->applyNextToken();
+            }
+
+            // Execute the request and handle the results
+            $this->command->add(Ua::OPTION, Ua::ITERATOR);
+            $this->lastResult = $this->command->getResult();
+            $resources = $this->handleResults($this->lastResult);
+            $this->determineNextToken($this->lastResult);
+
+            // If no resources collected, prepare to reiterate before yielding
+            if ($reiterate = empty($resources) && $this->nextToken) {
+                $this->command = clone $this->originalCommand;
+            }
+        } while ($reiterate);
+
+        return $resources;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function prepareRequest()
+    {
+        // Get the limit parameter key to set
+        $param = $this->get('limit_param');
+        if ($param && ($limit = $this->command->get($param))) {
+            $pageSize = $this->calculatePageSize();
+
+            // If the limit of the command is different than the pageSize of the iterator, use the smaller value
+            if ($limit && $pageSize) {
+                $this->command->set('limit', min($limit, $pageSize));
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function handleResults(Model $result)
+    {
+        $results = array();
+
+        // Get the result key that contains the results
+        if ($resultKey = $this->get('result_key')) {
+            $results = $result->getPath($resultKey) ?: array();
+        }
+
+        return $results;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function applyNextToken()
+    {
+        // Get the token parameter key to set
+        if ($tokenParam = $this->get('token_param')) {
+            // Set the next token. Works with multi-value tokens
+            if (is_array($tokenParam)) {
+                if (is_array($this->nextToken) && count($tokenParam) === count($this->nextToken)) {
+                    foreach (array_combine($tokenParam, $this->nextToken) as $param => $token) {
+                        $this->command->set($param, $token);
+                    }
+                } else {
+                    throw new RuntimeException('The definition of the iterator\'s token parameter and the actual token '
+                        . 'value are not compatible.');
+                }
+            } else {
+                $this->command->set($tokenParam, $this->nextToken);
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function determineNextToken(Model $result)
+    {
+        $this->nextToken = null;
+
+        // If the value of "more key" is true or there is no "more key" to check, then try to get the next token
+        $moreKey = $this->get('more_key');
+        if ($moreKey === null || $result->getPath($moreKey)) {
+            // Get the token key to check
+            if ($tokenKey = $this->get('token_key')) {
+                // Get the next token's value. Works with multi-value tokens
+                $getToken = function ($key) use ($result) {
+                    return $result->getPath((string) $key);
+                };
+                $this->nextToken = is_array($tokenKey) ? array_map($getToken, $tokenKey) : $getToken($tokenKey);
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Iterator/AwsResourceIteratorFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Iterator/AwsResourceIteratorFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d4ac279d5e24ecc6eba8a53052e126b3ba6c23f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Iterator/AwsResourceIteratorFactory.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Aws\Common\Iterator;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Collection;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Resource\ResourceIteratorFactoryInterface;
+
+/**
+ * Resource iterator factory used to instantiate the default AWS resource iterator with the correct configuration or
+ * use a concrete iterator class if one exists
+ */
+class AwsResourceIteratorFactory implements ResourceIteratorFactoryInterface
+{
+    /**
+     * @var array Default configuration values for iterators
+     */
+    protected static $defaultConfig = array(
+        'limit_key'   => null,
+        'limit_param' => null,
+        'more_key'    => null,
+        'token_key'   => null,
+        'token_param' => null,
+        'operations'  => array(),
+    );
+
+    /**
+     * @var Collection The configuration for the iterators
+     */
+    protected $config;
+
+    /**
+     * @var Collection Additional configurations for specific iterators
+     */
+    protected $operations;
+
+    /**
+     * @var ResourceIteratorFactoryInterface Another factory that will be used first to instantiate the iterator
+     */
+    protected $primaryIteratorFactory;
+
+    /**
+     * @param array                            $config                 An array of configuration values for the factory
+     * @param ResourceIteratorFactoryInterface $primaryIteratorFactory Another factory to use for chain of command
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct(array $config, ResourceIteratorFactoryInterface $primaryIteratorFactory = null)
+    {
+        $this->primaryIteratorFactory = $primaryIteratorFactory;
+        // Set up the config with default values
+        $this->config = Collection::fromConfig($config, self::$defaultConfig);
+
+        // Pull out the operation-specific configurations
+        $this->operations = new Collection();
+        $potentialOperations = $this->config->get('operations') ?: array();
+        $this->config->remove('operations');
+        foreach ($potentialOperations as $key => $value) {
+            if (is_int($key) && is_string($value)) {
+                $this->operations->set($value, array());
+            } elseif (is_string($key) && is_array($value)) {
+                $this->operations->set($key, $value);
+            } else {
+                throw new InvalidArgumentException('The iterator factory configuration was invalid.');
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build(CommandInterface $command, array $options = array())
+    {
+        // Get the configuration data for the command
+        $commandName = $command->getName();
+        $iteratorConfig = $this->operations->get($commandName) ?: array();
+        $options = array_replace($this->config->getAll(), $iteratorConfig, $options);
+
+        // Instantiate the iterator using the primary factory (if there is one)
+        if ($this->primaryIteratorFactory && $this->primaryIteratorFactory->canBuild($command)) {
+            $iterator = $this->primaryIteratorFactory->build($command, $options);
+        } elseif (!$this->operations->hasKey($commandName)) {
+            throw new InvalidArgumentException("Iterator was not found for {$commandName}.");
+        } else {
+            // Fallback to this factory for creating the iterator if the primary factory did not work
+            $iterator = new AwsResourceIterator($command, $options);
+        }
+
+        return $iterator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBuild(CommandInterface $command)
+    {
+        return ($this->primaryIteratorFactory && $this->primaryIteratorFactory->canBuild($command))
+            || $this->operations->hasKey($command->getName());
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..751b558d595a65b1be0a725ebab1665b7a7d7d9d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractTransfer.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Exception\MultipartUploadException;
+use Aws\Common\Exception\RuntimeException;
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Service\Command\OperationCommand;
+use Guzzle\Service\Resource\Model;
+
+/**
+ * Abstract class for transfer commonalities
+ */
+abstract class AbstractTransfer extends AbstractHasDispatcher implements TransferInterface
+{
+    const BEFORE_UPLOAD      = 'multipart_upload.before_upload';
+    const AFTER_UPLOAD       = 'multipart_upload.after_upload';
+    const BEFORE_PART_UPLOAD = 'multipart_upload.before_part_upload';
+    const AFTER_PART_UPLOAD  = 'multipart_upload.after_part_upload';
+    const AFTER_ABORT        = 'multipart_upload.after_abort';
+    const AFTER_COMPLETE     = 'multipart_upload.after_complete';
+
+    /**
+     * @var AwsClientInterface Client used for the transfers
+     */
+    protected $client;
+
+    /**
+     * @var TransferStateInterface State of the transfer
+     */
+    protected $state;
+
+    /**
+     * @var EntityBody Data source of the transfer
+     */
+    protected $source;
+
+    /**
+     * @var array Associative array of options
+     */
+    protected $options;
+
+    /**
+     * @var int Size of each part to upload
+     */
+    protected $partSize;
+
+    /**
+     * @var bool Whether or not the transfer has been stopped
+     */
+    protected $stopped = false;
+
+    /**
+     * Construct a new transfer object
+     *
+     * @param AwsClientInterface     $client  Client used for the transfers
+     * @param TransferStateInterface $state   State used to track transfer
+     * @param EntityBody             $source  Data source of the transfer
+     * @param array                  $options Array of options to apply
+     */
+    public function __construct(
+        AwsClientInterface $client,
+        TransferStateInterface $state,
+        EntityBody $source,
+        array $options = array()
+    ) {
+        $this->client  = $client;
+        $this->state   = $state;
+        $this->source  = $source;
+        $this->options = $options;
+
+        $this->init();
+
+        $this->partSize = $this->calculatePartSize();
+    }
+
+    public function __invoke()
+    {
+        return $this->upload();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getAllEvents()
+    {
+        return array(
+            self::BEFORE_PART_UPLOAD,
+            self::AFTER_UPLOAD,
+            self::BEFORE_PART_UPLOAD,
+            self::AFTER_PART_UPLOAD,
+            self::AFTER_ABORT,
+            self::AFTER_COMPLETE
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function abort()
+    {
+        $command = $this->getAbortCommand();
+        $result = $command->getResult();
+
+        $this->state->setAborted(true);
+        $this->stop();
+        $this->dispatch(self::AFTER_ABORT, $this->getEventData($command));
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function stop()
+    {
+        $this->stopped = true;
+
+        return $this->state;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getState()
+    {
+        return $this->state;
+    }
+
+    /**
+     * Get the array of options associated with the transfer
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Set an option on the transfer
+     *
+     * @param string $option Name of the option
+     * @param mixed  $value  Value to set
+     *
+     * @return self
+     */
+    public function setOption($option, $value)
+    {
+        $this->options[$option] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get the source body of the upload
+     *
+     * @return EntityBodyInterface
+     */
+    public function getSource()
+    {
+        return $this->source;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws MultipartUploadException when an error is encountered. Use getLastException() to get more information.
+     * @throws RuntimeException         when attempting to upload an aborted transfer
+     */
+    public function upload()
+    {
+        if ($this->state->isAborted()) {
+            throw new RuntimeException('The transfer has been aborted and cannot be uploaded');
+        }
+
+        $this->stopped = false;
+        $eventData = $this->getEventData();
+        $this->dispatch(self::BEFORE_UPLOAD, $eventData);
+
+        try {
+            $this->transfer();
+            $this->dispatch(self::AFTER_UPLOAD, $eventData);
+
+            if ($this->stopped) {
+                return null;
+            } else {
+                $result = $this->complete();
+                $this->dispatch(self::AFTER_COMPLETE, $eventData);
+            }
+        } catch (\Exception $e) {
+            throw new MultipartUploadException($this->state, $e);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get an array used for event notifications
+     *
+     * @param OperationCommand $command Command to include in event data
+     *
+     * @return array
+     */
+    protected function getEventData(OperationCommand $command = null)
+    {
+        $data = array(
+            'transfer'  => $this,
+            'source'    => $this->source,
+            'options'   => $this->options,
+            'client'    => $this->client,
+            'part_size' => $this->partSize,
+            'state'     => $this->state
+        );
+
+        if ($command) {
+            $data['command'] = $command;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Hook to initialize the transfer
+     */
+    protected function init() {}
+
+    /**
+     * Determine the upload part size based on the size of the source data and
+     * taking into account the acceptable minimum and maximum part sizes.
+     *
+     * @return int The part size
+     */
+    abstract protected function calculatePartSize();
+
+    /**
+     * Complete the multipart upload
+     *
+     * @return Model Returns the result of the complete multipart upload command
+     */
+    abstract protected function complete();
+
+    /**
+     * Hook to implement in subclasses to perform the actual transfer
+     */
+    abstract protected function transfer();
+
+    /**
+     * Fetches the abort command fom the concrete implementation
+     *
+     * @return OperationCommand
+     */
+    abstract protected function getAbortCommand();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractTransferState.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractTransferState.php
new file mode 100644
index 0000000000000000000000000000000000000000..06d6c84016706b79ca8ac55f4fdb6c45288f59ef
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractTransferState.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+use Aws\Common\Exception\RuntimeException;
+
+/**
+ * State of a multipart upload
+ */
+abstract class AbstractTransferState implements TransferStateInterface
+{
+    /**
+     * @var UploadIdInterface Object holding params used to identity the upload part
+     */
+    protected $uploadId;
+
+    /**
+     * @var array Array of parts where the part number is the index
+     */
+    protected $parts = array();
+
+    /**
+     * @var bool Whether or not the transfer was aborted
+     */
+    protected $aborted = false;
+
+    /**
+     * Construct a new transfer state object
+     *
+     * @param UploadIdInterface $uploadId Upload identifier object
+     */
+    public function __construct(UploadIdInterface $uploadId)
+    {
+        $this->uploadId = $uploadId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUploadId()
+    {
+        return $this->uploadId;
+    }
+
+    /**
+     * Get a data value from the transfer state's uploadId
+     *
+     * @param string $key Key to retrieve (e.g. Bucket, Key, UploadId, etc)
+     *
+     * @return string|null
+     */
+    public function getFromId($key)
+    {
+        $params = $this->uploadId->toParams();
+
+        return isset($params[$key]) ? $params[$key] : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPart($partNumber)
+    {
+        return isset($this->parts[$partNumber]) ? $this->parts[$partNumber] : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addPart(UploadPartInterface $part)
+    {
+        $partNumber = $part->getPartNumber();
+        $this->parts[$partNumber] = $part;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasPart($partNumber)
+    {
+        return isset($this->parts[$partNumber]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPartNumbers()
+    {
+        return array_keys($this->parts);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setAborted($aborted)
+    {
+        $this->aborted = (bool) $aborted;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAborted()
+    {
+        return $this->aborted;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function count()
+    {
+        return count($this->parts);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->parts);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        return serialize(get_object_vars($this));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
+    {
+        $data = unserialize($serialized);
+        foreach (get_object_vars($this) as $property => $oldValue) {
+            if (array_key_exists($property, $data)) {
+                $this->{$property} = $data[$property];
+            } else {
+                throw new RuntimeException("The {$property} property could be restored during unserialization.");
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..a1ad678610c07a060545c7352a204622a6da64ce
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadBuilder.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\EntityBody;
+
+/**
+ * Easily create a multipart uploader used to quickly and reliably upload a
+ * large file or data stream to Amazon S3 using multipart uploads
+ */
+abstract class AbstractUploadBuilder
+{
+    /**
+     * @var AwsClientInterface Client used to transfer requests
+     */
+    protected $client;
+
+    /**
+     * @var TransferStateInterface State of the transfer
+     */
+    protected $state;
+
+    /**
+     * @var EntityBody Source of the data
+     */
+    protected $source;
+
+    /**
+     * @var array Array of headers to set on the object
+     */
+    protected $headers = array();
+
+    /**
+     * Return a new instance of the UploadBuilder
+     *
+     * @return self
+     */
+    public static function newInstance()
+    {
+        return new static;
+    }
+
+    /**
+     * Set the client used to connect to the AWS service
+     *
+     * @param AwsClientInterface $client Client to use
+     *
+     * @return self
+     */
+    public function setClient(AwsClientInterface $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    /**
+     * Set the state of the upload. This is useful for resuming from a previously started multipart upload.
+     * You must use a local file stream as the data source if you wish to resume from a previous upload.
+     *
+     * @param TransferStateInterface|string $state Pass a TransferStateInterface object or the ID of the initiated
+     *                                             multipart upload. When an ID is passed, the builder will create a
+     *                                             state object using the data from a ListParts API response.
+     *
+     * @return self
+     */
+    public function resumeFrom($state)
+    {
+        $this->state = $state;
+
+        return $this;
+    }
+
+    /**
+     * Set the data source of the transfer
+     *
+     * @param resource|string|EntityBody $source Source of the transfer. Pass a string to transfer from a file on disk.
+     *                                           You can also stream from a resource returned from fopen or a Guzzle
+     *                                           {@see EntityBody} object.
+     *
+     * @return self
+     * @throws InvalidArgumentException when the source cannot be found or opened
+     */
+    public function setSource($source)
+    {
+        // Use the contents of a file as the data source
+        if (is_string($source)) {
+            if (!file_exists($source)) {
+                throw new InvalidArgumentException("File does not exist: {$source}");
+            }
+            // Clear the cache so that we send accurate file sizes
+            clearstatcache(true, $source);
+            $source = fopen($source, 'r');
+        }
+
+        $this->source = EntityBody::factory($source);
+
+        if ($this->source->isSeekable() && $this->source->getSize() == 0) {
+            throw new InvalidArgumentException('Empty body provided to upload builder');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Specify the headers to set on the upload
+     *
+     * @param array $headers Headers to add to the uploaded object
+     *
+     * @return self
+     */
+    public function setHeaders(array $headers)
+    {
+        $this->headers = $headers;
+
+        return $this;
+    }
+
+    /**
+     * Build the appropriate uploader based on the builder options
+     *
+     * @return TransferInterface
+     */
+    abstract public function build();
+
+    /**
+     * Initiate the multipart upload
+     *
+     * @return TransferStateInterface
+     */
+    abstract protected function initiateMultipartUpload();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadId.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadId.php
new file mode 100644
index 0000000000000000000000000000000000000000..da7952164cb792ba0277eeea848025dd2d2ff7df
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadId.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+use Aws\Common\Exception\InvalidArgumentException;
+
+/**
+ * An object that encapsulates the data identifying an upload
+ */
+abstract class AbstractUploadId implements UploadIdInterface
+{
+    /**
+     * @var array Expected values (with defaults)
+     */
+    protected static $expectedValues = array();
+
+    /**
+     * @var array Params representing the identifying information
+     */
+    protected $data = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromParams($data)
+    {
+        $uploadId = new static();
+        $uploadId->loadData($data);
+
+        return $uploadId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toParams()
+    {
+        return $this->data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        return serialize($this->data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
+    {
+        $this->loadData(unserialize($serialized));
+    }
+
+    /**
+     * Loads an array of data into the UploadId by extracting only the needed keys
+     *
+     * @param array $data Data to load
+     *
+     * @throws InvalidArgumentException if a required key is missing
+     */
+    protected function loadData($data)
+    {
+        $data = array_replace(static::$expectedValues, array_intersect_key($data, static::$expectedValues));
+        foreach ($data as $key => $value) {
+            if (isset($data[$key])) {
+                $this->data[$key] = $data[$key];
+            } else {
+                throw new InvalidArgumentException("A required key [$key] was missing from the UploadId.");
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadPart.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadPart.php
new file mode 100644
index 0000000000000000000000000000000000000000..1cf4c6d4fa3dd0bf8df4cde9b2aae42a54da92f5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/AbstractUploadPart.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+use Aws\Common\Exception\InvalidArgumentException;
+
+/**
+ * An object that encapsulates the data for an upload part
+ */
+abstract class AbstractUploadPart implements UploadPartInterface
+{
+    /**
+     * @var array A map of external array keys to internal property names
+     */
+    protected static $keyMap = array();
+
+    /**
+     * @var int The number of the upload part representing its order in the overall upload
+     */
+    protected $partNumber;
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromArray($data)
+    {
+        $part = new static();
+        $part->loadData($data);
+
+        return $part;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPartNumber()
+    {
+        return $this->partNumber;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $array = array();
+        foreach (static::$keyMap as $key => $property) {
+            $array[$key] = $this->{$property};
+        }
+
+        return $array;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        return serialize($this->toArray());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
+    {
+        $this->loadData(unserialize($serialized));
+    }
+
+    /**
+     * Loads an array of data into the upload part by extracting only the needed keys
+     *
+     * @param array|\Traversable $data Data to load into the upload part value object
+     *
+     * @throws InvalidArgumentException if a required key is missing
+     */
+    protected function loadData($data)
+    {
+        foreach (static::$keyMap as $key => $property) {
+            if (isset($data[$key])) {
+                $this->{$property} = $data[$key];
+            } else {
+                throw new InvalidArgumentException("A required key [$key] was missing from the upload part.");
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/TransferInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/TransferInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fc1ae9bb9b7932467f4f424a43ac4956982c142
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/TransferInterface.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+use Guzzle\Common\HasDispatcherInterface;
+use Guzzle\Service\Resource\Model;
+
+/**
+ * Interface for transferring the contents of a data source to an AWS service via a multipart upload interface
+ */
+interface TransferInterface extends HasDispatcherInterface
+{
+    /**
+     * Upload the source to using a multipart upload
+     *
+     * @return Model|null Result of the complete multipart upload command or null if uploading was stopped
+     */
+    public function upload();
+
+    /**
+     * Abort the upload
+     *
+     * @return Model Returns the result of the abort multipart upload command
+     */
+    public function abort();
+
+    /**
+     * Get the current state of the upload
+     *
+     * @return TransferStateInterface
+     */
+    public function getState();
+
+    /**
+     * Stop the transfer and retrieve the current state.
+     *
+     * This allows you to stop and later resume a long running transfer if needed.
+     *
+     * @return TransferStateInterface
+     */
+    public function stop();
+
+    /**
+     * Set an option on the transfer object
+     *
+     * @param string $option Option to set
+     * @param mixed  $value  The value to set
+     *
+     * @return self
+     */
+    public function setOption($option, $value);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/TransferStateInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/TransferStateInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f5c0e50dfd0ec8b0c2f80a369d00615fae289c1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/TransferStateInterface.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+use Aws\Common\Client\AwsClientInterface;
+
+/**
+ * State of a multipart upload
+ */
+interface TransferStateInterface extends \Countable, \IteratorAggregate, \Serializable
+{
+    /**
+     * Create the transfer state from the results of list parts request
+     *
+     * @param AwsClientInterface $client   Client used to send the request
+     * @param UploadIdInterface  $uploadId Params needed to identify the upload and form the request
+     *
+     * @return self
+     */
+    public static function fromUploadId(AwsClientInterface $client, UploadIdInterface $uploadId);
+
+    /**
+     * Get the params used to identify an upload part
+     *
+     * @return UploadIdInterface
+     */
+    public function getUploadId();
+
+    /**
+     * Get the part information of a specific part
+     *
+     * @param int $partNumber Part to retrieve
+     *
+     * @return UploadPartInterface
+     */
+    public function getPart($partNumber);
+
+    /**
+     * Add a part to the transfer state
+     *
+     * @param UploadPartInterface $part The part to add
+     *
+     * @return self
+     */
+    public function addPart(UploadPartInterface $part);
+
+    /**
+     * Check if a specific part has been uploaded
+     *
+     * @param int $partNumber Part to check
+     *
+     * @return bool
+     */
+    public function hasPart($partNumber);
+
+    /**
+     * Get a list of all of the uploaded part numbers
+     *
+     * @return array
+     */
+    public function getPartNumbers();
+
+    /**
+     * Set whether or not the transfer has been aborted
+     *
+     * @param bool $aborted Set to true to mark the transfer as aborted
+     *
+     * @return self
+     */
+    public function setAborted($aborted);
+
+    /**
+     * Check if the transfer has been marked as aborted
+     *
+     * @return bool
+     */
+    public function isAborted();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/UploadIdInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/UploadIdInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..dd14b17790f0393009eabc32236863ba3bd4382f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/UploadIdInterface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+/**
+ * An object that encapsulates the data identifying an upload
+ */
+interface UploadIdInterface extends \Serializable
+{
+    /**
+     * Create an UploadId from an array
+     *
+     * @param array $data Data representing the upload identification
+     *
+     * @return self
+     */
+    public static function fromParams($data);
+
+    /**
+     * Returns the array form of the upload identification for use as command params
+     *
+     * @return array
+     */
+    public function toParams();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/UploadPartInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/UploadPartInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d446d4f08cfbd1aa1e88120f238cb1d4868b57e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Model/MultipartUpload/UploadPartInterface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Model\MultipartUpload;
+
+/**
+ * An object that encapsulates the data for an upload part
+ */
+interface UploadPartInterface extends \Serializable
+{
+    /**
+     * Create an upload part from an array
+     *
+     * @param array|\Traversable $data Data representing the upload part
+     *
+     * @return self
+     */
+    public static function fromArray($data);
+
+    /**
+     * Returns the part number of the upload part which is used as an identifier
+     *
+     * @return int
+     */
+    public function getPartNumber();
+
+    /**
+     * Returns the array form of the upload part
+     *
+     * @return array
+     */
+    public function toArray();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Resources/aws-config.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Resources/aws-config.php
new file mode 100644
index 0000000000000000000000000000000000000000..7aa60c354514832d6737310c0fff8e12968c4e74
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Resources/aws-config.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+return array(
+    'class' => 'Aws\Common\Aws',
+    'services' => array(
+
+        'default_settings' => array(
+            'params' => array()
+        ),
+
+        'autoscaling' => array(
+            'alias'   => 'AutoScaling',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\AutoScaling\AutoScalingClient'
+        ),
+
+        'cloudformation' => array(
+            'alias'   => 'CloudFormation',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\CloudFormation\CloudFormationClient'
+        ),
+
+        'cloudfront' => array(
+            'alias'   => 'CloudFront',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\CloudFront\CloudFrontClient'
+        ),
+
+        'cloudfront_20120505' => array(
+            'extends' => 'cloudfront',
+            'params' => array(
+                'version' => '2012-05-05'
+            )
+        ),
+
+        'cloudsearch' => array(
+            'alias'   => 'CloudSearch',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\CloudSearch\CloudSearchClient'
+        ),
+
+        'cloudwatch' => array(
+            'alias'   => 'CloudWatch',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\CloudWatch\CloudWatchClient'
+        ),
+
+        'datapipeline' => array(
+            'alias'   => 'DataPipeline',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\DataPipeline\DataPipelineClient'
+        ),
+
+        'directconnect' => array(
+            'alias'   => 'DirectConnect',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\DirectConnect\DirectConnectClient'
+        ),
+
+        'dynamodb' => array(
+            'alias'   => 'DynamoDb',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\DynamoDb\DynamoDbClient'
+        ),
+
+        'dynamodb_20111205' => array(
+            'extends' => 'dynamodb',
+            'params' => array(
+                'version' => '2011-12-05'
+            )
+        ),
+
+        'ec2' => array(
+            'alias'   => 'Ec2',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Ec2\Ec2Client'
+        ),
+
+        'elasticache' => array(
+            'alias'   => 'ElastiCache',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\ElastiCache\ElastiCacheClient'
+        ),
+
+        'elasticbeanstalk' => array(
+            'alias'   => 'ElasticBeanstalk',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\ElasticBeanstalk\ElasticBeanstalkClient'
+        ),
+
+        'elasticloadbalancing' => array(
+            'alias'   => 'ElasticLoadBalancing',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\ElasticLoadBalancing\ElasticLoadBalancingClient'
+        ),
+
+        'elastictranscoder' => array(
+            'alias'   => 'ElasticTranscoder',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\ElasticTranscoder\ElasticTranscoderClient'
+        ),
+
+        'emr' => array(
+            'alias'   => 'Emr',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Emr\EmrClient'
+        ),
+
+        'glacier' => array(
+            'alias'   => 'Glacier',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Glacier\GlacierClient'
+        ),
+
+        'iam' => array(
+            'alias'   => 'Iam',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Iam\IamClient'
+        ),
+
+        'importexport' => array(
+            'alias'   => 'ImportExport',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\ImportExport\ImportExportClient'
+        ),
+
+        'opsworks' => array(
+            'alias'   => 'OpsWorks',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\OpsWorks\OpsWorksClient'
+        ),
+
+        'rds' => array(
+            'alias'   => 'Rds',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Rds\RdsClient'
+        ),
+
+        'redshift' => array(
+            'alias'   => 'Redshift',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Redshift\RedshiftClient'
+        ),
+
+        'route53' => array(
+            'alias'   => 'Route53',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Route53\Route53Client'
+        ),
+
+        's3' => array(
+            'alias'   => 'S3',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\S3\S3Client'
+        ),
+
+        'sdb' => array(
+            'alias'   => 'SimpleDb',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\SimpleDb\SimpleDbClient'
+        ),
+
+        'ses' => array(
+            'alias'   => 'Ses',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Ses\SesClient'
+        ),
+
+        'sns' => array(
+            'alias'   => 'Sns',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Sns\SnsClient'
+        ),
+
+        'sqs' => array(
+            'alias'   => 'Sqs',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Sqs\SqsClient'
+        ),
+
+        'storagegateway' => array(
+            'alias'   => 'StorageGateway',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\StorageGateway\StorageGatewayClient'
+        ),
+
+        'sts' => array(
+            'alias'   => 'Sts',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Sts\StsClient'
+        ),
+
+        'support' => array(
+            'alias'   => 'Support',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Support\SupportClient'
+        ),
+
+        'swf' => array(
+            'alias'   => 'Swf',
+            'extends' => 'default_settings',
+            'class'   => 'Aws\Swf\SwfClient'
+        ),
+    )
+);
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Resources/sdk1-config.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Resources/sdk1-config.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5121ab4900fb9c39dd44d0388e1f3a097cbd224
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Resources/sdk1-config.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+return array(
+    'includes' => array('_aws'),
+    'services' => array(
+
+        'sdk1_settings' => array(
+            'extends' => 'default_settings',
+            'params'  => array(
+                'certificate_authority' => false
+            )
+        ),
+
+        'v1.autoscaling' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonAS'
+        ),
+
+        'v1.cloudformation' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonCloudFormation'
+        ),
+
+        'v1.cloudfront' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonCloudFront'
+        ),
+
+        'v1.cloudsearch' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonCloudSearch'
+        ),
+
+        'v1.cloudwatch' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonCloudWatch'
+        ),
+
+        'v1.dynamodb' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonDynamoDB'
+        ),
+
+        'v1.ec2' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonEC2'
+        ),
+
+        'v1.elasticache' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonElastiCache'
+        ),
+
+        'v1.elasticbeanstalk' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonElasticBeanstalk'
+        ),
+
+        'v1.elb' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonELB'
+        ),
+
+        'v1.emr' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonEMR'
+        ),
+
+        'v1.iam' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonIAM'
+        ),
+
+        'v1.importexport'     => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonImportExport'
+        ),
+
+        'v1.rds' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonRDS'
+        ),
+
+        'v1.s3'  => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonS3'
+        ),
+
+        'v1.sdb' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonSDB'
+        ),
+
+        'v1.ses' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonSES'
+        ),
+
+        'v1.sns' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonSNS'
+        ),
+
+        'v1.sqs' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonSQS'
+        ),
+
+        'v1.storagegateway'   => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonStorageGateway'
+        ),
+
+        'v1.sts' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonSTS'
+        ),
+
+        'v1.swf' => array(
+            'extends' => 'sdk1_settings',
+            'class'   => 'AmazonSWF'
+        )
+    )
+);
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/AbstractSignature.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/AbstractSignature.php
new file mode 100644
index 0000000000000000000000000000000000000000..00d66f819abe6a2742696f701b73bbc5a1431306
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/AbstractSignature.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Abstract signature class that can be used when implementing new concrete
+ * AWS signature protocol strategies
+ */
+abstract class AbstractSignature implements SignatureInterface
+{
+    /**
+     * @var int Timestamp
+     */
+    private $timestamp;
+
+    /**
+     * Get the canonicalized query string for a request
+     *
+     * @param  RequestInterface $request
+     * @return string
+     */
+    protected function getCanonicalizedQueryString(RequestInterface $request)
+    {
+        $queryParams = $request->getQuery()->getAll();
+        unset($queryParams['X-Amz-Signature']);
+        if (empty($queryParams)) {
+            return '';
+        }
+
+        $qs = '';
+        ksort($queryParams);
+        foreach ($queryParams as $key => $values) {
+            if (is_array($values)) {
+                sort($values);
+            } elseif (!$values) {
+                $values = array('');
+            }
+
+            foreach ((array) $values as $value) {
+                $qs .= rawurlencode($key) . '=' . rawurlencode($value) . '&';
+            }
+        }
+
+        return substr($qs, 0, -1);
+    }
+
+    /**
+     * Provides the timestamp used for the class
+     *
+     * @param bool $refresh Set to TRUE to refresh the cached timestamp
+     *
+     * @return int
+     */
+    protected function getTimestamp($refresh = false)
+    {
+        if (!$this->timestamp || $refresh) {
+            $this->timestamp = time();
+        }
+
+        return $this->timestamp;
+    }
+
+    /**
+     * Get a date for one of the parts of the requests
+     *
+     * @param string $format Date format
+     *
+     * @return string
+     */
+    protected function getDateTime($format)
+    {
+        return gmdate($format, $this->getTimestamp());
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/EndpointSignatureInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/EndpointSignatureInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..a71cb73ceb481596b721eb2c35114f69d21d7253
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/EndpointSignatureInterface.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+/**
+ * Interface for signatures that use specific region and service names when
+ * signing requests.
+ */
+interface EndpointSignatureInterface extends SignatureInterface
+{
+    /**
+     * Set the service name instead of inferring it from a request URL
+     *
+     * @param string $service Name of the service used when signing
+     *
+     * @return self
+     */
+    public function setServiceName($service);
+
+    /**
+     * Set the region name instead of inferring it from a request URL
+     *
+     * @param string $region Name of the region used when signing
+     *
+     * @return self
+     */
+    public function setRegionName($region);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..35117ed41b10403005bb6157fba684bc972ff0c4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Interface used to provide interchangeable strategies for signing requests
+ * using the various AWS signature protocols.
+ */
+interface SignatureInterface
+{
+    /**
+     * Signs the specified request with an AWS signing protocol by using the
+     * provided AWS account credentials and adding the required headers to the
+     * request.
+     *
+     * @param RequestInterface     $request     Request to add a signature to
+     * @param CredentialsInterface $credentials Signing credentials
+     */
+    public function signRequest(RequestInterface $request, CredentialsInterface $credentials);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureListener.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..d24d2520000aed5684684d36e0badd62fe617ee0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureListener.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Guzzle\Common\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Listener used to sign requests before they are sent over the wire
+ */
+class SignatureListener implements EventSubscriberInterface
+{
+    /**
+     * @var CredentialsInterface
+     */
+    protected $credentials;
+
+    /**
+     * @var SignatureInterface
+     */
+    protected $signature;
+
+    /**
+     * Construct a new request signing plugin
+     *
+     * @param CredentialsInterface $credentials Credentials used to sign requests
+     * @param SignatureInterface   $signature   Signature implementation
+     */
+    public function __construct(CredentialsInterface $credentials, SignatureInterface $signature)
+    {
+        $this->credentials = $credentials;
+        $this->signature = $signature;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'request.before_send'        => array('onRequestBeforeSend', -255),
+            'client.credentials_changed' => array('onCredentialsChanged')
+        );
+    }
+
+    /**
+     * Updates the listener with new credentials if the client is updated
+     *
+     * @param Event $event Event emitted
+     */
+    public function onCredentialsChanged(Event $event)
+    {
+        $this->credentials = $event['credentials'];
+    }
+
+    /**
+     * Signs requests before they are sent
+     *
+     * @param Event $event Event emitted
+     */
+    public function onRequestBeforeSend(Event $event)
+    {
+        $this->signature->signRequest($event['request'], $this->credentials);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV2.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV2.php
new file mode 100644
index 0000000000000000000000000000000000000000..8b2f3a47fb8c6991d2af83a05be0cefc3a593885
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV2.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Implementation of Signature Version 2
+ * @link http://aws.amazon.com/articles/1928
+ */
+class SignatureV2 extends AbstractSignature
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function signRequest(RequestInterface $request, CredentialsInterface $credentials)
+    {
+        // refresh the cached timestamp
+        $this->getTimestamp(true);
+
+        // set values we need in CanonicalizedParameterString
+        $this->addParameter($request, 'Timestamp', $this->getDateTime('c'));
+        $this->addParameter($request, 'SignatureVersion', '2');
+        $this->addParameter($request, 'SignatureMethod', 'HmacSHA256');
+        $this->addParameter($request, 'AWSAccessKeyId', $credentials->getAccessKeyId());
+
+        if ($token = $credentials->getSecurityToken()) {
+            $this->addParameter($request, 'SecurityToken', $token);
+        }
+
+        // Get the path and ensure it's absolute
+        $path = '/' . ltrim($request->getUrl(true)->normalizePath()->getPath(), '/');
+
+        // build string to sign
+        $sign = $request->getMethod() . "\n"
+            . $request->getHost() . "\n"
+            . $path . "\n"
+            . $this->getCanonicalizedParameterString($request);
+
+        // Add the string to sign to the request for debugging purposes
+        $request->getParams()->set('aws.string_to_sign', $sign);
+
+        $signature = base64_encode(
+            hash_hmac(
+                'sha256',
+                $sign,
+                $credentials->getSecretKey(),
+                true
+            )
+        );
+
+        $this->addParameter($request, 'Signature', $signature);
+    }
+
+    /**
+     * Add a parameter key and value to the request according to type
+     *
+     * @param RequestInterface $request The request
+     * @param string           $key     The name of the parameter
+     * @param string           $value   The value of the parameter
+     */
+    public function addParameter(RequestInterface $request, $key, $value)
+    {
+        if ($request->getMethod() == 'POST') {
+            $request->setPostField($key, $value);
+        } else {
+            $request->getQuery()->set($key, $value);
+        }
+    }
+
+    /**
+     * Get the canonicalized query/parameter string for a request
+     *
+     * @param RequestInterface $request Request used to build canonicalized string
+     *
+     * @return string
+     */
+    public function getCanonicalizedParameterString(RequestInterface $request)
+    {
+        if ($request->getMethod() == 'POST') {
+            $params = $request->getPostFields()->toArray();
+        } else {
+            $params = $request->getQuery()->toArray();
+        }
+
+        // Don't resign a previous signature value
+        unset($params['Signature']);
+        uksort($params, 'strcmp');
+
+        $str = '';
+        foreach ($params as $key => $val) {
+            $str .= rawurlencode($key) . '=' . rawurlencode($val) . '&';
+        }
+
+        return substr($str, 0, -1);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV3.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV3.php
new file mode 100644
index 0000000000000000000000000000000000000000..bde4534817cf0ca16fff4656eff37d129f1f7732
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV3.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Aws\Common\Enum\DateFormat;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+
+/**
+ * Implementation of Signature Version 3
+ * @link http://docs.amazonwebservices.com/amazonswf/latest/developerguide/HMACAuth-swf.html
+ */
+class SignatureV3 extends AbstractSignature
+{
+    /**
+     * Get an array of headers to be signed
+     *
+     * @param RequestInterface $request Request to get headers from
+     *
+     * @return array
+     */
+    protected function getHeadersToSign(RequestInterface $request)
+    {
+        $headers = array();
+        foreach ($request->getHeaders()->toArray() as $k => $v) {
+            $k = strtolower($k);
+            if ($k == 'host' || strpos($k, 'x-amz-') !== false) {
+                $headers[$k] = implode(',', $v);
+            }
+        }
+
+        // Sort the headers alphabetically and add them to the string to sign
+        ksort($headers);
+
+        return $headers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function signRequest(RequestInterface $request, CredentialsInterface $credentials)
+    {
+        // Refresh the cached timestamp
+        $this->getTimestamp(true);
+
+        // Add default headers
+        $request->setHeader('x-amz-date', $this->getDateTime(DateFormat::RFC1123));
+
+        // Add the security token if one is present
+        if ($credentials->getSecurityToken()) {
+            $request->setHeader('x-amz-security-token', $credentials->getSecurityToken());
+        }
+
+        // Grab the path and ensure that it is absolute
+        $path = '/' . ltrim($request->getUrl(true)->normalizePath()->getPath(), '/');
+
+        // Begin building the string to sign
+        $sign = $request->getMethod() . "\n"
+            . "{$path}\n"
+            . $this->getCanonicalizedQueryString($request) . "\n";
+
+        // Get all of the headers that must be signed (host and x-amz-*)
+        $headers = $this->getHeadersToSign($request);
+        foreach ($headers as $key => $value) {
+            $sign .= $key . ':' . $value . "\n";
+        }
+
+        $sign .= "\n";
+
+        // Add the body of the request if a body is present
+        if ($request instanceof EntityEnclosingRequestInterface) {
+            $sign .= (string) $request->getBody();
+        }
+
+        // Add the string to sign to the request for debugging purposes
+        $request->getParams()->set('aws.string_to_sign', $sign);
+
+        $signature = base64_encode(hash_hmac('sha256',
+            hash('sha256', $sign, true), $credentials->getSecretKey(), true));
+
+        // Add the authorization header to the request
+        $request->setHeader('x-amzn-authorization', sprintf('AWS3 AWSAccessKeyId=%s,Algorithm=HmacSHA256,SignedHeaders=%s,Signature=%s',
+            $credentials->getAccessKeyId(),
+            implode(';', array_keys($headers)),
+            $signature));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV3Https.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV3Https.php
new file mode 100644
index 0000000000000000000000000000000000000000..dfe88ffb1cdc4e5fb6bf9433cc681f483005d490
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV3Https.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Aws\Common\Enum\DateFormat;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Implementation of Signature Version 3 HTTPS
+ * @link http://docs.amazonwebservices.com/Route53/latest/DeveloperGuide/RESTAuthentication.html
+ */
+class SignatureV3Https extends AbstractSignature
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function signRequest(RequestInterface $request, CredentialsInterface $credentials)
+    {
+        // Add a date header if one is not set
+        if (!$request->hasHeader('date') && !$request->hasHeader('x-amz-date')) {
+            $request->setHeader('Date', $this->getDateTime(DateFormat::RFC1123));
+        }
+
+        // Add the security token if one is present
+        if ($credentials->getSecurityToken()) {
+            $request->setHeader('x-amz-security-token', $credentials->getSecurityToken());
+        }
+
+        // Determine the string to sign
+        $stringToSign = $request->getHeader('Date', true) ?: $request->getHeader('x-amz-date', true);
+        $request->getParams()->set('aws.string_to_sign', $stringToSign);
+
+        // Calculate the signature
+        $signature = base64_encode(hash_hmac('sha256', $stringToSign, $credentials->getSecretKey(), true));
+
+        // Add the authorization header to the request
+        $headerFormat = 'AWS3-HTTPS AWSAccessKeyId=%s,Algorithm=HmacSHA256,Signature=%s';
+        $request->setHeader('X-Amzn-Authorization', sprintf($headerFormat, $credentials->getAccessKeyId(), $signature));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV4.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV4.php
new file mode 100644
index 0000000000000000000000000000000000000000..06d4d45dfbfc8ccf9142918c2dc5b0623f676b93
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Signature/SignatureV4.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Signature;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Aws\Common\Enum\DateFormat;
+use Aws\Common\HostNameUtils;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Url;
+
+/**
+ * Signature Version 4
+ * @link http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html
+ */
+class SignatureV4 extends AbstractSignature implements EndpointSignatureInterface
+{
+    /**
+     * @var string Cache of the default empty entity-body payload
+     */
+    const DEFAULT_PAYLOAD = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
+
+    /**
+     * @var string Explicitly set service name
+     */
+    protected $serviceName;
+
+    /**
+     * @var string Explicitly set region name
+     */
+    protected $regionName;
+
+    /**
+     * @var int Maximum number of hashes to cache
+     */
+    protected $maxCacheSize = 50;
+
+    /**
+     * @var array Cache of previously signed values
+     */
+    protected $hashCache = array();
+
+    /**
+     * @var int Size of the hash cache
+     */
+    protected $cacheSize = 0;
+
+    /**
+     * Set the service name instead of inferring it from a request URL
+     *
+     * @param string $service Name of the service used when signing
+     *
+     * @return self
+     */
+    public function setServiceName($service)
+    {
+        $this->serviceName = $service;
+
+        return $this;
+    }
+
+    /**
+     * Set the region name instead of inferring it from a request URL
+     *
+     * @param string $region Name of the region used when signing
+     *
+     * @return self
+     */
+    public function setRegionName($region)
+    {
+        $this->regionName = $region;
+
+        return $this;
+    }
+
+    /**
+     * Set the maximum number of computed hashes to cache
+     *
+     * @param int $maxCacheSize Maximum number of hashes to cache
+     *
+     * @return self
+     */
+    public function setMaxCacheSize($maxCacheSize)
+    {
+        $this->maxCacheSize = $maxCacheSize;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function signRequest(RequestInterface $request, CredentialsInterface $credentials)
+    {
+        // Refresh the cached timestamp
+        $this->getTimestamp(true);
+
+        $longDate = $this->getDateTime(DateFormat::ISO8601);
+        $shortDate = $this->getDateTime(DateFormat::SHORT);
+
+        // Remove any previously set Authorization headers so that
+        // exponential backoff works correctly
+        $request->removeHeader('Authorization');
+
+        // Requires a x-amz-date header or Date
+        if ($request->hasHeader('x-amz-date') || !$request->hasHeader('Date')) {
+            $request->setHeader('x-amz-date', $longDate);
+        } else {
+            $request->setHeader('Date', $this->getDateTime(DateFormat::RFC1123));
+        }
+
+        // Add the security token if one is present
+        if ($credentials->getSecurityToken()) {
+            $request->setHeader('x-amz-security-token', $credentials->getSecurityToken());
+        }
+
+        // Parse the service and region or use one that is explicitly set
+        $url = null;
+        if (!$this->regionName || !$this->serviceName) {
+            $url = Url::factory($request->getUrl());
+        }
+        if (!$region = $this->regionName) {
+            $region = HostNameUtils::parseRegionName($url);
+        }
+        if (!$service = $this->serviceName) {
+            $service = HostNameUtils::parseServiceName($url);
+        }
+
+        $credentialScope = "{$shortDate}/{$region}/{$service}/aws4_request";
+
+        $signingContext = $this->createCanonicalRequest($request);
+        $signingContext['string_to_sign'] = "AWS4-HMAC-SHA256\n{$longDate}\n{$credentialScope}\n"
+            . hash('sha256', $signingContext['canonical_request']);
+
+        // Calculate the signing key using a series of derived keys
+        $signingKey = $this->getSigningKey($shortDate, $region, $service, $credentials->getSecretKey());
+        $signature = hash_hmac('sha256', $signingContext['string_to_sign'], $signingKey);
+
+        $request->setHeader('Authorization', "AWS4-HMAC-SHA256 "
+            . "Credential={$credentials->getAccessKeyId()}/{$credentialScope}, "
+            . "SignedHeaders={$signingContext['signed_headers']}, Signature={$signature}");
+
+        // Add debug information to the request
+        $request->getParams()->set('aws.signature', $signingContext);
+    }
+
+    /**
+     * Create the canonical representation of a request
+     *
+     * @param RequestInterface $request Request to canonicalize
+     *
+     * @return array Returns an array of context information
+     */
+    private function createCanonicalRequest(RequestInterface $request)
+    {
+        // Normalize the path as required by SigV4 and ensure it's absolute
+        $method = $request->getMethod();
+        $canon = $method . "\n"
+            . '/' . ltrim($request->getUrl(true)->normalizePath()->getPath(), '/') . "\n"
+            . $this->getCanonicalizedQueryString($request) . "\n";
+
+        // Create the canonical headers
+        $headers = array();
+        foreach ($request->getHeaders()->getAll() as $key => $values) {
+            if ($key != 'User-Agent') {
+                $key = strtolower($key);
+                if (!isset($headers[$key])) {
+                    $headers[$key] = array();
+                }
+                foreach ($values as $value) {
+                    $headers[$key][] = preg_replace('/\s+/', ' ', trim($value));
+                }
+            }
+        }
+
+        // The headers must be sorted
+        ksort($headers);
+
+        // Continue to build the canonical request by adding headers
+        foreach ($headers as $key => $values) {
+            // Combine multi-value headers into a sorted comma separated list
+            if (count($values) > 1) {
+                sort($values);
+            }
+            $canon .= $key . ':' . implode(',', $values) . "\n";
+        }
+
+        // Create the signed headers
+        $signedHeaders = implode(';', array_keys($headers));
+        $canon .= "\n{$signedHeaders}\n";
+
+        // Create the payload if this request has an entity body
+        if ($request->hasHeader('x-amz-content-sha256')) {
+            // Handle streaming operations (e.g. Glacier.UploadArchive)
+            $canon .= $request->getHeader('x-amz-content-sha256');
+        } elseif ($request instanceof EntityEnclosingRequestInterface) {
+            $canon .= hash(
+                'sha256',
+                $method == 'POST' && count($request->getPostFields())
+                    ? (string) $request->getPostFields() : (string) $request->getBody()
+            );
+        } else {
+            $canon .= self::DEFAULT_PAYLOAD;
+        }
+
+        return array(
+            'canonical_request' => $canon,
+            'signed_headers'    => $signedHeaders
+        );
+    }
+
+    /**
+     * Get a hash for a specific key and value.  If the hash was previously
+     * cached, return it
+     *
+     * @param string $shortDate Short date
+     * @param string $region    Region name
+     * @param string $service   Service name
+     * @param string $secretKey Secret Access Key
+     *
+     * @return string
+     */
+    private function getSigningKey($shortDate, $region, $service, $secretKey)
+    {
+        $cacheKey = $shortDate . '_' . $region . '_' . $service . '_' . $secretKey;
+
+        // Retrieve the hash form the cache or create it and add it to the cache
+        if (!isset($this->hashCache[$cacheKey])) {
+            // When the cache size reaches the max, then just clear the cache
+            if (++$this->cacheSize > $this->maxCacheSize) {
+                $this->hashCache = array();
+                $this->cacheSize = 0;
+            }
+            $dateKey = hash_hmac('sha256', $shortDate, 'AWS4' . $secretKey, true);
+            $regionKey = hash_hmac('sha256', $region, $dateKey, true);
+            $serviceKey = hash_hmac('sha256', $service, $regionKey, true);
+            $this->hashCache[$cacheKey] = hash_hmac('sha256', 'aws4_request', $serviceKey, true);
+        }
+
+        return $this->hashCache[$cacheKey];
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/AbstractResourceWaiter.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/AbstractResourceWaiter.php
new file mode 100644
index 0000000000000000000000000000000000000000..533484863851fd06f6b43ab0ca19cdd5a1f58197
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/AbstractResourceWaiter.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Exception\RuntimeException;
+
+/**
+ * Abstract waiter implementation used to wait on resources
+ */
+abstract class AbstractResourceWaiter extends AbstractWaiter implements ResourceWaiterInterface
+{
+    /**
+     * @var AwsClientInterface
+     */
+    protected $client;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setClient(AwsClientInterface $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function wait()
+    {
+        if (!$this->client) {
+            throw new RuntimeException('No client has been specified on the waiter');
+        }
+
+        parent::wait();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/AbstractWaiter.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/AbstractWaiter.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d294cc26af3cc4ac4cc908df18812a0bab15fdb
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/AbstractWaiter.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Exception\RuntimeException;
+use Guzzle\Common\AbstractHasDispatcher;
+
+/**
+ * Abstract wait implementation
+ */
+abstract class AbstractWaiter extends AbstractHasDispatcher implements WaiterInterface
+{
+    protected $attempts = 0;
+    protected $config = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getAllEvents()
+    {
+        return array(
+            // About to check if the waiter needs to wait
+            'waiter.before_attempt',
+            // About to sleep
+            'waiter.before_wait',
+        );
+    }
+
+    /**
+     * The max attempts allowed by the waiter
+     *
+     * @return int
+     */
+    public function getMaxAttempts()
+    {
+        return isset($this->config[self::MAX_ATTEMPTS]) ? $this->config[self::MAX_ATTEMPTS] : 10;
+    }
+
+    /**
+     * Get the amount of time in seconds to delay between attempts
+     *
+     * @return int
+     */
+    public function getInterval()
+    {
+        return isset($this->config[self::INTERVAL]) ? $this->config[self::INTERVAL] : 0;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setMaxAttempts($maxAttempts)
+    {
+        $this->config[self::MAX_ATTEMPTS] = $maxAttempts;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setInterval($interval)
+    {
+        $this->config[self::INTERVAL] = $interval;
+
+        return $this;
+    }
+
+    /**
+     * Set config options associated with the waiter
+     *
+     * @param array $config Options to set
+     *
+     * @return self
+     */
+    public function setConfig(array $config)
+    {
+        $this->config = $config;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function wait()
+    {
+        $this->attempts = 0;
+
+        do {
+            $this->dispatch('waiter.before_attempt', array(
+                'waiter' => $this,
+                'config' => $this->config,
+            ));
+
+            if ($this->doWait()) {
+                break;
+            }
+
+            if (++$this->attempts >= $this->getMaxAttempts()) {
+                throw new RuntimeException('Wait method never resolved to true after ' . $this->attempts . ' attempts');
+            }
+
+            $this->dispatch('waiter.before_wait', array(
+                'waiter' => $this,
+                'config' => $this->config,
+            ));
+
+            if ($this->getInterval()) {
+                usleep($this->getInterval() * 1000000);
+            }
+
+        } while (1);
+    }
+
+    /**
+     * Method to implement in subclasses
+     *
+     * @return bool Return true when successful, false on failure
+     */
+    abstract protected function doWait();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/CallableWaiter.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/CallableWaiter.php
new file mode 100644
index 0000000000000000000000000000000000000000..a205e061751a34b6ddd11c7298634e420fc024f4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/CallableWaiter.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Exception\RuntimeException;
+
+/**
+ * Callable wait implementation
+ */
+class CallableWaiter extends AbstractWaiter
+{
+    /**
+     * @var callable Callable function
+     */
+    protected $callable;
+
+    /**
+     * @var array Additional context for the callable function
+     */
+    protected $context = array();
+
+    /**
+     * Set the callable function to call in each wait attempt
+     *
+     * @param callable $callable Callable function
+     *
+     * @return self
+     * @throws InvalidArgumentException when the method is not callable
+     */
+    public function setCallable($callable)
+    {
+        if (!is_callable($callable)) {
+            throw new InvalidArgumentException('Value is not callable');
+        }
+
+        $this->callable = $callable;
+
+        return $this;
+    }
+
+    /**
+     * Set additional context for the callable function. This data will be passed into the callable function as the
+     * second argument
+     *
+     * @param array $context Additional context
+     *
+     * @return self
+     */
+    public function setContext(array $context)
+    {
+        $this->context = $context;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function doWait()
+    {
+        if (!$this->callable) {
+            throw new RuntimeException('No callable was specified for the wait method');
+        }
+
+        return call_user_func($this->callable, $this->attempts, $this->context);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/CompositeWaiterFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/CompositeWaiterFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..5278e49f29a4e16b3dc13dc05b8602b7f23408d9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/CompositeWaiterFactory.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Exception\InvalidArgumentException;
+
+/**
+ * Factory that utilizes multiple factories for creating waiters
+ */
+class CompositeWaiterFactory implements WaiterFactoryInterface
+{
+    /**
+     * @var array Array of factories
+     */
+    protected $factories;
+
+    /**
+     * @param array $factories Array of factories used to instantiate waiters
+     */
+    public function __construct(array $factories)
+    {
+        $this->factories = $factories;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build($waiter)
+    {
+        if (!($factory = $this->getFactory($waiter))) {
+            throw new InvalidArgumentException("Waiter was not found matching {$waiter}.");
+        }
+
+        return $factory->build($waiter);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBuild($waiter)
+    {
+        return (bool) $this->getFactory($waiter);
+    }
+
+    /**
+     * Add a factory to the composite factory
+     *
+     * @param WaiterFactoryInterface $factory Factory to add
+     *
+     * @return self
+     */
+    public function addFactory(WaiterFactoryInterface $factory)
+    {
+        $this->factories[] = $factory;
+
+        return $this;
+    }
+
+    /**
+     * Get the factory that matches the waiter name
+     *
+     * @param string $waiter Name of the waiter
+     *
+     * @return WaiterFactoryInterface|bool
+     */
+    protected function getFactory($waiter)
+    {
+        foreach ($this->factories as $factory) {
+            if ($factory->canBuild($waiter)) {
+                return $factory;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/ConfigResourceWaiter.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/ConfigResourceWaiter.php
new file mode 100644
index 0000000000000000000000000000000000000000..8ef0577da736571cc808b0d157d20633b1b32458
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/ConfigResourceWaiter.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Exception\RuntimeException;
+use Aws\Common\Exception\ServiceResponseException;
+use Guzzle\Service\Resource\Model;
+use Guzzle\Service\Exception\ValidationException;
+
+/**
+ * Resource waiter driven by configuration options
+ */
+class ConfigResourceWaiter extends AbstractResourceWaiter
+{
+    /**
+     * @var WaiterConfig Waiter configuration
+     */
+    protected $waiterConfig;
+
+    /**
+     * @param WaiterConfig $waiterConfig Waiter configuration
+     */
+    public function __construct(WaiterConfig $waiterConfig)
+    {
+        $this->waiterConfig = $waiterConfig;
+        $this->setInterval($waiterConfig->get(WaiterConfig::INTERVAL));
+        $this->setMaxAttempts($waiterConfig->get(WaiterConfig::MAX_ATTEMPTS));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setConfig(array $config)
+    {
+        foreach ($config as $key => $value) {
+            if (substr($key, 0, 7) == 'waiter.') {
+                $this->waiterConfig->set(substr($key, 7), $value);
+            }
+        }
+
+        if (!isset($config[self::INTERVAL])) {
+            $config[self::INTERVAL] = $this->waiterConfig->get(WaiterConfig::INTERVAL);
+        }
+
+        if (!isset($config[self::MAX_ATTEMPTS])) {
+            $config[self::MAX_ATTEMPTS] = $this->waiterConfig->get(WaiterConfig::MAX_ATTEMPTS);
+        }
+
+        return parent::setConfig($config);
+    }
+
+    /**
+     * Get the waiter's configuration data
+     *
+     * @return WaiterConfig
+     */
+    public function getWaiterConfig()
+    {
+        return $this->waiterConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doWait()
+    {
+        $params = $this->config;
+        // remove waiter settings from the operation's input
+        foreach (array_keys($params) as $key) {
+            if (substr($key, 0, 7) == 'waiter.') {
+                unset($params[$key]);
+            }
+        }
+
+        $operation = $this->client->getCommand($this->waiterConfig->get(WaiterConfig::OPERATION), $params);
+
+        try {
+            return $this->checkResult($this->client->execute($operation));
+        } catch (ValidationException $e) {
+            throw new InvalidArgumentException(
+                $this->waiterConfig->get(WaiterConfig::WAITER_NAME) . ' waiter validation failed:  ' . $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
+        } catch (ServiceResponseException $e) {
+
+            // Check if this exception satisfies a success or failure acceptor
+            $transition = $this->checkErrorAcceptor($e);
+            if (null !== $transition) {
+                return $transition;
+            }
+
+            // Check if this exception should be ignored
+            foreach ((array) $this->waiterConfig->get(WaiterConfig::IGNORE_ERRORS) as $ignore) {
+                if ($e->getExceptionCode() == $ignore) {
+                    // This exception is ignored, so it counts as a failed attempt rather than a fast-fail
+                    return false;
+                }
+            }
+
+            // Allow non-ignore exceptions to bubble through
+            throw $e;
+        }
+    }
+
+    /**
+     * Check if an exception satisfies a success or failure acceptor
+     *
+     * @param ServiceResponseException $e
+     *
+     * @return bool|null Returns true for success, false for failure, and null for no transition
+     */
+    protected function checkErrorAcceptor(ServiceResponseException $e)
+    {
+        if ($this->waiterConfig->get(WaiterConfig::SUCCESS_TYPE) == 'error') {
+            if ($e->getExceptionCode() == $this->waiterConfig->get(WaiterConfig::SUCCESS_VALUE)) {
+                // Mark as a success
+                return true;
+            }
+        }
+
+        // Mark as an attempt
+        return null;
+    }
+
+    /**
+     * Check to see if the response model satisfies a success or failure state
+     *
+     * @param Model $result Result model
+     *
+     * @return bool
+     * @throws RuntimeException
+     */
+    protected function checkResult(Model $result)
+    {
+        // Check if the result evaluates to true based on the path and output model
+        if ($this->waiterConfig->get(WaiterConfig::SUCCESS_TYPE) == 'output' &&
+            $this->checkPath(
+                $result,
+                $this->waiterConfig->get(WaiterConfig::SUCCESS_PATH),
+                $this->waiterConfig->get(WaiterConfig::SUCCESS_VALUE)
+            )
+        ) {
+            return true;
+        }
+
+        // It did not finish waiting yet. Determine if we need to fail-fast based on the failure acceptor.
+        if ($this->waiterConfig->get(WaiterConfig::FAILURE_TYPE) == 'output') {
+            $failureValue = $this->waiterConfig->get(WaiterConfig::FAILURE_VALUE);
+            if ($failureValue) {
+                $key = $this->waiterConfig->get(WaiterConfig::FAILURE_PATH);
+                if ($this->checkPath($result, $key, $failureValue, false)) {
+                    // Determine which of the results triggered the failure
+                    $triggered = array_intersect(
+                        (array) $this->waiterConfig->get(WaiterConfig::FAILURE_VALUE),
+                        array_unique((array) $result->getPath($key))
+                    );
+                    // fast fail because the failure case was satisfied
+                    throw new RuntimeException(
+                        'A resource entered into an invalid state of "'
+                        . implode(', ', $triggered) . '" while waiting with the "'
+                        . $this->waiterConfig->get(WaiterConfig::WAITER_NAME) . '" waiter.'
+                    );
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check to see if the path of the output key is satisfied by the value
+     *
+     * @param Model  $model      Result model
+     * @param string $key        Key to check
+     * @param string $checkValue Compare the key to the value
+     * @param bool   $all        Set to true to ensure all value match or false to only match one
+     *
+     * @return bool
+     */
+    protected function checkPath(Model $model, $key = null, $checkValue = array(), $all = true)
+    {
+        // If no key is set, then just assume true because the request succeeded
+        if (!$key) {
+            return true;
+        }
+
+        if (!($result = $model->getPath($key))) {
+            return false;
+        }
+
+        $total = $matches = 0;
+        foreach ((array) $result as $value) {
+            $total++;
+            foreach ((array) $checkValue as $check) {
+                if ($value == $check) {
+                    $matches++;
+                    break;
+                }
+            }
+        }
+
+        // When matching all values, ensure that the match count matches the total count
+        if ($all && $total != $matches) {
+            return false;
+        }
+
+        return $matches > 0;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/ResourceWaiterInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/ResourceWaiterInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..07cf41d65fe45809517ab08f8d2300cbf5777b22
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/ResourceWaiterInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Client\AwsClientInterface;
+
+/**
+ * Interface used in conjunction with clients to wait on a resource
+ */
+interface ResourceWaiterInterface extends WaiterInterface
+{
+    /**
+     * Set the client associated with the waiter
+     *
+     * @param AwsClientInterface $client Client to use with the waiter
+     *
+     * @return self
+     */
+    public function setClient(AwsClientInterface $client);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterClassFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterClassFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..43686abd49816eeb0b2b561b414e244d654c1889
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterClassFactory.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Guzzle\Inflection\Inflector;
+use Guzzle\Inflection\InflectorInterface;
+
+/**
+ * Factory for creating {@see WaiterInterface} objects using a convention of
+ * storing waiter classes in the Waiter folder of a client class namespace using
+ * a snake_case to CamelCase conversion (e.g. camel_case => CamelCase).
+ */
+class WaiterClassFactory implements WaiterFactoryInterface
+{
+    /**
+     * @var array List of namespaces used to look for classes
+     */
+    protected $namespaces;
+
+    /**
+     * @var InflectorInterface Inflector used to inflect class names
+     */
+    protected $inflector;
+
+    /**
+     * @param array|string       $namespaces Namespaces of waiter objects
+     * @param InflectorInterface $inflector  Inflector used to resolve class names
+     */
+    public function __construct($namespaces = array(), InflectorInterface $inflector = null)
+    {
+        $this->namespaces = (array) $namespaces;
+        $this->inflector = $inflector ?: Inflector::getDefault();
+    }
+
+    /**
+     * Registers a namespace to check for Waiters
+     *
+     * @param string $namespace Namespace which contains Waiter classes
+     *
+     * @return self
+     */
+    public function registerNamespace($namespace)
+    {
+        array_unshift($this->namespaces, $namespace);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build($waiter)
+    {
+        if (!($className = $this->getClassName($waiter))) {
+            throw new InvalidArgumentException("Waiter was not found matching {$waiter}.");
+        }
+
+        return new $className();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBuild($waiter)
+    {
+        return $this->getClassName($waiter) !== null;
+    }
+
+    /**
+     * Get the name of a waiter class
+     *
+     * @param string $waiter Waiter name
+     *
+     * @return string|null
+     */
+    protected function getClassName($waiter)
+    {
+        $waiterName = $this->inflector->camel($waiter);
+
+        // Determine the name of the class to load
+        $className = null;
+        foreach ($this->namespaces as $namespace) {
+            $potentialClassName = $namespace . '\\' . $waiterName;
+            if (class_exists($potentialClassName)) {
+                return $potentialClassName;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterConfig.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterConfig.php
new file mode 100644
index 0000000000000000000000000000000000000000..7c10f5a9d784cc7b99fa547d9695045141a7f9b8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterConfig.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Guzzle\Common\Collection;
+
+/**
+ * Configuration info of a waiter object
+ */
+class WaiterConfig extends Collection
+{
+    const WAITER_NAME = 'name';
+    const MAX_ATTEMPTS = 'max_attempts';
+    const INTERVAL = 'interval';
+    const OPERATION = 'operation';
+    const IGNORE_ERRORS = 'ignore_errors';
+    const DESCRIPTION = 'description';
+    const SUCCESS_TYPE = 'success.type';
+    const SUCCESS_PATH = 'success.path';
+    const SUCCESS_VALUE = 'success.value';
+    const FAILURE_TYPE = 'failure.type';
+    const FAILURE_PATH = 'failure.path';
+    const FAILURE_VALUE = 'failure.value';
+
+    /**
+     * @param array $data Array of configuration directives
+     */
+    public function __construct(array $data = array())
+    {
+        $this->data = $data;
+        $this->extractConfig();
+    }
+
+    /**
+     * Create the command configuration variables
+     */
+    protected function extractConfig()
+    {
+        // Populate success.* and failure.* if specified in acceptor.*
+        foreach ($this->data as $key => $value) {
+            if (substr($key, 0, 9) == 'acceptor.') {
+                $name = substr($key, 9);
+                if (!isset($this->data["success.{$name}"])) {
+                    $this->data["success.{$name}"] = $value;
+                }
+                if (!isset($this->data["failure.{$name}"])) {
+                    $this->data["failure.{$name}"] = $value;
+                }
+                unset($this->data[$key]);
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterConfigFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterConfigFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..cb921495f99e5bf5960d8907c65057750d4b2b45
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterConfigFactory.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Guzzle\Inflection\Inflector;
+use Guzzle\Inflection\InflectorInterface;
+
+/**
+ * Factory for creating {@see WaiterInterface} objects using a configuration DSL.
+ */
+class WaiterConfigFactory implements WaiterFactoryInterface
+{
+    /**
+     * @var array Configuration directives
+     */
+    protected $config;
+
+    /**
+     * @var InflectorInterface Inflector used to inflect class names
+     */
+    protected $inflector;
+
+    /**
+     * @param array              $config    Array of configuration directives
+     * @param InflectorInterface $inflector Inflector used to resolve class names
+     */
+    public function __construct(
+        array $config,
+        InflectorInterface $inflector = null
+    ) {
+        $this->config = $config;
+        $this->inflector = $inflector ?: Inflector::getDefault();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build($waiter)
+    {
+        return new ConfigResourceWaiter($this->getWaiterConfig($waiter));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBuild($waiter)
+    {
+        return isset($this->config[$waiter]) || isset($this->config[$this->inflector->camel($waiter)]);
+    }
+
+    /**
+     * Get waiter configuration data, taking __default__ and extensions into account
+     *
+     * @param string $name Waiter name
+     *
+     * @return WaiterConfig
+     * @throws InvalidArgumentException
+     */
+    protected function getWaiterConfig($name)
+    {
+        if (!$this->canBuild($name)) {
+            throw new InvalidArgumentException('No waiter found matching "' . $name . '"');
+        }
+
+        // inflect the name if needed
+        $name = isset($this->config[$name]) ? $name : $this->inflector->camel($name);
+        $waiter = new WaiterConfig($this->config[$name]);
+        $waiter['name'] = $name;
+
+        // Always use __default__ as the basis if it's set
+        if (isset($this->config['__default__'])) {
+            $parentWaiter = new WaiterConfig($this->config['__default__']);
+            $waiter = $parentWaiter->overwriteWith($waiter);
+        }
+
+        // Allow for configuration extensions
+        if (isset($this->config[$name]['extends'])) {
+            $waiter = $this->getWaiterConfig($this->config[$name]['extends'])->overwriteWith($waiter);
+        }
+
+        return $waiter;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterFactoryInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterFactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..b9bf0f45b0b41be6a68cc847c7d08b9182e8ce4e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterFactoryInterface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+/**
+ * Waiter factory used to create waiter objects by short names
+ */
+interface WaiterFactoryInterface
+{
+    /**
+     * Create a waiter by name
+     *
+     * @param string $waiter Name of the waiter to create
+     *
+     * @return WaiterInterface
+     */
+    public function build($waiter);
+
+    /**
+     * Check if the factory can create a waiter by a specific name
+     *
+     * @param string $waiter Name of the waiter to check
+     *
+     * @return bool
+     */
+    public function canBuild($waiter);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5966db8063a12093960657326ec48d843b746de
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/Common/Waiter/WaiterInterface.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\Common\Waiter;
+
+/**
+ * WaiterInterface used to wait on something to be in a particular state
+ */
+interface WaiterInterface
+{
+    const INTERVAL = 'waiter.interval';
+    const MAX_ATTEMPTS = 'waiter.max_attempts';
+
+    /**
+     * Set the maximum number of attempts to make when waiting
+     *
+     * @param int $maxAttempts Max number of attempts
+     *
+     * @return self
+     */
+    public function setMaxAttempts($maxAttempts);
+
+    /**
+     * Set the amount of time to interval between attempts
+     *
+     * @param int $interval Interval in seconds
+     *
+     * @return self
+     */
+    public function setInterval($interval);
+
+    /**
+     * Set configuration options associated with the waiter
+     *
+     * @param array $config Configuration options to set
+     *
+     * @return self
+     */
+    public function setConfig(array $config);
+
+    /**
+     * Begin the waiting loop
+     *
+     * @throw RuntimeException if the method never resolves to true
+     */
+    public function wait();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/LICENSE.md b/apps/files_external/3rdparty/aws-sdk-php/Aws/LICENSE.md
new file mode 100644
index 0000000000000000000000000000000000000000..8d53e9f5e884b76577ff9e6bc22468633f9e8415
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/LICENSE.md
@@ -0,0 +1,141 @@
+# Apache License
+Version 2.0, January 2004
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+## 1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1
+through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the
+License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled
+by, or are under common control with that entity. For the purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract
+or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software
+source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form,
+including but not limited to compiled object code, generated documentation, and conversions to other media
+types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License,
+as indicated by a copyright notice that is included in or attached to the work (an example is provided in the
+Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from)
+the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent,
+as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not
+include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work
+and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any
+modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to
+Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to
+submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to the Licensor or its representatives, including but not
+limited to communication on electronic mailing lists, source code control systems, and issue tracking systems
+that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been
+received by Licensor and subsequently incorporated within the Work.
+
+## 2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
+Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+## 3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent
+license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such
+license applies only to those patent claims licensable by such Contributor that are necessarily infringed by
+their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim
+or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work
+constitutes direct or contributory patent infringement, then any patent licenses granted to You under this
+License for that Work shall terminate as of the date such litigation is filed.
+
+## 4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You meet the following conditions:
+
+   1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+   2. You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+   3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent,
+	  trademark, and attribution notices from the Source form of the Work, excluding those notices that do
+	  not pertain to any part of the Derivative Works; and
+
+   4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that
+	  You distribute must include a readable copy of the attribution notices contained within such NOTICE
+	  file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one
+	  of the following places: within a NOTICE text file distributed as part of the Derivative Works; within
+	  the Source form or documentation, if provided along with the Derivative Works; or, within a display
+	  generated by the Derivative Works, if and wherever such third-party notices normally appear. The
+	  contents of the NOTICE file are for informational purposes only and do not modify the License. You may
+	  add Your own attribution notices within Derivative Works that You distribute, alongside or as an
+	  addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be
+	  construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license
+terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative
+Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the
+conditions stated in this License.
+
+## 5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by
+You to the Licensor shall be under the terms and conditions of this License, without any additional terms or
+conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate
+license agreement you may have executed with Licensor regarding such Contributions.
+
+## 6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of
+the Licensor, except as required for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+## 7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor
+provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+## 8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless
+required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any
+Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential
+damages of any character arising as a result of this License or out of the use or inability to use the Work
+(including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has been advised of the possibility
+of such damages.
+
+## 9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for,
+acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole
+responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold
+each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/NOTICE.md b/apps/files_external/3rdparty/aws-sdk-php/Aws/NOTICE.md
new file mode 100644
index 0000000000000000000000000000000000000000..848585326723e6edba6cfadd40bdf251b9f73351
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/NOTICE.md
@@ -0,0 +1,112 @@
+# AWS SDK for PHP
+
+<http://aws.amazon.com/php>
+
+Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License").
+You may not use this file except in compliance with the License.
+A copy of the License is located at
+
+<http://aws.amazon.com/apache2.0>
+
+or in the "license" file accompanying this file. This file is distributed
+on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+express or implied. See the License for the specific language governing
+permissions and limitations under the License.
+
+# Guzzle
+
+<https://github.com/guzzle/guzzle>
+
+Copyright (c) 2011 Michael Dowling, https://github.com/mtdowling
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+# Symfony
+
+<https://github.com/symfony/symfony>
+
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+# Doctrine Common
+
+<https://github.com/doctrine/common>
+
+Copyright (c) 2006-2012 Doctrine Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+# Monolog
+
+<https://github.com/Seldaek/monolog>
+
+Copyright (c) Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/AcpListener.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/AcpListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d28407e129567280a292c93af78a1ab4b35ae0f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/AcpListener.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\S3\Model\Acp;
+use Guzzle\Common\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Listener used to add an Access Control Policy to a request
+ */
+class AcpListener implements EventSubscriberInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array('command.before_prepare' => array('onCommandBeforePrepare', -255));
+    }
+
+    /**
+     * An event handler for constructing ACP definitions.
+     *
+     * @param Event $event The event to respond to.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function onCommandBeforePrepare(Event $event)
+    {
+        /** @var $command \Guzzle\Service\Command\AbstractCommand */
+        $command = $event['command'];
+        $operation = $command->getOperation();
+        if ($operation->hasParam('ACP') && $command->hasKey('ACP')) {
+            if ($acp = $command->get('ACP')) {
+                // Ensure that the correct object was passed
+                if (!($acp instanceof Acp)) {
+                    throw new InvalidArgumentException('ACP must be an instance of Aws\S3\Model\Acp');
+                }
+
+                // Check if the user specified both an ACP and Grants
+                if ($command->hasKey('Grants')) {
+                    throw new InvalidArgumentException(
+                        'Use either the ACP parameter or the Grants parameter. Do not use both.'
+                    );
+                }
+
+                // Add the correct headers/body based parameters to the command
+                if ($operation->hasParam('Grants')) {
+                    $command->overwriteWith($acp->toArray());
+                } else {
+                    $acp->updateCommand($command);
+                }
+            }
+
+            // Remove the ACP parameter
+            $command->remove('ACP');
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/BucketStyleListener.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/BucketStyleListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..6bb5bb42cd90008083ec3932c8eee4af22788c8b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/BucketStyleListener.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Guzzle\Common\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Listener used to change the way in which buckets are referenced (path/virtual style) based on context
+ */
+class BucketStyleListener implements EventSubscriberInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array('command.after_prepare' => array('onCommandAfterPrepare', -255));
+    }
+
+    /**
+     * Changes how buckets are referenced in the HTTP request
+     *
+     * @param Event $event Event emitted
+     */
+    public function onCommandAfterPrepare(Event $event)
+    {
+        $command = $event['command'];
+        $bucket = $command['Bucket'];
+        $request = $command->getRequest();
+        $pathStyle = false;
+
+        if ($key = $command['Key']) {
+            // Modify the command Key to account for the {/Key*} explosion into an array
+            if (is_array($key)) {
+                $command['Key'] = $key = implode('/', $key);
+            }
+        }
+
+        // Set the key and bucket on the request
+        $request->getParams()->set('bucket', $bucket)->set('key', $key);
+
+        // Switch to virtual if PathStyle is disabled, or not a DNS compatible bucket name, or the scheme is
+        // http, or the scheme is https and there are no dots in the host header (avoids SSL issues)
+        if (!$command['PathStyle'] && $command->getClient()->isValidBucketName($bucket)
+            && !($command->getRequest()->getScheme() == 'https' && strpos($bucket, '.'))
+        ) {
+            // Switch to virtual hosted bucket
+            $request->setHost($bucket . '.' . $request->getHost());
+            $request->setPath(preg_replace("#^/{$bucket}#", '', $request->getPath()));
+        } else {
+            $pathStyle = true;
+        }
+
+        if (!$bucket) {
+            $request->getParams()->set('s3.resource', '/');
+        } elseif ($pathStyle) {
+            // Path style does not need a trailing slash
+            $request->getParams()->set(
+                's3.resource',
+                '/' . rawurlencode($bucket) . ($key ? ('/' . S3Client::encodeKey($key)) : '')
+            );
+        } else {
+            // Bucket style needs a trailing slash
+            $request->getParams()->set(
+                's3.resource',
+                '/' . rawurlencode($bucket) . ($key ? ('/' . S3Client::encodeKey($key)) : '/')
+            );
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Command/S3Command.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Command/S3Command.php
new file mode 100644
index 0000000000000000000000000000000000000000..b48d9b2bc1f1107b5af16ed8755f7c5c0a4e2a40
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Command/S3Command.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Command;
+
+use Aws\S3\Exception\RedirectException;
+use Guzzle\Service\Command\OperationCommand;
+use Guzzle\Service\Resource\Model;
+use Guzzle\Common\Event;
+
+/**
+ * Adds functionality to Amazon S3 commands:
+ * - Adds the PutObject URL to a response
+ * - Allows creating a Pre-signed URL from any command
+ */
+class S3Command extends OperationCommand
+{
+    /**
+     * Create a pre-signed URL for the operation
+     *
+     * @param int|string $expires The Unix timestamp to expire at or a string that can be evaluated by strtotime
+     *
+     * @return string
+     */
+    public function createPresignedUrl($expires)
+    {
+        return $this->client->createPresignedUrl($this->prepare(), $expires);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function process()
+    {
+        $request = $this->getRequest();
+        $response = $this->getResponse();
+
+        // Dispatch an error if a 301 redirect occurred
+        if ($response->getStatusCode() == 301) {
+            $this->getClient()->getEventDispatcher()->dispatch('request.error', new Event(array(
+                'request'  => $this->getRequest(),
+                'response' => $response
+            )));
+        }
+
+        parent::process();
+
+        // Set the GetObject URL if using the PutObject operation
+        if ($this->result instanceof Model && $this->getName() == 'PutObject') {
+            $this->result->set('ObjectURL', $request->getUrl());
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/CannedAcl.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/CannedAcl.php
new file mode 100644
index 0000000000000000000000000000000000000000..da4704527bd741f9e409f4f751805194610eb917
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/CannedAcl.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable CannedAcl values
+ */
+class CannedAcl extends Enum
+{
+    const PRIVATE_ACCESS = 'private';
+    const PUBLIC_READ = 'public-read';
+    const PUBLIC_READ_WRITE = 'public-read-write';
+    const AUTHENTICATED_READ = 'authenticated-read';
+    const BUCKET_OWNER_READ = 'bucket-owner-read';
+    const BUCKET_OWNER_FULL_CONTROL = 'bucket-owner-full-control';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Event.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Event.php
new file mode 100644
index 0000000000000000000000000000000000000000..05abcacb118b6a7af15833b3cb1f1d6bc2564d60
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Event.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable Event values
+ */
+class Event extends Enum
+{
+    const REDUCED_REDUNDANCY_LOST_OBJECT = 's3:ReducedRedundancyLostObject';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/GranteeType.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/GranteeType.php
new file mode 100644
index 0000000000000000000000000000000000000000..5370047426e5fe4c4c2537bf8e1a6731d0899dea
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/GranteeType.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable GranteeType values
+ */
+class GranteeType extends Enum
+{
+    const USER = 'CanonicalUser';
+    const EMAIL = 'AmazonCustomerByEmail';
+    const GROUP = 'Group';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Group.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Group.php
new file mode 100644
index 0000000000000000000000000000000000000000..069716317134753402d48b1d3a53e003d9f9d941
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Group.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable Amazon S3 group options for ACL grantees
+ */
+class Group extends Enum
+{
+    const AUTHENTICATED_USERS = 'http://acs.amazonaws.com/groups/global/AuthenticatedUsers';
+    const ALL_USERS           = 'http://acs.amazonaws.com/groups/global/AllUsers';
+    const LOG_DELIVERY        = 'http://acs.amazonaws.com/groups/s3/LogDelivery';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/MFADelete.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/MFADelete.php
new file mode 100644
index 0000000000000000000000000000000000000000..e92721e735319ad1602d5c854dc91871642f7b7f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/MFADelete.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable MFADelete values
+ */
+class MFADelete extends Enum
+{
+    const ENABLED = 'Enabled';
+    const DISABLED = 'Disabled';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/MetadataDirective.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/MetadataDirective.php
new file mode 100644
index 0000000000000000000000000000000000000000..588ceed6d4febfde5afb3b55c0af767185c87ae3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/MetadataDirective.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable MetadataDirective values
+ */
+class MetadataDirective extends Enum
+{
+    const COPY = 'COPY';
+    const REPLACE = 'REPLACE';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Payer.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Payer.php
new file mode 100644
index 0000000000000000000000000000000000000000..3016aa530f751fd02c88fc27c3e7e371071492dc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Payer.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable Payer values
+ */
+class Payer extends Enum
+{
+    const REQUESTER = 'Requester';
+    const BUCKET_OWNER = 'BucketOwner';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Permission.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Permission.php
new file mode 100644
index 0000000000000000000000000000000000000000..bafd226eaa74612f87af23664c604577efc16dfd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Permission.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable Permission values
+ */
+class Permission extends Enum
+{
+    const FULL_CONTROL = 'FULL_CONTROL';
+    const WRITE = 'WRITE';
+    const WRITE_ACP = 'WRITE_ACP';
+    const READ = 'READ';
+    const READ_ACP = 'READ_ACP';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Protocol.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Protocol.php
new file mode 100644
index 0000000000000000000000000000000000000000..93b57e34a14a73773bed12901acb9e68adc87e55
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Protocol.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable Protocol values
+ */
+class Protocol extends Enum
+{
+    const HTTP = 'http';
+    const HTTPS = 'https';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/ServerSideEncryption.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/ServerSideEncryption.php
new file mode 100644
index 0000000000000000000000000000000000000000..53256a12a9e4b1ee9621882f13950074c43db12c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/ServerSideEncryption.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable ServerSideEncryption values
+ */
+class ServerSideEncryption extends Enum
+{
+    const AES256 = 'AES256';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Status.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Status.php
new file mode 100644
index 0000000000000000000000000000000000000000..8071bbdbd61c5806ada0120e5d07de567bea37ee
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Status.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable Status values
+ */
+class Status extends Enum
+{
+    const ENABLED = 'Enabled';
+    const DISABLED = 'Disabled';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Storage.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Storage.php
new file mode 100644
index 0000000000000000000000000000000000000000..5248a81cff5430b3d1e36383f275f485c44eb082
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/Storage.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable Amazon S3 storage options
+ */
+class Storage extends Enum
+{
+    const STANDARD = 'STANDARD';
+    const REDUCED  = 'REDUCED_REDUNDANCY';
+    const GLACIER = 'GLACIER';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/StorageClass.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/StorageClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b8ab117185dd4ca15bc7a3219bec99b6b76fc5c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Enum/StorageClass.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Enum;
+
+use Aws\Common\Enum;
+
+/**
+ * Contains enumerable StorageClass values
+ */
+class StorageClass extends Enum
+{
+    const STANDARD = 'STANDARD';
+    const REDUCED_REDUNDANCY = 'REDUCED_REDUNDANCY';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AccessDeniedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AccessDeniedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..7de2ef6447ccfe3eeef1a6c2f8921732b1bd7791
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AccessDeniedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Access Denied
+ */
+class AccessDeniedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AccountProblemException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AccountProblemException.php
new file mode 100644
index 0000000000000000000000000000000000000000..5e1c7acd1bc0bf9a96b1c4d1c466ac9e9d97ef42
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AccountProblemException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * There is a problem with your AWS account that prevents the operation from completing successfully. Please use Contact Us.
+ */
+class AccountProblemException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AmbiguousGrantByEmailAddressException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AmbiguousGrantByEmailAddressException.php
new file mode 100644
index 0000000000000000000000000000000000000000..77a57f51dbfc99dffa310cf051ec8aff0e5538f7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/AmbiguousGrantByEmailAddressException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The e-mail address you provided is associated with more than one account.
+ */
+class AmbiguousGrantByEmailAddressException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BadDigestException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BadDigestException.php
new file mode 100644
index 0000000000000000000000000000000000000000..1cc642d3571adae318321c48758f73296da7d61c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BadDigestException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The Content-MD5 you specified did not match what we received.
+ */
+class BadDigestException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketAlreadyExistsException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketAlreadyExistsException.php
new file mode 100644
index 0000000000000000000000000000000000000000..fade68bb1f75c2c3a128cb21a0d11771e9571c0f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketAlreadyExistsException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The requested bucket name is not available. The bucket namespace is shared by all users of the system. Please select a different name and try again.
+ */
+class BucketAlreadyExistsException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketAlreadyOwnedByYouException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketAlreadyOwnedByYouException.php
new file mode 100644
index 0000000000000000000000000000000000000000..12462faab4d8430fdcefb08a064e3876208d9fff
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketAlreadyOwnedByYouException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your previous request to create the named bucket succeeded and you already own it.
+ */
+class BucketAlreadyOwnedByYouException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketNotEmptyException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketNotEmptyException.php
new file mode 100644
index 0000000000000000000000000000000000000000..e06bc30363fe6f3141de0d6314ca238de489205e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/BucketNotEmptyException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The bucket you tried to delete is not empty.
+ */
+class BucketNotEmptyException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/CredentialsNotSupportedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/CredentialsNotSupportedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..2568b4c2b64c9659017eb0f7e0ad33a2dbff819a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/CredentialsNotSupportedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * This request does not support credentials.
+ */
+class CredentialsNotSupportedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/CrossLocationLoggingProhibitedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/CrossLocationLoggingProhibitedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a6780ecf57972ee750f041ddcd593b62333b7cf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/CrossLocationLoggingProhibitedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Cross location logging not allowed. Buckets in one geographic location cannot log information to a bucket in another location.
+ */
+class CrossLocationLoggingProhibitedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/DeleteMultipleObjectsException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/DeleteMultipleObjectsException.php
new file mode 100644
index 0000000000000000000000000000000000000000..44a3aa52849cf98be56e127ceca0e71faf0f6945
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/DeleteMultipleObjectsException.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Exception thrown when errors occur in a DeleteMultipleObjects request
+ */
+class DeleteMultipleObjectsException extends S3Exception
+{
+    /**
+     * @var array Array of errors
+     */
+    protected $errors = array();
+
+    /**
+     * @param array $errors Array of errors
+     */
+    public function __construct(array $errors = array())
+    {
+        parent::__construct('Unable to delete certain keys when executing a DeleteMultipleObjects request');
+        $this->errors = $errors;
+    }
+
+    /**
+     * Get the errored objects
+     *
+     * @return array Returns an array of associative arrays, each containing
+     *               a 'Code', 'Message', and 'Key' key.
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/EntityTooLargeException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/EntityTooLargeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..66e6da949002e26e0052baa2fc51325a6feae099
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/EntityTooLargeException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your proposed upload exceeds the maximum allowed object size.
+ */
+class EntityTooLargeException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/EntityTooSmallException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/EntityTooSmallException.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4128dcc28ab08a42bed6bf7b3062245c8130a72
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/EntityTooSmallException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your proposed upload is smaller than the minimum allowed object size.
+ */
+class EntityTooSmallException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ExpiredTokenException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ExpiredTokenException.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ddeea4c4b6bcd9463059c7c655e9dd713a1c05a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ExpiredTokenException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The provided token has expired.
+ */
+class ExpiredTokenException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IllegalVersioningConfigurationException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IllegalVersioningConfigurationException.php
new file mode 100644
index 0000000000000000000000000000000000000000..58185d7d76b584affb04d9037952414467868fc3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IllegalVersioningConfigurationException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Indicates that the Versioning configuration specified in the request is invalid.
+ */
+class IllegalVersioningConfigurationException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IncompleteBodyException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IncompleteBodyException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b87a0647c90dafe8163086c708c711c3a30c9ce7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IncompleteBodyException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * You did not provide the number of bytes specified by the Content-Length HTTP header
+ */
+class IncompleteBodyException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IncorrectNumberOfFilesInPostRequestException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IncorrectNumberOfFilesInPostRequestException.php
new file mode 100644
index 0000000000000000000000000000000000000000..6650722414ad4cbf4562d859e9e7f3975191d9b0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/IncorrectNumberOfFilesInPostRequestException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * POST requires exactly one file upload per request.
+ */
+class IncorrectNumberOfFilesInPostRequestException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InlineDataTooLargeException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InlineDataTooLargeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec263e1de60e5dceae18b8f939a895439514d405
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InlineDataTooLargeException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Inline data exceeds the maximum allowed size.
+ */
+class InlineDataTooLargeException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InternalErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InternalErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..6640cdb0ab178c573cd2936521071358e0a7caca
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InternalErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * We encountered an internal error. Please try again.
+ */
+class InternalErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidAccessKeyIdException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidAccessKeyIdException.php
new file mode 100644
index 0000000000000000000000000000000000000000..f4d42f7c59ac25350b80c69f1312ec3dcb85a10f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidAccessKeyIdException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The AWS Access Key Id you provided does not exist in our records.
+ */
+class InvalidAccessKeyIdException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidAddressingHeaderException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidAddressingHeaderException.php
new file mode 100644
index 0000000000000000000000000000000000000000..f49fd768dda7c47248a75376dbdf750d2f70f0cc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidAddressingHeaderException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * You must specify the Anonymous role.
+ */
+class InvalidAddressingHeaderException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidArgumentException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..d540ffc3fa0ee3fe19f5bb24d141323e4bed8c8a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidArgumentException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Invalid Argument
+ */
+class InvalidArgumentException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidBucketNameException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidBucketNameException.php
new file mode 100644
index 0000000000000000000000000000000000000000..66b55d9afc9ebfeebfa72e3d3e879fe3728255a9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidBucketNameException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified bucket is not valid.
+ */
+class InvalidBucketNameException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidBucketStateException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidBucketStateException.php
new file mode 100644
index 0000000000000000000000000000000000000000..91cf817adbf0146bf8192c3543973493877fbd93
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidBucketStateException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The request is not valid with the current state of the bucket.
+ */
+class InvalidBucketStateException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidDigestException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidDigestException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c203b7683df33d691c3c8f5addf09a5ecab2ea0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidDigestException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The Content-MD5 you specified was an invalid.
+ */
+class InvalidDigestException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidLocationConstraintException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidLocationConstraintException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b30a7e6e0a8811f2e11706ebd32083c0f809ac59
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidLocationConstraintException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified location constraint is not valid. For more information about Regions, see How to Select a Region for Your Buckets.
+ */
+class InvalidLocationConstraintException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPartException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPartException.php
new file mode 100644
index 0000000000000000000000000000000000000000..200855288ed2ea17424ee41c8e2f6b19bf3230a2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPartException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * One or more of the specified parts could not be found. The part might not have been uploaded, or the specified entity tag might not have matched the part's entity tag.
+ */
+class InvalidPartException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPartOrderException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPartOrderException.php
new file mode 100644
index 0000000000000000000000000000000000000000..a04acdcaef460f506fb9a6129b5eb6a721e499f2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPartOrderException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The list of parts was not in ascending order.Parts list must specified in order by part number.
+ */
+class InvalidPartOrderException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPayerException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPayerException.php
new file mode 100644
index 0000000000000000000000000000000000000000..048de9bd71594c65fa8d8cf3563169ddd86fb3fa
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPayerException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * All access to this object has been disabled.
+ */
+class InvalidPayerException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPolicyDocumentException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPolicyDocumentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3fc24a3ca959af5330889e03289d97b4341a178a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidPolicyDocumentException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The content of the form does not meet the conditions specified in the policy document.
+ */
+class InvalidPolicyDocumentException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidRangeException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidRangeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..455b05277dbeb3b304c3a373c556b4cad674b718
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidRangeException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The requested range cannot be satisfied.
+ */
+class InvalidRangeException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidRequestException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidRequestException.php
new file mode 100644
index 0000000000000000000000000000000000000000..89e4c8f00383d725252f896e0343ad2649a1a37b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidRequestException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * SOAP requests must be made over an HTTPS connection.
+ */
+class InvalidRequestException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidSOAPRequestException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidSOAPRequestException.php
new file mode 100644
index 0000000000000000000000000000000000000000..a8d8ce196e2a450b6f6272835e621eb4dcbc16b3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidSOAPRequestException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The SOAP request body is invalid.
+ */
+class InvalidSOAPRequestException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidSecurityException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidSecurityException.php
new file mode 100644
index 0000000000000000000000000000000000000000..08fadd0094553157052f20d97e108cfdf2eb74a8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidSecurityException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The provided security credentials are not valid.
+ */
+class InvalidSecurityException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidStorageClassException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidStorageClassException.php
new file mode 100644
index 0000000000000000000000000000000000000000..09e66efba387489d84aa0ec495bd3cce95f23b60
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidStorageClassException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The storage class you specified is not valid.
+ */
+class InvalidStorageClassException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTagErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTagErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..87f48ff82fd35d8631785c21d476ee04560566b1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTagErrorException.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The Tag provided was not a valid tag. This can occur if the Tag did not pass input validation. See the
+ * CostAllocation docs for a description of valid tags.
+ */
+class InvalidTagErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTargetBucketForLoggingException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTargetBucketForLoggingException.php
new file mode 100644
index 0000000000000000000000000000000000000000..d81eab0195efcdee9d5a07fcfd1bcf6208a86f59
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTargetBucketForLoggingException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The target bucket for logging does not exist, is not owned by you, or does not have the appropriate grants for the log-delivery group.
+ */
+class InvalidTargetBucketForLoggingException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTokenException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTokenException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b359ec04b7310d50827c0c4f47c48bdaffddd424
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidTokenException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The provided token is malformed or otherwise invalid.
+ */
+class InvalidTokenException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidURIException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidURIException.php
new file mode 100644
index 0000000000000000000000000000000000000000..cb3694e5668af80b7bf8b2d970c83873ba304bec
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/InvalidURIException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Couldn't parse the specified URI.
+ */
+class InvalidURIException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/KeyTooLongException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/KeyTooLongException.php
new file mode 100644
index 0000000000000000000000000000000000000000..e5a654a33c30dd701e1378431e5b70048e2629bf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/KeyTooLongException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your key is too long.
+ */
+class KeyTooLongException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedACLErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedACLErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1876c6342f9777d0645e5e6a2495827ab673d7f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedACLErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The XML you provided was not well-formed or did not validate against our published schema.
+ */
+class MalformedACLErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedPOSTRequestException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedPOSTRequestException.php
new file mode 100644
index 0000000000000000000000000000000000000000..ed0d572f1842f7c4361967e1893797678dcf629a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedPOSTRequestException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The body of your POST request is not well-formed multipart/form-data.
+ */
+class MalformedPOSTRequestException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedXMLException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedXMLException.php
new file mode 100644
index 0000000000000000000000000000000000000000..f23d96515a9918ebfe1108212ca7745d3577226f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MalformedXMLException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * This happens when the user sends a malformed xml (xml that doesn't conform to the published xsd) for the configuration. The error message is, "The XML you provided was not well-formed or did not validate against our published schema."
+ */
+class MalformedXMLException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MaxMessageLengthExceededException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MaxMessageLengthExceededException.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8f9bce7bcb3ccacc6be3f6f6a3d00aa2c97c7d0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MaxMessageLengthExceededException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your request was too big.
+ */
+class MaxMessageLengthExceededException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MaxPostPreDataLengthExceededErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MaxPostPreDataLengthExceededErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3fe204316ea66de9684ba8810f522a87d007a266
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MaxPostPreDataLengthExceededErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your POST request fields preceding the upload file were too large.
+ */
+class MaxPostPreDataLengthExceededErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MetadataTooLargeException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MetadataTooLargeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..584d3fdcdc417046cffcd1d9ec5de2e9b6ebd39e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MetadataTooLargeException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your metadata headers exceed the maximum allowed metadata size.
+ */
+class MetadataTooLargeException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MethodNotAllowedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MethodNotAllowedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..21dc731555889ca1ed9966226cdd0b4c13469bef
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MethodNotAllowedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified method is not allowed against this resource.
+ */
+class MethodNotAllowedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingAttachmentException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingAttachmentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..e90e1a781e4c3ce59b60b2e8791c9efc651ecac2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingAttachmentException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * A SOAP attachment was expected, but none were found.
+ */
+class MissingAttachmentException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingContentLengthException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingContentLengthException.php
new file mode 100644
index 0000000000000000000000000000000000000000..19429f3090d8a36ea4a77dc3a56fb3b62af8a38f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingContentLengthException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * You must provide the Content-Length HTTP header.
+ */
+class MissingContentLengthException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingRequestBodyErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingRequestBodyErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b3f38e3af002b535c560448f8c571e89332091b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingRequestBodyErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * This happens when the user sends an empty xml document as a request. The error message is, "Request body is empty."
+ */
+class MissingRequestBodyErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingSecurityElementException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingSecurityElementException.php
new file mode 100644
index 0000000000000000000000000000000000000000..8c74a8729e64ec675ae987b408fe95658bd7a7e9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingSecurityElementException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The SOAP 1.1 request is missing a security element.
+ */
+class MissingSecurityElementException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingSecurityHeaderException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingSecurityHeaderException.php
new file mode 100644
index 0000000000000000000000000000000000000000..4de9cfc9b4295322a8ad4c461a66100d8069a652
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/MissingSecurityHeaderException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your request was missing a required header.
+ */
+class MissingSecurityHeaderException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoLoggingStatusForKeyException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoLoggingStatusForKeyException.php
new file mode 100644
index 0000000000000000000000000000000000000000..339cb7677dae499bc20c310e3aa902f3554fa6c1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoLoggingStatusForKeyException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * There is no such thing as a logging status sub-resource for a key.
+ */
+class NoLoggingStatusForKeyException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchBucketException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchBucketException.php
new file mode 100644
index 0000000000000000000000000000000000000000..c13c16dcaa7d408d051168d34aad571c8cb2e362
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchBucketException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified bucket does not exist.
+ */
+class NoSuchBucketException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchBucketPolicyException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchBucketPolicyException.php
new file mode 100644
index 0000000000000000000000000000000000000000..57f648a5f8166b4fabc153f1637f869b6954d8f5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchBucketPolicyException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified bucket policy does not exist.
+ */
+class NoSuchBucketPolicyException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchCORSConfigurationException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchCORSConfigurationException.php
new file mode 100644
index 0000000000000000000000000000000000000000..9aed8d9719b69027c78c8329f9616779458a8bed
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchCORSConfigurationException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified bucket does not have a CORs configuration.
+ */
+class NoSuchCORSConfigurationException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchKeyException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchKeyException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b3124320f1934bad3c2cb51ce1a4335e266de12
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchKeyException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified key does not exist.
+ */
+class NoSuchKeyException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchLifecycleConfigurationException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchLifecycleConfigurationException.php
new file mode 100644
index 0000000000000000000000000000000000000000..075b7c56efd6bc6fed62579fec40a334596d014c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchLifecycleConfigurationException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The lifecycle configuration does not exist.
+ */
+class NoSuchLifecycleConfigurationException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchTagSetErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchTagSetErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..12369bd19c9709aa75aab1ef34501b1d6a395ca2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchTagSetErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * There is no TagSet associated with the bucket.
+ */
+class NoSuchTagSetErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchUploadException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchUploadException.php
new file mode 100644
index 0000000000000000000000000000000000000000..75789e4e4a8ddfa618e4f68fb881af60809240a7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchUploadException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified multipart upload does not exist.
+ */
+class NoSuchUploadException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchVersionException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchVersionException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3eb54db0373bcb7639967a9c1a9f2d70124615ac
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchVersionException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Indicates that the version ID specified in the request does not match an existing version.
+ */
+class NoSuchVersionException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchWebsiteConfigurationException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchWebsiteConfigurationException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b20c443ea279757c34038ecb50bb29900275ed75
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NoSuchWebsiteConfigurationException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified bucket does not have a website configuration.
+ */
+class NoSuchWebsiteConfigurationException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotImplementedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotImplementedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..065e49e5f32af3ed4f6cf01d7a4be9d2e1abb9a9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotImplementedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * A header you provided implies functionality that is not implemented.
+ */
+class NotImplementedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotSignedUpException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotSignedUpException.php
new file mode 100644
index 0000000000000000000000000000000000000000..086fa3bdc431ef7ebbd008144269744673242163
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotSignedUpException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your account is not signed up for the Amazon S3 service. You must sign up before you can use Amazon S3. You can sign up at the following URL: http://aws.amazon.com/s3
+ */
+class NotSignedUpException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotSuchBucketPolicyException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotSuchBucketPolicyException.php
new file mode 100644
index 0000000000000000000000000000000000000000..48f376af66afe28d0852848f78b0ec356ccb930d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/NotSuchBucketPolicyException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The specified bucket does not have a bucket policy.
+ */
+class NotSuchBucketPolicyException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ObjectAlreadyInActiveTierErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ObjectAlreadyInActiveTierErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..4361d52145925089a93c41b106d9757b5031d19a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ObjectAlreadyInActiveTierErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * This operation is not allowed against this storage tier
+ */
+class ObjectAlreadyInActiveTierErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ObjectNotInActiveTierErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ObjectNotInActiveTierErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..26ee3996a64ea52da4217b554e19ec28c6d5a65a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ObjectNotInActiveTierErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The source object of the COPY operation is not in the active tier and is only stored in Amazon Glacier.
+ */
+class ObjectNotInActiveTierErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/OperationAbortedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/OperationAbortedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..245279aef5c8a9364e369d77f527bea3ba69f3b2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/OperationAbortedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * A conflicting conditional operation is currently in progress against this resource. Please try again.
+ */
+class OperationAbortedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/Parser/S3ExceptionParser.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/Parser/S3ExceptionParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..a914204a87ba98efb16b1ec2d77a1fda374ee28d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/Parser/S3ExceptionParser.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception\Parser;
+
+use Aws\Common\Exception\Parser\DefaultXmlExceptionParser;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Parses S3 exception responses
+ */
+class S3ExceptionParser extends DefaultXmlExceptionParser
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function parse(RequestInterface $request, Response $response)
+    {
+        $data = parent::parse($request, $response);
+
+        if ($response->getStatusCode() === 301) {
+            $data['type'] = 'client';
+            if (isset($data['message'], $data['parsed'])) {
+                $data['message'] = rtrim($data['message'], '.') . ': "' . $data['parsed']->Endpoint . '".';
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseHeaders(RequestInterface $request, Response $response, array &$data)
+    {
+        parent::parseHeaders($request, $response, $data);
+
+        // Get the request
+        $status  = $response->getStatusCode();
+        $method  = $request->getMethod();
+
+        // Attempt to determine code for 403s and 404s
+        if ($status === 403) {
+            $data['code'] = 'AccessDenied';
+        } elseif ($method === 'HEAD' && $status === 404) {
+            $path   = explode('/', trim($request->getPath(), '/'));
+            $host   = explode('.', $request->getHost());
+            $bucket = (count($host) === 4) ? $host[0] : array_shift($path);
+            $object = array_shift($path);
+
+            if ($bucket && $object) {
+                $data['code'] = 'NoSuchKey';
+            } elseif ($bucket) {
+                $data['code'] = 'NoSuchBucket';
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/PermanentRedirectException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/PermanentRedirectException.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2af82076c4596a2df2c8298c20e478dfb2c3575
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/PermanentRedirectException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The bucket you are attempting to access must be addressed using the specified endpoint. Please send all future requests to this endpoint.
+ */
+class PermanentRedirectException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/PreconditionFailedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/PreconditionFailedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..8805432c3426b375bfef37d470fa8cec289d1243
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/PreconditionFailedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * At least one of the preconditions you specified did not hold.
+ */
+class PreconditionFailedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RedirectException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RedirectException.php
new file mode 100644
index 0000000000000000000000000000000000000000..e89c816d4808b3716d750be89893011ac025d201
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RedirectException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Temporary redirect.
+ */
+class RedirectException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestIsNotMultiPartContentException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestIsNotMultiPartContentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b539feed64f3c6b24660912ad276aa52d5d192f3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestIsNotMultiPartContentException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Bucket POST must be of the enclosure-type multipart/form-data.
+ */
+class RequestIsNotMultiPartContentException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTimeTooSkewedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTimeTooSkewedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..37253901824aa9999c1d0a1aa7e39c6abaf89ed0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTimeTooSkewedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The difference between the request time and the server's time is too large.
+ */
+class RequestTimeTooSkewedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTimeoutException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTimeoutException.php
new file mode 100644
index 0000000000000000000000000000000000000000..a00d50f0f267bc21e06a7d0f0aa170ed37b4b959
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTimeoutException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Your socket connection to the server was not read from or written to within the timeout period.
+ */
+class RequestTimeoutException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTorrentOfBucketErrorException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTorrentOfBucketErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..8d46e150942073118136595d1454b186241a57c1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/RequestTorrentOfBucketErrorException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Requesting the torrent file of a bucket is not permitted.
+ */
+class RequestTorrentOfBucketErrorException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/S3Exception.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/S3Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..29e82ed256b3fa5eab79d688519858a5ed2c2762
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/S3Exception.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+use Aws\Common\Exception\ServiceResponseException;
+
+/**
+ * Default service exception class
+ */
+class S3Exception extends ServiceResponseException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ServiceUnavailableException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ServiceUnavailableException.php
new file mode 100644
index 0000000000000000000000000000000000000000..390a30a3fea618884cb232a8be267190134d378e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/ServiceUnavailableException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Please reduce your request rate.
+ */
+class ServiceUnavailableException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/SignatureDoesNotMatchException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/SignatureDoesNotMatchException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3dfe98c78ce92fb515cc8c279c23bcfdbbe4104a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/SignatureDoesNotMatchException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The request signature we calculated does not match the signature you provided. Check your AWS Secret Access Key and signing method. For more information, see REST Authentication and SOAP Authentication for details.
+ */
+class SignatureDoesNotMatchException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/SlowDownException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/SlowDownException.php
new file mode 100644
index 0000000000000000000000000000000000000000..4e3aea7c439c5ca44d86bc027929ac4da84875d3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/SlowDownException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * Please reduce your request rate.
+ */
+class SlowDownException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TemporaryRedirectException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TemporaryRedirectException.php
new file mode 100644
index 0000000000000000000000000000000000000000..37abedf0807e320f1b1c08de56214593bb07af6b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TemporaryRedirectException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * You are being redirected to the bucket while DNS updates.
+ */
+class TemporaryRedirectException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TokenRefreshRequiredException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TokenRefreshRequiredException.php
new file mode 100644
index 0000000000000000000000000000000000000000..31f29dd57bfbb7e4d82fd083782eb9d9fb925241
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TokenRefreshRequiredException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The provided token must be refreshed.
+ */
+class TokenRefreshRequiredException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TooManyBucketsException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TooManyBucketsException.php
new file mode 100644
index 0000000000000000000000000000000000000000..c49605c40acb3f4f654071d37147328e85d21880
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/TooManyBucketsException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * You have attempted to create more buckets than allowed.
+ */
+class TooManyBucketsException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UnexpectedContentException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UnexpectedContentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea105ca494dc87f518a4aea2ded1604cf6fa891c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UnexpectedContentException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * This request does not support content.
+ */
+class UnexpectedContentException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UnresolvableGrantByEmailAddressException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UnresolvableGrantByEmailAddressException.php
new file mode 100644
index 0000000000000000000000000000000000000000..2138a57fc1a3d09dda49db0f7e9a74d0bf51f030
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UnresolvableGrantByEmailAddressException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The e-mail address you provided does not match any account on record.
+ */
+class UnresolvableGrantByEmailAddressException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UserKeyMustBeSpecifiedException.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UserKeyMustBeSpecifiedException.php
new file mode 100644
index 0000000000000000000000000000000000000000..f1bcc9c07ad79ae2b1dd054c39a3dbf7effffd25
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Exception/UserKeyMustBeSpecifiedException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Exception;
+
+/**
+ * The bucket POST must contain the specified field name. If it is specified, please check the order of the fields.
+ */
+class UserKeyMustBeSpecifiedException extends S3Exception {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListBucketsIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListBucketsIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..059b09488eb2fb5823217209f075bbc01636320e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListBucketsIterator.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Iterator;
+
+use Aws\Common\Iterator\AwsResourceIterator;
+use Guzzle\Service\Resource\Model;
+
+/**
+ * Iterator for the S3 ListBuckets command
+ *
+ * This iterator includes the following additional options:
+ * @option bool names_only Set to true to receive only the object/prefix names
+ */
+class ListBucketsIterator extends AwsResourceIterator
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function handleResults(Model $result)
+    {
+        // Get the results
+        $buckets = $result->get('Buckets') ?: array();
+
+        // If only the names_only set, change arrays to a string
+        if ($this->get('names_only')) {
+            foreach ($buckets as &$bucket) {
+                $bucket = $bucket['Name'];
+            }
+        }
+
+        return $buckets;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListMultipartUploadsIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListMultipartUploadsIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..fbfb7ff3ab09a8566aaf4751ce444e185e8fc972
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListMultipartUploadsIterator.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Iterator;
+
+use Guzzle\Service\Resource\Model;
+use Aws\Common\Iterator\AwsResourceIterator;
+
+/**
+ * Iterator for the S3 ListMultipartUploads command
+ *
+ * This iterator includes the following additional options:
+ * @option bool return_prefixes Set to true to return both prefixes and uploads
+ */
+class ListMultipartUploadsIterator extends AwsResourceIterator
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function handleResults(Model $result)
+    {
+        // Get the list of uploads
+        $uploads = $result->get('Uploads') ?: array();
+
+        // If there are prefixes and we want them, merge them in
+        if ($this->get('return_prefixes') && $result->hasKey('CommonPrefixes')) {
+            $uploads = array_merge($uploads, $result->get('CommonPrefixes'));
+        }
+
+        return $uploads;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListObjectVersionsIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListObjectVersionsIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..54177033293e037785555ea14e6a6ebec8b12440
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListObjectVersionsIterator.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Iterator;
+
+use Aws\Common\Iterator\AwsResourceIterator;
+use Guzzle\Service\Resource\Model;
+
+/**
+ * Iterator for an S3 ListObjectVersions command
+ *
+ * This iterator includes the following additional options:
+ * @option bool return_prefixes Set to true to receive both prefixes and versions in results
+ */
+class ListObjectVersionsIterator extends AwsResourceIterator
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function handleResults(Model $result)
+    {
+        // Get the list of object versions
+        $versions = $result->get('Versions') ?: array();
+        $deleteMarkers = $result->get('DeleteMarkers') ?: array();
+        $versions = array_merge($versions, $deleteMarkers);
+
+        // If there are prefixes and we want them, merge them in
+        if ($this->get('return_prefixes') && $result->hasKey('CommonPrefixes')) {
+            $versions = array_merge($versions, $result->get('CommonPrefixes'));
+        }
+
+        return $versions;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListObjectsIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListObjectsIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b976389c7b4534d0aff92289095fb310c5c4ffe
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/ListObjectsIterator.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Iterator;
+
+use Aws\Common\Iterator\AwsResourceIterator;
+use Guzzle\Service\Resource\Model;
+
+/**
+ * Iterator for an S3 ListObjects command
+ *
+ * This iterator includes the following additional options:
+ * @option bool return_prefixes Set to true to receive both prefixes and objects in results
+ * @option bool sort_results    Set to true to sort mixed (object/prefix) results
+ * @option bool names_only      Set to true to receive only the object/prefix names
+ */
+class ListObjectsIterator extends AwsResourceIterator
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function handleResults(Model $result)
+    {
+        // Get the list of objects and record the last key
+        $objects = $result->get('Contents') ?: array();
+        $numObjects = count($objects);
+        $lastKey = $numObjects ? $objects[$numObjects - 1]['Key'] : false;
+        if ($lastKey && !$result->hasKey($this->get('token_key'))) {
+            $result->set($this->get('token_key'), $lastKey);
+        }
+
+        // Closure for getting the name of an object or prefix
+        $getName = function ($object) {
+            return isset($object['Key']) ? $object['Key'] : $object['Prefix'];
+        };
+
+        // If common prefixes returned (i.e. a delimiter was set) and they need to be returned, there is more to do
+        if ($this->get('return_prefixes') && $result->hasKey('CommonPrefixes')) {
+            // Collect and format the prefixes to include with the objects
+            $objects = array_merge($objects, $result->get('CommonPrefixes'));
+
+            // Sort the objects and prefixes to maintain alphabetical order, but only if some of each were returned
+            if ($this->get('sort_results') && $lastKey && $objects) {
+                usort($objects, function ($object1, $object2) use ($getName) {
+                    return strcmp($getName($object1), $getName($object2));
+                });
+            }
+        }
+
+        // If only the names are desired, iterate through the results and convert the arrays to the object/prefix names
+        if ($this->get('names_only')) {
+            $objects = array_map($getName, $objects);
+        }
+
+        return $objects;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/OpendirIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/OpendirIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..82c0153ed51f1454c1b4ed45fcd21eeac35b8469
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Iterator/OpendirIterator.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Iterator;
+
+/**
+ * Provides an iterator around an opendir resource. This is useful when you need to provide context to an opendir so
+ * you can't use RecursiveDirectoryIterator
+ */
+class OpendirIterator implements \Iterator
+{
+    /** @var resource */
+    protected $dirHandle;
+
+    /** @var \SplFileInfo */
+    protected $currentFile;
+
+    /** @var int */
+    protected $key = -1;
+
+    /** @var string */
+    protected $filePrefix;
+
+    /**
+     * @param resource $dirHandle  Opened directory handled returned from opendir
+     * @param string   $filePrefix Prefix to add to each filename
+     */
+    public function __construct($dirHandle, $filePrefix = '')
+    {
+        $this->filePrefix = $filePrefix;
+        $this->dirHandle = $dirHandle;
+        $this->next();
+    }
+
+    public function __destruct()
+    {
+        if ($this->dirHandle) {
+            closedir($this->dirHandle);
+        }
+    }
+
+    public function rewind()
+    {
+        $this->key = 0;
+        rewinddir($this->dirHandle);
+    }
+
+    public function current()
+    {
+        return $this->currentFile;
+    }
+
+    public function next()
+    {
+        if ($file = readdir($this->dirHandle)) {
+            $this->currentFile = new \SplFileInfo($this->filePrefix . $file);
+        } else {
+            $this->currentFile = false;
+        }
+
+        $this->key++;
+    }
+
+    public function key()
+    {
+        return $this->key;
+    }
+
+    public function valid()
+    {
+        return $this->currentFile !== false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Acp.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Acp.php
new file mode 100644
index 0000000000000000000000000000000000000000..8325a2b65705b05d51646ee8ac19e4290be11f06
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Acp.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Exception\OverflowException;
+use Guzzle\Common\ToArrayInterface;
+use Guzzle\Service\Command\AbstractCommand;
+
+/**
+ * Amazon S3 Access Control Policy (ACP)
+ */
+class Acp implements ToArrayInterface, \IteratorAggregate, \Countable
+{
+    /**
+     * @var \SplObjectStorage List of grants on the ACP
+     */
+    protected $grants = array();
+
+    /**
+     * @var Grantee The owner of the ACP
+     */
+    protected $owner;
+
+    /**
+     * Constructs an ACP
+     *
+     * @param Grantee            $owner  ACP policy owner
+     * @param array|\Traversable $grants List of grants for the ACP
+     */
+    public function __construct(Grantee $owner, $grants = null)
+    {
+        $this->setOwner($owner);
+        $this->setGrants($grants);
+    }
+
+    /**
+     * Create an Acp object from an array. This can be used to create an ACP from a response to a GetObject/Bucket ACL
+     * operation.
+     *
+     * @param array $data Array of ACP data
+     *
+     * @return self
+     */
+    public static function fromArray(array $data)
+    {
+        $builder = new AcpBuilder();
+        $builder->setOwner((string) $data['Owner']['ID'], $data['Owner']['DisplayName']);
+
+        // Add each Grantee to the ACP
+        foreach ($data['Grants'] as $grant) {
+            $permission = $grant['Permission'];
+
+            // Determine the type for response bodies that are missing the Type parameter
+            if (!isset($grant['Grantee']['Type'])) {
+                if (isset($grant['Grantee']['ID'])) {
+                    $grant['Grantee']['Type'] = 'CanonicalUser';
+                } elseif (isset($grant['Grantee']['URI'])) {
+                    $grant['Grantee']['Type'] = 'Group';
+                } else {
+                    $grant['Grantee']['Type'] = 'AmazonCustomerByEmail';
+                }
+            }
+
+            switch ($grant['Grantee']['Type']) {
+                case 'Group':
+                    $builder->addGrantForGroup($permission, $grant['Grantee']['URI']);
+                    break;
+                case 'AmazonCustomerByEmail':
+                    $builder->addGrantForEmail($permission, $grant['Grantee']['EmailAddress']);
+                    break;
+                case 'CanonicalUser':
+                    $builder->addGrantForUser(
+                        $permission,
+                        $grant['Grantee']['ID'],
+                        $grant['Grantee']['DisplayName']
+                    );
+            }
+        }
+
+        return $builder->build();
+    }
+
+    /**
+     * Set the owner of the ACP policy
+     *
+     * @param Grantee $owner ACP policy owner
+     *
+     * @return self
+     *
+     * @throws InvalidArgumentException if the grantee does not have an ID set
+     */
+    public function setOwner(Grantee $owner)
+    {
+        if (!$owner->isCanonicalUser()) {
+            throw new InvalidArgumentException('The owner must have an ID set.');
+        }
+
+        $this->owner = $owner;
+
+        return $this;
+    }
+
+    /**
+     * Get the owner of the ACP policy
+     *
+     * @return Grantee
+     */
+    public function getOwner()
+    {
+        return $this->owner;
+    }
+
+    /**
+     * Set the grants for the ACP
+     *
+     * @param array|\Traversable $grants List of grants for the ACP
+     *
+     * @return self
+     *
+     * @throws InvalidArgumentException
+     */
+    public function setGrants($grants = array())
+    {
+        $this->grants = new \SplObjectStorage();
+
+        if ($grants) {
+            if (is_array($grants) || $grants instanceof \Traversable) {
+                /** @var $grant Grant */
+                foreach ($grants as $grant) {
+                    $this->addGrant($grant);
+                }
+            } else {
+                throw new InvalidArgumentException('Grants must be passed in as an array or Traversable object.');
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get all of the grants
+     *
+     * @return \SplObjectStorage
+     */
+    public function getGrants()
+    {
+        return $this->grants;
+    }
+
+    /**
+     * Add a Grant
+     *
+     * @param Grant $grant Grant to add
+     *
+     * @return self
+     */
+    public function addGrant(Grant $grant)
+    {
+        if (count($this->grants) < 100) {
+            $this->grants->attach($grant);
+        } else {
+            throw new OverflowException('An ACP may contain up to 100 grants.');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the total number of attributes
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->grants);
+    }
+
+    /**
+     * Returns the grants for iteration
+     *
+     * @return \SplObjectStorage
+     */
+    public function getIterator()
+    {
+        return $this->grants;
+    }
+
+    /**
+     * Applies grant headers to a command's parameters
+     *
+     * @param AbstractCommand $command Command to be updated
+     *
+     * @return self
+     */
+    public function updateCommand(AbstractCommand $command)
+    {
+        $parameters = array();
+        foreach ($this->grants as $grant) {
+            /** @var $grant Grant */
+            $parameters = array_merge_recursive($parameters, $grant->getParameterArray());
+        }
+
+        foreach ($parameters as $name => $values) {
+            $command->set($name, implode(', ', (array) $values));
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $grants = array();
+        foreach ($this->grants as $grant) {
+            $grants[] = $grant->toArray();
+        }
+
+        return array(
+            'Owner' => array(
+                'ID'          => $this->owner->getId(),
+                'DisplayName' => $this->owner->getDisplayName()
+            ),
+            'Grants' => $grants
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/AcpBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/AcpBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e41c3cb0a0316fce8f272178a5298081f05e62b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/AcpBuilder.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\S3\Enum\GranteeType;
+
+/**
+ * Builder for creating Access Control Policies
+ */
+class AcpBuilder
+{
+    /**
+     * @var Grantee The owner for the ACL
+     */
+    protected $owner;
+
+    /**
+     * @var array An array of Grant objects for the ACL
+     */
+    protected $grants = array();
+
+    /**
+     * Static method for chainable instantiation
+     *
+     * @return self
+     */
+    public static function newInstance()
+    {
+        return new self;
+    }
+
+    /**
+     * Sets the owner to be set on the ACL
+     *
+     * @param string $id          Owner identifier
+     * @param string $displayName Owner display name
+     *
+     * @return self
+     */
+    public function setOwner($id, $displayName = null)
+    {
+        $this->owner = new Grantee($id, $displayName ?: $id, GranteeType::USER);
+
+        return $this;
+    }
+
+    /**
+     * Create and store a Grant with a CanonicalUser Grantee for the ACL
+     *
+     * @param string $permission  Permission for the Grant
+     * @param string $id          Grantee identifier
+     * @param string $displayName Grantee display name
+     *
+     * @return self
+     */
+    public function addGrantForUser($permission, $id, $displayName = null)
+    {
+        $grantee = new Grantee($id, $displayName ?: $id, GranteeType::USER);
+        $this->addGrant($permission, $grantee);
+
+        return $this;
+    }
+
+    /**
+     * Create and store a Grant with a AmazonCustomerByEmail Grantee for the ACL
+     *
+     * @param string $permission Permission for the Grant
+     * @param string $email      Grantee email address
+     *
+     * @return self
+     */
+    public function addGrantForEmail($permission, $email)
+    {
+        $grantee = new Grantee($email, null, GranteeType::EMAIL);
+        $this->addGrant($permission, $grantee);
+
+        return $this;
+    }
+
+    /**
+     * Create and store a Grant with a Group Grantee for the ACL
+     *
+     * @param string $permission Permission for the Grant
+     * @param string $group      Grantee group
+     *
+     * @return self
+     */
+    public function addGrantForGroup($permission, $group)
+    {
+        $grantee = new Grantee($group, null, GranteeType::GROUP);
+        $this->addGrant($permission, $grantee);
+
+        return $this;
+    }
+
+    /**
+     * Create and store a Grant for the ACL
+     *
+     * @param string  $permission Permission for the Grant
+     * @param Grantee $grantee    The Grantee for the Grant
+     *
+     * @return self
+     */
+    public function addGrant($permission, Grantee $grantee)
+    {
+        $this->grants[] = new Grant($grantee, $permission);
+
+        return $this;
+    }
+
+    /**
+     * Builds the ACP and returns it
+     *
+     * @return Acp
+     */
+    public function build()
+    {
+        return new Acp($this->owner, $this->grants);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/ClearBucket.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/ClearBucket.php
new file mode 100644
index 0000000000000000000000000000000000000000..f63b22e420496ccc4d79f25dcaf3959cfb0a60e2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/ClearBucket.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Iterator\AwsResourceIterator;
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Batch\FlushingBatch;
+use Guzzle\Batch\ExceptionBufferingBatch;
+use Guzzle\Batch\NotifyingBatch;
+use Guzzle\Common\Exception\ExceptionCollection;
+
+/**
+ * Class used to clear the contents of a bucket or the results of an iterator
+ */
+class ClearBucket extends AbstractHasDispatcher
+{
+    /**
+     * @var string Event emitted when a batch request has completed
+     */
+    const AFTER_DELETE = 'clear_bucket.after_delete';
+
+    /**
+     * @var string Event emitted before the bucket is cleared
+     */
+    const BEFORE_CLEAR = 'clear_bucket.before_clear';
+
+    /**
+     * @var string Event emitted after the bucket is cleared
+     */
+    const AFTER_CLEAR = 'clear_bucket.after_clear';
+
+    /**
+     * @var AwsClientInterface Client used to execute the requests
+     */
+    protected $client;
+
+    /**
+     * @var AbstractS3ResourceIterator Iterator used to yield keys
+     */
+    protected $iterator;
+
+    /**
+     * @var string MFA used with each request
+     */
+    protected $mfa;
+
+    /**
+     * @param AwsClientInterface $client Client used to execute requests
+     * @param string             $bucket Name of the bucket to clear
+     */
+    public function __construct(AwsClientInterface $client, $bucket)
+    {
+        $this->client = $client;
+        $this->bucket = $bucket;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getAllEvents()
+    {
+        return array(self::AFTER_DELETE, self::BEFORE_CLEAR, self::AFTER_CLEAR);
+    }
+
+    /**
+     * Set the bucket that is to be cleared
+     *
+     * @param string $bucket Name of the bucket to clear
+     *
+     * @return self
+     */
+    public function setBucket($bucket)
+    {
+        $this->bucket = $bucket;
+
+        return $this;
+    }
+
+    /**
+     * Get the iterator used to yield the keys to be deleted. A default iterator
+     * will be created and returned if no iterator has been explicitly set.
+     *
+     * @return \Iterator
+     */
+    public function getIterator()
+    {
+        if (!$this->iterator) {
+            $this->iterator = $this->client->getIterator('ListObjectVersions', array(
+                'Bucket' => $this->bucket
+            ));
+        }
+
+        return $this->iterator;
+    }
+
+    /**
+     * Sets a different iterator to use than the default iterator. This can be helpful when you wish to delete
+     * only specific keys from a bucket (e.g. keys that match a certain prefix or delimiter, or perhaps keys that
+     * pass through a filtered, decorated iterator).
+     *
+     * @param \Iterator $iterator Iterator used to yield the keys to be deleted
+     *
+     * @return self
+     */
+    public function setIterator(\Iterator $iterator)
+    {
+        $this->iterator = $iterator;
+
+        return $this;
+    }
+
+    /**
+     * Set the MFA token to send with each request
+     *
+     * @param string $mfa MFA token to send with each request. The value is the concatenation of the authentication
+     *                    device's serial number, a space, and the value displayed on your authentication device.
+     *
+     * @return self
+     */
+    public function setMfa($mfa)
+    {
+        $this->mfa = $mfa;
+
+        return $this;
+    }
+
+    /**
+     * Clear the bucket
+     *
+     * @return int Returns the number of deleted keys
+     * @throws ExceptionCollection
+     */
+    public function clear()
+    {
+        $that = $this;
+        $batch = DeleteObjectsBatch::factory($this->client, $this->bucket, $this->mfa);
+        $batch = new NotifyingBatch($batch, function ($items) use ($that) {
+            $that->dispatch(ClearBucket::AFTER_DELETE, array('keys' => $items));
+        });
+        $batch = new FlushingBatch(new ExceptionBufferingBatch($batch), 1000);
+
+        // Let any listeners know that the bucket is about to be cleared
+        $this->dispatch(self::BEFORE_CLEAR, array(
+            'iterator' => $this->getIterator(),
+            'batch'    => $batch,
+            'mfa'      => $this->mfa
+        ));
+
+        $deleted = 0;
+        foreach ($this->getIterator() as $object) {
+            if (isset($object['VersionId'])) {
+                $versionId = $object['VersionId'] == 'null' ? null : $object['VersionId'];
+            } else {
+                $versionId = null;
+            }
+            $batch->addKey($object['Key'], $versionId);
+            $deleted++;
+        }
+        $batch->flush();
+
+        // If any errors were encountered, then throw an ExceptionCollection
+        if (count($batch->getExceptions())) {
+            $e = new ExceptionCollection();
+            foreach ($batch->getExceptions() as $exception) {
+                $e->add($exception->getPrevious());
+            }
+            throw $e;
+        }
+
+        // Let any listeners know that the bucket was cleared
+        $this->dispatch(self::AFTER_CLEAR, array('deleted' => $deleted));
+
+        return $deleted;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/DeleteObjectsBatch.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/DeleteObjectsBatch.php
new file mode 100644
index 0000000000000000000000000000000000000000..17d8af33a732e289f76807cca419416a80c86b04
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/DeleteObjectsBatch.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Exception\InvalidArgumentException;
+use Guzzle\Service\Command\AbstractCommand;
+use Guzzle\Batch\BatchBuilder;
+use Guzzle\Batch\BatchSizeDivisor;
+use Guzzle\Batch\AbstractBatchDecorator;
+
+/**
+ * The DeleteObjectsBatch is a BatchDecorator for Guzzle that implements a
+ * queue for deleting keys from an Amazon S3 bucket. You can add DeleteObject
+ * or an array of [Key => %s, VersionId => %s] and call flush when the objects
+ * should be deleted.
+ */
+class DeleteObjectsBatch extends AbstractBatchDecorator
+{
+    /**
+     * Factory for creating a DeleteObjectsBatch
+     *
+     * @param AwsClientInterface $client Client used to transfer requests
+     * @param string             $bucket Bucket that contains the objects to delete
+     * @param string             $mfa    MFA token to use with the request
+     *
+     * @return self
+     */
+    public static function factory(AwsClientInterface $client, $bucket, $mfa = null)
+    {
+        $batch = BatchBuilder::factory()
+            ->createBatchesWith(new BatchSizeDivisor(1000))
+            ->transferWith(new DeleteObjectsTransfer($client, $bucket, $mfa))
+            ->build();
+
+        return new self($batch);
+    }
+
+    /**
+     * Add an object to be deleted
+     *
+     * @param string $key       Key of the object
+     * @param string $versionId VersionID of the object
+     *
+     * @return self
+     */
+    public function addKey($key, $versionId = null)
+    {
+        return $this->add(array(
+            'Key'       => $key,
+            'VersionId' => $versionId
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add($item)
+    {
+        if ($item instanceof AbstractCommand && $item->getName() == 'DeleteObject') {
+            $item = array(
+                'Key'       => $item['Key'],
+                'VersionId' => $item['VersionId']
+            );
+        }
+
+        if (!is_array($item) || (!isset($item['Key']))) {
+            throw new InvalidArgumentException('Item must be a DeleteObject command or array containing a Key and VersionId key.');
+        }
+
+        return $this->decoratedBatch->add($item);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/DeleteObjectsTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/DeleteObjectsTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3d3828c4e331ea5f7550de73fd5399e15299562
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/DeleteObjectsTransfer.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Exception\OverflowException;
+use Aws\Common\Enum\UaString as Ua;
+use Aws\S3\Exception\InvalidArgumentException;
+use Aws\S3\Exception\DeleteMultipleObjectsException;
+use Guzzle\Batch\BatchTransferInterface;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Transfer logic for deleting multiple objects from an Amazon S3 bucket in a
+ * single request
+ */
+class DeleteObjectsTransfer implements BatchTransferInterface
+{
+    /**
+     * @var AwsClientInterface The Amazon S3 client for doing transfers
+     */
+    protected $client;
+
+    /**
+     * @var string Bucket from which to delete the objects
+     */
+    protected $bucket;
+
+    /**
+     * @var string MFA token to apply to the request
+     */
+    protected $mfa;
+
+    /**
+     * Constructs a transfer using the injected client
+     *
+     * @param AwsClientInterface $client Client used to transfer the requests
+     * @param string             $bucket Name of the bucket that stores the objects
+     * @param string             $mfa    MFA token used when contacting the Amazon S3 API
+     */
+    public function __construct(AwsClientInterface $client, $bucket, $mfa = null)
+    {
+        $this->client = $client;
+        $this->bucket = $bucket;
+        $this->mfa = $mfa;
+    }
+
+    /**
+     * Set a new MFA token value
+     *
+     * @param string $token MFA token
+     *
+     * @return self
+     */
+    public function setMfa($token)
+    {
+        $this->mfa = $token;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws OverflowException        if a batch has more than 1000 items
+     * @throws InvalidArgumentException when an invalid batch item is encountered
+     */
+    public function transfer(array $batch)
+    {
+        if (empty($batch)) {
+            return;
+        }
+
+        if (count($batch) > 1000) {
+            throw new OverflowException('Batches should be divided into chunks of no larger than 1000 keys');
+        }
+
+        $del = array();
+        $command = $this->client->getCommand('DeleteObjects', array(
+            'Bucket'   => $this->bucket,
+            Ua::OPTION => Ua::BATCH
+        ));
+
+        if ($this->mfa) {
+            $command->getRequestHeaders()->set('x-amz-mfa', $this->mfa);
+        }
+
+        foreach ($batch as $object) {
+            // Ensure that the batch item is valid
+            if (!is_array($object) || !isset($object['Key'])) {
+                throw new InvalidArgumentException('Invalid batch item encountered: ' . var_export($batch, true));
+            }
+            $del[] = array(
+                'Key'       => $object['Key'],
+                'VersionId' => isset($object['VersionId']) ? $object['VersionId'] : null
+            );
+        }
+
+        $command['Objects'] = $del;
+
+        $command->execute();
+        $this->processResponse($command);
+    }
+
+    /**
+     * Process the response of the DeleteMultipleObjects request
+     *
+     * @paramCommandInterface $command Command executed
+     */
+    protected function processResponse(CommandInterface $command)
+    {
+        $result = $command->getResult();
+
+        // Ensure that the objects were deleted successfully
+        if (!empty($result['Errors'])) {
+            $errors = $result['Errors'];
+            throw new DeleteMultipleObjectsException($errors);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Grant.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Grant.php
new file mode 100644
index 0000000000000000000000000000000000000000..afc2757e8ccace25216a6e28aff5a5be70b0af63
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Grant.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\S3\Enum\Permission;
+use Aws\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * Amazon S3 Grant model
+ */
+class Grant implements ToArrayInterface
+{
+    /**
+     * @var array A map of permissions to operation parameters
+     */
+    protected static $parameterMap = array(
+        Permission::READ         => 'GrantRead',
+        Permission::WRITE        => 'GrantWrite',
+        Permission::READ_ACP     => 'GrantReadACP',
+        Permission::WRITE_ACP    => 'GrantWriteACP',
+        Permission::FULL_CONTROL => 'GrantFullControl'
+    );
+
+    /**
+     * @var Grantee The grantee affected by the grant
+     */
+    protected $grantee;
+
+    /**
+     * @var string The permission set by the grant
+     */
+    protected $permission;
+
+    /**
+     * Constructs an ACL
+     *
+     * @param Grantee $grantee    Affected grantee
+     * @param string  $permission Permission applied
+     */
+    public function __construct(Grantee $grantee, $permission)
+    {
+        $this->setGrantee($grantee);
+        $this->setPermission($permission);
+    }
+
+    /**
+     * Set the grantee affected by the grant
+     *
+     * @param Grantee $grantee Affected grantee
+     *
+     * @return self
+     */
+    public function setGrantee(Grantee $grantee)
+    {
+        $this->grantee = $grantee;
+
+        return $this;
+    }
+
+    /**
+     * Get the grantee affected by the grant
+     *
+     * @return Grantee
+     */
+    public function getGrantee()
+    {
+        return $this->grantee;
+    }
+
+    /**
+     * Set the permission set by the grant
+     *
+     * @param string $permission Permission applied
+     *
+     * @return self
+     *
+     * @throws InvalidArgumentException
+     */
+    public function setPermission($permission)
+    {
+        $valid = Permission::values();
+        if (!in_array($permission, $valid)) {
+            throw new InvalidArgumentException('The permission must be one of '
+                . 'the following: ' . implode(', ', $valid) . '.');
+        }
+
+        $this->permission = $permission;
+
+        return $this;
+    }
+
+    /**
+     * Get the permission set by the grant
+     *
+     * @return string
+     */
+    public function getPermission()
+    {
+        return $this->permission;
+    }
+
+    /**
+     * Returns an array of the operation parameter and value to set on the operation
+     *
+     * @return array
+     */
+    public function getParameterArray()
+    {
+        return array(
+            self::$parameterMap[$this->permission] => $this->grantee->getHeaderValue()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        return array(
+            'Grantee'    => $this->grantee->toArray(),
+            'Permission' => $this->permission
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Grantee.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Grantee.php
new file mode 100644
index 0000000000000000000000000000000000000000..f49c70fca1c0675e037a76ff1d9ab4b2db76d9b4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/Grantee.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\S3\Enum\Group;
+use Aws\S3\Enum\GranteeType;
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Exception\UnexpectedValueException;
+use Aws\Common\Exception\LogicException;
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * Amazon S3 Grantee model
+ */
+class Grantee implements ToArrayInterface
+{
+    /**
+     * @var array A map of grantee types to grant header value prefixes
+     */
+    protected static $headerMap = array(
+        GranteeType::USER  => 'id',
+        GranteeType::EMAIL => 'emailAddress',
+        GranteeType::GROUP => 'uri'
+    );
+
+    /**
+     * @var string The account ID, email, or URL identifying the grantee
+     */
+    protected $id;
+
+    /**
+     * @var string The display name of the grantee
+     */
+    protected $displayName;
+
+    /**
+     * @var string The type of the grantee (CanonicalUser or Group)
+     */
+    protected $type;
+
+    /**
+     * Constructs a Grantee
+     *
+     * @param string $id           Grantee identifier
+     * @param string $displayName  Grantee display name
+     * @param string $expectedType The expected type of the grantee
+     */
+    public function __construct($id, $displayName = null, $expectedType = null)
+    {
+        $this->type = GranteeType::USER;
+        $this->setId($id, $expectedType);
+        $this->setDisplayName($displayName);
+    }
+
+    /**
+     * Sets the account ID, email, or URL identifying the grantee
+     *
+     * @param string $id           Grantee identifier
+     * @param string $expectedType The expected type of the grantee
+     *
+     * @return Grantee
+     *
+     * @throws UnexpectedValueException if $expectedType is set and the grantee
+     *     is not of that type after instantiation
+     * @throws InvalidArgumentException when the ID provided is not a string
+     */
+    public function setId($id, $expectedType = null)
+    {
+        if (in_array($id, Group::values())) {
+            $this->type = GranteeType::GROUP;
+        } elseif (!is_string($id)) {
+            throw new InvalidArgumentException('The grantee ID must be provided as a string value.');
+        }
+
+        if (strpos($id, '@') !== false) {
+            $this->type = GranteeType::EMAIL;
+        }
+
+        if ($expectedType && $expectedType !== $this->type) {
+            throw new UnexpectedValueException('The type of the grantee after '
+                . 'setting the ID did not match the specified, expected type "'
+                . $expectedType . '" but received "' . $this->type . '".');
+        }
+
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * Gets the grantee identifier
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Gets the grantee email address (if it is set)
+     *
+     * @return null|string
+     */
+    public function getEmailAddress()
+    {
+        return $this->isAmazonCustomerByEmail() ? $this->id : null;
+    }
+
+    /**
+     * Gets the grantee URI (if it is set)
+     *
+     * @return null|string
+     */
+    public function getGroupUri()
+    {
+        return $this->isGroup() ? $this->id : null;
+    }
+
+    /**
+     * Sets the display name of the grantee
+     *
+     * @param string $displayName Grantee name
+     *
+     * @return Grantee
+     *
+     * @throws LogicException when the grantee type not CanonicalUser
+     */
+    public function setDisplayName($displayName)
+    {
+        if ($this->type === GranteeType::USER) {
+            if (empty($displayName) || !is_string($displayName)) {
+                $displayName = $this->id;
+            }
+            $this->displayName = $displayName;
+        } else {
+            if ($displayName) {
+                throw new LogicException('The display name can only be set '
+                    . 'for grantees specified by ID.');
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Gets the grantee display name
+     *
+     * @return string
+     */
+    public function getDisplayName()
+    {
+        return $this->displayName;
+    }
+
+    /**
+     * Gets the grantee type (determined by ID)
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Returns true if this grantee object represents a canonical user by ID
+     *
+     * @return bool
+     */
+    public function isCanonicalUser()
+    {
+        return ($this->type === GranteeType::USER);
+    }
+
+    /**
+     * Returns true if this grantee object represents a customer by email
+     *
+     * @return bool
+     */
+    public function isAmazonCustomerByEmail()
+    {
+        return ($this->type === GranteeType::EMAIL);
+    }
+
+    /**
+     * Returns true if this grantee object represents a group by URL
+     *
+     * @return bool
+     */
+    public function isGroup()
+    {
+        return ($this->type === GranteeType::GROUP);
+    }
+
+    /**
+     * Returns the value used in headers to specify this grantee
+     *
+     * @return string
+     */
+    public function getHeaderValue()
+    {
+        $key = self::$headerMap[$this->type];
+
+        return "{$key}=\"{$this->id}\"";
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function toArray()
+    {
+        $result = array(
+            'Type' => $this->type
+        );
+
+        switch ($this->type) {
+            case GranteeType::USER:
+                $result['ID'] = $this->id;
+                $result['DisplayName'] = $this->displayName;
+                break;
+            case GranteeType::EMAIL:
+                $result['EmailAddress'] = $this->id;
+                break;
+            case GranteeType::GROUP:
+                $result['URI'] = $this->id;
+        }
+
+        return $result;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/AbstractTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/AbstractTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..c48232d492f2fc7440b0c41b51b659214dfd9ebf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/AbstractTransfer.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model\MultipartUpload;
+
+use Aws\Common\Enum\UaString as Ua;
+use Aws\Common\Exception\RuntimeException;
+use Aws\Common\Model\MultipartUpload\AbstractTransfer as CommonAbstractTransfer;
+use Guzzle\Service\Command\OperationCommand;
+
+/**
+ * Abstract class for transfer commonalities
+ */
+abstract class AbstractTransfer extends CommonAbstractTransfer
+{
+    // An S3 upload part can be anywhere from 5 MB to 5 GB, but you can only have 10000 parts per upload
+    const MIN_PART_SIZE = 5242880;
+    const MAX_PART_SIZE = 5368709120;
+    const MAX_PARTS     = 10000;
+
+    /**
+     * {@inheritdoc}
+     * @throws RuntimeException if the part size can not be calculated from the provided data
+     */
+    protected function init()
+    {
+        // Merge provided options onto the default option values
+        $this->options = array_replace(array(
+            'min_part_size' => self::MIN_PART_SIZE,
+            'part_md5'      => true
+        ), $this->options);
+
+        // Make sure the part size can be calculated somehow
+        if (!$this->options['min_part_size'] && !$this->source->getContentLength()) {
+            throw new RuntimeException('The ContentLength of the data source could not be determined, and no '
+                . 'min_part_size option was provided');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function calculatePartSize()
+    {
+        $partSize = $this->source->getContentLength()
+            ? (int) ceil(($this->source->getContentLength() / self::MAX_PARTS))
+            : self::MIN_PART_SIZE;
+        $partSize = max($this->options['min_part_size'], $partSize);
+        $partSize = min($partSize, self::MAX_PART_SIZE);
+        $partSize = max($partSize, self::MIN_PART_SIZE);
+
+        return $partSize;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function complete()
+    {
+        /** @var $part UploadPart  */
+        $parts = array();
+        foreach ($this->state as $part) {
+            $parts[] = array(
+                'PartNumber' => $part->getPartNumber(),
+                'ETag'       => $part->getETag(),
+            );
+        }
+
+        $params = $this->state->getUploadId()->toParams();
+        $params[Ua::OPTION] = Ua::MULTIPART_UPLOAD;
+        $params['Parts'] = $parts;
+        $command = $this->client->getCommand('CompleteMultipartUpload', $params);
+
+        return $command->getResult();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAbortCommand()
+    {
+        $params = $this->state->getUploadId()->toParams();
+        $params[Ua::OPTION] = Ua::MULTIPART_UPLOAD;
+
+        /** @var $command OperationCommand */
+        $command = $this->client->getCommand('AbortMultipartUpload', $params);
+
+        return $command;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/ParallelTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/ParallelTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..caa9e88833132bbd72f2e1d5fe7fb6e7e4e54b38
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/ParallelTransfer.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model\MultipartUpload;
+
+use Aws\Common\Exception\RuntimeException;
+use Aws\Common\Enum\DateFormat;
+use Aws\Common\Enum\UaString as Ua;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\ReadLimitEntityBody;
+
+/**
+ * Transfers multipart upload parts in parallel
+ */
+class ParallelTransfer extends AbstractTransfer
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function init()
+    {
+        parent::init();
+
+        if (!$this->source->isLocal() || $this->source->getWrapper() != 'plainfile') {
+            throw new RuntimeException('The source data must be a local file stream when uploading in parallel.');
+        }
+
+        if (empty($this->options['concurrency'])) {
+            throw new RuntimeException('The `concurrency` option must be specified when instantiating.');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function transfer()
+    {
+        $totalParts  = (int) ceil($this->source->getContentLength() / $this->partSize);
+        $concurrency = min($totalParts, $this->options['concurrency']);
+        $partsToSend = $this->prepareParts($concurrency);
+        $eventData   = $this->getEventData();
+
+        while (!$this->stopped && count($this->state) < $totalParts) {
+
+            $currentTotal = count($this->state);
+            $commands = array();
+
+            for ($i = 0; $i < $concurrency && $i + $currentTotal < $totalParts; $i++) {
+
+                // Move the offset to the correct position
+                $partsToSend[$i]->setOffset(($currentTotal + $i) * $this->partSize);
+
+                // @codeCoverageIgnoreStart
+                if ($partsToSend[$i]->getContentLength() == 0) {
+                    break;
+                }
+                // @codeCoverageIgnoreEnd
+
+                $params = $this->state->getUploadId()->toParams();
+                $eventData['command'] = $this->client->getCommand('UploadPart', array_replace($params, array(
+                    'PartNumber' => count($this->state) + 1 + $i,
+                    'Body'       => $partsToSend[$i],
+                    'ContentMD5' => (bool) $this->options['part_md5'],
+                    Ua::OPTION   => Ua::MULTIPART_UPLOAD
+                )));
+                $commands[] = $eventData['command'];
+                // Notify any listeners of the part upload
+                $this->dispatch(self::BEFORE_PART_UPLOAD, $eventData);
+            }
+
+            // Allow listeners to stop the transfer if needed
+            if ($this->stopped) {
+                break;
+            }
+
+            // Execute each command, iterate over the results, and add to the transfer state
+            /** @var $command \Guzzle\Service\Command\OperationCommand */
+            foreach ($this->client->execute($commands) as $command) {
+                $this->state->addPart(UploadPart::fromArray(array(
+                    'PartNumber'   => count($this->state) + 1,
+                    'ETag'         => $command->getResponse()->getEtag(),
+                    'Size'         => (int) $command->getResponse()->getContentLength(),
+                    'LastModified' => gmdate(DateFormat::RFC2822)
+                )));
+                $eventData['command'] = $command;
+                // Notify any listeners the the part was uploaded
+                $this->dispatch(self::AFTER_PART_UPLOAD, $eventData);
+            }
+        }
+    }
+
+    /**
+     * Prepare the entity body handles to use while transferring
+     *
+     * @param int $concurrency Number of parts to prepare
+     *
+     * @return array Parts to send
+     */
+    protected function prepareParts($concurrency)
+    {
+        $url = $this->source->getUri();
+        // Use the source EntityBody as the first part
+        $parts = array(new ReadLimitEntityBody($this->source, $this->partSize));
+        // Open EntityBody handles for each part to upload in parallel
+        for ($i = 1; $i < $concurrency; $i++) {
+            $parts[] = new ReadLimitEntityBody(new EntityBody(fopen($url, 'r')), $this->partSize);
+        }
+
+        return $parts;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/SerialTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/SerialTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a5953f5b24cbe2235fe72ca609105f4cd2c0a49
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/SerialTransfer.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model\MultipartUpload;
+
+use Aws\Common\Enum\DateFormat;
+use Aws\Common\Enum\Size;
+use Aws\Common\Enum\UaString as Ua;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\ReadLimitEntityBody;
+
+/**
+ * Transfers multipart upload parts serially
+ */
+class SerialTransfer extends AbstractTransfer
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function transfer()
+    {
+        while (!$this->stopped && !$this->source->isConsumed()) {
+
+            if ($this->source->getContentLength() && $this->source->isSeekable()) {
+                // If the stream is seekable and the Content-Length known, then stream from the data source
+                $body = new ReadLimitEntityBody($this->source, $this->partSize, $this->source->ftell());
+            } else {
+                // We need to read the data source into a temporary buffer before streaming
+                $body = EntityBody::factory();
+                while ($body->getContentLength() < $this->partSize
+                    && $body->write(
+                        $this->source->read(max(1, min(10 * Size::KB, $this->partSize - $body->getContentLength())))
+                    ));
+            }
+
+            // @codeCoverageIgnoreStart
+            if ($body->getContentLength() == 0) {
+                break;
+            }
+            // @codeCoverageIgnoreEnd
+
+            $params = $this->state->getUploadId()->toParams();
+            $command = $this->client->getCommand('UploadPart', array_replace($params, array(
+                'PartNumber' => count($this->state) + 1,
+                'Body'       => $body,
+                'ContentMD5' => (bool) $this->options['part_md5'],
+                Ua::OPTION   => Ua::MULTIPART_UPLOAD
+            )));
+
+            // Notify observers that the part is about to be uploaded
+            $eventData = $this->getEventData();
+            $eventData['command'] = $command;
+            $this->dispatch(self::BEFORE_PART_UPLOAD, $eventData);
+
+            // Allow listeners to stop the transfer if needed
+            if ($this->stopped) {
+                break;
+            }
+
+            $response = $command->getResponse();
+
+            $this->state->addPart(UploadPart::fromArray(array(
+                'PartNumber'   => count($this->state) + 1,
+                'ETag'         => $response->getEtag(),
+                'Size'         => $body->getContentLength(),
+                'LastModified' => gmdate(DateFormat::RFC2822)
+            )));
+
+            // Notify observers that the part was uploaded
+            $this->dispatch(self::AFTER_PART_UPLOAD, $eventData);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/TransferState.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/TransferState.php
new file mode 100644
index 0000000000000000000000000000000000000000..c63663fd648ea5aa5587ec58a355a112cdecd7f2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/TransferState.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model\MultipartUpload;
+
+use Aws\Common\Client\AwsClientInterface;
+use Aws\Common\Model\MultipartUpload\AbstractTransferState;
+use Aws\Common\Model\MultipartUpload\UploadIdInterface;
+
+/**
+ * State of a multipart upload
+ */
+class TransferState extends AbstractTransferState
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function fromUploadId(AwsClientInterface $client, UploadIdInterface $uploadId)
+    {
+        $transferState = new self($uploadId);
+
+        foreach ($client->getIterator('ListParts', $uploadId->toParams()) as $part) {
+            $transferState->addPart(UploadPart::fromArray($part));
+        }
+
+        return $transferState;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..6da35ef6532a5341326eeeb3e21277c322ab560a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadBuilder.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model\MultipartUpload;
+
+use Aws\Common\Enum\UaString as Ua;
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Model\MultipartUpload\AbstractUploadBuilder;
+use Aws\S3\Model\Acp;
+use Guzzle\Common\Collection;
+
+/**
+ * Easily create a multipart uploader used to quickly and reliably upload a
+ * large file or data stream to Amazon S3 using multipart uploads
+ */
+class UploadBuilder extends AbstractUploadBuilder
+{
+    /**
+     * @var int Concurrency level to transfer the parts
+     */
+    protected $concurrency = 1;
+
+    /**
+     * @var int Minimum part size to upload
+     */
+    protected $minPartSize = AbstractTransfer::MIN_PART_SIZE;
+
+    /**
+     * @var string MD5 hash of the entire body to transfer
+     */
+    protected $md5;
+
+    /**
+     * @var bool Whether or not to calculate the entire MD5 hash of the object
+     */
+    protected $calculateEntireMd5 = false;
+
+    /**
+     * @var bool Whether or not to calculate MD5 hash of each part
+     */
+    protected $calculatePartMd5 = true;
+
+    /**
+     * @var array Array of initiate command options
+     */
+    protected $commandOptions = array();
+
+    /**
+     * @var array Array of transfer options
+     */
+    protected $transferOptions = array();
+
+    /**
+     * Set the bucket to upload the object to
+     *
+     * @param string $bucket Name of the bucket
+     *
+     * @return self
+     */
+    public function setBucket($bucket)
+    {
+        return $this->setOption('Bucket', $bucket);
+    }
+
+    /**
+     * Set the key of the object
+     *
+     * @param string $key Key of the object to upload
+     *
+     * @return self
+     */
+    public function setKey($key)
+    {
+        return $this->setOption('Key', $key);
+    }
+
+    /**
+     * Set the minimum acceptable part size
+     *
+     * @param int $minSize Minimum acceptable part size in bytes
+     *
+     * @return self
+     */
+    public function setMinPartSize($minSize)
+    {
+        $this->minPartSize = (int) max((int) $minSize, AbstractTransfer::MIN_PART_SIZE);
+
+        return $this;
+    }
+
+    /**
+     * Set the concurrency level to use when uploading parts. This affects how
+     * many parts are uploaded in parallel. You must use a local file as your
+     * data source when using a concurrency greater than 1
+     *
+     * @param int $concurrency Concurrency level
+     *
+     * @return self
+     */
+    public function setConcurrency($concurrency)
+    {
+        $this->concurrency = $concurrency;
+
+        return $this;
+    }
+
+    /**
+     * Explicitly set the MD5 hash of the entire body
+     *
+     * @param string $md5 MD5 hash of the entire body
+     *
+     * @return self
+     */
+    public function setMd5($md5)
+    {
+        $this->md5 = $md5;
+
+        return $this;
+    }
+
+    /**
+     * Set to true to have the builder calculate the MD5 hash of the entire data
+     * source before initiating a multipart upload (this could be an expensive
+     * operation). This setting can ony be used with seekable data sources.
+     *
+     * @param bool $calculateMd5 Set to true to calculate the MD5 hash of the body
+     *
+     * @return self
+     */
+    public function calculateMd5($calculateMd5)
+    {
+        $this->calculateEntireMd5 = (bool) $calculateMd5;
+
+        return $this;
+    }
+
+    /**
+     * Specify whether or not to calculate the MD5 hash of each uploaded part.
+     * This setting defaults to true.
+     *
+     * @param bool $usePartMd5 Set to true to calculate the MD5 has of each part
+     *
+     * @return self
+     */
+    public function calculatePartMd5($usePartMd5)
+    {
+        $this->calculatePartMd5 = (bool) $usePartMd5;
+
+        return $this;
+    }
+
+    /**
+     * Set the ACP to use on the object
+     *
+     * @param Acp $acp ACP to set on the object
+     *
+     * @return self
+     */
+    public function setAcp(Acp $acp)
+    {
+        return $this->setOption('ACP', $acp);
+    }
+
+    /**
+     * Set an option to pass to the initial CreateMultipartUpload operation
+     *
+     * @param string $name  Option name
+     * @param string $value Option value
+     *
+     * @return self
+     */
+    public function setOption($name, $value)
+    {
+        $this->commandOptions[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Add an array of options to pass to the initial CreateMultipartUpload operation
+     *
+     * @param array $options Array of CreateMultipartUpload operation parameters
+     *
+     * @return self
+     */
+    public function addOptions(array $options)
+    {
+        $this->commandOptions = array_replace($this->commandOptions, $options);
+
+        return $this;
+    }
+
+    /**
+     * Set an array of transfer options to apply to the upload transfer object
+     *
+     * @param array $options Transfer options
+     *
+     * @return self
+     */
+    public function setTransferOptions(array $options)
+    {
+        $this->transferOptions = $options;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws InvalidArgumentException when attempting to resume a transfer using a non-seekable stream
+     * @throws InvalidArgumentException when missing required properties (bucket, key, client, source)
+     */
+    public function build()
+    {
+        if ($this->state instanceof TransferState) {
+            $this->commandOptions = array_replace($this->commandOptions, $this->state->getUploadId()->toParams());
+        }
+
+        if (!isset($this->commandOptions['Bucket']) || !isset($this->commandOptions['Key'])
+            || !$this->client || !$this->source
+        ) {
+            throw new InvalidArgumentException('You must specify a Bucket, Key, client, and source.');
+        }
+
+        if ($this->state && !$this->source->isSeekable()) {
+            throw new InvalidArgumentException('You cannot resume a transfer using a non-seekable source.');
+        }
+
+        // If no state was set, then create one by initiating or loading a multipart upload
+        if (is_string($this->state)) {
+            $this->state = TransferState::fromUploadId($this->client, UploadId::fromParams(array(
+                'Bucket'   => $this->commandOptions['Bucket'],
+                'Key'      => $this->commandOptions['Key'],
+                'UploadId' => $this->state
+            )));
+        } elseif (!$this->state) {
+            $this->state = $this->initiateMultipartUpload();
+        }
+
+        $options = array_replace(array(
+            'min_part_size' => $this->minPartSize,
+            'part_md5'      => (bool) $this->calculatePartMd5,
+            'concurrency'   => $this->concurrency
+        ), $this->transferOptions);
+
+        return $this->concurrency > 1
+            ? new ParallelTransfer($this->client, $this->state, $this->source, $options)
+            : new SerialTransfer($this->client, $this->state, $this->source, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function initiateMultipartUpload()
+    {
+        // Determine Content-Type
+        if ($mimeType = $this->source->getContentType()) {
+            $this->commandOptions['ContentType'] = $mimeType;
+        }
+
+        $params = array_replace(array(
+            Ua::OPTION        => Ua::MULTIPART_UPLOAD,
+            'command.headers' => $this->headers,
+            'Metadata'        => array()
+        ), $this->commandOptions);
+
+        // Calculate the MD5 hash if none was set and it is asked of the builder
+        if ($this->calculateEntireMd5) {
+            $this->md5 = $this->source->getContentMd5();
+        }
+
+        // If an MD5 is specified, then add it to the custom headers of the request
+        // so that it will be returned when downloading the object from Amazon S3
+        if ($this->md5) {
+            $params['Metadata']['x-amz-Content-MD5'] = $this->md5;
+        }
+
+        $result = $this->client->getCommand('CreateMultipartUpload', $params)->execute();
+        // Create a new state based on the initiated upload
+        $params['UploadId'] = $result['UploadId'];
+
+        return new TransferState(UploadId::fromParams($params));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadId.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadId.php
new file mode 100644
index 0000000000000000000000000000000000000000..9d5f3842162f4c39765236c368dd0d536d2593eb
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadId.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model\MultipartUpload;
+
+use Aws\Common\Model\MultipartUpload\AbstractUploadId;
+
+/**
+ * An object that encapsulates the identification for a Glacier upload part
+ * @codeCoverageIgnore
+ */
+class UploadId extends AbstractUploadId
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected static $expectedValues = array(
+        'Bucket'   => false,
+        'Key'      => false,
+        'UploadId' => false
+    );
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadPart.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadPart.php
new file mode 100644
index 0000000000000000000000000000000000000000..e0ded33abd4427324ce48d7e8cc9121eccf31129
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/MultipartUpload/UploadPart.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model\MultipartUpload;
+
+use Aws\Common\Model\MultipartUpload\AbstractUploadPart;
+
+/**
+ * An object that encapsulates the data for a Glacier upload operation
+ */
+class UploadPart extends AbstractUploadPart
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected static $keyMap = array(
+        'PartNumber'   => 'partNumber',
+        'ETag'         => 'eTag',
+        'LastModified' => 'lastModified',
+        'Size'         => 'size'
+    );
+
+    /**
+     * @var string The ETag for this part
+     */
+    protected $eTag;
+
+    /**
+     * @var string The last modified date
+     */
+    protected $lastModified;
+
+    /**
+     * @var int The size (or content-length) in bytes of the upload body
+     */
+    protected $size;
+
+    /**
+     * @return string
+     */
+    public function getETag()
+    {
+        return $this->eTag;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLastModified()
+    {
+        return $this->lastModified;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/PostObject.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/PostObject.php
new file mode 100644
index 0000000000000000000000000000000000000000..eaa726e4ae22e727ae40ee943bc2f74f38a0d79c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Model/PostObject.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Model;
+
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Enum\DateFormat;
+use Aws\S3\S3Client;
+use Guzzle\Common\Collection;
+use Guzzle\Http\Url;
+
+/**
+ * Encapsulates the logic for getting the data for an S3 object POST upload form
+ */
+class PostObject extends Collection
+{
+    /**
+     * @var S3Client The S3 client being used to sign the policy
+     */
+    protected $client;
+
+    /**
+     * @var string The bucket name where the object will be posted
+     */
+    protected $bucket;
+
+    /**
+     * @var array The <form> tag attributes as an array
+     */
+    protected $formAttributes;
+
+    /**
+     * @var array The form's <input> elements as an array
+     */
+    protected $formInputs;
+
+    /**
+     * @var string The raw json policy
+     */
+    protected $jsonPolicy;
+
+    /**
+     * Constructs the PostObject
+     *
+     * The options array accepts the following keys:
+     *
+     * - acl:                          The access control setting to apply to the uploaded file. Accepts any of the
+     *                                 CannedAcl constants
+     * - Cache-Control:                The Cache-Control HTTP header value to apply to the uploaded file
+     * - Content-Disposition:          The Content-Disposition HTTP header value to apply to the uploaded file
+     * - Content-Encoding:             The Content-Encoding HTTP header value to apply to the uploaded file
+     * - Content-Type:                 The Content-Type HTTP header value to apply to the uploaded file. The default
+     *                                 value is `application/octet-stream`
+     * - Expires:                      The Expires HTTP header value to apply to the uploaded file
+     * - key:                          The location where the file should be uploaded to. The default value is
+     *                                 `^${filename}` which will use the name of the uploaded file
+     * - policy:                       A raw policy in JSON format. By default, the PostObject creates one for you
+     * - success_action_redirect:      The URI for Amazon S3 to redirect to upon successful upload
+     * - success_action_status:        The status code for Amazon S3 to return upon successful upload
+     * - ttd:                          The expiration time for the generated upload form data
+     * - x-amz-server-side-encryption: The server-side encryption mechanism to use
+     * - x-amz-storage-class:          The storage setting to apply to the object
+     * - x-amz-meta-*:                 Any custom meta tag that should be set to the object
+     *
+     * For the Cache-Control, Content-Disposition, Content-Encoding,
+     * Content-Type, Expires, and key options, to use a "starts-with" comparison
+     * instead of an equals comparison, prefix the value with a ^ (carat)
+     * character
+     *
+     * @param S3Client $client
+     * @param $bucket
+     * @param array $options
+     */
+    public function __construct(S3Client $client, $bucket, array $options = array())
+    {
+        $this->setClient($client);
+        $this->setBucket($bucket);
+        parent::__construct($options);
+    }
+
+    /**
+     * Analyzes the provided data and turns it into useful data that can be
+     * consumed and used to build an upload form
+     *
+     * @return PostObject
+     */
+    public function prepareData()
+    {
+        // Validate required options
+        $options = Collection::fromConfig($this->data, array(
+            'ttd' => '+1 hour',
+            'key' => '^${filename}',
+        ));
+
+        // Format ttd option
+        $ttd = $options['ttd'];
+        $ttd = is_numeric($ttd) ? (int) $ttd : strtotime($ttd);
+        unset($options['ttd']);
+
+        // Save policy if passed in
+        $rawPolicy = $options['policy'];
+        unset($options['policy']);
+
+        // Setup policy document
+        $policy = array(
+            'expiration' => gmdate(DateFormat::ISO8601_S3, $ttd),
+            'conditions' => array(array('bucket' => $this->bucket))
+        );
+
+        // Configure the endpoint/action
+        $url = Url::factory($this->client->getBaseUrl());
+        $url->setHost($this->bucket . '.' . $url->getHost());
+
+        // Setup basic form
+        $this->formAttributes = array(
+            'action' => (string) $url,
+            'method' => 'POST',
+            'enctype' => 'multipart/form-data'
+        );
+        $this->formInputs = array(
+            'AWSAccessKeyId' => $this->client->getCredentials()->getAccessKeyId()
+        );
+
+        // Add success action status
+        $status = (int) $options->get('success_action_status');
+        if ($status && in_array($status, array(200, 201, 204))) {
+            $this->formInputs['success_action_status'] = (string) $status;
+            $policy['conditions'][] = array(
+                'success_action_status' => (string) $status
+            );
+            $options->remove('success_action_status');
+        }
+
+        // Add other options
+        foreach ($options as $key => $value) {
+            $value = (string) $value;
+            if ($value[0] === '^') {
+                $value = substr($value, 1);
+                $this->formInputs[$key] = $value;
+                $value = preg_replace('/\$\{(\w*)\}/', '', $value);
+                $policy['conditions'][] = array('starts-with', '$' . $key, $value);
+            } else {
+                $this->formInputs[$key] = $value;
+                $policy['conditions'][] = array($key => $value);
+            }
+        }
+
+        // Add policy
+        $this->jsonPolicy = $rawPolicy ?: json_encode($policy);
+        $jsonPolicy64 = base64_encode($this->jsonPolicy);
+        $this->formInputs['policy'] = $jsonPolicy64;
+
+        // Add signature
+        $this->formInputs['signature'] = base64_encode(hash_hmac(
+            'sha1',
+            $jsonPolicy64,
+            $this->client->getCredentials()->getSecretKey(),
+            true
+        ));
+
+        return $this;
+    }
+
+    /**
+     * Sets the S3 client
+     *
+     * @param S3Client $client
+     *
+     * @return PostObject
+     */
+    public function setClient(S3Client $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    /**
+     * Gets the S3 client
+     *
+     * @return S3Client
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    /**
+     * Sets the bucket and makes sure it is a valid bucket name
+     *
+     * @param string $bucket
+     *
+     * @return PostObject
+     */
+    public function setBucket($bucket)
+    {
+        $this->bucket = $bucket;
+
+        return $this;
+    }
+
+    /**
+     * Gets the bucket name
+     *
+     * @return string
+     */
+    public function getBucket()
+    {
+        return $this->bucket;
+    }
+
+    /**
+     * Gets the form attributes as an array
+     *
+     * @return array
+     */
+    public function getFormAttributes()
+    {
+        return $this->formAttributes;
+    }
+
+    /**
+     * Gets the form inputs as an array
+     *
+     * @return array
+     */
+    public function getFormInputs()
+    {
+        return $this->formInputs;
+    }
+
+    /**
+     * Gets the raw JSON policy
+     *
+     * @return string
+     */
+    public function getJsonPolicy()
+    {
+        return $this->jsonPolicy;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Resources/s3-2006-03-01.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Resources/s3-2006-03-01.php
new file mode 100644
index 0000000000000000000000000000000000000000..516440f1a03801a5c5076f0cd9708f1b2ecb5477
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Resources/s3-2006-03-01.php
@@ -0,0 +1,4931 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+return array (
+    'apiVersion' => '2006-03-01',
+    'endpointPrefix' => 's3',
+    'serviceFullName' => 'Amazon Simple Storage Service',
+    'serviceAbbreviation' => 'Amazon S3',
+    'serviceType' => 'rest-xml',
+    'timestampFormat' => 'rfc822',
+    'globalEndpoint' => 's3.amazonaws.com',
+    'signatureVersion' => 's3',
+    'namespace' => 'S3',
+    'regions' => array(
+        'us-east-1' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3.amazonaws.com',
+        ),
+        'us-west-1' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-us-west-1.amazonaws.com',
+        ),
+        'us-west-2' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-us-west-2.amazonaws.com',
+        ),
+        'eu-west-1' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-eu-west-1.amazonaws.com',
+        ),
+        'ap-northeast-1' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-ap-northeast-1.amazonaws.com',
+        ),
+        'ap-southeast-1' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-ap-southeast-1.amazonaws.com',
+        ),
+        'ap-southeast-2' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-ap-southeast-2.amazonaws.com',
+        ),
+        'sa-east-1' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-sa-east-1.amazonaws.com',
+        ),
+        'us-gov-west-1' => array(
+            'http' => true,
+            'https' => true,
+            'hostname' => 's3-us-gov-west-1.amazonaws.com',
+        ),
+    ),
+    'operations' => array(
+        'AbortMultipartUpload' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'AbortMultipartUploadOutput',
+            'responseType' => 'model',
+            'summary' => 'Aborts a multipart upload.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadAbort.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'UploadId' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'uploadId',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The specified multipart upload does not exist.',
+                    'class' => 'NoSuchUploadException',
+                ),
+            ),
+        ),
+        'CompleteMultipartUpload' => array(
+            'httpMethod' => 'POST',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'CompleteMultipartUploadOutput',
+            'responseType' => 'model',
+            'summary' => 'Completes a multipart upload by assembling previously uploaded parts.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadComplete.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'MultipartUpload',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'Parts' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Part',
+                        'properties' => array(
+                            'ETag' => array(
+                                'description' => 'Entity tag returned when the part was uploaded.',
+                                'type' => 'string',
+                            ),
+                            'PartNumber' => array(
+                                'description' => 'Part number that identifies the part.',
+                                'type' => 'numeric',
+                            ),
+                        ),
+                    ),
+                ),
+                'UploadId' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'uploadId',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'CopyObject' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'CopyObjectOutput',
+            'responseType' => 'model',
+            'summary' => 'Creates a copy of an object that is already stored in Amazon S3.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html',
+            'parameters' => array(
+                'ACL' => array(
+                    'description' => 'The canned ACL to apply to the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-acl',
+                    'enum' => array(
+                        'private',
+                        'public-read',
+                        'public-read-write',
+                        'authenticated-read',
+                        'bucket-owner-read',
+                        'bucket-owner-full-control',
+                    ),
+                ),
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'CacheControl' => array(
+                    'description' => 'Specifies caching behavior along the request/reply chain.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Cache-Control',
+                ),
+                'ContentDisposition' => array(
+                    'description' => 'Specifies presentational information for the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Disposition',
+                ),
+                'ContentEncoding' => array(
+                    'description' => 'Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Encoding',
+                ),
+                'ContentLanguage' => array(
+                    'description' => 'The language the content is in.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Language',
+                ),
+                'ContentType' => array(
+                    'description' => 'A standard MIME type describing the format of the object data.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Type',
+                ),
+                'CopySource' => array(
+                    'required' => true,
+                    'description' => 'The name of the source bucket and key name of the source object, separated by a slash (/). Must be URL-encoded.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source',
+                ),
+                'CopySourceIfMatch' => array(
+                    'description' => 'Copies the object if its entity tag (ETag) matches the specified tag.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-match',
+                ),
+                'CopySourceIfModifiedSince' => array(
+                    'description' => 'Copies the object if it has been modified since the specified time.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-modified-since',
+                ),
+                'CopySourceIfNoneMatch' => array(
+                    'description' => 'Copies the object if its entity tag (ETag) is different than the specified ETag.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-none-match',
+                ),
+                'CopySourceIfUnmodifiedSince' => array(
+                    'description' => 'Copies the object if it hasn\'t been modified since the specified time.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-unmodified-since',
+                ),
+                'Expires' => array(
+                    'description' => 'The date and time at which the object is no longer cacheable.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                ),
+                'GrantFullControl' => array(
+                    'description' => 'Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-full-control',
+                ),
+                'GrantRead' => array(
+                    'description' => 'Allows grantee to read the object data and its metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read',
+                ),
+                'GrantReadACP' => array(
+                    'description' => 'Allows grantee to read the object ACL.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read-acp',
+                ),
+                'GrantWriteACP' => array(
+                    'description' => 'Allows grantee to write the ACL for the applicable object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write-acp',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'Metadata' => array(
+                    'description' => 'A map of metadata to store with the object in S3.',
+                    'type' => 'object',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-meta-',
+                    'additionalProperties' => array(
+                        'description' => 'The metadata key. This will be prefixed with x-amz-meta- before sending to S3 as a header. The x-amz-meta- header will be stripped from the key when retrieving headers.',
+                        'type' => 'string',
+                    ),
+                ),
+                'MetadataDirective' => array(
+                    'description' => 'Specifies whether the metadata is copied from the source object or replaced with metadata provided in the request.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-metadata-directive',
+                    'enum' => array(
+                        'COPY',
+                        'REPLACE',
+                    ),
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                    'enum' => array(
+                        'AES256',
+                    ),
+                ),
+                'StorageClass' => array(
+                    'description' => 'The type of storage to use for the object. Defaults to \'STANDARD\'.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-storage-class',
+                    'enum' => array(
+                        'STANDARD',
+                        'REDUCED_REDUNDANCY',
+                    ),
+                ),
+                'WebsiteRedirectLocation' => array(
+                    'description' => 'If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-website-redirect-location',
+                ),
+                'ACP' => array(
+                    'description' => 'Pass an Aws\\S3\\Model\\Acp object as an alternative way to add access control policy headers to the operation',
+                    'type' => 'object',
+                    'additionalProperties' => true,
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The source object of the COPY operation is not in the active tier and is only stored in Amazon Glacier.',
+                    'class' => 'ObjectNotInActiveTierErrorException',
+                ),
+            ),
+        ),
+        'CreateBucket' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'CreateBucketOutput',
+            'responseType' => 'model',
+            'summary' => 'Creates a new bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'CreateBucketConfiguration',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'ACL' => array(
+                    'description' => 'The canned ACL to apply to the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-acl',
+                    'enum' => array(
+                        'private',
+                        'public-read',
+                        'public-read-write',
+                        'authenticated-read',
+                        'bucket-owner-read',
+                        'bucket-owner-full-control',
+                    ),
+                ),
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'LocationConstraint' => array(
+                    'description' => 'Specifies the region where the bucket will be created.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                    'enum' => array(
+                        'EU',
+                        'eu-west-1',
+                        'us-west-1',
+                        'us-west-2',
+                        'ap-southeast-1',
+                        'ap-northeast-1',
+                        'sa-east-1',
+                    ),
+                ),
+                'GrantFullControl' => array(
+                    'description' => 'Allows grantee the read, write, read ACP, and write ACP permissions on the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-full-control',
+                ),
+                'GrantRead' => array(
+                    'description' => 'Allows grantee to list the objects in the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read',
+                ),
+                'GrantReadACP' => array(
+                    'description' => 'Allows grantee to read the bucket ACL.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read-acp',
+                ),
+                'GrantWrite' => array(
+                    'description' => 'Allows grantee to create, overwrite, and delete any object in the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write',
+                ),
+                'GrantWriteACP' => array(
+                    'description' => 'Allows grantee to write the ACL for the applicable bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write-acp',
+                ),
+                'ACP' => array(
+                    'description' => 'Pass an Aws\\S3\\Model\\Acp object as an alternative way to add access control policy headers to the operation',
+                    'type' => 'object',
+                    'additionalProperties' => true,
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The requested bucket name is not available. The bucket namespace is shared by all users of the system. Please select a different name and try again.',
+                    'class' => 'BucketAlreadyExistsException',
+                ),
+            ),
+        ),
+        'CreateMultipartUpload' => array(
+            'httpMethod' => 'POST',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'CreateMultipartUploadOutput',
+            'responseType' => 'model',
+            'summary' => 'Initiates a multipart upload and returns an upload ID.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadInitiate.html',
+            'parameters' => array(
+                'ACL' => array(
+                    'description' => 'The canned ACL to apply to the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-acl',
+                    'enum' => array(
+                        'private',
+                        'public-read',
+                        'public-read-write',
+                        'authenticated-read',
+                        'bucket-owner-read',
+                        'bucket-owner-full-control',
+                    ),
+                ),
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'CacheControl' => array(
+                    'description' => 'Specifies caching behavior along the request/reply chain.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Cache-Control',
+                ),
+                'ContentDisposition' => array(
+                    'description' => 'Specifies presentational information for the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Disposition',
+                ),
+                'ContentEncoding' => array(
+                    'description' => 'Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Encoding',
+                ),
+                'ContentLanguage' => array(
+                    'description' => 'The language the content is in.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Language',
+                ),
+                'ContentType' => array(
+                    'description' => 'A standard MIME type describing the format of the object data.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Type',
+                ),
+                'Expires' => array(
+                    'description' => 'The date and time at which the object is no longer cacheable.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                ),
+                'GrantFullControl' => array(
+                    'description' => 'Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-full-control',
+                ),
+                'GrantRead' => array(
+                    'description' => 'Allows grantee to read the object data and its metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read',
+                ),
+                'GrantReadACP' => array(
+                    'description' => 'Allows grantee to read the object ACL.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read-acp',
+                ),
+                'GrantWriteACP' => array(
+                    'description' => 'Allows grantee to write the ACL for the applicable object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write-acp',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'Metadata' => array(
+                    'description' => 'A map of metadata to store with the object in S3.',
+                    'type' => 'object',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-meta-',
+                    'additionalProperties' => array(
+                        'description' => 'The metadata key. This will be prefixed with x-amz-meta- before sending to S3 as a header. The x-amz-meta- header will be stripped from the key when retrieving headers.',
+                        'type' => 'string',
+                    ),
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                    'enum' => array(
+                        'AES256',
+                    ),
+                ),
+                'StorageClass' => array(
+                    'description' => 'The type of storage to use for the object. Defaults to \'STANDARD\'.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-storage-class',
+                    'enum' => array(
+                        'STANDARD',
+                        'REDUCED_REDUNDANCY',
+                    ),
+                ),
+                'WebsiteRedirectLocation' => array(
+                    'description' => 'If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-website-redirect-location',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'uploads',
+                    'default' => '_guzzle_blank_',
+                ),
+                'ACP' => array(
+                    'description' => 'Pass an Aws\\S3\\Model\\Acp object as an alternative way to add access control policy headers to the operation',
+                    'type' => 'object',
+                    'additionalProperties' => true,
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'DeleteBucket' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteBucketOutput',
+            'responseType' => 'model',
+            'summary' => 'Deletes the bucket. All objects (including all object versions and Delete Markers) in the bucket must be deleted before the bucket itself can be deleted.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETE.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+            ),
+        ),
+        'DeleteBucketCors' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteBucketCorsOutput',
+            'responseType' => 'model',
+            'summary' => 'Deletes the cors configuration information set for the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEcors.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'cors',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'DeleteBucketLifecycle' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteBucketLifecycleOutput',
+            'responseType' => 'model',
+            'summary' => 'Deletes the lifecycle configuration from the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETElifecycle.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'lifecycle',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'DeleteBucketPolicy' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteBucketPolicyOutput',
+            'responseType' => 'model',
+            'summary' => 'Deletes the policy from the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEpolicy.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'policy',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'DeleteBucketTagging' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteBucketTaggingOutput',
+            'responseType' => 'model',
+            'summary' => 'Deletes the tags from the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEtagging.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'tagging',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'DeleteBucketWebsite' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteBucketWebsiteOutput',
+            'responseType' => 'model',
+            'summary' => 'This operation removes the website configuration from the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEwebsite.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'website',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'DeleteObject' => array(
+            'httpMethod' => 'DELETE',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteObjectOutput',
+            'responseType' => 'model',
+            'summary' => 'Removes the null version (if there is one) of an object and inserts a delete marker, which becomes the latest version of the object. If there isn\'t a null version, Amazon S3 does not remove any objects.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectDELETE.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+            ),
+        ),
+        'DeleteObjects' => array(
+            'httpMethod' => 'POST',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'DeleteObjectsOutput',
+            'responseType' => 'model',
+            'summary' => 'This operation enables you to delete multiple objects from a bucket using a single HTTP request. You may specify up to 1000 keys.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/multiobjectdeleteapi.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'Delete',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Objects' => array(
+                    'required' => true,
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Object',
+                        'properties' => array(
+                            'Key' => array(
+                                'required' => true,
+                                'description' => 'Key name of the object to delete.',
+                                'type' => 'string',
+                            ),
+                            'VersionId' => array(
+                                'description' => 'VersionId for the specific version of the object to delete.',
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'Quiet' => array(
+                    'description' => 'Element to enable quiet mode for the request. When you add this element, you must set its value to true.',
+                    'type' => 'boolean',
+                    'format' => 'boolean-string',
+                    'location' => 'xml',
+                ),
+                'MFA' => array(
+                    'description' => 'The concatenation of the authentication device\'s serial number, a space, and the value that is displayed on your authentication device.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-mfa',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'delete',
+                    'default' => '_guzzle_blank_',
+                ),
+                'ContentMD5' => array(
+                    'required' => true,
+                    'default' => true,
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketAcl' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketAclOutput',
+            'responseType' => 'model',
+            'summary' => 'Gets the access control policy for the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETacl.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'acl',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketCors' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketCorsOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the cors configuration for the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETcors.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'cors',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketLifecycle' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketLifecycleOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the lifecycle configuration information set on the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlifecycle.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'lifecycle',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketLocation' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketLocationOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the region the bucket resides in.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlocation.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'location',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'GetBucketLogging' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketLoggingOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the logging status of a bucket and the permissions users have to view and modify that status. To use GET, you must be the bucket owner.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlogging.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'logging',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketNotification' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketNotificationOutput',
+            'responseType' => 'model',
+            'summary' => 'Return the notification configuration of a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETnotification.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'notification',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketPolicy' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketPolicyOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the policy of a specified bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETpolicy.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'policy',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'GetBucketRequestPayment' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketRequestPaymentOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the request payment configuration of a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentGET.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'requestPayment',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketTagging' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketTaggingOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the tag set associated with the bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETtagging.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'tagging',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketVersioning' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketVersioningOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the versioning state of a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETversioningStatus.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'versioning',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetBucketWebsite' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetBucketWebsiteOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the website configuration for a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETwebsite.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'website',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'GetObject' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetObjectOutput',
+            'responseType' => 'model',
+            'summary' => 'Retrieves objects from Amazon S3.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGET.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'IfMatch' => array(
+                    'description' => 'Return the object only if its entity tag (ETag) is the same as the one specified, otherwise return a 412 (precondition failed).',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'If-Match',
+                ),
+                'IfModifiedSince' => array(
+                    'description' => 'Return the object only if it has been modified since the specified time, otherwise return a 304 (not modified).',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'If-Modified-Since',
+                ),
+                'IfNoneMatch' => array(
+                    'description' => 'Return the object only if its entity tag (ETag) is different from the one specified, otherwise return a 304 (not modified).',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'If-None-Match',
+                ),
+                'IfUnmodifiedSince' => array(
+                    'description' => 'Return the object only if it has not been modified since the specified time, otherwise return a 412 (precondition failed).',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'If-Unmodified-Since',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'Range' => array(
+                    'description' => 'Downloads the specified range bytes of an object. For more information about the HTTP Range header, go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'ResponseCacheControl' => array(
+                    'description' => 'Sets the Cache-Control header of the response.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'response-cache-control',
+                ),
+                'ResponseContentDisposition' => array(
+                    'description' => 'Sets the Content-Disposition header of the response',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'response-content-disposition',
+                ),
+                'ResponseContentEncoding' => array(
+                    'description' => 'Sets the Content-Encoding header of the response.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'response-content-encoding',
+                ),
+                'ResponseContentLanguage' => array(
+                    'description' => 'Sets the Content-Language header of the response.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'response-content-language',
+                ),
+                'ResponseContentType' => array(
+                    'description' => 'Sets the Content-Type header of the response.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'response-content-type',
+                ),
+                'ResponseExpires' => array(
+                    'description' => 'Sets the Expires header of the response.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'query',
+                    'sentAs' => 'response-expires',
+                ),
+                'VersionId' => array(
+                    'description' => 'VersionId used to reference a specific version of the object.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'versionId',
+                ),
+                'SaveAs' => array(
+                    'description' => 'Specify where the contents of the object should be downloaded. Can be the path to a file, a resource returned by fopen, or a Guzzle\\Http\\EntityBodyInterface object.',
+                    'location' => 'response_body',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The specified key does not exist.',
+                    'class' => 'NoSuchKeyException',
+                ),
+            ),
+        ),
+        'GetObjectAcl' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetObjectAclOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns the access control list (ACL) of an object.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETacl.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'VersionId' => array(
+                    'description' => 'VersionId used to reference a specific version of the object.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'versionId',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'acl',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The specified key does not exist.',
+                    'class' => 'NoSuchKeyException',
+                ),
+            ),
+        ),
+        'GetObjectTorrent' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'GetObjectTorrentOutput',
+            'responseType' => 'model',
+            'summary' => 'Return torrent files from a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETtorrent.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'torrent',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'HeadBucket' => array(
+            'httpMethod' => 'HEAD',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'HeadBucketOutput',
+            'responseType' => 'model',
+            'summary' => 'This operation is useful to determine if a bucket exists and you have permission to access it.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketHEAD.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The specified bucket does not exist.',
+                    'class' => 'NoSuchBucketException',
+                ),
+            ),
+        ),
+        'HeadObject' => array(
+            'httpMethod' => 'HEAD',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'HeadObjectOutput',
+            'responseType' => 'model',
+            'summary' => 'The HEAD operation retrieves metadata from an object without returning the object itself. This operation is useful if you\'re only interested in an object\'s metadata. To use HEAD, you must have READ access to the object.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectHEAD.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'IfMatch' => array(
+                    'description' => 'Return the object only if its entity tag (ETag) is the same as the one specified, otherwise return a 412 (precondition failed).',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'If-Match',
+                ),
+                'IfModifiedSince' => array(
+                    'description' => 'Return the object only if it has been modified since the specified time, otherwise return a 304 (not modified).',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'If-Modified-Since',
+                ),
+                'IfNoneMatch' => array(
+                    'description' => 'Return the object only if its entity tag (ETag) is different from the one specified, otherwise return a 304 (not modified).',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'If-None-Match',
+                ),
+                'IfUnmodifiedSince' => array(
+                    'description' => 'Return the object only if it has not been modified since the specified time, otherwise return a 412 (precondition failed).',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'If-Unmodified-Since',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'Range' => array(
+                    'description' => 'Downloads the specified range bytes of an object. For more information about the HTTP Range header, go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'VersionId' => array(
+                    'description' => 'VersionId used to reference a specific version of the object.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'versionId',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The specified key does not exist.',
+                    'class' => 'NoSuchKeyException',
+                ),
+            ),
+        ),
+        'ListBuckets' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'ListBucketsOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns a list of all buckets owned by the authenticated sender of the request.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTServiceGET.html',
+            'parameters' => array(
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'ListMultipartUploads' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'ListMultipartUploadsOutput',
+            'responseType' => 'model',
+            'summary' => 'This operation lists in-progress multipart uploads.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadListMPUpload.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Delimiter' => array(
+                    'description' => 'Character you use to group keys.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'delimiter',
+                ),
+                'KeyMarker' => array(
+                    'description' => 'Together with upload-id-marker, this parameter specifies the multipart upload after which listing should begin.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'key-marker',
+                ),
+                'MaxUploads' => array(
+                    'description' => 'Sets the maximum number of multipart uploads, from 1 to 1,000, to return in the response body. 1,000 is the maximum number of uploads that can be returned in a response.',
+                    'type' => 'numeric',
+                    'location' => 'query',
+                    'sentAs' => 'max-uploads',
+                ),
+                'Prefix' => array(
+                    'description' => 'Lists in-progress uploads only for those keys that begin with the specified prefix.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'prefix',
+                ),
+                'UploadIdMarker' => array(
+                    'description' => 'Together with key-marker, specifies the multipart upload after which listing should begin. If key-marker is not specified, the upload-id-marker parameter is ignored.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'upload-id-marker',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'uploads',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'ListObjectVersions' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'ListObjectVersionsOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns metadata about all of the versions of objects in a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETVersion.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Delimiter' => array(
+                    'description' => 'A delimiter is a character you use to group keys.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'delimiter',
+                ),
+                'KeyMarker' => array(
+                    'description' => 'Specifies the key to start with when listing objects in a bucket.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'key-marker',
+                ),
+                'MaxKeys' => array(
+                    'description' => 'Sets the maximum number of keys returned in the response. The response might contain fewer keys but will never contain more.',
+                    'type' => 'numeric',
+                    'location' => 'query',
+                    'sentAs' => 'max-keys',
+                ),
+                'Prefix' => array(
+                    'description' => 'Limits the response to keys that begin with the specified prefix.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'prefix',
+                ),
+                'VersionIdMarker' => array(
+                    'description' => 'Specifies the object version you want to start listing from.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'version-id-marker',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'versions',
+                    'default' => '_guzzle_blank_',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'ListObjects' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'ListObjectsOutput',
+            'responseType' => 'model',
+            'summary' => 'Returns some or all (up to 1000) of the objects in a bucket. You can use the request parameters as selection criteria to return a subset of the objects in a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGET.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Delimiter' => array(
+                    'description' => 'A delimiter is a character you use to group keys.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'delimiter',
+                ),
+                'Marker' => array(
+                    'description' => 'Specifies the key to start with when listing objects in a bucket.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'marker',
+                ),
+                'MaxKeys' => array(
+                    'description' => 'Sets the maximum number of keys returned in the response. The response might contain fewer keys but will never contain more.',
+                    'type' => 'numeric',
+                    'location' => 'query',
+                    'sentAs' => 'max-keys',
+                ),
+                'Prefix' => array(
+                    'description' => 'Limits the response to keys that begin with the specified prefix.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'prefix',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The specified bucket does not exist.',
+                    'class' => 'NoSuchBucketException',
+                ),
+            ),
+        ),
+        'ListParts' => array(
+            'httpMethod' => 'GET',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'ListPartsOutput',
+            'responseType' => 'model',
+            'summary' => 'Lists the parts that have been uploaded for a specific multipart upload.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadListParts.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'MaxParts' => array(
+                    'description' => 'Sets the maximum number of parts to return.',
+                    'type' => 'numeric',
+                    'location' => 'query',
+                    'sentAs' => 'max-parts',
+                ),
+                'PartNumberMarker' => array(
+                    'description' => 'Specifies the part after which listing should begin. Only parts with higher part numbers will be listed.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'part-number-marker',
+                ),
+                'UploadId' => array(
+                    'required' => true,
+                    'description' => 'Upload ID identifying the multipart upload whose parts are being listed.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'uploadId',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+        'PutBucketAcl' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketAclOutput',
+            'responseType' => 'model',
+            'summary' => 'Sets the permissions on a bucket using access control lists (ACL).',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTacl.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'AccessControlPolicy',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'ACL' => array(
+                    'description' => 'The canned ACL to apply to the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-acl',
+                    'enum' => array(
+                        'private',
+                        'public-read',
+                        'public-read-write',
+                        'authenticated-read',
+                        'bucket-owner-read',
+                        'bucket-owner-full-control',
+                    ),
+                ),
+                'Grants' => array(
+                    'description' => 'A list of grants.',
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'AccessControlList',
+                    'items' => array(
+                        'name' => 'Grant',
+                        'type' => 'object',
+                        'properties' => array(
+                            'Grantee' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'DisplayName' => array(
+                                        'description' => 'Screen name of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'EmailAddress' => array(
+                                        'description' => 'Email address of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'ID' => array(
+                                        'description' => 'The canonical user ID of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'Type' => array(
+                                        'required' => true,
+                                        'description' => 'Type of grantee',
+                                        'type' => 'string',
+                                        'sentAs' => 'xsi:type',
+                                        'data' => array(
+                                            'xmlAttribute' => true,
+                                            'xmlNamespace' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                        ),
+                                        'enum' => array(
+                                            'CanonicalUser',
+                                            'AmazonCustomerByEmail',
+                                            'Group',
+                                        ),
+                                    ),
+                                    'URI' => array(
+                                        'description' => 'URI of the grantee group.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Permission' => array(
+                                'description' => 'Specifies the permission given to the grantee.',
+                                'type' => 'string',
+                                'enum' => array(
+                                    'FULL_CONTROL',
+                                    'WRITE',
+                                    'WRITE_ACP',
+                                    'READ',
+                                    'READ_ACP',
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'Owner' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'DisplayName' => array(
+                            'type' => 'string',
+                        ),
+                        'ID' => array(
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'GrantFullControl' => array(
+                    'description' => 'Allows grantee the read, write, read ACP, and write ACP permissions on the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-full-control',
+                ),
+                'GrantRead' => array(
+                    'description' => 'Allows grantee to list the objects in the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read',
+                ),
+                'GrantReadACP' => array(
+                    'description' => 'Allows grantee to read the bucket ACL.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read-acp',
+                ),
+                'GrantWrite' => array(
+                    'description' => 'Allows grantee to create, overwrite, and delete any object in the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write',
+                ),
+                'GrantWriteACP' => array(
+                    'description' => 'Allows grantee to write the ACL for the applicable bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write-acp',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'acl',
+                    'default' => '_guzzle_blank_',
+                ),
+                'ACP' => array(
+                    'description' => 'Pass an Aws\\S3\\Model\\Acp object as an alternative way to add an access control policy to the operation',
+                    'type' => 'object',
+                    'additionalProperties' => true,
+                ),
+            ),
+        ),
+        'PutBucketCors' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketCorsOutput',
+            'responseType' => 'model',
+            'summary' => 'Sets the cors configuration for a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTcors.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'CORSConfiguration',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'CORSRules' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'CORSRule',
+                        'properties' => array(
+                            'AllowedHeaders' => array(
+                                'description' => 'Specifies which headers are allowed in a pre-flight OPTIONS request.',
+                                'type' => 'array',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'AllowedHeader',
+                                ),
+                            ),
+                            'AllowedMethods' => array(
+                                'description' => 'Identifies HTTP methods that the domain/origin specified in the rule is allowed to execute.',
+                                'type' => 'array',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'AllowedMethod',
+                                ),
+                            ),
+                            'AllowedOrigins' => array(
+                                'description' => 'One or more origins you want customers to be able to access the bucket from.',
+                                'type' => 'array',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'AllowedOrigin',
+                                ),
+                            ),
+                            'ExposeHeaders' => array(
+                                'description' => 'One or more headers in the response that you want customers to be able to access from their applications (for example, from a JavaScript XMLHttpRequest object).',
+                                'type' => 'array',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'ExposeHeader',
+                                ),
+                            ),
+                            'MaxAgeSeconds' => array(
+                                'description' => 'The time in seconds that your browser is to cache the preflight response for the specified resource.',
+                                'type' => 'numeric',
+                            ),
+                        ),
+                    ),
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'cors',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketLifecycle' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketLifecycleOutput',
+            'responseType' => 'model',
+            'summary' => 'Sets lifecycle configuration for your bucket. If a lifecycle configuration exists, it replaces it.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlifecycle.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'LifecycleConfiguration',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'Rules' => array(
+                    'required' => true,
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Rule',
+                        'properties' => array(
+                            'Expiration' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'Date' => array(
+                                        'description' => 'Indicates at what date the object is to be moved or deleted. Should be in GMT ISO 8601 Format.',
+                                        'type' => array(
+                                            'object',
+                                            'string',
+                                            'integer',
+                                        ),
+                                        'format' => 'date-time',
+                                    ),
+                                    'Days' => array(
+                                        'description' => 'Indicates the lifetime, in days, of the objects that are subject to the rule. The value must be a non-zero positive integer.',
+                                        'type' => 'numeric',
+                                    ),
+                                ),
+                            ),
+                            'ID' => array(
+                                'description' => 'Unique identifier for the rule. The value cannot be longer than 255 characters.',
+                                'type' => 'string',
+                            ),
+                            'Prefix' => array(
+                                'required' => true,
+                                'description' => 'Prefix identifying one or more objects to which the rule applies.',
+                                'type' => 'string',
+                            ),
+                            'Status' => array(
+                                'required' => true,
+                                'description' => 'If \'Enabled\', the rule is currently being applied. If \'Disabled\', the rule is not currently being applied.',
+                                'type' => 'string',
+                                'enum' => array(
+                                    'Enabled',
+                                    'Disabled',
+                                ),
+                            ),
+                            'Transition' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'Date' => array(
+                                        'description' => 'Indicates at what date the object is to be moved or deleted. Should be in GMT ISO 8601 Format.',
+                                        'type' => array(
+                                            'object',
+                                            'string',
+                                            'integer',
+                                        ),
+                                        'format' => 'date-time',
+                                    ),
+                                    'Days' => array(
+                                        'description' => 'Indicates the lifetime, in days, of the objects that are subject to the rule. The value must be a non-zero positive integer.',
+                                        'type' => 'numeric',
+                                    ),
+                                    'StorageClass' => array(
+                                        'description' => 'The class of storage used to store the object.',
+                                        'type' => 'string',
+                                        'enum' => array(
+                                            'STANDARD',
+                                            'REDUCED_REDUNDANCY',
+                                            'GLACIER',
+                                        ),
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'lifecycle',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketLogging' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketLoggingOutput',
+            'responseType' => 'model',
+            'summary' => 'Set the logging parameters for a bucket and to specify permissions for who can view and modify the logging parameters. To set the logging status of a bucket, you must be the bucket owner.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlogging.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'BucketLoggingStatus',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'LoggingEnabled' => array(
+                    'required' => true,
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'TargetBucket' => array(
+                            'description' => 'Specifies the bucket where you want Amazon S3 to store server access logs. You can have your logs delivered to any bucket that you own, including the same bucket that is being logged. You can also configure multiple buckets to deliver their logs to the same target bucket. In this case you should choose a different TargetPrefix for each source bucket so that the delivered log files can be distinguished by key.',
+                            'type' => 'string',
+                        ),
+                        'TargetGrants' => array(
+                            'type' => 'array',
+                            'items' => array(
+                                'name' => 'Grant',
+                                'type' => 'object',
+                                'properties' => array(
+                                    'Grantee' => array(
+                                        'type' => 'object',
+                                        'properties' => array(
+                                            'DisplayName' => array(
+                                                'description' => 'Screen name of the grantee.',
+                                                'type' => 'string',
+                                            ),
+                                            'EmailAddress' => array(
+                                                'description' => 'Email address of the grantee.',
+                                                'type' => 'string',
+                                            ),
+                                            'ID' => array(
+                                                'description' => 'The canonical user ID of the grantee.',
+                                                'type' => 'string',
+                                            ),
+                                            'Type' => array(
+                                                'required' => true,
+                                                'description' => 'Type of grantee',
+                                                'type' => 'string',
+                                                'sentAs' => 'xsi:type',
+                                                'data' => array(
+                                                    'xmlAttribute' => true,
+                                                    'xmlNamespace' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                                ),
+                                                'enum' => array(
+                                                    'CanonicalUser',
+                                                    'AmazonCustomerByEmail',
+                                                    'Group',
+                                                ),
+                                            ),
+                                            'URI' => array(
+                                                'description' => 'URI of the grantee group.',
+                                                'type' => 'string',
+                                            ),
+                                        ),
+                                    ),
+                                    'Permission' => array(
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                        'TargetPrefix' => array(
+                            'description' => 'This element lets you specify a prefix for the keys that the log files will be stored under.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'logging',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketNotification' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketNotificationOutput',
+            'responseType' => 'model',
+            'summary' => 'Enables notifications of specified events for a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTnotification.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'NotificationConfiguration',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'TopicConfiguration' => array(
+                    'required' => true,
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'Event' => array(
+                            'description' => 'Bucket event for which to send notifications.',
+                            'type' => 'string',
+                            'enum' => array(
+                                's3:ReducedRedundancyLostObject',
+                            ),
+                        ),
+                        'Topic' => array(
+                            'description' => 'Amazon SNS topic to which Amazon S3 will publish a message to report the specified events for the bucket.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'notification',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketPolicy' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketPolicyOutput',
+            'responseType' => 'model',
+            'summary' => 'Replaces a policy on a bucket. If the bucket already has a policy, the one in this request completely replaces it.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTpolicy.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'Policy' => array(
+                    'required' => true,
+                    'description' => 'The bucket policy as a JSON document.',
+                    'type' => array(
+                        'string',
+                        'object',
+                    ),
+                    'location' => 'body',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'policy',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketRequestPayment' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketRequestPaymentOutput',
+            'responseType' => 'model',
+            'summary' => 'Sets the request payment configuration for a bucket. By default, the bucket owner pays for downloads from the bucket. This configuration parameter enables the bucket owner (only) to specify that the person requesting the download will be charged for the download.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentPUT.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'RequestPaymentConfiguration',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'Payer' => array(
+                    'required' => true,
+                    'description' => 'Specifies who pays for the download and request fees.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                    'enum' => array(
+                        'Requester',
+                        'BucketOwner',
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'requestPayment',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketTagging' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketTaggingOutput',
+            'responseType' => 'model',
+            'summary' => 'Sets the tags for a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTtagging.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'Tagging',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'TagSet' => array(
+                    'required' => true,
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'items' => array(
+                        'name' => 'Tag',
+                        'required' => true,
+                        'type' => 'object',
+                        'properties' => array(
+                            'Key' => array(
+                                'required' => true,
+                                'description' => 'Name of the tag.',
+                                'type' => 'string',
+                            ),
+                            'Value' => array(
+                                'required' => true,
+                                'description' => 'Value of the tag.',
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'tagging',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketVersioning' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketVersioningOutput',
+            'responseType' => 'model',
+            'summary' => 'Sets the versioning state of an existing bucket. To set the versioning state, you must be the bucket owner.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTVersioningStatus.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'VersioningConfiguration',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'MFA' => array(
+                    'description' => 'The value is the concatenation of the authentication device\'s serial number, a space, and the value displayed on your authentication device.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-mfa',
+                ),
+                'MFADelete' => array(
+                    'description' => 'Specifies whether MFA delete is enabled in the bucket versioning configuration. This element is only returned if the bucket has been configured with MFA delete. If the bucket has never been so configured, this element is not returned.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                    'enum' => array(
+                        'Enabled',
+                        'Disabled',
+                    ),
+                ),
+                'Status' => array(
+                    'description' => 'The versioning state of the bucket.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                    'enum' => array(
+                        'Enabled',
+                        'Disabled',
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'versioning',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutBucketWebsite' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutBucketWebsiteOutput',
+            'responseType' => 'model',
+            'summary' => 'Set the website configuration for a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTwebsite.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'WebsiteConfiguration',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+                'xmlAllowEmpty' => true,
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'ErrorDocument' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'Key' => array(
+                            'required' => true,
+                            'description' => 'The object key name to use when a 4XX class error occurs.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'IndexDocument' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'Suffix' => array(
+                            'required' => true,
+                            'description' => 'A suffix that is appended to a request that is for a directory on the website endpoint (e.g. if the suffix is index.html and you make a request to samplebucket/images/ the data that is returned will be for the object with the key name images/index.html) The suffix must not be empty and must not include a slash character.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'RedirectAllRequestsTo' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'HostName' => array(
+                            'required' => true,
+                            'description' => 'Name of the host where requests will be redirected.',
+                            'type' => 'string',
+                        ),
+                        'Protocol' => array(
+                            'description' => 'Protocol to use (http, https) when redirecting requests. The default is the protocol that is used in the original request.',
+                            'type' => 'string',
+                            'enum' => array(
+                                'http',
+                                'https',
+                            ),
+                        ),
+                    ),
+                ),
+                'RoutingRules' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'items' => array(
+                        'name' => 'RoutingRule',
+                        'type' => 'object',
+                        'properties' => array(
+                            'Condition' => array(
+                                'description' => 'A container for describing a condition that must be met for the specified redirect to apply. For example, 1. If request is for pages in the /docs folder, redirect to the /documents folder. 2. If request results in HTTP error 4xx, redirect request to another host where you might process the error.',
+                                'type' => 'object',
+                                'properties' => array(
+                                    'HttpErrorCodeReturnedEquals' => array(
+                                        'description' => 'The HTTP error code when the redirect is applied. In the event of an error, if the error code equals this value, then the specified redirect is applied. Required when parent element Condition is specified and sibling KeyPrefixEquals is not specified. If both are specified, then both must be true for the redirect to be applied.',
+                                        'type' => 'string',
+                                    ),
+                                    'KeyPrefixEquals' => array(
+                                        'description' => 'The object key name prefix when the redirect is applied. For example, to redirect requests for ExamplePage.html, the key prefix will be ExamplePage.html. To redirect request for all pages with the prefix docs/, the key prefix will be /docs, which identifies all objects in the docs/ folder. Required when the parent element Condition is specified and sibling HttpErrorCodeReturnedEquals is not specified. If both conditions are specified, both must be true for the redirect to be applied.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Redirect' => array(
+                                'required' => true,
+                                'description' => 'Container for redirect information. You can redirect requests to another host, to another page, or with another protocol. In the event of an error, you can can specify a different error code to return.',
+                                'type' => 'object',
+                                'properties' => array(
+                                    'HostName' => array(
+                                        'required' => true,
+                                        'description' => 'Name of the host where requests will be redirected.',
+                                        'type' => 'string',
+                                    ),
+                                    'HttpRedirectCode' => array(
+                                        'description' => 'The HTTP redirect code to use on the response. Not required if one of the siblings is present.',
+                                        'type' => 'string',
+                                    ),
+                                    'Protocol' => array(
+                                        'description' => 'Protocol to use (http, https) when redirecting requests. The default is the protocol that is used in the original request.',
+                                        'type' => 'string',
+                                        'enum' => array(
+                                            'http',
+                                            'https',
+                                        ),
+                                    ),
+                                    'ReplaceKeyPrefixWith' => array(
+                                        'description' => 'The object key prefix to use in the redirect request. For example, to redirect requests for all pages with prefix docs/ (objects in the docs/ folder) to documents/, you can set a condition block with KeyPrefixEquals set to docs/ and in the Redirect set ReplaceKeyPrefixWith to /documents. Not required if one of the siblings is present. Can be present only if ReplaceKeyWith is not provided.',
+                                        'type' => 'string',
+                                    ),
+                                    'ReplaceKeyWith' => array(
+                                        'description' => 'The specific object key to use in the redirect request. For example, redirect request to error.html. Not required if one of the sibling is present. Can be present only if ReplaceKeyPrefixWith is not provided.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'website',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+        ),
+        'PutObject' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutObjectOutput',
+            'responseType' => 'model',
+            'summary' => 'Adds an object to a bucket.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html',
+            'parameters' => array(
+                'ACL' => array(
+                    'description' => 'The canned ACL to apply to the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-acl',
+                    'enum' => array(
+                        'private',
+                        'public-read',
+                        'public-read-write',
+                        'authenticated-read',
+                        'bucket-owner-read',
+                        'bucket-owner-full-control',
+                    ),
+                ),
+                'Body' => array(
+                    'description' => 'Pass a string containing the body, a handle returned by fopen, or a Guzzle\\Http\\EntityBodyInterface object',
+                    'type' => array(
+                        'string',
+                        'object',
+                    ),
+                    'location' => 'body',
+                ),
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'CacheControl' => array(
+                    'description' => 'Specifies caching behavior along the request/reply chain.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Cache-Control',
+                ),
+                'ContentDisposition' => array(
+                    'description' => 'Specifies presentational information for the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Disposition',
+                ),
+                'ContentEncoding' => array(
+                    'description' => 'Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Encoding',
+                ),
+                'ContentLanguage' => array(
+                    'description' => 'The language the content is in.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Language',
+                ),
+                'ContentLength' => array(
+                    'description' => 'Size of the body in bytes. This parameter is useful when the size of the body cannot be determined automatically.',
+                    'type' => 'numeric',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Length',
+                ),
+                'ContentMD5' => array(
+                    'description' => 'Content-MD5 checksum of the body. Set to false to disable',
+                    'default' => true,
+                ),
+                'ContentType' => array(
+                    'description' => 'A standard MIME type describing the format of the object data.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Type',
+                ),
+                'Expires' => array(
+                    'description' => 'The date and time at which the object is no longer cacheable.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                ),
+                'GrantFullControl' => array(
+                    'description' => 'Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-full-control',
+                ),
+                'GrantRead' => array(
+                    'description' => 'Allows grantee to read the object data and its metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read',
+                ),
+                'GrantReadACP' => array(
+                    'description' => 'Allows grantee to read the object ACL.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read-acp',
+                ),
+                'GrantWriteACP' => array(
+                    'description' => 'Allows grantee to write the ACL for the applicable object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write-acp',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'Metadata' => array(
+                    'description' => 'A map of metadata to store with the object in S3.',
+                    'type' => 'object',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-meta-',
+                    'additionalProperties' => array(
+                        'description' => 'The metadata key. This will be prefixed with x-amz-meta- before sending to S3 as a header. The x-amz-meta- header will be stripped from the key when retrieving headers.',
+                        'type' => 'string',
+                    ),
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                    'enum' => array(
+                        'AES256',
+                    ),
+                ),
+                'StorageClass' => array(
+                    'description' => 'The type of storage to use for the object. Defaults to \'STANDARD\'.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-storage-class',
+                    'enum' => array(
+                        'STANDARD',
+                        'REDUCED_REDUNDANCY',
+                    ),
+                ),
+                'WebsiteRedirectLocation' => array(
+                    'description' => 'If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-website-redirect-location',
+                ),
+                'ValidateMD5' => array(
+                    'description' => 'Whether or not the Content-MD5 header of the response is validated. Default is true.',
+                    'default' => true,
+                ),
+                'ACP' => array(
+                    'description' => 'Pass an Aws\\S3\\Model\\Acp object as an alternative way to add access control policy headers to the operation',
+                    'type' => 'object',
+                    'additionalProperties' => true,
+                ),
+            ),
+        ),
+        'PutObjectAcl' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'PutObjectAclOutput',
+            'responseType' => 'model',
+            'summary' => 'uses the acl subresource to set the access control list (ACL) permissions for an object that already exists in a bucket',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'AccessControlPolicy',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'ACL' => array(
+                    'description' => 'The canned ACL to apply to the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-acl',
+                    'enum' => array(
+                        'private',
+                        'public-read',
+                        'public-read-write',
+                        'authenticated-read',
+                        'bucket-owner-read',
+                        'bucket-owner-full-control',
+                    ),
+                ),
+                'Grants' => array(
+                    'description' => 'A list of grants.',
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'AccessControlList',
+                    'items' => array(
+                        'name' => 'Grant',
+                        'type' => 'object',
+                        'properties' => array(
+                            'Grantee' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'DisplayName' => array(
+                                        'description' => 'Screen name of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'EmailAddress' => array(
+                                        'description' => 'Email address of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'ID' => array(
+                                        'description' => 'The canonical user ID of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'Type' => array(
+                                        'required' => true,
+                                        'description' => 'Type of grantee',
+                                        'type' => 'string',
+                                        'sentAs' => 'xsi:type',
+                                        'data' => array(
+                                            'xmlAttribute' => true,
+                                            'xmlNamespace' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                        ),
+                                        'enum' => array(
+                                            'CanonicalUser',
+                                            'AmazonCustomerByEmail',
+                                            'Group',
+                                        ),
+                                    ),
+                                    'URI' => array(
+                                        'description' => 'URI of the grantee group.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Permission' => array(
+                                'description' => 'Specifies the permission given to the grantee.',
+                                'type' => 'string',
+                                'enum' => array(
+                                    'FULL_CONTROL',
+                                    'WRITE',
+                                    'WRITE_ACP',
+                                    'READ',
+                                    'READ_ACP',
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'Owner' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'DisplayName' => array(
+                            'type' => 'string',
+                        ),
+                        'ID' => array(
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentMD5' => array(
+                    'default' => true,
+                ),
+                'GrantFullControl' => array(
+                    'description' => 'Allows grantee the read, write, read ACP, and write ACP permissions on the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-full-control',
+                ),
+                'GrantRead' => array(
+                    'description' => 'Allows grantee to list the objects in the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read',
+                ),
+                'GrantReadACP' => array(
+                    'description' => 'Allows grantee to read the bucket ACL.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-read-acp',
+                ),
+                'GrantWrite' => array(
+                    'description' => 'Allows grantee to create, overwrite, and delete any object in the bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write',
+                ),
+                'GrantWriteACP' => array(
+                    'description' => 'Allows grantee to write the ACL for the applicable bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-grant-write-acp',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'acl',
+                    'default' => '_guzzle_blank_',
+                ),
+                'ACP' => array(
+                    'description' => 'Pass an Aws\\S3\\Model\\Acp object as an alternative way to add an access control policy to the operation',
+                    'type' => 'object',
+                    'additionalProperties' => true,
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'The specified key does not exist.',
+                    'class' => 'NoSuchKeyException',
+                ),
+            ),
+        ),
+        'RestoreObject' => array(
+            'httpMethod' => 'POST',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'RestoreObjectOutput',
+            'responseType' => 'model',
+            'summary' => 'Restores an archived copy of an object back into Amazon S3',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectRestore.html',
+            'data' => array(
+                'xmlRoot' => array(
+                    'name' => 'RestoreRequest',
+                    'namespaces' => array(
+                        'http://s3.amazonaws.com/doc/2006-03-01/',
+                    ),
+                ),
+            ),
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'Days' => array(
+                    'required' => true,
+                    'description' => 'Lifetime of the active copy in days',
+                    'type' => 'numeric',
+                    'location' => 'xml',
+                ),
+                'SubResource' => array(
+                    'required' => true,
+                    'static' => true,
+                    'location' => 'query',
+                    'sentAs' => 'restore',
+                    'default' => '_guzzle_blank_',
+                ),
+            ),
+            'errorResponses' => array(
+                array(
+                    'reason' => 'This operation is not allowed against this storage tier',
+                    'class' => 'ObjectAlreadyInActiveTierErrorException',
+                ),
+            ),
+        ),
+        'UploadPart' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'UploadPartOutput',
+            'responseType' => 'model',
+            'summary' => 'Uploads a part in a multipart upload.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPart.html',
+            'parameters' => array(
+                'Body' => array(
+                    'description' => 'Pass a string containing the body, a handle returned by fopen, or a Guzzle\\Http\\EntityBodyInterface object',
+                    'type' => array(
+                        'string',
+                        'object',
+                    ),
+                    'location' => 'body',
+                ),
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'ContentLength' => array(
+                    'description' => 'Size of the body in bytes. This parameter is useful when the size of the body cannot be determined automatically.',
+                    'type' => 'numeric',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Length',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'PartNumber' => array(
+                    'required' => true,
+                    'description' => 'Part number of part being uploaded.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'partNumber',
+                ),
+                'UploadId' => array(
+                    'required' => true,
+                    'description' => 'Upload ID identifying the multipart upload whose part is being uploaded.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'uploadId',
+                ),
+                'ContentMD5' => array(
+                    'description' => 'Content-MD5 checksum of the body. Set to false to disable',
+                    'default' => true,
+                ),
+                'ValidateMD5' => array(
+                    'description' => 'Whether or not the Content-MD5 header of the response is validated. Default is true.',
+                    'default' => true,
+                ),
+            ),
+        ),
+        'UploadPartCopy' => array(
+            'httpMethod' => 'PUT',
+            'uri' => '/{Bucket}{/Key*}',
+            'class' => 'Aws\\S3\\Command\\S3Command',
+            'responseClass' => 'UploadPartCopyOutput',
+            'responseType' => 'model',
+            'summary' => 'Uploads a part by copying data from an existing object as data source.',
+            'documentationUrl' => 'http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPartCopy.html',
+            'parameters' => array(
+                'Bucket' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                ),
+                'CopySource' => array(
+                    'required' => true,
+                    'description' => 'The name of the source bucket and key name of the source object, separated by a slash (/). Must be URL-encoded.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source',
+                ),
+                'CopySourceIfMatch' => array(
+                    'description' => 'Copies the object if its entity tag (ETag) matches the specified tag.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-match',
+                ),
+                'CopySourceIfModifiedSince' => array(
+                    'description' => 'Copies the object if it has been modified since the specified time.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-modified-since',
+                ),
+                'CopySourceIfNoneMatch' => array(
+                    'description' => 'Copies the object if its entity tag (ETag) is different than the specified ETag.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-none-match',
+                ),
+                'CopySourceIfUnmodifiedSince' => array(
+                    'description' => 'Copies the object if it hasn\'t been modified since the specified time.',
+                    'type' => array(
+                        'object',
+                        'string',
+                        'integer',
+                    ),
+                    'format' => 'date-time-http',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-if-unmodified-since',
+                ),
+                'CopySourceRange' => array(
+                    'description' => 'The range of bytes to copy from the source object. The range value must use the form bytes=first-last, where the first and last are the zero-based byte offsets to copy. For example, bytes=0-9 indicates that you want to copy the first ten bytes of the source. You can copy a range only if the source object is greater than 5 GB.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-range',
+                ),
+                'Key' => array(
+                    'required' => true,
+                    'type' => 'string',
+                    'location' => 'uri',
+                    'filters' => array(
+                        'Aws\\S3\\S3Client::explodeKey',
+                    ),
+                ),
+                'PartNumber' => array(
+                    'required' => true,
+                    'description' => 'Part number of part being copied.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'partNumber',
+                ),
+                'UploadId' => array(
+                    'required' => true,
+                    'description' => 'Upload ID identifying the multipart upload whose part is being copied.',
+                    'type' => 'string',
+                    'location' => 'query',
+                    'sentAs' => 'uploadId',
+                ),
+                'command.expects' => array(
+                    'static' => true,
+                    'default' => 'application/xml',
+                ),
+            ),
+        ),
+    ),
+    'models' => array(
+        'AbortMultipartUploadOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'CompleteMultipartUploadOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Location' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Bucket' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Key' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Expiration' => array(
+                    'description' => 'If the object expiration is configured, this will contain the expiration date (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-expiration',
+                ),
+                'ETag' => array(
+                    'description' => 'Entity tag of the object.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'VersionId' => array(
+                    'description' => 'Version of the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-version-id',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'CopyObjectOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'ETag' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'LastModified' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Expiration' => array(
+                    'description' => 'If the object expiration is configured, the response includes this header.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-expiration',
+                ),
+                'CopySourceVersionId' => array(
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-version-id',
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'CreateBucketOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Location' => array(
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'CreateMultipartUploadOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Bucket' => array(
+                    'description' => 'Name of the bucket to which the multipart upload was initiated.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                    'sentAs' => 'Bucket',
+                ),
+                'Key' => array(
+                    'description' => 'Object key for which the multipart upload was initiated.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'UploadId' => array(
+                    'description' => 'ID for the initiated multipart upload.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteBucketOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteBucketCorsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteBucketLifecycleOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteBucketPolicyOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteBucketTaggingOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteBucketWebsiteOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteObjectOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'DeleteMarker' => array(
+                    'description' => 'Specifies whether the versioned object that was permanently deleted was (true) or was not (false) a delete marker.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-delete-marker',
+                ),
+                'VersionId' => array(
+                    'description' => 'Returns the version ID of the delete marker created as a result of the DELETE operation.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-version-id',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'DeleteObjectsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Deleted' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'properties' => array(
+                            'Key' => array(
+                                'type' => 'string',
+                            ),
+                            'VersionId' => array(
+                                'type' => 'string',
+                            ),
+                            'DeleteMarker' => array(
+                                'type' => 'boolean',
+                            ),
+                            'DeleteMarkerVersionId' => array(
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'Errors' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'Error',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Error',
+                        'properties' => array(
+                            'Key' => array(
+                                'type' => 'string',
+                            ),
+                            'VersionId' => array(
+                                'type' => 'string',
+                            ),
+                            'Code' => array(
+                                'type' => 'string',
+                            ),
+                            'Message' => array(
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketAclOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Owner' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'ID' => array(
+                            'type' => 'string',
+                        ),
+                        'DisplayName' => array(
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'Grants' => array(
+                    'description' => 'A list of grants.',
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'AccessControlList',
+                    'items' => array(
+                        'name' => 'Grant',
+                        'type' => 'object',
+                        'sentAs' => 'Grant',
+                        'properties' => array(
+                            'Grantee' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'Type' => array(
+                                        'description' => 'Type of grantee',
+                                        'type' => 'string',
+                                        'sentAs' => 'xsi:type',
+                                        'data' => array(
+                                            'xmlAttribute' => true,
+                                            'xmlNamespace' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                        ),
+                                    ),
+                                    'ID' => array(
+                                        'description' => 'The canonical user ID of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'DisplayName' => array(
+                                        'description' => 'Screen name of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'EmailAddress' => array(
+                                        'description' => 'Email address of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'URI' => array(
+                                        'description' => 'URI of the grantee group.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Permission' => array(
+                                'description' => 'Specifies the permission given to the grantee.',
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketCorsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'CORSRules' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'CORSRule',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'CORSRule',
+                        'properties' => array(
+                            'AllowedHeaders' => array(
+                                'description' => 'Specifies which headers are allowed in a pre-flight OPTIONS request.',
+                                'type' => 'array',
+                                'sentAs' => 'AllowedHeader',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'AllowedHeader',
+                                ),
+                            ),
+                            'AllowedOrigins' => array(
+                                'description' => 'One or more origins you want customers to be able to access the bucket from.',
+                                'type' => 'array',
+                                'sentAs' => 'AllowedOrigin',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'AllowedOrigin',
+                                ),
+                            ),
+                            'AllowedMethods' => array(
+                                'description' => 'Identifies HTTP methods that the domain/origin specified in the rule is allowed to execute.',
+                                'type' => 'array',
+                                'sentAs' => 'AllowedMethod',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'AllowedMethod',
+                                ),
+                            ),
+                            'MaxAgeSeconds' => array(
+                                'description' => 'The time in seconds that your browser is to cache the preflight response for the specified resource.',
+                                'type' => 'numeric',
+                            ),
+                            'ExposeHeaders' => array(
+                                'description' => 'One or more headers in the response that you want customers to be able to access from their applications (for example, from a JavaScript XMLHttpRequest object).',
+                                'type' => 'array',
+                                'sentAs' => 'ExposeHeader',
+                                'data' => array(
+                                    'xmlFlattened' => true,
+                                ),
+                                'items' => array(
+                                    'type' => 'string',
+                                    'sentAs' => 'ExposeHeader',
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketLifecycleOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Rules' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'Rule',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Rule',
+                        'properties' => array(
+                            'ID' => array(
+                                'description' => 'Unique identifier for the rule. The value cannot be longer than 255 characters.',
+                                'type' => 'string',
+                            ),
+                            'Prefix' => array(
+                                'description' => 'Prefix identifying one or more objects to which the rule applies.',
+                                'type' => 'string',
+                            ),
+                            'Status' => array(
+                                'description' => 'If \'Enabled\', the rule is currently being applied. If \'Disabled\', the rule is not currently being applied.',
+                                'type' => 'string',
+                            ),
+                            'Transition' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'Days' => array(
+                                        'description' => 'Indicates the lifetime, in days, of the objects that are subject to the rule. The value must be a non-zero positive integer.',
+                                        'type' => 'numeric',
+                                    ),
+                                    'Date' => array(
+                                        'description' => 'Indicates at what date the object is to be moved or deleted. Should be in GMT ISO 8601 Format.',
+                                        'type' => 'string',
+                                    ),
+                                    'StorageClass' => array(
+                                        'description' => 'The class of storage used to store the object.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Expiration' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'Days' => array(
+                                        'description' => 'Indicates the lifetime, in days, of the objects that are subject to the rule. The value must be a non-zero positive integer.',
+                                        'type' => 'numeric',
+                                    ),
+                                    'Date' => array(
+                                        'description' => 'Indicates at what date the object is to be moved or deleted. Should be in GMT ISO 8601 Format.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketLocationOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Location' => array(
+                    'type' => 'string',
+                    'location' => 'body',
+                    'filters' => array(
+                        'strval',
+                        'strip_tags',
+                        'trim',
+                    ),
+                ),
+            ),
+        ),
+        'GetBucketLoggingOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'LoggingEnabled' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'TargetBucket' => array(
+                            'description' => 'Specifies the bucket where you want Amazon S3 to store server access logs. You can have your logs delivered to any bucket that you own, including the same bucket that is being logged. You can also configure multiple buckets to deliver their logs to the same target bucket. In this case you should choose a different TargetPrefix for each source bucket so that the delivered log files can be distinguished by key.',
+                            'type' => 'string',
+                        ),
+                        'TargetPrefix' => array(
+                            'description' => 'This element lets you specify a prefix for the keys that the log files will be stored under.',
+                            'type' => 'string',
+                        ),
+                        'TargetGrants' => array(
+                            'type' => 'array',
+                            'items' => array(
+                                'name' => 'Grant',
+                                'type' => 'object',
+                                'sentAs' => 'Grant',
+                                'properties' => array(
+                                    'Grantee' => array(
+                                        'type' => 'object',
+                                        'properties' => array(
+                                            'Type' => array(
+                                                'description' => 'Type of grantee',
+                                                'type' => 'string',
+                                                'sentAs' => 'xsi:type',
+                                                'data' => array(
+                                                    'xmlAttribute' => true,
+                                                    'xmlNamespace' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                                ),
+                                            ),
+                                            'ID' => array(
+                                                'description' => 'The canonical user ID of the grantee.',
+                                                'type' => 'string',
+                                            ),
+                                            'DisplayName' => array(
+                                                'description' => 'Screen name of the grantee.',
+                                                'type' => 'string',
+                                            ),
+                                            'EmailAddress' => array(
+                                                'description' => 'Email address of the grantee.',
+                                                'type' => 'string',
+                                            ),
+                                            'URI' => array(
+                                                'description' => 'URI of the grantee group.',
+                                                'type' => 'string',
+                                            ),
+                                        ),
+                                    ),
+                                    'Permission' => array(
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketNotificationOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'TopicConfiguration' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'Topic' => array(
+                            'description' => 'Amazon SNS topic to which Amazon S3 will publish a message to report the specified events for the bucket.',
+                            'type' => 'string',
+                        ),
+                        'Event' => array(
+                            'description' => 'Bucket event for which to send notifications.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketPolicyOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Policy' => array(
+                    'description' => 'The bucket policy as a JSON document.',
+                    'type' => 'string',
+                    'instanceOf' => 'Guzzle\\Http\\EntityBody',
+                    'location' => 'body',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketRequestPaymentOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Payer' => array(
+                    'description' => 'Specifies who pays for the download and request fees.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketTaggingOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'TagSet' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'items' => array(
+                        'name' => 'Tag',
+                        'type' => 'object',
+                        'sentAs' => 'Tag',
+                        'properties' => array(
+                            'Key' => array(
+                                'description' => 'Name of the tag.',
+                                'type' => 'string',
+                            ),
+                            'Value' => array(
+                                'description' => 'Value of the tag.',
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketVersioningOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Status' => array(
+                    'description' => 'The versioning state of the bucket.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'MFADelete' => array(
+                    'description' => 'Specifies whether MFA delete is enabled in the bucket versioning configuration. This element is only returned if the bucket has been configured with MFA delete. If the bucket has never been so configured, this element is not returned.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetBucketWebsiteOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RedirectAllRequestsTo' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'HostName' => array(
+                            'description' => 'Name of the host where requests will be redirected.',
+                            'type' => 'string',
+                        ),
+                        'Protocol' => array(
+                            'description' => 'Protocol to use (http, https) when redirecting requests. The default is the protocol that is used in the original request.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'IndexDocument' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'Suffix' => array(
+                            'description' => 'A suffix that is appended to a request that is for a directory on the website endpoint (e.g. if the suffix is index.html and you make a request to samplebucket/images/ the data that is returned will be for the object with the key name images/index.html) The suffix must not be empty and must not include a slash character.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'ErrorDocument' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'Key' => array(
+                            'description' => 'The object key name to use when a 4XX class error occurs.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'RoutingRules' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'items' => array(
+                        'name' => 'RoutingRule',
+                        'type' => 'object',
+                        'sentAs' => 'RoutingRule',
+                        'properties' => array(
+                            'Condition' => array(
+                                'description' => 'A container for describing a condition that must be met for the specified redirect to apply. For example, 1. If request is for pages in the /docs folder, redirect to the /documents folder. 2. If request results in HTTP error 4xx, redirect request to another host where you might process the error.',
+                                'type' => 'object',
+                                'properties' => array(
+                                    'KeyPrefixEquals' => array(
+                                        'description' => 'The object key name prefix when the redirect is applied. For example, to redirect requests for ExamplePage.html, the key prefix will be ExamplePage.html. To redirect request for all pages with the prefix docs/, the key prefix will be /docs, which identifies all objects in the docs/ folder. Required when the parent element Condition is specified and sibling HttpErrorCodeReturnedEquals is not specified. If both conditions are specified, both must be true for the redirect to be applied.',
+                                        'type' => 'string',
+                                    ),
+                                    'HttpErrorCodeReturnedEquals' => array(
+                                        'description' => 'The HTTP error code when the redirect is applied. In the event of an error, if the error code equals this value, then the specified redirect is applied. Required when parent element Condition is specified and sibling KeyPrefixEquals is not specified. If both are specified, then both must be true for the redirect to be applied.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Redirect' => array(
+                                'description' => 'Container for redirect information. You can redirect requests to another host, to another page, or with another protocol. In the event of an error, you can can specify a different error code to return.',
+                                'type' => 'object',
+                                'properties' => array(
+                                    'ReplaceKeyPrefixWith' => array(
+                                        'description' => 'The object key prefix to use in the redirect request. For example, to redirect requests for all pages with prefix docs/ (objects in the docs/ folder) to documents/, you can set a condition block with KeyPrefixEquals set to docs/ and in the Redirect set ReplaceKeyPrefixWith to /documents. Not required if one of the siblings is present. Can be present only if ReplaceKeyWith is not provided.',
+                                        'type' => 'string',
+                                    ),
+                                    'ReplaceKeyWith' => array(
+                                        'description' => 'The specific object key to use in the redirect request. For example, redirect request to error.html. Not required if one of the sibling is present. Can be present only if ReplaceKeyPrefixWith is not provided.',
+                                        'type' => 'string',
+                                    ),
+                                    'HttpRedirectCode' => array(
+                                        'description' => 'The HTTP redirect code to use on the response. Not required if one of the siblings is present.',
+                                        'type' => 'string',
+                                    ),
+                                    'HostName' => array(
+                                        'description' => 'Name of the host where requests will be redirected.',
+                                        'type' => 'string',
+                                    ),
+                                    'Protocol' => array(
+                                        'description' => 'Protocol to use (http, https) when redirecting requests. The default is the protocol that is used in the original request.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetObjectOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Body' => array(
+                    'description' => 'Object data.',
+                    'type' => 'string',
+                    'instanceOf' => 'Guzzle\\Http\\EntityBody',
+                    'location' => 'body',
+                ),
+                'DeleteMarker' => array(
+                    'description' => 'Specifies whether the object retrieved was (true) or was not (false) a Delete Marker. If false, this response header does not appear in the response.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-delete-marker',
+                ),
+                'AcceptRanges' => array(
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'accept-ranges',
+                ),
+                'Expiration' => array(
+                    'description' => 'If the object expiration is configured (see PUT Bucket lifecycle), the response includes this header. It includes the expiry-date and rule-id key value pairs providing object expiration information. The value of the rule-id is URL encoded.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-expiration',
+                ),
+                'Restore' => array(
+                    'description' => 'Provides information about object restoration operation and expiration time of the restored object copy.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-restore',
+                ),
+                'LastModified' => array(
+                    'description' => 'Last modified date of the object',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Last-Modified',
+                ),
+                'ContentLength' => array(
+                    'description' => 'Size of the body in bytes.',
+                    'type' => 'numeric',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Length',
+                ),
+                'ETag' => array(
+                    'description' => 'An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'MissingMeta' => array(
+                    'description' => 'This is set to the number of metadata entries not returned in x-amz-meta headers. This can happen if you create metadata using an API like SOAP that supports more flexible metadata than the REST API. For example, using SOAP, you can create metadata whose values are not legal HTTP headers.',
+                    'type' => 'numeric',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-missing-meta',
+                ),
+                'VersionId' => array(
+                    'description' => 'Version of the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-version-id',
+                ),
+                'CacheControl' => array(
+                    'description' => 'Specifies caching behavior along the request/reply chain.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Cache-Control',
+                ),
+                'ContentDisposition' => array(
+                    'description' => 'Specifies presentational information for the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Disposition',
+                ),
+                'ContentEncoding' => array(
+                    'description' => 'Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Encoding',
+                ),
+                'ContentLanguage' => array(
+                    'description' => 'The language the content is in.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Language',
+                ),
+                'ContentType' => array(
+                    'description' => 'A standard MIME type describing the format of the object data.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Type',
+                ),
+                'Expires' => array(
+                    'description' => 'The date and time at which the object is no longer cacheable.',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'WebsiteRedirectLocation' => array(
+                    'description' => 'If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-website-redirect-location',
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'Metadata' => array(
+                    'description' => 'A map of metadata to store with the object in S3.',
+                    'type' => 'object',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-meta-',
+                    'additionalProperties' => array(
+                        'description' => 'The metadata value.',
+                        'type' => 'string',
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetObjectAclOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Owner' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'ID' => array(
+                            'type' => 'string',
+                        ),
+                        'DisplayName' => array(
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'Grants' => array(
+                    'description' => 'A list of grants.',
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'AccessControlList',
+                    'items' => array(
+                        'name' => 'Grant',
+                        'type' => 'object',
+                        'sentAs' => 'Grant',
+                        'properties' => array(
+                            'Grantee' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'Type' => array(
+                                        'description' => 'Type of grantee',
+                                        'type' => 'string',
+                                        'sentAs' => 'xsi:type',
+                                        'data' => array(
+                                            'xmlAttribute' => true,
+                                            'xmlNamespace' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                        ),
+                                    ),
+                                    'ID' => array(
+                                        'description' => 'The canonical user ID of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'DisplayName' => array(
+                                        'description' => 'Screen name of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'EmailAddress' => array(
+                                        'description' => 'Email address of the grantee.',
+                                        'type' => 'string',
+                                    ),
+                                    'URI' => array(
+                                        'description' => 'URI of the grantee group.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Permission' => array(
+                                'description' => 'Specifies the permission given to the grantee.',
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'GetObjectTorrentOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Body' => array(
+                    'type' => 'string',
+                    'instanceOf' => 'Guzzle\\Http\\EntityBody',
+                    'location' => 'body',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'HeadBucketOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'HeadObjectOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'DeleteMarker' => array(
+                    'description' => 'Specifies whether the object retrieved was (true) or was not (false) a Delete Marker. If false, this response header does not appear in the response.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-delete-marker',
+                ),
+                'AcceptRanges' => array(
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'accept-ranges',
+                ),
+                'Expiration' => array(
+                    'description' => 'If the object expiration is configured (see PUT Bucket lifecycle), the response includes this header. It includes the expiry-date and rule-id key value pairs providing object expiration information. The value of the rule-id is URL encoded.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-expiration',
+                ),
+                'Restore' => array(
+                    'description' => 'Provides information about object restoration operation and expiration time of the restored object copy.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-restore',
+                ),
+                'LastModified' => array(
+                    'description' => 'Last modified date of the object',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Last-Modified',
+                ),
+                'ContentLength' => array(
+                    'description' => 'Size of the body in bytes.',
+                    'type' => 'numeric',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Length',
+                ),
+                'ETag' => array(
+                    'description' => 'An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'MissingMeta' => array(
+                    'description' => 'This is set to the number of metadata entries not returned in x-amz-meta headers. This can happen if you create metadata using an API like SOAP that supports more flexible metadata than the REST API. For example, using SOAP, you can create metadata whose values are not legal HTTP headers.',
+                    'type' => 'numeric',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-missing-meta',
+                ),
+                'VersionId' => array(
+                    'description' => 'Version of the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-version-id',
+                ),
+                'CacheControl' => array(
+                    'description' => 'Specifies caching behavior along the request/reply chain.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Cache-Control',
+                ),
+                'ContentDisposition' => array(
+                    'description' => 'Specifies presentational information for the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Disposition',
+                ),
+                'ContentEncoding' => array(
+                    'description' => 'Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Encoding',
+                ),
+                'ContentLanguage' => array(
+                    'description' => 'The language the content is in.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Language',
+                ),
+                'ContentType' => array(
+                    'description' => 'A standard MIME type describing the format of the object data.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'Content-Type',
+                ),
+                'Expires' => array(
+                    'description' => 'The date and time at which the object is no longer cacheable.',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'WebsiteRedirectLocation' => array(
+                    'description' => 'If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-website-redirect-location',
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'Metadata' => array(
+                    'description' => 'A map of metadata to store with the object in S3.',
+                    'type' => 'object',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-meta-',
+                    'additionalProperties' => array(
+                        'description' => 'The metadata value.',
+                        'type' => 'string',
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'ListBucketsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Buckets' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'items' => array(
+                        'name' => 'Bucket',
+                        'type' => 'object',
+                        'sentAs' => 'Bucket',
+                        'properties' => array(
+                            'Name' => array(
+                                'description' => 'The name of the bucket.',
+                                'type' => 'string',
+                            ),
+                            'CreationDate' => array(
+                                'description' => 'Date the bucket was created.',
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'Owner' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'ID' => array(
+                            'type' => 'string',
+                        ),
+                        'DisplayName' => array(
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'ListMultipartUploadsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Bucket' => array(
+                    'description' => 'Name of the bucket to which the multipart upload was initiated.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'KeyMarker' => array(
+                    'description' => 'The key at or after which the listing began.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'UploadIdMarker' => array(
+                    'description' => 'Upload ID after which listing began.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'NextKeyMarker' => array(
+                    'description' => 'When a list is truncated, this element specifies the value that should be used for the key-marker request parameter in a subsequent request.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'NextUploadIdMarker' => array(
+                    'description' => 'When a list is truncated, this element specifies the value that should be used for the upload-id-marker request parameter in a subsequent request.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'MaxUploads' => array(
+                    'description' => 'Maximum number of multipart uploads that could have been included in the response.',
+                    'type' => 'numeric',
+                    'location' => 'xml',
+                ),
+                'IsTruncated' => array(
+                    'description' => 'Indicates whether the returned list of multipart uploads is truncated. A value of true indicates that the list was truncated. The list can be truncated if the number of multipart uploads exceeds the limit allowed or specified by max uploads.',
+                    'type' => 'boolean',
+                    'location' => 'xml',
+                ),
+                'Uploads' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'Upload',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Upload',
+                        'properties' => array(
+                            'UploadId' => array(
+                                'description' => 'Upload ID that identifies the multipart upload.',
+                                'type' => 'string',
+                            ),
+                            'Key' => array(
+                                'description' => 'Key of the object for which the multipart upload was initiated.',
+                                'type' => 'string',
+                            ),
+                            'Initiated' => array(
+                                'description' => 'Date and time at which the multipart upload was initiated.',
+                                'type' => 'string',
+                            ),
+                            'StorageClass' => array(
+                                'description' => 'The class of storage used to store the object.',
+                                'type' => 'string',
+                            ),
+                            'Owner' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'ID' => array(
+                                        'type' => 'string',
+                                    ),
+                                    'DisplayName' => array(
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Initiator' => array(
+                                'description' => 'Identifies who initiated the multipart upload.',
+                                'type' => 'object',
+                                'properties' => array(
+                                    'ID' => array(
+                                        'description' => 'If the principal is an AWS account, it provides the Canonical User ID. If the principal is an IAM User, it provides a user ARN value.',
+                                        'type' => 'string',
+                                    ),
+                                    'DisplayName' => array(
+                                        'description' => 'Name of the Principal.',
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'ListObjectVersionsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'IsTruncated' => array(
+                    'description' => 'A flag that indicates whether or not Amazon S3 returned all of the results that satisfied the search criteria. If your results were truncated, you can make a follow-up paginated request using the NextKeyMarker and NextVersionIdMarker response parameters as a starting place in another request to return the rest of the results.',
+                    'type' => 'boolean',
+                    'location' => 'xml',
+                ),
+                'KeyMarker' => array(
+                    'description' => 'Marks the last Key returned in a truncated response.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'VersionIdMarker' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'NextKeyMarker' => array(
+                    'description' => 'Use this value for the key marker request parameter in a subsequent request.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'NextVersionIdMarker' => array(
+                    'description' => 'Use this value for the next version id marker parameter in a subsequent request.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Versions' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'Version',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Version',
+                        'properties' => array(
+                            'ETag' => array(
+                                'type' => 'string',
+                            ),
+                            'Size' => array(
+                                'description' => 'Size in bytes of the object.',
+                                'type' => 'string',
+                            ),
+                            'StorageClass' => array(
+                                'description' => 'The class of storage used to store the object.',
+                                'type' => 'string',
+                            ),
+                            'Key' => array(
+                                'description' => 'The object key.',
+                                'type' => 'string',
+                            ),
+                            'VersionId' => array(
+                                'description' => 'Version ID of an object.',
+                                'type' => 'string',
+                            ),
+                            'IsLatest' => array(
+                                'description' => 'Specifies whether the object is (true) or is not (false) the latest version of an object.',
+                                'type' => 'boolean',
+                            ),
+                            'LastModified' => array(
+                                'description' => 'Date and time the object was last modified.',
+                                'type' => 'string',
+                            ),
+                            'Owner' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'ID' => array(
+                                        'type' => 'string',
+                                    ),
+                                    'DisplayName' => array(
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'DeleteMarkers' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'DeleteMarker',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'DeleteMarker',
+                        'properties' => array(
+                            'Owner' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'ID' => array(
+                                        'type' => 'string',
+                                    ),
+                                    'DisplayName' => array(
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                            'Key' => array(
+                                'description' => 'The object key.',
+                                'type' => 'string',
+                            ),
+                            'VersionId' => array(
+                                'description' => 'Version ID of an object.',
+                                'type' => 'string',
+                            ),
+                            'IsLatest' => array(
+                                'description' => 'Specifies whether the object is (true) or is not (false) the latest version of an object.',
+                                'type' => 'boolean',
+                            ),
+                            'LastModified' => array(
+                                'description' => 'Date and time the object was last modified.',
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'Name' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Prefix' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'MaxKeys' => array(
+                    'type' => 'numeric',
+                    'location' => 'xml',
+                ),
+                'CommonPrefixes' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'properties' => array(
+                            'Prefix' => array(
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'ListObjectsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'IsTruncated' => array(
+                    'description' => 'A flag that indicates whether or not Amazon S3 returned all of the results that satisfied the search criteria.',
+                    'type' => 'boolean',
+                    'location' => 'xml',
+                ),
+                'Marker' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Contents' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'properties' => array(
+                            'Key' => array(
+                                'type' => 'string',
+                            ),
+                            'LastModified' => array(
+                                'type' => 'string',
+                            ),
+                            'ETag' => array(
+                                'type' => 'string',
+                            ),
+                            'Size' => array(
+                                'type' => 'numeric',
+                            ),
+                            'StorageClass' => array(
+                                'description' => 'The class of storage used to store the object.',
+                                'type' => 'string',
+                            ),
+                            'Owner' => array(
+                                'type' => 'object',
+                                'properties' => array(
+                                    'ID' => array(
+                                        'type' => 'string',
+                                    ),
+                                    'DisplayName' => array(
+                                        'type' => 'string',
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                ),
+                'Name' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Prefix' => array(
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'MaxKeys' => array(
+                    'type' => 'numeric',
+                    'location' => 'xml',
+                ),
+                'CommonPrefixes' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'properties' => array(
+                            'Prefix' => array(
+                                'type' => 'string',
+                            ),
+                        ),
+                    ),
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'ListPartsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Bucket' => array(
+                    'description' => 'Name of the bucket to which the multipart upload was initiated.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'Key' => array(
+                    'description' => 'Object key for which the multipart upload was initiated.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'UploadId' => array(
+                    'description' => 'Upload ID identifying the multipart upload whose parts are being listed.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'PartNumberMarker' => array(
+                    'description' => 'Part number after which listing begins.',
+                    'type' => 'numeric',
+                    'location' => 'xml',
+                ),
+                'NextPartNumberMarker' => array(
+                    'description' => 'When a list is truncated, this element specifies the last part in the list, as well as the value to use for the part-number-marker request parameter in a subsequent request.',
+                    'type' => 'numeric',
+                    'location' => 'xml',
+                ),
+                'MaxParts' => array(
+                    'description' => 'Maximum number of parts that were allowed in the response.',
+                    'type' => 'numeric',
+                    'location' => 'xml',
+                ),
+                'IsTruncated' => array(
+                    'description' => 'Indicates whether the returned list of parts is truncated.',
+                    'type' => 'boolean',
+                    'location' => 'xml',
+                ),
+                'Parts' => array(
+                    'type' => 'array',
+                    'location' => 'xml',
+                    'sentAs' => 'Part',
+                    'data' => array(
+                        'xmlFlattened' => true,
+                    ),
+                    'items' => array(
+                        'type' => 'object',
+                        'sentAs' => 'Part',
+                        'properties' => array(
+                            'PartNumber' => array(
+                                'description' => 'Part number identifying the part.',
+                                'type' => 'numeric',
+                            ),
+                            'LastModified' => array(
+                                'description' => 'Date and time at which the part was uploaded.',
+                                'type' => 'string',
+                            ),
+                            'ETag' => array(
+                                'description' => 'Entity tag returned when the part was uploaded.',
+                                'type' => 'string',
+                            ),
+                            'Size' => array(
+                                'description' => 'Size of the uploaded part data.',
+                                'type' => 'numeric',
+                            ),
+                        ),
+                    ),
+                ),
+                'Initiator' => array(
+                    'description' => 'Identifies who initiated the multipart upload.',
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'ID' => array(
+                            'description' => 'If the principal is an AWS account, it provides the Canonical User ID. If the principal is an IAM User, it provides a user ARN value.',
+                            'type' => 'string',
+                        ),
+                        'DisplayName' => array(
+                            'description' => 'Name of the Principal.',
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'Owner' => array(
+                    'type' => 'object',
+                    'location' => 'xml',
+                    'properties' => array(
+                        'ID' => array(
+                            'type' => 'string',
+                        ),
+                        'DisplayName' => array(
+                            'type' => 'string',
+                        ),
+                    ),
+                ),
+                'StorageClass' => array(
+                    'description' => 'The class of storage used to store the object.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketAclOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketCorsOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketLifecycleOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketLoggingOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketNotificationOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketPolicyOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketRequestPaymentOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketTaggingOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketVersioningOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutBucketWebsiteOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'PutObjectOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'Expiration' => array(
+                    'description' => 'If the object expiration is configured, this will contain the expiration date (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-expiration',
+                ),
+                'ETag' => array(
+                    'description' => 'Entity tag for the uploaded object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'VersionId' => array(
+                    'description' => 'Version of the object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-version-id',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+                'ObjectURL' => array(
+                    'description' => 'URL of the uploaded object',
+                ),
+            ),
+        ),
+        'PutObjectAclOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'RestoreObjectOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'UploadPartOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'ETag' => array(
+                    'description' => 'Entity tag for the uploaded object.',
+                    'type' => 'string',
+                    'location' => 'header',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+        'UploadPartCopyOutput' => array(
+            'type' => 'object',
+            'additionalProperties' => true,
+            'properties' => array(
+                'CopySourceVersionId' => array(
+                    'description' => 'The version of the source object that was copied, if you have enabled versioning on the source bucket.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-copy-source-version-id',
+                ),
+                'ETag' => array(
+                    'description' => 'Entity tag of the object.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'LastModified' => array(
+                    'description' => 'Date and time at which the object was uploaded.',
+                    'type' => 'string',
+                    'location' => 'xml',
+                ),
+                'ServerSideEncryption' => array(
+                    'description' => 'The Server-side encryption algorithm used when storing this object in S3.',
+                    'type' => 'string',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-server-side-encryption',
+                ),
+                'RequestId' => array(
+                    'description' => 'Request ID of the operation',
+                    'location' => 'header',
+                    'sentAs' => 'x-amz-request-id',
+                ),
+            ),
+        ),
+    ),
+    'waiters' => array(
+        '__default__' => array(
+            'interval' => 5,
+            'max_attempts' => 20,
+        ),
+        'BucketExists' => array(
+            'operation' => 'HeadBucket',
+            'description' => 'Wait until a bucket exists.',
+            'success.type' => 'output',
+            'ignore_errors' => array(
+                'NoSuchBucket',
+            ),
+        ),
+        'BucketNotExists' => array(
+            'operation' => 'HeadBucket',
+            'description' => 'Wait until a bucket does not exist.',
+            'success.type' => 'error',
+            'success.value' => 'NoSuchBucket',
+        ),
+        'ObjectExists' => array(
+            'operation' => 'HeadObject',
+            'description' => 'Wait until an object exists.',
+            'success.type' => 'output',
+            'ignore_errors' => array(
+                'NoSuchKey',
+            ),
+        ),
+    ),
+);
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/ResumableDownload.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/ResumableDownload.php
new file mode 100644
index 0000000000000000000000000000000000000000..386a077370d84c8e73a5bcde6b16f8699b37746d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/ResumableDownload.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Aws\Common\Exception\RuntimeException;
+use Aws\Common\Exception\UnexpectedValueException;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\ReadLimitEntityBody;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Service\Resource\Model;
+
+/**
+ * Allows you to resume the download of a partially downloaded object.
+ *
+ * Downloads objects from Amazon S3 in using "Range" downloads. This allows a partially downloaded object to be resumed
+ * so that only the remaining portion of the object is downloaded.
+ */
+class ResumableDownload
+{
+    /** @var S3Client The S3 client to use to download objects and issue HEAD requests */
+    protected $client;
+
+    /** @var \Guzzle\Service\Resource\Model Model object returned when the initial HeadObject operation was called */
+    protected $meta;
+
+    /** @var array Array of parameters to pass to a GetObject operation */
+    protected $params;
+
+    /** @var \Guzzle\Http\EntityBody Where the object will be downloaded */
+    protected $target;
+
+    /**
+     * @param S3Client                            $client Client to use when executing requests
+     * @param string                              $bucket Bucket that holds the object
+     * @param string                              $key    Key of the object
+     * @param string|resource|EntityBodyInterface $target Where the object should be downloaded to. Pass a string to
+     *                                                    save the object to a file, pass a resource returned by
+     *                                                    fopen() to save the object to a stream resource, or pass a
+     *                                                    Guzzle EntityBody object to save the contents to an
+     *                                                    EntityBody.
+     * @param array                               $params Any additional GetObject or HeadObject parameters to use
+     *                                                    with each command issued by the client. (e.g. pass "Version"
+     *                                                    to download a specific version of an object)
+     * @throws RuntimeException if the target variable points to a file that cannot be opened
+     */
+    public function __construct(S3Client $client, $bucket, $key, $target, array $params = array())
+    {
+        $this->params = $params;
+        $this->client = $client;
+        $this->params['Bucket'] = $bucket;
+        $this->params['Key'] = $key;
+
+        // If a string is passed, then assume that the download should stream to a file on disk
+        if (is_string($target)) {
+            if (!($target = fopen($target, 'a+'))) {
+                throw new RuntimeException("Unable to open {$target} for writing");
+            }
+            // Always append to the file
+            fseek($target, 0, SEEK_END);
+        }
+
+        // Get the metadata and Content-MD5 of the object
+        $this->target = EntityBody::factory($target);
+    }
+
+    /**
+     * Get the bucket of the download
+     *
+     * @return string
+     */
+    public function getBucket()
+    {
+        return $this->params['Bucket'];
+    }
+
+    /**
+     * Get the key of the download
+     *
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->params['Key'];
+    }
+
+    /**
+     * Get the file to which the contents are downloaded
+     *
+     * @return string
+     */
+    public function getFilename()
+    {
+        return $this->target->getUri();
+    }
+
+    /**
+     * Download the remainder of the object from Amazon S3
+     *
+     * Performs a message integrity check if possible
+     *
+     * @return Model
+     */
+    public function __invoke()
+    {
+        $command = $this->client->getCommand('HeadObject', $this->params);
+        $this->meta = $command->execute();
+
+        if ($this->target->ftell() >= $this->meta['ContentLength']) {
+            return false;
+        }
+
+        $this->meta['ContentMD5'] = (string) $command->getResponse()->getHeader('Content-MD5');
+
+        // Use a ReadLimitEntityBody so that rewinding the stream after an error does not cause the file pointer
+        // to enter an inconsistent state with the data being downloaded
+        $this->params['SaveAs'] = new ReadLimitEntityBody(
+            $this->target,
+            $this->meta['ContentLength'],
+            $this->target->ftell()
+        );
+
+        $result = $this->getRemaining();
+        $this->checkIntegrity();
+
+        return $result;
+    }
+
+    /**
+     * Send the command to get the remainder of the object
+     *
+     * @return Model
+     */
+    protected function getRemaining()
+    {
+        $current = $this->target->ftell();
+        $targetByte = $this->meta['ContentLength'] - 1;
+        $this->params['Range'] = "bytes={$current}-{$targetByte}";
+
+        // Set the starting offset so that the body is never seeked to before this point in the event of a retry
+        $this->params['SaveAs']->setOffset($current);
+        $command = $this->client->getCommand('GetObject', $this->params);
+
+        return $command->execute();
+    }
+
+    /**
+     * Performs an MD5 message integrity check if possible
+     *
+     * @throws UnexpectedValueException if the message does not validate
+     */
+    protected function checkIntegrity()
+    {
+        if ($this->target->isReadable() && $expected = $this->meta['ContentMD5']) {
+            $actual = $this->target->getContentMd5();
+            if ($actual != $expected) {
+                throw new UnexpectedValueException(
+                    "Message integrity check failed. Expected {$expected} but got {$actual}."
+                );
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3Client.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3Client.php
new file mode 100644
index 0000000000000000000000000000000000000000..88c61b83dded3adf45db08fe9ab6721f04cc7917
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3Client.php
@@ -0,0 +1,689 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Aws\Common\Client\AbstractClient;
+use Aws\Common\Client\ClientBuilder;
+use Aws\Common\Client\ExpiredCredentialsChecker;
+use Aws\Common\Client\UploadBodyListener;
+use Aws\Common\Enum\ClientOptions as Options;
+use Aws\Common\Exception\RuntimeException;
+use Aws\Common\Exception\InvalidArgumentException;
+use Aws\Common\Model\MultipartUpload\AbstractTransfer;
+use Aws\S3\Exception\AccessDeniedException;
+use Aws\S3\Exception\Parser\S3ExceptionParser;
+use Aws\S3\Exception\S3Exception;
+use Aws\S3\Model\ClearBucket;
+use Aws\S3\Model\MultipartUpload\AbstractTransfer as AbstractMulti;
+use Aws\S3\Model\MultipartUpload\UploadBuilder;
+use Aws\S3\S3Signature;
+use Aws\S3\Sync\DownloadSyncBuilder;
+use Aws\S3\Sync\UploadSyncBuilder;
+use Aws\S3\Sync\AbstractSync;
+use Guzzle\Common\Collection;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Iterator\FilterIterator;
+use Guzzle\Plugin\Backoff\BackoffPlugin;
+use Guzzle\Plugin\Backoff\CurlBackoffStrategy;
+use Guzzle\Plugin\Backoff\ExponentialBackoffStrategy;
+use Guzzle\Plugin\Backoff\HttpBackoffStrategy;
+use Guzzle\Plugin\Backoff\TruncatedBackoffStrategy;
+use Guzzle\Plugin\Md5\CommandContentMd5Plugin;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Command\Factory\AliasFactory;
+use Guzzle\Service\Command\Factory\CompositeFactory;
+use Guzzle\Service\Resource\Model;
+use Guzzle\Service\Resource\ResourceIteratorInterface;
+
+/**
+ * Client to interact with Amazon Simple Storage Service
+ *
+ * @method Model abortMultipartUpload(array $args = array()) {@command S3 AbortMultipartUpload}
+ * @method Model completeMultipartUpload(array $args = array()) {@command S3 CompleteMultipartUpload}
+ * @method Model copyObject(array $args = array()) {@command S3 CopyObject}
+ * @method Model createBucket(array $args = array()) {@command S3 CreateBucket}
+ * @method Model createMultipartUpload(array $args = array()) {@command S3 CreateMultipartUpload}
+ * @method Model deleteBucket(array $args = array()) {@command S3 DeleteBucket}
+ * @method Model deleteBucketCors(array $args = array()) {@command S3 DeleteBucketCors}
+ * @method Model deleteBucketLifecycle(array $args = array()) {@command S3 DeleteBucketLifecycle}
+ * @method Model deleteBucketPolicy(array $args = array()) {@command S3 DeleteBucketPolicy}
+ * @method Model deleteBucketTagging(array $args = array()) {@command S3 DeleteBucketTagging}
+ * @method Model deleteBucketWebsite(array $args = array()) {@command S3 DeleteBucketWebsite}
+ * @method Model deleteObject(array $args = array()) {@command S3 DeleteObject}
+ * @method Model deleteObjects(array $args = array()) {@command S3 DeleteObjects}
+ * @method Model getBucketAcl(array $args = array()) {@command S3 GetBucketAcl}
+ * @method Model getBucketCors(array $args = array()) {@command S3 GetBucketCors}
+ * @method Model getBucketLifecycle(array $args = array()) {@command S3 GetBucketLifecycle}
+ * @method Model getBucketLocation(array $args = array()) {@command S3 GetBucketLocation}
+ * @method Model getBucketLogging(array $args = array()) {@command S3 GetBucketLogging}
+ * @method Model getBucketNotification(array $args = array()) {@command S3 GetBucketNotification}
+ * @method Model getBucketPolicy(array $args = array()) {@command S3 GetBucketPolicy}
+ * @method Model getBucketRequestPayment(array $args = array()) {@command S3 GetBucketRequestPayment}
+ * @method Model getBucketTagging(array $args = array()) {@command S3 GetBucketTagging}
+ * @method Model getBucketVersioning(array $args = array()) {@command S3 GetBucketVersioning}
+ * @method Model getBucketWebsite(array $args = array()) {@command S3 GetBucketWebsite}
+ * @method Model getObject(array $args = array()) {@command S3 GetObject}
+ * @method Model getObjectAcl(array $args = array()) {@command S3 GetObjectAcl}
+ * @method Model getObjectTorrent(array $args = array()) {@command S3 GetObjectTorrent}
+ * @method Model headBucket(array $args = array()) {@command S3 HeadBucket}
+ * @method Model headObject(array $args = array()) {@command S3 HeadObject}
+ * @method Model listBuckets(array $args = array()) {@command S3 ListBuckets}
+ * @method Model listMultipartUploads(array $args = array()) {@command S3 ListMultipartUploads}
+ * @method Model listObjectVersions(array $args = array()) {@command S3 ListObjectVersions}
+ * @method Model listObjects(array $args = array()) {@command S3 ListObjects}
+ * @method Model listParts(array $args = array()) {@command S3 ListParts}
+ * @method Model putBucketAcl(array $args = array()) {@command S3 PutBucketAcl}
+ * @method Model putBucketCors(array $args = array()) {@command S3 PutBucketCors}
+ * @method Model putBucketLifecycle(array $args = array()) {@command S3 PutBucketLifecycle}
+ * @method Model putBucketLogging(array $args = array()) {@command S3 PutBucketLogging}
+ * @method Model putBucketNotification(array $args = array()) {@command S3 PutBucketNotification}
+ * @method Model putBucketPolicy(array $args = array()) {@command S3 PutBucketPolicy}
+ * @method Model putBucketRequestPayment(array $args = array()) {@command S3 PutBucketRequestPayment}
+ * @method Model putBucketTagging(array $args = array()) {@command S3 PutBucketTagging}
+ * @method Model putBucketVersioning(array $args = array()) {@command S3 PutBucketVersioning}
+ * @method Model putBucketWebsite(array $args = array()) {@command S3 PutBucketWebsite}
+ * @method Model putObject(array $args = array()) {@command S3 PutObject}
+ * @method Model putObjectAcl(array $args = array()) {@command S3 PutObjectAcl}
+ * @method Model restoreObject(array $args = array()) {@command S3 RestoreObject}
+ * @method Model uploadPart(array $args = array()) {@command S3 UploadPart}
+ * @method Model uploadPartCopy(array $args = array()) {@command S3 UploadPartCopy}
+ * @method waitUntilBucketExists(array $input) Wait until a bucket exists. The input array uses the parameters of the HeadBucket operation and waiter specific settings
+ * @method waitUntilBucketNotExists(array $input) Wait until a bucket does not exist. The input array uses the parameters of the HeadBucket operation and waiter specific settings
+ * @method waitUntilObjectExists(array $input) Wait until an object exists. The input array uses the parameters of the HeadObject operation and waiter specific settings
+ * @method ResourceIteratorInterface getListBucketsIterator(array $args = array()) The input array uses the parameters of the ListBuckets operation
+ * @method ResourceIteratorInterface getListMultipartUploadsIterator(array $args = array()) The input array uses the parameters of the ListMultipartUploads operation
+ * @method ResourceIteratorInterface getListObjectsIterator(array $args = array()) The input array uses the parameters of the ListObjects operation
+ * @method ResourceIteratorInterface getListObjectVersionsIterator(array $args = array()) The input array uses the parameters of the ListObjectVersions operation
+ * @method ResourceIteratorInterface getListPartsIterator(array $args = array()) The input array uses the parameters of the ListParts operation
+ *
+ * @link http://docs.aws.amazon.com/aws-sdk-php-2/guide/latest/service-s3.html User guide
+ * @link http://docs.aws.amazon.com/aws-sdk-php-2/latest/class-Aws.S3.S3Client.html API docs
+ */
+class S3Client extends AbstractClient
+{
+    const LATEST_API_VERSION = '2006-03-01';
+
+    /**
+     * @var array Aliases for S3 operations
+     */
+    protected static $commandAliases = array(
+        // REST API Docs Aliases
+        'GetService' => 'ListBuckets',
+        'GetBucket'  => 'ListObjects',
+        'PutBucket'  => 'CreateBucket',
+
+        // SDK 1.x Aliases
+        'GetBucketHeaders'              => 'HeadBucket',
+        'GetObjectHeaders'              => 'HeadObject',
+        'SetBucketAcl'                  => 'PutBucketAcl',
+        'CreateObject'                  => 'PutObject',
+        'DeleteObjects'                 => 'DeleteMultipleObjects',
+        'PutObjectCopy'                 => 'CopyObject',
+        'SetObjectAcl'                  => 'PutObjectAcl',
+        'GetLogs'                       => 'GetBucketLogging',
+        'GetVersioningStatus'           => 'GetBucketVersioning',
+        'SetBucketPolicy'               => 'PutBucketPolicy',
+        'CreateBucketNotification'      => 'PutBucketNotification',
+        'GetBucketNotifications'        => 'GetBucketNotification',
+        'CopyPart'                      => 'UploadPartCopy',
+        'CreateWebsiteConfig'           => 'PutBucketWebsite',
+        'GetWebsiteConfig'              => 'GetBucketWebsite',
+        'DeleteWebsiteConfig'           => 'DeleteBucketWebsite',
+        'CreateObjectExpirationConfig'  => 'PutBucketLifecycle',
+        'GetObjectExpirationConfig'     => 'GetBucketLifecycle',
+        'DeleteObjectExpirationConfig'  => 'DeleteBucketLifecycle',
+    );
+
+    /**
+     * @inheritdoc
+     */
+    protected $directory = __DIR__;
+
+    /**
+     * Factory method to create a new Amazon S3 client using an array of configuration options.
+     *
+     * The following array keys and values are available options:
+     *
+     * Credential options (key, secret, and optional token OR credentials is required)
+     *
+     * - key - AWS Access Key ID
+     * - secret - AWS secret access key
+     * - credentials - You can optionally provide a custom `Aws\Common\Credentials\CredentialsInterface` object
+     * - token - Custom AWS security token to use with request authentication
+     * - token.ttd - UNIX timestamp for when the custom credentials expire
+     * - credentials.cache - Used to cache credentials when using providers that require HTTP requests. Set the true
+     *   to use the default APC cache or provide a `Guzzle\Cache\CacheAdapterInterface` object.
+     * - credentials.cache.key - Optional custom cache key to use with the credentials
+     * - credentials.client - Pass this option to specify a custom `Guzzle\Http\ClientInterface` to use if your
+     *   credentials require a HTTP request (e.g. RefreshableInstanceProfileCredentials)
+     *
+     * Region and Endpoint options (a `region` and optional `scheme` OR a `base_url` is required)
+     *
+     * - region - Region name (e.g. 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', etc...)
+     * - scheme - URI Scheme of the base URL (e.g. 'https', 'http').
+     * - base_url - Instead of using a `region` and `scheme`, you can specify a custom base URL for the client
+     *
+     * Generic client options
+     *
+     * - ssl.certificate_authority: Set to true to use the bundled CA cert (default), system to use the certificate
+     *   bundled with your system, or pass the full path to an SSL certificate bundle. This option should be used when
+     *   you encounter curl error code 60.
+     * - curl.options - Array of cURL options to apply to every request.
+     *   See http://www.php.net/manual/en/function.curl-setopt.php for a list of available options
+     * - signature - You can optionally provide a custom signature implementation used to sign requests
+     * - client.backoff.logger - `Guzzle\Log\LogAdapterInterface` object used to log backoff retries. Use
+     *   'debug' to emit PHP warnings when a retry is issued.
+     * - client.backoff.logger.template - Optional template to use for exponential backoff log messages. See
+     *   `Guzzle\Plugin\Backoff\BackoffLogger` for formatting information.
+     *
+     * @param array|Collection $config Client configuration data
+     *
+     * @return self
+     */
+    public static function factory($config = array())
+    {
+        $exceptionParser = new S3ExceptionParser();
+
+        // Configure the custom exponential backoff plugin for retrying S3 specific errors
+        if (!isset($config[Options::BACKOFF])) {
+            $config[Options::BACKOFF] = new BackoffPlugin(
+                new TruncatedBackoffStrategy(3,
+                    new HttpBackoffStrategy(null,
+                        new SocketTimeoutChecker(
+                            new CurlBackoffStrategy(null,
+                                new ExpiredCredentialsChecker($exceptionParser,
+                                    new ExponentialBackoffStrategy()
+                                )
+                            )
+                        )
+                    )
+                )
+            );
+        }
+
+        $client = ClientBuilder::factory(__NAMESPACE__)
+            ->setConfig($config)
+            ->setConfigDefaults(array(
+                Options::SIGNATURE => new S3Signature(),
+                Options::VERSION => self::LATEST_API_VERSION,
+                Options::SERVICE_DESCRIPTION => __DIR__ . '/Resources/s3-%s.php'
+            ))
+            ->setExceptionParser($exceptionParser)
+            ->setIteratorsConfig(array(
+                'more_key' => 'IsTruncated',
+                'operations' => array(
+                    'ListBuckets',
+                    'ListMultipartUploads' => array(
+                        'limit_param' => 'MaxUploads',
+                        'token_param' => array('KeyMarker', 'UploadIdMarker'),
+                        'token_key'   => array('NextKeyMarker', 'NextUploadIdMarker'),
+                    ),
+                    'ListObjects' => array(
+                        'limit_param' => 'MaxKeys',
+                        'token_param' => 'Marker',
+                        'token_key'   => 'NextMarker',
+                    ),
+                    'ListObjectVersions' => array(
+                        'limit_param' => 'MaxKeys',
+                        'token_param' => array('KeyMarker', 'VersionIdMarker'),
+                        'token_key'   => array('nextKeyMarker', 'nextVersionIdMarker'),
+                    ),
+                    'ListParts' => array(
+                        'limit_param' => 'MaxParts',
+                        'result_key'  => 'Parts',
+                        'token_param' => 'PartNumberMarker',
+                        'token_key'   => 'NextPartNumberMarker',
+                    ),
+                )
+            ))
+            ->build();
+
+        // Use virtual hosted buckets when possible
+        $client->addSubscriber(new BucketStyleListener());
+
+        // Ensure that ACP headers are applied when needed
+        $client->addSubscriber(new AcpListener());
+
+        // Validate and add Content-MD5 hashes
+        $client->addSubscriber(new CommandContentMd5Plugin());
+
+        // Allow for specifying bodies with file paths and file handles
+        $client->addSubscriber(new UploadBodyListener(array('PutObject', 'UploadPart')));
+
+        // Add aliases for some S3 operations
+        $default = CompositeFactory::getDefaultChain($client);
+        $default->add(
+            new AliasFactory($client, self::$commandAliases),
+            'Guzzle\Service\Command\Factory\ServiceDescriptionFactory'
+        );
+        $client->setCommandFactory($default);
+
+        return $client;
+    }
+
+    /**
+     * Find out if a string is a valid name for an Amazon S3 bucket.
+     *
+     * @param string $bucket The name of the bucket to check.
+     *
+     * @return bool TRUE if the bucket name is valid or FALSE if it is invalid.
+     */
+    public static function isValidBucketName($bucket)
+    {
+        $bucketLen = strlen($bucket);
+        if (!$bucket || $bucketLen < 3 || $bucketLen > 63
+            // Cannot start or end with a '.'
+            || $bucket[0] == '.'
+            || $bucket[$bucketLen - 1] == '.'
+            // Cannot look like an IP address
+            || preg_match('/^\d+\.\d+\.\d+\.\d+$/', $bucket)
+            // Cannot include special characters, must start and end with lower alnum
+            || !preg_match('/^[a-z0-9][a-z0-9\-.]*[a-z0-9]?$/', $bucket)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Create a pre-signed URL for a request
+     *
+     * @param RequestInterface     $request Request to generate the URL for. Use the factory methods of the client to
+     *                                      create this request object
+     * @param int|string|\DateTime $expires The time at which the URL should expire. This can be a Unix timestamp, a
+     *                                      PHP DateTime object, or a string that can be evaluated by strtotime
+     *
+     * @return string
+     * @throws InvalidArgumentException if the request is not associated with this client object
+     */
+    public function createPresignedUrl(RequestInterface $request, $expires)
+    {
+        if ($request->getClient() !== $this) {
+            throw new InvalidArgumentException('The request object must be associated with the client. Use the '
+                . '$client->get(), $client->head(), $client->post(), $client->put(), etc. methods when passing in a '
+                . 'request object');
+        }
+
+        if ($expires instanceof \DateTime) {
+            $expires = $expires->getTimestamp();
+        } elseif (!is_numeric($expires)) {
+            $expires = strtotime($expires);
+        }
+
+        // Operate on a clone of the request, so the original is not altered
+        $request = clone $request;
+
+        // URL encoding already occurs in the URI template expansion. Undo that and encode using the same encoding as
+        // GET object, PUT object, etc.
+        $path = $this->encodeKey(rawurldecode($request->getPath()));
+        $request->setPath($path);
+
+        // Make sure to handle temporary credentials
+        if ($token = $this->credentials->getSecurityToken()) {
+            $request->setHeader('x-amz-security-token', $token);
+            $request->getQuery()->set('x-amz-security-token', $token);
+        }
+
+        // Set query params required for pre-signed URLs
+        $request->getQuery()
+            ->set('AWSAccessKeyId', $this->credentials->getAccessKeyId())
+            ->set('Expires', $expires)
+            ->set('Signature', $this->signature->signString(
+                $this->signature->createCanonicalizedString($request, $expires),
+                $this->credentials
+            ));
+
+        return $request->getUrl();
+    }
+
+    /**
+     * Returns the URL to an object identified by its bucket and key. If an expiration time is provided, the URL will
+     * be signed and set to expire at the provided time.
+     *
+     * @param string $bucket  The name of the bucket where the object is located
+     * @param string $key     The key of the object
+     * @param mixed  $expires The time at which the URL should expire
+     * @param array  $args    Arguments to the GetObject command. Additionally you can specify a "Scheme" if you would
+     *                        like the URL to use a different scheme than what the client is configured to use
+     *
+     * @return string The URL to the object
+     */
+    public function getObjectUrl($bucket, $key, $expires = null, array $args = array())
+    {
+        $command = $this->getCommand('GetObject', $args + array('Bucket' => $bucket, 'Key' => $key));
+
+        if ($command->hasKey('Scheme')) {
+            $scheme = $command['Scheme'];
+            $request = $command->remove('Scheme')->prepare()->setScheme($scheme)->setPort(null);
+        } else {
+            $request = $command->prepare();
+        }
+
+        return $expires ? $this->createPresignedUrl($request, $expires) : $request->getUrl();
+    }
+
+    /**
+     * Helper used to clear the contents of a bucket. Use the {@see ClearBucket} object directly
+     * for more advanced options and control.
+     *
+     * @param string $bucket Name of the bucket to clear.
+     *
+     * @return int Returns the number of deleted keys
+     */
+    public function clearBucket($bucket)
+    {
+        $clear = new ClearBucket($this, $bucket);
+
+        return $clear->clear();
+    }
+
+    /**
+     * Determines whether or not a bucket exists by name
+     *
+     * @param string $bucket    The name of the bucket
+     * @param bool   $accept403 Set to true if 403s are acceptable
+     * @param array  $options   Additional options to add to the executed command
+     *
+     * @return bool
+     */
+    public function doesBucketExist($bucket, $accept403 = true, array $options = array())
+    {
+        return $this->checkExistenceWithCommand(
+            $this->getCommand('HeadBucket', array_merge($options, array(
+                'Bucket' => $bucket
+            ))), $accept403
+        );
+    }
+
+    /**
+     * Determines whether or not an object exists by name
+     *
+     * @param string $bucket  The name of the bucket
+     * @param string $key     The key of the object
+     * @param array  $options Additional options to add to the executed command
+     *
+     * @return bool
+     */
+    public function doesObjectExist($bucket, $key, array $options = array())
+    {
+        return $this->checkExistenceWithCommand(
+            $this->getCommand('HeadObject', array_merge($options, array(
+                'Bucket' => $bucket,
+                'Key'    => $key
+            )))
+        );
+    }
+
+    /**
+     * Determines whether or not a bucket policy exists for a bucket
+     *
+     * @param string $bucket  The name of the bucket
+     * @param array  $options Additional options to add to the executed command
+     *
+     * @return bool
+     */
+    public function doesBucketPolicyExist($bucket, array $options = array())
+    {
+        return $this->checkExistenceWithCommand(
+            $this->getCommand('GetBucketPolicy', array_merge($options, array(
+                'Bucket' => $bucket
+            )))
+        );
+    }
+
+    /**
+     * Raw URL encode a key and allow for '/' characters
+     *
+     * @param string $key Key to encode
+     *
+     * @return string Returns the encoded key
+     */
+    public static function encodeKey($key)
+    {
+        return str_replace('%2F', '/', rawurlencode($key));
+    }
+
+    /**
+     * Explode a prefixed key into an array of values
+     *
+     * @param string $key Key to explode
+     *
+     * @return array Returns the exploded
+     */
+    public static function explodeKey($key)
+    {
+        // Remove a leading slash if one is found
+        return explode('/', $key && $key[0] == '/' ? substr($key, 1) : $key);
+    }
+
+    /**
+     * Register the Amazon S3 stream wrapper and associates it with this client object
+     *
+     * @return self
+     */
+    public function registerStreamWrapper()
+    {
+        StreamWrapper::register($this);
+
+        return $this;
+    }
+
+    /**
+     * Upload a file, stream, or string to a bucket. If the upload size exceeds the specified threshold, the upload
+     * will be performed using parallel multipart uploads.
+     *
+     * @param string $bucket  Bucket to upload the object
+     * @param string $key     Key of the object
+     * @param mixed  $body    Object data to upload. Can be a Guzzle\Http\EntityBodyInterface, stream resource, or
+     *                        string of data to upload.
+     * @param string $acl     ACL to apply to the object
+     * @param array  $options Custom options used when executing commands:
+     *     - params: Custom parameters to use with the upload. The parameters must map to a PutObject
+     *       or InitiateMultipartUpload operation parameters.
+     *     - min_part_size: Minimum size to allow for each uploaded part when performing a multipart upload.
+     *     - concurrency: Maximum number of concurrent multipart uploads.
+     *     - before_upload: Callback to invoke before each multipart upload. The callback will receive a
+     *       Guzzle\Common\Event object with context.
+     *
+     * @see Aws\S3\Model\MultipartUpload\UploadBuilder for more options and customization
+     * @return \Guzzle\Service\Resource\Model Returns the modeled result of the performed operation
+     */
+    public function upload($bucket, $key, $body, $acl = 'private', array $options = array())
+    {
+        $body = EntityBody::factory($body);
+        $options = Collection::fromConfig(array_change_key_case($options), array(
+            'min_part_size' => AbstractMulti::MIN_PART_SIZE,
+            'params'        => array(),
+            'concurrency'   => $body->getWrapper() == 'plainfile' ? 3 : 1
+        ));
+
+        if ($body->getSize() < $options['min_part_size']) {
+            // Perform a simple PutObject operation
+            return $this->putObject(array(
+                'Bucket' => $bucket,
+                'Key'    => $key,
+                'Body'   => $body,
+                'ACL'    => $acl
+            ) + $options['params']);
+        }
+
+        // Perform a multipart upload if the file is large enough
+        $transfer = UploadBuilder::newInstance()
+            ->setBucket($bucket)
+            ->setKey($key)
+            ->setMinPartSize($options['min_part_size'])
+            ->setConcurrency($options['concurrency'])
+            ->setClient($this)
+            ->setSource($body)
+            ->setTransferOptions($options->toArray())
+            ->addOptions($options['params'])
+            ->setOption('ACL', $acl)
+            ->build()
+            ->upload();
+
+        if ($options['before_upload']) {
+            $transfer->getEventDispatcher()->addListener(
+                AbstractTransfer::BEFORE_PART_UPLOAD,
+                $options['before_upload']
+            );
+        }
+
+        return $transfer;
+    }
+
+    /**
+     * Recursively uploads all files in a given directory to a given bucket.
+     *
+     * @param string $directory Full path to a directory to upload
+     * @param string $bucket    Name of the bucket
+     * @param string $keyPrefix Virtual directory key prefix to add to each upload
+     * @param array  $options   Associative array of upload options
+     *     - params: Array of parameters to use with each PutObject operation performed during the transfer
+     *     - base_dir: Base directory to remove from each object key
+     *     - force: Set to true to upload every file, even if the file is already in Amazon S3 and has not changed
+     *     - concurrency: Maximum number of parallel uploads (defaults to 10)
+     *     - debug: Set to true or an fopen resource to enable debug mode to print information about each upload
+     *     - multipart_upload_size: When the size of a file exceeds this value, the file will be uploaded using a
+     *       multipart upload.
+     *
+     * @see Aws\S3\S3Sync\S3Sync for more options and customization
+     */
+    public function uploadDirectory($directory, $bucket, $keyPrefix = null, array $options = array())
+    {
+        $options = Collection::fromConfig($options, array('base_dir' => $directory));
+        $builder = $options['builder'] ?: UploadSyncBuilder::getInstance();
+        $builder->uploadFromDirectory($directory)
+            ->setClient($this)
+            ->setBucket($bucket)
+            ->setKeyPrefix($keyPrefix)
+            ->setConcurrency($options['concurrency'] ?: 5)
+            ->setBaseDir($options['base_dir'])
+            ->force($options['force'])
+            ->setOperationParams($options['params'] ?: array())
+            ->enableDebugOutput($options['debug']);
+
+        if ($options->hasKey('multipart_upload_size')) {
+            $builder->setMultipartUploadSize($options['multipart_upload_size']);
+        }
+
+        $builder->build()->transfer();
+    }
+
+    /**
+     * Downloads a bucket to the local filesystem
+     *
+     * @param string $directory Directory to download to
+     * @param string $bucket    Bucket to download from
+     * @param string $keyPrefix Only download objects that use this key prefix
+     * @param array  $options   Associative array of download options
+     *     - params: Array of parameters to use with each GetObject operation performed during the transfer
+     *     - base_dir: Base directory to remove from each object key when storing in the local filesystem
+     *     - force: Set to true to download every file, even if the file is already on the local filesystem and has not
+     *       changed
+     *     - concurrency: Maximum number of parallel downloads (defaults to 10)
+     *     - debug: Set to true or a fopen resource to enable debug mode to print information about each download
+     *     - allow_resumable: Set to true to allow previously interrupted downloads to be resumed using a Range GET
+     */
+    public function downloadBucket($directory, $bucket, $keyPrefix = '', array $options = array())
+    {
+        $options = new Collection($options);
+        $builder = $options['builder'] ?: DownloadSyncBuilder::getInstance();
+        $builder->setDirectory($directory)
+            ->setClient($this)
+            ->setBucket($bucket)
+            ->setKeyPrefix($keyPrefix)
+            ->setConcurrency($options['concurrency'] ?: 10)
+            ->setBaseDir($options['base_dir'])
+            ->force($options['force'])
+            ->setOperationParams($options['params'] ?: array())
+            ->enableDebugOutput($options['debug']);
+
+        if ($options['allow_resumable']) {
+            $builder->allowResumableDownloads();
+        }
+
+        $builder->build()->transfer();
+    }
+
+    /**
+     * Deletes objects from Amazon S3 that match the result of a ListObjects operation. For example, this allows you
+     * to do things like delete all objects that match a specific key prefix.
+     *
+     * @param string $bucket  Bucket that contains the object keys
+     * @param string $prefix  Optionally delete only objects under this key prefix
+     * @param string $regex   Delete only objects that match this regex
+     * @param array  $options Options used when deleting the object:
+     *     - before_delete: Callback to invoke before each delete. The callback will receive a
+     *       Guzzle\Common\Event object with context.
+     *
+     * @see Aws\S3\S3Client::listObjects
+     * @see Aws\S3\Model\ClearBucket For more options or customization
+     * @return int Returns the number of deleted keys
+     * @throws RuntimeException if no prefix and no regex is given
+     */
+    public function deleteMatchingObjects($bucket, $prefix = '', $regex = '', array $options = array())
+    {
+        if (!$prefix && !$regex) {
+            throw new RuntimeException('A prefix or regex is required, or use S3Client::clearBucket().');
+        }
+
+        $clear = new ClearBucket($this, $bucket);
+        $iterator = $this->getIterator('ListObjects', array('Bucket' => $bucket, 'Prefix' => $prefix));
+
+        if ($regex) {
+            $iterator = new FilterIterator($iterator, function ($current) use ($regex) {
+                return preg_match($regex, $current['Key']);
+            });
+        }
+
+        $clear->setIterator($iterator);
+        if (isset($options['before_delete'])) {
+            $clear->getEventDispatcher()->addListener(ClearBucket::BEFORE_CLEAR, $options['before_delete']);
+        }
+
+        return $clear->clear();
+    }
+
+    /**
+     * Determines whether or not a resource exists using a command
+     *
+     * @param CommandInterface $command   Command used to poll for the resource
+     * @param bool             $accept403 Set to true if 403s are acceptable
+     *
+     * @return bool
+     * @throws S3Exception|\Exception if there is an unhandled exception
+     */
+    protected function checkExistenceWithCommand(CommandInterface $command, $accept403 = false)
+    {
+        try {
+            $command->execute();
+            $exists = true;
+        } catch (AccessDeniedException $e) {
+            $exists = (bool) $accept403;
+        } catch (S3Exception $e) {
+            $exists = false;
+            if ($e->getResponse()->getStatusCode() >= 500) {
+                // @codeCoverageIgnoreStart
+                throw $e;
+                // @codeCoverageIgnoreEnd
+            }
+        }
+
+        return $exists;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3Signature.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3Signature.php
new file mode 100644
index 0000000000000000000000000000000000000000..67c3da3b746f94cd2bfaa293f6e9d688e1d4dc6a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3Signature.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Aws\Common\Credentials\CredentialsInterface;
+use Aws\Common\Enum\DateFormat;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\QueryString;
+use Guzzle\Http\Url;
+
+/**
+ * Default Amazon S3 signature implementation
+ * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAuthentication.html
+ */
+class S3Signature implements S3SignatureInterface
+{
+    /**
+     * @var array Query string values that must be signed
+     */
+    protected $signableQueryString = array(
+        'acl', 'delete', 'lifecycle', 'location', 'logging', 'notification',
+        'partNumber', 'policy', 'requestPayment', 'torrent', 'uploadId',
+        'uploads', 'versionId', 'versioning', 'versions', 'website',
+        'response-cache-control', 'response-content-disposition',
+        'response-content-encoding', 'response-content-language',
+        'response-content-type', 'response-expires', 'restore', 'tagging', 'cors'
+    );
+
+    /**
+     * @var array Sorted headers that must be signed
+     */
+    protected $signableHeaders = array('Content-MD5', 'Content-Type');
+
+    /**
+     * {@inheritdoc}
+     */
+    public function signRequest(RequestInterface $request, CredentialsInterface $credentials)
+    {
+        // Add the security token header if one is being used by the credentials
+        if ($token = $credentials->getSecurityToken()) {
+            $request->setHeader('x-amz-security-token', $token);
+        }
+
+        // Add a date header if one is not set
+        if (!$request->hasHeader('date') && !$request->hasHeader('x-amz-date')) {
+            $request->setHeader('Date', gmdate(DateFormat::RFC2822));
+        }
+
+        $stringToSign = $this->createCanonicalizedString($request);
+        $request->getParams()->set('aws.string_to_sign', $stringToSign);
+
+        $request->setHeader(
+            'Authorization',
+            'AWS ' . $credentials->getAccessKeyId() . ':' . $this->signString($stringToSign, $credentials)
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function signString($string, CredentialsInterface $credentials)
+    {
+        return base64_encode(hash_hmac('sha1', $string, $credentials->getSecretKey(), true));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createCanonicalizedString(RequestInterface $request, $expires = null)
+    {
+        $buffer = $request->getMethod() . "\n";
+
+        // Add the interesting headers
+        foreach ($this->signableHeaders as $header) {
+            $buffer .= (string) $request->getHeader($header) . "\n";
+        }
+
+        // Choose dates from left to right based on what's set
+        $date = $expires ?: (string) $request->getHeader('date');
+
+        $buffer .= "{$date}\n"
+            . $this->createCanonicalizedAmzHeaders($request)
+            . $this->createCanonicalizedResource($request);
+
+        return $buffer;
+    }
+
+    /**
+     * Create a canonicalized AmzHeaders string for a signature.
+     *
+     * @param RequestInterface $request Request from which to gather headers
+     *
+     * @return string Returns canonicalized AMZ headers.
+     */
+    protected function createCanonicalizedAmzHeaders(RequestInterface $request)
+    {
+        $headers = array();
+        foreach ($request->getHeaders(true) as $header) {
+            /** @var $header \Guzzle\Http\Message\Header */
+            $name = strtolower($header->getName());
+            if (strpos($name, 'x-amz-') === 0) {
+                $value = trim((string) $header);
+                if ($value || $value === '0') {
+                    $headers[$name] = $name . ':' . $value;
+                }
+            }
+        }
+
+        if (empty($headers)) {
+            return '';
+        } else {
+            ksort($headers);
+
+            return implode("\n", $headers) . "\n";
+        }
+    }
+
+    /**
+     * Create a canonicalized resource for a request
+     *
+     * @param RequestInterface $request Request for the resource
+     *
+     * @return string
+     */
+    protected function createCanonicalizedResource(RequestInterface $request)
+    {
+        $buffer = $request->getParams()->get('s3.resource');
+        // When sending a raw HTTP request (e.g. $client->get())
+        if (null === $buffer) {
+            $bucket = $request->getParams()->get('bucket') ?: $this->parseBucketName($request);
+            // Use any specified bucket name, the parsed bucket name, or no bucket name when interacting with GetService
+            $buffer = $bucket ? "/{$bucket}" : '';
+            // Remove encoding from the path and use the S3 specific encoding
+            $path = S3Client::encodeKey(rawurldecode($request->getPath()));
+            // if the bucket was path style, then ensure that the bucket wasn't duplicated in the resource
+            $buffer .= preg_replace("#^/{$bucket}/{$bucket}#", "/{$bucket}", $path);
+        }
+
+        // Remove double slashes
+        $buffer = str_replace('//', '/', $buffer);
+
+        // Add sub resource parameters
+        $query = $request->getQuery();
+        $first = true;
+        foreach ($this->signableQueryString as $key) {
+            if ($value = $query->get($key)) {
+                $buffer .= $first ? '?' : '&';
+                $first = false;
+                $buffer .= $key;
+                if ($value !== QueryString::BLANK) {
+                    $buffer .= "={$value}";
+                }
+            }
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * Parse the bucket name from a request object
+     *
+     * @param RequestInterface $request Request to parse
+     *
+     * @return string
+     */
+    protected function parseBucketName(RequestInterface $request)
+    {
+        $baseUrl = Url::factory($request->getClient()->getBaseUrl());
+        $baseHost = $baseUrl->getHost();
+        $host = $request->getHost();
+
+        if (strpos($host, $baseHost) === false) {
+            // Does not contain the base URL, so it's either a redirect, CNAME, or using a different region
+            $baseHost = '';
+            // For every known S3 host, check if that host is present on the request
+            $regions = $request->getClient()->getDescription()->getData('regions');
+            foreach ($regions as $region) {
+                if (strpos($host, $region['hostname']) !== false) {
+                    // This host matches the request host. Tells use the region and endpoint-- we can derive the bucket
+                    $baseHost = $region['hostname'];
+                    break;
+                }
+            }
+            // If no matching base URL was found, then assume that this is a CNAME, and the CNAME is the bucket
+            if (!$baseHost) {
+                return $host;
+            }
+        }
+
+        // Remove the baseURL from the host of the request to attempt to determine the bucket name
+        return trim(str_replace($baseHost, '', $request->getHost()), ' .');
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3SignatureInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3SignatureInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1182f64f3db52445223102b7ec61c164619c528
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/S3SignatureInterface.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Aws\Common\Signature\SignatureInterface;
+use Aws\Common\Credentials\CredentialsInterface;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Amazon S3 signature interface
+ * @link http://docs.amazonwebservices.com/AmazonS3/latest/dev/RESTAuthentication.html
+ */
+interface S3SignatureInterface extends SignatureInterface
+{
+    /**
+     * Sign a string for Amazon S3
+     *
+     * @param string               $string      String to sign
+     * @param CredentialsInterface $credentials Credentials used to sign
+     *
+     * @return string
+     */
+    public function signString($string, CredentialsInterface $credentials);
+
+    /**
+     * Create a canonicalized string for a signature.
+     *
+     * @param RequestInterface $request Base on the request
+     * @param string           $expires Pass a UNIX timestamp if creating a query signature
+     *
+     * @return string Returns a canonicalized string for an Amazon S3 signature.
+     */
+    public function createCanonicalizedString(RequestInterface $request, $expires = null);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/SocketTimeoutChecker.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/SocketTimeoutChecker.php
new file mode 100644
index 0000000000000000000000000000000000000000..e0cfa4065ff4b213a8d664922ccb87d605309424
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/SocketTimeoutChecker.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Guzzle\Http\Exception\HttpException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Plugin\Backoff\BackoffStrategyInterface;
+use Guzzle\Plugin\Backoff\AbstractBackoffStrategy;
+
+/**
+ * Custom S3 exponential backoff checking use to retry 400 responses containing the following reason phrase:
+ * "Your socket connection to the server was not read from or written to within the timeout period.".
+ * This error has been reported as intermittent/random, and in most cases, seems to occur during the middle of a
+ * transfer. This plugin will attempt to retry these failed requests, and if using a local file, will clear the
+ * stat cache of the file and set a new content-length header on the upload.
+ */
+class SocketTimeoutChecker extends AbstractBackoffStrategy
+{
+    const ERR = 'Your socket connection to the server was not read from or written to within the timeout period';
+
+    /**
+     * {@inheridoc}
+     */
+    public function __construct(BackoffStrategyInterface $next = null)
+    {
+        if ($next) {
+            $this->setNext($next);
+        }
+    }
+
+    /**
+     * {@inheridoc}
+     */
+    public function makesDecision()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDelay(
+        $retries,
+        RequestInterface $request,
+        Response $response = null,
+        HttpException $e = null
+    ) {
+        if ($response
+            && $response->getStatusCode() == 400
+            && strpos($response->getBody(), self::ERR)
+        ) {
+            // Check if the request is sending a local file, and if so, clear the stat cache and recalculate the size.
+            if ($request instanceof EntityEnclosingRequestInterface) {
+                if ($request->getBody()->getWrapper() == 'plainfile') {
+                    $filename = $request->getBody()->getUri();
+                    // Clear the cache so that we send accurate file sizes
+                    clearstatcache(true, $filename);
+                    $length = filesize($filename);
+                    $request->getBody()->setSize($length);
+                    $request->setHeader('Content-Length', $length);
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/StreamWrapper.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/StreamWrapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..86c2610b63d241849dc9072eef39c0360fa837b7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/StreamWrapper.php
@@ -0,0 +1,765 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3;
+
+use Aws\Common\Exception\RuntimeException;
+use Aws\S3\Exception\S3Exception;
+use Aws\S3\Exception\NoSuchKeyException;
+use Aws\S3\Iterator\ListObjectsIterator;
+use Guzzle\Http\QueryString;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\CachingEntityBody;
+use Guzzle\Stream\PhpStreamRequestFactory;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Amazon S3 stream wrapper to use "s3://<bucket>/<key>" files with PHP streams, supporting "r", "w", "a", "x".
+ *
+ * # Supported stream related PHP functions:
+ * - fopen, fclose, fread, fwrite, fseek, ftell, feof, fflush
+ * - opendir, closedir, readdir, rewinddir
+ * - copy, rename, unlink
+ * - mkdir, rmdir, rmdir (recursive)
+ * - file_get_contents, file_put_contents
+ * - file_exists, filesize, is_file, is_dir
+ *
+ * # Opening "r" (read only) streams:
+ *
+ * Read only streams are truly streaming by default and will not allow you to seek. This is because data
+ * read from the stream is not kept in memory or on the local filesystem. You can force a "r" stream to be seekable
+ * by setting the "seekable" stream context option true. This will allow true streaming of data from Amazon S3, but
+ * will maintain a buffer of previously read bytes in a 'php://temp' stream to allow seeking to previously read bytes
+ * from the stream.
+ *
+ * You may pass any GetObject parameters as 's3' stream context options. These options will affect how the data is
+ * downloaded from Amazon S3.
+ *
+ * # Opening "w" and "x" (write only) streams:
+ *
+ * Because Amazon S3 requires a Content-Length header, write only streams will maintain a 'php://temp' stream to buffer
+ * data written to the stream until the stream is flushed (usually by closing the stream with fclose).
+ *
+ * You may pass any PutObject parameters as 's3' stream context options. These options will affect how the data is
+ * uploaded to Amazon S3.
+ *
+ * When opening an "x" stream, the file must exist on Amazon S3 for the stream to open successfully.
+ *
+ * # Opening "a" (write only append) streams:
+ *
+ * Similar to "w" streams, opening append streams requires that the data be buffered in a "php://temp" stream. Append
+ * streams will attempt to download the contents of an object in Amazon S3, seek to the end of the object, then allow
+ * you to append to the contents of the object. The data will then be uploaded using a PutObject operation when the
+ * stream is flushed (usually with fclose).
+ *
+ * You may pass any GetObject and/or PutObject parameters as 's3' stream context options. These options will affect how
+ * the data is downloaded and uploaded from Amazon S3.
+ *
+ * Stream context options:
+ *
+ * - "seekable": Set to true to create a seekable "r" (read only) stream by using a php://temp stream buffer
+ * - "throw_exceptions": Set to true to throw exceptions instead of trigger_errors
+ * - For "unlink" only: Any option that can be passed to the DeleteObject operation
+ */
+class StreamWrapper
+{
+    /**
+     * @var resource|null Stream context (this is set by PHP when a context is used)
+     */
+    public $context;
+
+    /**
+     * @var S3Client Client used to send requests
+     */
+    protected static $client;
+
+    /**
+     * @var string Mode the stream was opened with
+     */
+    protected $mode;
+
+    /**
+     * @var EntityBody Underlying stream resource
+     */
+    protected $body;
+
+    /**
+     * @var array Current parameters to use with the flush operation
+     */
+    protected $params;
+
+    /**
+     * @var ListObjectsIterator Iterator used with opendir() and subsequent readdir() calls
+     */
+    protected $objectIterator;
+
+    /**
+     * @var string The bucket that was opened when opendir() was called
+     */
+    protected $openedBucket;
+
+    /**
+     * @var string The prefix of the bucket that was opened with opendir()
+     */
+    protected $openedBucketPrefix;
+
+    /**
+     * @var array The next key to retrieve when using a directory iterator. Helps for fast directory traversal.
+     */
+    protected static $nextStat = array();
+
+    /**
+     * Register the 's3://' stream wrapper
+     *
+     * @param S3Client $client Client to use with the stream wrapper
+     */
+    public static function register(S3Client $client)
+    {
+        if (in_array('s3', stream_get_wrappers())) {
+            stream_wrapper_unregister('s3');
+        }
+
+        stream_wrapper_register('s3', __CLASS__, STREAM_IS_URL);
+        self::$client = $client;
+    }
+
+    /**
+     * Close the stream
+     */
+    public function stream_close()
+    {
+        $this->body = null;
+    }
+
+    /**
+     * @param string $path
+     * @param string $mode
+     * @param int    $options
+     * @param string $opened_path
+     *
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        // We don't care about the binary flag
+        $this->mode = $mode = rtrim($mode, 'bt');
+        $this->params = $params = $this->getParams($path);
+        $errors = array();
+
+        if (!$params['Key']) {
+            $errors[] = 'Cannot open a bucket. You must specify a path in the form of s3://bucket/key';
+        }
+
+        if (strpos($mode, '+')) {
+            $errors[] = 'The Amazon S3 stream wrapper does not allow simultaneous reading and writing.';
+        }
+
+        if (!in_array($mode, array('r', 'w', 'a', 'x'))) {
+            $errors[] = "Mode not supported: {$mode}. Use one 'r', 'w', 'a', or 'x'.";
+        }
+
+        // When using mode "x" validate if the file exists before attempting to read
+        if ($mode == 'x' && !self::$client->doesObjectExist($params['Bucket'], $params['Key'], $this->getOptions())) {
+            $errors[] = "{$path} does not exist on Amazon S3";
+        }
+
+        if (!$errors) {
+            if ($mode == 'r') {
+                $this->openReadStream($params, $errors);
+            } elseif ($mode == 'a') {
+                $this->openAppendStream($params, $errors);
+            } else {
+                $this->openWriteStream($params, $errors);
+            }
+        }
+
+        return $errors ? $this->triggerError($errors) : true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        return $this->body->feof();
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_flush()
+    {
+        if ($this->mode == 'r') {
+            return false;
+        }
+
+        $this->body->rewind();
+        $params = $this->params;
+        $params['Body'] = $this->body;
+
+        try {
+            self::$client->putObject($params);
+            return true;
+        } catch (\Exception $e) {
+            return $this->triggerError($e->getMessage());
+        }
+    }
+
+    /**
+     * Read data from the underlying stream
+     *
+     * @param int $count Amount of bytes to read
+     *
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        return $this->body->read($count);
+    }
+
+    /**
+     * Seek to a specific byte in the stream
+     *
+     * @param int $offset Seek offset
+     * @param int $whence Whence (SEEK_SET, SEEK_CUR, SEEK_END)
+     *
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET)
+    {
+        return $this->body->seek($offset, $whence);
+    }
+
+    /**
+     * Get the current position of the stream
+     *
+     * @return int Returns the current position in the stream
+     */
+    public function stream_tell()
+    {
+        return $this->body->ftell();
+    }
+
+    /**
+     * Write data the to the stream
+     *
+     * @param string $data
+     *
+     * @return int Returns the number of bytes written to the stream
+     */
+    public function stream_write($data)
+    {
+        return $this->body->write($data);
+    }
+
+    /**
+     * Delete a specific object
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path)
+    {
+        try {
+            $this->clearStatInfo($path);
+            self::$client->deleteObject($this->getParams($path));
+            return true;
+        } catch (\Exception $e) {
+            return $this->triggerError($e->getMessage());
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function stream_stat()
+    {
+        $stat = fstat($this->body->getStream());
+        // Add the size of the underlying stream if it is known
+        if ($this->mode == 'r' && $this->body->getSize()) {
+            $stat[7] = $stat['size'] = $this->body->getSize();
+        }
+
+        return $stat;
+    }
+
+    /**
+     * Provides information for is_dir, is_file, filesize, etc. Works on buckets, keys, and prefixes
+     *
+     * @param string $path
+     * @param int    $flags
+     *
+     * @return array Returns an array of stat data
+     * @link http://www.php.net/manual/en/streamwrapper.url-stat.php
+     */
+    public function url_stat($path, $flags)
+    {
+        // Check if this path is in the url_stat cache
+        if (isset(self::$nextStat[$path])) {
+            return self::$nextStat[$path];
+        }
+
+        $parts = $this->getParams($path);
+
+        // Stat a bucket or just s3://
+        if (!$parts['Key'] && (!$parts['Bucket'] || self::$client->doesBucketExist($parts['Bucket']))) {
+            return $this->formatUrlStat($path);
+        }
+
+        // You must pass either a bucket or a bucket + key
+        if (!$parts['Key']) {
+            return $this->triggerError("File or directory not found: {$path}", $flags);
+        }
+
+        try {
+            try {
+                // Attempt to stat and cache regular object
+                return $this->formatUrlStat(self::$client->headObject($parts)->toArray());
+            } catch (NoSuchKeyException $e) {
+                // Maybe this isn't an actual key, but a prefix. Do a prefix listing of objects to determine.
+                $result = self::$client->listObjects(array(
+                    'Bucket'  => $parts['Bucket'],
+                    'Prefix'  => $parts['Key'],
+                    'MaxKeys' => 1
+                ));
+                if (!$result['Contents'] && !$result['CommonPrefixes']) {
+                    return $this->triggerError("File or directory not found: {$path}", $flags);
+                }
+                // This is a directory prefix
+                return $this->formatUrlStat($path);
+            }
+        } catch (\Exception $e) {
+            return $this->triggerError($e->getMessage(), $flags);
+        }
+    }
+
+    /**
+     * Support for mkdir().
+     *
+     * @param string $path    Directory which should be created.
+     * @param int    $mode    Permissions. 700-range permissions map to ACL_PUBLIC. 600-range permissions map to
+     *                        ACL_AUTH_READ. All other permissions map to ACL_PRIVATE. Expects octal form.
+     * @param int    $options A bitwise mask of values, such as STREAM_MKDIR_RECURSIVE. (unused)
+     *
+     * @return bool
+     * @link http://www.php.net/manual/en/streamwrapper.mkdir.php
+     */
+    public function mkdir($path, $mode, $options)
+    {
+        $params = $this->getParams($path);
+        $this->clearStatInfo($path);
+
+        if (!$params['Bucket'] || $params['Key']) {
+            return false;
+        }
+
+        try {
+            if (!isset($params['ACL'])) {
+                $mode = decoct($mode);
+                if ($mode >= 700 and $mode <= 799) {
+                    $params['ACL'] = 'public-read';
+                } elseif ($mode >= 600 && $mode <= 699) {
+                    $params['ACL'] = 'authenticated-read';
+                } else {
+                    $params['ACL'] = 'private';
+                }
+            }
+            self::$client->createBucket($params);
+            return true;
+        } catch (\Exception $e) {
+            return $this->triggerError($e->getMessage());
+        }
+    }
+
+    /**
+     * Remove a bucket from Amazon S3
+     *
+     * @param string $path the directory path
+     *
+     * @return bool true if directory was successfully removed
+     * @link http://www.php.net/manual/en/streamwrapper.rmdir.php
+     */
+    public function rmdir($path)
+    {
+        $params = $this->getParams($path);
+        if (!$params['Bucket']) {
+            return $this->triggerError('You cannot delete s3://. Please specify a bucket.');
+        } elseif ($params['Key']) {
+            return $this->triggerError('rmdir() only supports bucket deletion');
+        }
+
+        try {
+            self::$client->deleteBucket(array('Bucket' => $params['Bucket']));
+            $this->clearStatInfo($path);
+            return true;
+        } catch (\Exception $e) {
+            return $this->triggerError($e->getMessage());
+        }
+    }
+
+    /**
+     * Support for opendir().
+     *
+     * @param string $path    The path to the directory (e.g. "s3://dir[</prefix>]")
+     * @param string $options Whether or not to enforce safe_mode (0x04). Unused.
+     *
+     * @return bool true on success
+     * @see http://www.php.net/manual/en/function.opendir.php
+     */
+    public function dir_opendir($path, $options)
+    {
+        // Reset the cache
+        $this->clearStatInfo();
+        $params = $this->getParams($path);
+        $delimiter = $this->getOption('delimiter');
+
+        if ($delimiter === null) {
+            $delimiter = '/';
+        }
+
+        if ($params['Key']) {
+            $suffix = $delimiter ?: '/';
+            $params['Key'] = rtrim($params['Key'], $suffix) . $suffix;
+        }
+
+        $this->openedBucket = $params['Bucket'];
+        $this->openedBucketPrefix = $params['Key'];
+        $operationParams = array('Bucket' => $params['Bucket'], 'Prefix' => $params['Key']);
+
+        if ($delimiter) {
+            $operationParams['Delimiter'] = $delimiter;
+        }
+
+        $this->objectIterator = self::$client->getIterator('ListObjects', $operationParams, array(
+            'return_prefixes' => true,
+            'sort_results'    => true
+        ));
+
+        $this->objectIterator->next();
+
+        return true;
+    }
+
+    /**
+     * Close the directory listing handles
+     *
+     * @return bool true on success
+     */
+    public function dir_closedir()
+    {
+        $this->objectIterator = null;
+
+        return true;
+    }
+
+    /**
+     * This method is called in response to rewinddir()
+     *
+     * @return boolean true on success
+     */
+    public function dir_rewinddir()
+    {
+        $this->clearStatInfo();
+        $this->objectIterator->rewind();
+
+        return true;
+    }
+
+    /**
+     * This method is called in response to readdir()
+     *
+     * @return string Should return a string representing the next filename, or false if there is no next file.
+     *
+     * @link http://www.php.net/manual/en/function.readdir.php
+     */
+    public function dir_readdir()
+    {
+        $result = false;
+        if ($this->objectIterator->valid()) {
+            $current = $this->objectIterator->current();
+            if (isset($current['Prefix'])) {
+                // Include "directories"
+                $result = str_replace($this->openedBucketPrefix, '', $current['Prefix']);
+                $key = "s3://{$this->openedBucket}/{$current['Prefix']}";
+                $stat = $this->formatUrlStat($current['Prefix']);
+            } else {
+                // Remove the prefix from the result to emulate other stream wrappers
+                $result = str_replace($this->openedBucketPrefix, '', $current['Key']);
+                $key = "s3://{$this->openedBucket}/{$current['Key']}";
+                $stat = $this->formatUrlStat($current);
+            }
+
+            // Cache the object data for quick url_stat lookups used with RecursiveDirectoryIterator
+            self::$nextStat = array($key => $stat);
+            $this->objectIterator->next();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Called in response to rename() to rename a file or directory. Currently only supports renaming objects.
+     *
+     * @param string $path_from the path to the file to rename
+     * @param string $path_to   the new path to the file
+     *
+     * @return bool true if file was successfully renamed
+     * @link http://www.php.net/manual/en/function.rename.php
+     */
+    public function rename($path_from, $path_to)
+    {
+        $partsFrom = $this->getParams($path_from);
+        $partsTo = $this->getParams($path_to);
+        $this->clearStatInfo($path_from);
+        $this->clearStatInfo($path_to);
+
+        if (!$partsFrom['Key'] || !$partsTo['Key']) {
+            return $this->triggerError('The Amazon S3 stream wrapper only supports copying objects');
+        }
+
+        try {
+            // Copy the object and allow overriding default parameters if desired, but by default copy metadata
+            self::$client->copyObject($this->getOptions() + array(
+                'Bucket' => $partsTo['Bucket'],
+                'Key' => $partsTo['Key'],
+                'CopySource' => '/' . $partsFrom['Bucket'] . '/' . rawurlencode($partsFrom['Key']),
+                'MetadataDirective' => 'COPY'
+            ));
+            // Delete the original object
+            self::$client->deleteObject(array(
+                'Bucket' => $partsFrom['Bucket'],
+                'Key'    => $partsFrom['Key']
+            ) + $this->getOptions());
+        } catch (\Exception $e) {
+            return $this->triggerError($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * Cast the stream to return the underlying file resource
+     *
+     * @param int $cast_as STREAM_CAST_FOR_SELECT or STREAM_CAST_AS_STREAM
+     *
+     * @return resource
+     */
+    public function stream_cast($cast_as)
+    {
+        return $this->body->getStream();
+    }
+
+    /**
+     * Get the stream context options available to the current stream
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        $context = $this->context ?: stream_context_get_default();
+        $options = stream_context_get_options($context);
+
+        return isset($options['s3']) ? $options['s3'] : array();
+    }
+
+    /**
+     * Get a specific stream context option
+     *
+     * @param string $name Name of the option to retrieve
+     *
+     * @return mixed|null
+     */
+    protected function getOption($name)
+    {
+        $options = $this->getOptions();
+
+        return isset($options[$name]) ? $options[$name] : null;
+    }
+
+    /**
+     * Get the bucket and key from the passed path (e.g. s3://bucket/key)
+     *
+     * @param string $path Path passed to the stream wrapper
+     *
+     * @return array Hash of 'Bucket', 'Key', and custom params
+     */
+    protected function getParams($path)
+    {
+        $parts = explode('/', substr($path, 5), 2);
+
+        $params = $this->getOptions();
+        unset($params['seekable']);
+        unset($params['throw_exceptions']);
+
+        return array(
+            'Bucket' => $parts[0],
+            'Key'    => isset($parts[1]) ? $parts[1] : null
+        ) + $params;
+    }
+
+    /**
+     * Serialize and sign a command, returning a request object
+     *
+     * @param CommandInterface $command Command to sign
+     *
+     * @return RequestInterface
+     */
+    protected function getSignedRequest($command)
+    {
+        $request = $command->prepare();
+        $request->dispatch('request.before_send', array('request' => $request));
+
+        return $request;
+    }
+
+    /**
+     * Initialize the stream wrapper for a read only stream
+     *
+     * @param array $params Operation parameters
+     * @param array $errors Any encountered errors to append to
+     *
+     * @return bool
+     */
+    protected function openReadStream(array $params, array &$errors)
+    {
+        // Create the command and serialize the request
+        $request = $this->getSignedRequest(self::$client->getCommand('GetObject', $params));
+        // Create a stream that uses the EntityBody object
+        $factory = $this->getOption('stream_factory') ?: new PhpStreamRequestFactory();
+        $this->body = $factory->fromRequest($request, array(), array('stream_class' => 'Guzzle\Http\EntityBody'));
+
+        // Wrap the body in a caching entity body if seeking is allowed
+        if ($this->getOption('seekable')) {
+            $this->body = new CachingEntityBody($this->body);
+        }
+
+        return true;
+    }
+
+    /**
+     * Initialize the stream wrapper for a write only stream
+     *
+     * @param array $params Operation parameters
+     * @param array $errors Any encountered errors to append to
+     *
+     * @return bool
+     */
+    protected function openWriteStream(array $params, array &$errors)
+    {
+        $this->body = new EntityBody(fopen('php://temp', 'r+'));
+    }
+
+    /**
+     * Initialize the stream wrapper for an append stream
+     *
+     * @param array $params Operation parameters
+     * @param array $errors Any encountered errors to append to
+     *
+     * @return bool
+     */
+    protected function openAppendStream(array $params, array &$errors)
+    {
+        try {
+            // Get the body of the object
+            $this->body = self::$client->getObject($params)->get('Body');
+            $this->body->seek(0, SEEK_END);
+        } catch (S3Exception $e) {
+            // The object does not exist, so use a simple write stream
+            $this->openWriteStream($params, $errors);
+        }
+
+        return true;
+    }
+
+    /**
+     * Trigger one or more errors
+     *
+     * @param string|array $errors Errors to trigger
+     * @param mixed        $flags  If set to STREAM_URL_STAT_QUIET, then no error or exception occurs
+     *
+     * @return bool Returns false
+     * @throws RuntimeException if throw_errors is true
+     */
+    protected function triggerError($errors, $flags = null)
+    {
+        if ($flags != STREAM_URL_STAT_QUIET) {
+            if ($this->getOption('throw_exceptions')) {
+                throw new RuntimeException(implode("\n", (array) $errors));
+            } else {
+                trigger_error(implode("\n", (array) $errors), E_USER_WARNING);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Prepare a url_stat result array
+     *
+     * @param string|array $result Data to add
+     *
+     * @return array Returns the modified url_stat result
+     */
+    protected function formatUrlStat($result = null)
+    {
+        static $statTemplate = array(
+            0  => 0,  'dev'     => 0,
+            1  => 0,  'ino'     => 0,
+            2  => 0,  'mode'    => 0,
+            3  => 0,  'nlink'   => 0,
+            4  => 0,  'uid'     => 0,
+            5  => 0,  'gid'     => 0,
+            6  => -1, 'rdev'    => -1,
+            7  => 0,  'size'    => 0,
+            8  => 0,  'atime'   => 0,
+            9  => 0,  'mtime'   => 0,
+            10 => 0,  'ctime'   => 0,
+            11 => -1, 'blksize' => -1,
+            12 => -1, 'blocks'  => -1,
+        );
+
+        $stat = $statTemplate;
+
+        // Determine what type of data is being cached
+        if (!$result || is_string($result)) {
+            // Directory with 0777 access - see "man 2 stat".
+            $stat['mode'] = $stat[2] = 0040777;
+        } elseif (is_array($result) && isset($result['LastModified'])) {
+            // ListObjects or HeadObject result
+            $stat['mtime'] = $stat[9] = $stat['ctime'] = $stat[10] = strtotime($result['LastModified']);
+            $stat['size'] = $stat[7] = (isset($result['ContentLength']) ? $result['ContentLength'] : $result['Size']);
+            // Regular file with 0777 access - see "man 2 stat".
+            $stat['mode'] = $stat[2] = 0100777;
+        } else {
+            $stat['mode'] = $stat[2] = 0100777;
+        }
+
+        return $stat;
+    }
+
+    /**
+     * Clear the next stat result from the cache
+     *
+     * @param string $path If a path is specific, clearstatcache() will be called
+     */
+    protected function clearStatInfo($path = null)
+    {
+        self::$nextStat = array();
+        if ($path) {
+            clearstatcache(true, $path);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/AbstractSync.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/AbstractSync.php
new file mode 100644
index 0000000000000000000000000000000000000000..b9a08b5fe181d7994b898180ee0fae97001fcdac
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/AbstractSync.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+use Aws\S3\S3Client;
+use Aws\S3\Model\MultipartUpload\AbstractTransfer;
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Common\Collection;
+use Guzzle\Http\EntityBody;
+use Guzzle\Iterator\ChunkedIterator;
+use Guzzle\Service\Command\CommandInterface;
+
+abstract class AbstractSync extends AbstractHasDispatcher
+{
+    const BEFORE_TRANSFER = 's3.sync.before_transfer';
+    const AFTER_TRANSFER = 's3.sync.after_transfer';
+
+    /** @var Collection */
+    protected $options;
+
+    /**
+     * @param array $options Associative array of options:
+     *     - client: (S3Client) used to transfer requests
+     *     - bucket: (string) Amazon S3 bucket
+     *     - iterator: (\Iterator) Iterator that yields SplFileInfo objects to transfer
+     *     - source_converter: (FilenameConverterInterface) Converter used to convert filenames
+     *     - *: Any other options required by subclasses
+     */
+    public function __construct(array $options)
+    {
+        $this->options = Collection::fromConfig(
+            $options,
+            array('concurrency' => 10),
+            array('client', 'bucket', 'iterator', 'source_converter')
+        );
+        $this->init();
+    }
+
+    public static function getAllEvents()
+    {
+        return array(self::BEFORE_TRANSFER, self::AFTER_TRANSFER);
+    }
+
+    /**
+     * Begin transferring files
+     */
+    public function transfer()
+    {
+        // Pull out chunks of uploads to upload in parallel
+        $iterator = new ChunkedIterator($this->options['iterator'], $this->options['concurrency']);
+        foreach ($iterator as $files) {
+            $this->transferFiles($files);
+        }
+    }
+
+    /**
+     * Create a command or special transfer action for the
+     *
+     * @param \SplFileInfo $file File used to build the transfer
+     *
+     * @return CommandInterface|callable
+     */
+    abstract protected function createTransferAction(\SplFileInfo $file);
+
+    /**
+     * Hook to initialize subclasses
+     * @codeCoverageIgnore
+     */
+    protected function init() {}
+
+    /**
+     * Process and transfer a group of files
+     *
+     * @param array $files Files to transfer
+     */
+    protected function transferFiles(array $files)
+    {
+        // Create the base event data object
+        $event = array('sync' => $this, 'client' => $this->options['client']);
+
+        $commands = array();
+        foreach ($files as $file) {
+            if ($action = $this->createTransferAction($file)) {
+                $event = array('command' => $action, 'file' => $file) + $event;
+                $this->dispatch(self::BEFORE_TRANSFER, $event);
+                if ($action instanceof CommandInterface) {
+                    $commands[] = $action;
+                } elseif (is_callable($action)) {
+                    $action();
+                    $this->dispatch(self::AFTER_TRANSFER, $event);
+                }
+            }
+        }
+
+        $this->transferCommands($commands);
+    }
+
+    /**
+     * Transfer an array of commands in parallel
+     *
+     * @param array $commands Commands to transfer
+     */
+    protected function transferCommands(array $commands)
+    {
+        if ($commands) {
+            $this->options['client']->execute($commands);
+            // Notify listeners that each command finished
+            $event = array('sync' => $this, 'client' => $this->options['client']);
+            foreach ($commands as $command) {
+                $event['command'] = $command;
+                $this->dispatch(self::AFTER_TRANSFER, $event);
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/AbstractSyncBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/AbstractSyncBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..96d01b26c3c6f653ef6456b9046be6ac80d5b457
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/AbstractSyncBuilder.php
@@ -0,0 +1,421 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+use Aws\Common\Exception\RuntimeException;
+use Aws\Common\Exception\UnexpectedValueException;
+use Aws\Common\Model\MultipartUpload\AbstractTransfer;
+use Aws\Common\Model\MultipartUpload\TransferInterface;
+use Aws\S3\S3Client;
+use Aws\S3\Iterator\OpendirIterator;
+use Guzzle\Common\Event;
+use Guzzle\Common\HasDispatcherInterface;
+use Guzzle\Iterator\FilterIterator;
+use Guzzle\Service\Command\CommandInterface;
+
+abstract class AbstractSyncBuilder
+{
+    /** @var \Iterator Iterator that returns SplFileInfo objects to upload */
+    protected $sourceIterator;
+
+    /** @var S3Client Amazon S3 client used to send requests */
+    protected $client;
+
+    /** @var string Bucket used with the transfer */
+    protected $bucket;
+
+    /** @var int Number of files that can be transferred concurrently */
+    protected $concurrency = 10;
+
+    /** @var array Custom parameters to add to each operation sent while transferring */
+    protected $params = array();
+
+    /** @var FilenameConverterInterface */
+    protected $sourceConverter;
+
+    /** @var FilenameConverterInterface */
+    protected $targetConverter;
+
+    /** @var string Prefix at prepend to each Amazon S3 object key */
+    protected $keyPrefix = '';
+
+    /** @var string Directory separator for Amazon S3 keys */
+    protected $delimiter = '/';
+
+    /** @var string Base directory to remove from each file path before converting to an object name or file name */
+    protected $baseDir;
+
+    /** @var bool Whether or not to only transfer modified or new files */
+    protected $forcing = false;
+
+    /** @var bool Whether or not debug output is enable */
+    protected $debug;
+
+    /**
+     * @return self
+     */
+    public static function getInstance()
+    {
+        return new static();
+    }
+
+    /**
+     * Set the bucket to use with the sync
+     *
+     * @param string $bucket Amazon S3 bucket name
+     *
+     * @return self
+     */
+    public function setBucket($bucket)
+    {
+        $this->bucket = $bucket;
+
+        return $this;
+    }
+
+    /**
+     * Set the Amazon S3 client object that will send requests
+     *
+     * @param S3Client $client Amazon S3 client
+     *
+     * @return self
+     */
+    public function setClient(S3Client $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    /**
+     * Set a custom iterator that returns \SplFileInfo objects for the source data
+     *
+     * @param \Iterator $iterator
+     *
+     * @return self
+     */
+    public function setSourceIterator(\Iterator $iterator)
+    {
+        $this->sourceIterator = $iterator;
+
+        return $this;
+    }
+
+    /**
+     * Set a custom object key provider instead of building one internally
+     *
+     * @param FileNameConverterInterface $converter Filename to object key provider
+     *
+     * @return self
+     */
+    public function setSourceFilenameConverter(FilenameConverterInterface $converter)
+    {
+        $this->sourceConverter = $converter;
+
+        return $this;
+    }
+
+    /**
+     * Set a custom object key provider instead of building one internally
+     *
+     * @param FileNameConverterInterface $converter Filename to object key provider
+     *
+     * @return self
+     */
+    public function setTargetFilenameConverter(FilenameConverterInterface $converter)
+    {
+        $this->targetConverter = $converter;
+
+        return $this;
+    }
+
+    /**
+     * Set the base directory of the files being transferred. The base directory is removed from each file path before
+     * converting the file path to an object key or vice versa.
+     *
+     * @param string $baseDir Base directory, which will be deleted from each uploaded object key
+     *
+     * @return self
+     */
+    public function setBaseDir($baseDir)
+    {
+        $this->baseDir = $baseDir;
+
+        return $this;
+    }
+
+    /**
+     * Specify a prefix to prepend to each Amazon S3 object key or the prefix where object are stored in a bucket
+     *
+     * Can be used to upload files to a pseudo sub-folder key or only download files from a pseudo sub-folder
+     *
+     * @param string $keyPrefix Prefix for each uploaded key
+     *
+     * @return self
+     */
+    public function setKeyPrefix($keyPrefix)
+    {
+        $this->keyPrefix = $keyPrefix;
+
+        return $this;
+    }
+
+    /**
+     * Specify the delimiter used for the targeted filesystem (default delimiter is "/")
+     *
+     * @param string $delimiter Delimiter to use to separate paths
+     *
+     * @return self
+     */
+    public function setDelimiter($delimiter)
+    {
+        $this->delimiter = $delimiter;
+
+        return $this;
+    }
+
+    /**
+     * Specify an array of operation parameters to apply to each operation executed by the sync object
+     *
+     * @param array $params Associative array of PutObject (upload) GetObject (download) parameters
+     *
+     * @return self
+     */
+    public function setOperationParams(array $params)
+    {
+        $this->params = $params;
+
+        return $this;
+    }
+
+    /**
+     * Set the number of files that can be transferred concurrently
+     *
+     * @param int $concurrency Number of concurrent transfers
+     *
+     * @return self
+     */
+    public function setConcurrency($concurrency)
+    {
+        $this->concurrency = $concurrency;
+
+        return $this;
+    }
+
+    /**
+     * Set to true to force transfers even if a file already exists and has not changed
+     *
+     * @param bool $force Set to true to force transfers without checking if it has changed
+     *
+     * @return self
+     */
+    public function force($force = false)
+    {
+        $this->forcing = (bool) $force;
+
+        return $this;
+    }
+
+    /**
+     * Enable debug mode
+     *
+     * @param bool|resource $enabledOrResource Set to true or false to enable or disable debug output. Pass an opened
+     *                                         fopen resource to write to instead of writing to standard out.
+     * @return self
+     */
+    public function enableDebugOutput($enabledOrResource = true)
+    {
+        $this->debug = $enabledOrResource;
+
+        return $this;
+    }
+
+    /**
+     * Add a filename filter that uses a regular expression to filter out files that you do not wish to transfer.
+     *
+     * @param string $search Regular expression search (in preg_match format). Any filename that matches this regex
+     *                       will not be transferred.
+     * @return self
+     */
+    public function addRegexFilter($search)
+    {
+        $this->assertFileIteratorSet();
+        $this->sourceIterator = new FilterIterator($this->sourceIterator, function ($i) use ($search) {
+            return !preg_match($search, (string) $i);
+        });
+        $this->sourceIterator->rewind();
+
+        return $this;
+    }
+
+    /**
+     * Builds a UploadSync or DownloadSync object
+     *
+     * @return AbstractSync
+     */
+    public function build()
+    {
+        $this->validateRequirements();
+        $this->sourceConverter = $this->sourceConverter ?: $this->getDefaultSourceConverter();
+        $this->targetConverter = $this->targetConverter ?: $this->getDefaultTargetConverter();
+
+        // Only wrap the source iterator in a changed files iterator if we are not forcing the transfers
+        if (!$this->forcing) {
+            $this->sourceIterator = new ChangedFilesIterator(
+                new \NoRewindIterator($this->sourceIterator),
+                $this->getTargetIterator(),
+                $this->sourceConverter,
+                $this->targetConverter
+            );
+            $this->sourceIterator->rewind();
+        }
+
+        $sync = $this->specificBuild();
+
+        if ($this->params) {
+            $this->addCustomParamListener($sync);
+        }
+
+        if ($this->debug) {
+            $this->addDebugListener($sync, is_bool($this->debug) ? STDOUT : $this->debug);
+        }
+
+        return $sync;
+    }
+
+    /**
+     * Hook to implement in subclasses
+     *
+     * @return self
+     */
+    abstract protected function specificBuild();
+
+    /**
+     * @return \Iterator
+     */
+    abstract protected function getTargetIterator();
+
+    /**
+     * @return FilenameConverterInterface
+     */
+    abstract protected function getDefaultSourceConverter();
+
+    /**
+     * @return FilenameConverterInterface
+     */
+    abstract protected function getDefaultTargetConverter();
+
+    /**
+     * Add a listener to the sync object to output debug information while transferring
+     *
+     * @param AbstractSync $sync     Sync object to listen to
+     * @param resource     $resource Where to write debug messages
+     */
+    abstract protected function addDebugListener(AbstractSync $sync, $resource);
+
+    /**
+     * Validate that the builder has the minimal requirements
+     *
+     * @throws RuntimeException if the builder is not configured completely
+     */
+    protected function validateRequirements()
+    {
+        if (!$this->client) {
+            throw new RuntimeException('No client was provided');
+        }
+        if (!$this->bucket) {
+            throw new RuntimeException('No bucket was provided');
+        }
+        $this->assertFileIteratorSet();
+    }
+
+    /**
+     * Ensure that the base file iterator has been provided
+     *
+     * @throws RuntimeException
+     */
+    protected function assertFileIteratorSet()
+    {
+        // Interesting... Need to use isset because: Object of class GlobIterator could not be converted to boolean
+        if (!isset($this->sourceIterator)) {
+            throw new RuntimeException('A source file iterator must be specified');
+        }
+    }
+
+    /**
+     * Wraps a generated iterator in a filter iterator that removes directories
+     *
+     * @param \Iterator $iterator Iterator to wrap
+     *
+     * @return \Iterator
+     * @throws UnexpectedValueException
+     */
+    protected function filterIterator(\Iterator $iterator)
+    {
+        $f = new FilterIterator($iterator, function ($i) {
+            if (!$i instanceof \SplFileInfo) {
+                throw new UnexpectedValueException('All iterators for UploadSync must return SplFileInfo objects');
+            }
+            return $i->isFile();
+        });
+
+        $f->rewind();
+
+        return $f;
+    }
+
+    /**
+     * Add the custom param listener to a transfer object
+     *
+     * @param HasDispatcherInterface $sync
+     */
+    protected function addCustomParamListener(HasDispatcherInterface $sync)
+    {
+        $params = $this->params;
+        $sync->getEventDispatcher()->addListener(
+            UploadSync::BEFORE_TRANSFER,
+            function (Event $e) use ($params) {
+                if ($e['command'] instanceof CommandInterface) {
+                    $e['command']->overwriteWith($params);
+                } elseif ($e['command'] instanceof TransferInterface) {
+                    // Multipart upload transfer object
+                    foreach ($params as $k => $v) {
+                        $e['command']->setOption($k, $v);
+                    }
+                }
+            }
+        );
+    }
+
+    /**
+     * Create an Amazon S3 file iterator based on the given builder settings
+     *
+     * @return OpendirIterator
+     */
+    protected function createS3Iterator()
+    {
+        // Ensure that the stream wrapper is registered
+        $this->client->registerStreamWrapper();
+        // Calculate the opendir() bucket and optional key prefix location
+        // Remove the delimiter as it is not needed for this
+        $dir = rtrim('s3://' . $this->bucket . ($this->keyPrefix ? ('/' . $this->keyPrefix) : ''), '/');
+        // Use opendir so that we can pass stream context to the iterator
+        $dh = opendir($dir, stream_context_create(array('s3' => array('delimiter' => ''))));
+
+        return $this->filterIterator(new \NoRewindIterator(new OpendirIterator($dh, $dir . '/')));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/ChangedFilesIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/ChangedFilesIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..3cf309df90122e7741a8e0413f29b6ddeafaacda
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/ChangedFilesIterator.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+use Aws\S3\S3Client;
+
+/**
+ * Iterator used to filter an internal iterator to only yield files that do not exist in the target iterator or files
+ * that have changed
+ */
+class ChangedFilesIterator extends \FilterIterator
+{
+    /** @var \Iterator */
+    protected $sourceIterator;
+
+    /** @var \Iterator */
+    protected $targetIterator;
+
+    /** @var FilenameConverterInterface */
+    protected $sourceConverter;
+
+    /** @var FilenameConverterInterface */
+    protected $targetConverter;
+
+    /** @var array Previously loaded data */
+    protected $cache = array();
+
+    /**
+     * @param \Iterator                  $sourceIterator  Iterator to wrap and filter
+     * @param \Iterator                  $targetIterator  Iterator used to compare against the source iterator
+     * @param FilenameConverterInterface $sourceConverter Key converter to convert source to target keys
+     * @param FilenameConverterInterface $targetConverter Key converter to convert target to source keys
+     */
+    public function __construct(
+        \Iterator $sourceIterator,
+        \Iterator $targetIterator,
+        FilenameConverterInterface $sourceConverter,
+        FilenameConverterInterface $targetConverter
+    ) {
+        $this->targetIterator = $targetIterator;
+        $this->sourceConverter = $sourceConverter;
+        $this->targetConverter = $targetConverter;
+        parent::__construct($sourceIterator);
+    }
+
+    public function accept()
+    {
+        $current = $this->current();
+        $key = $this->sourceConverter->convert((string) $current);
+        if (!($data = $this->getTargetData($key))) {
+            return true;
+        }
+
+        // Ensure the Content-Length matches and it hasn't been modified since the mtime
+        return $current->getSize() != $data[0] || $current->getMTime() > $data[1];
+    }
+
+    /**
+     * Returns an array of the files from the target iterator that were not found in the source iterator
+     *
+     * @return array
+     */
+    public function getUnmatched()
+    {
+        return array_keys($this->cache);
+    }
+
+    /**
+     * Get key information from the target iterator for a particular filename
+     *
+     * @param string $key Target iterator filename
+     *
+     * @return array|bool Returns an array of data, or false if the key is not in the iterator
+     */
+    protected function getTargetData($key)
+    {
+        if (isset($this->cache[$key])) {
+            $result = $this->cache[$key];
+            unset($this->cache[$key]);
+            return $result;
+        }
+
+        $it = $this->targetIterator;
+
+        while ($it->valid()) {
+            $value = $it->current();
+            $data = array($value->getSize(), $value->getMTime());
+            $filename = $this->targetConverter->convert((string) $value);
+            if ($filename == $key) {
+                return $data;
+            }
+            $this->cache[$filename] = $data;
+            $it->next();
+        }
+
+        return false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/DownloadSync.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/DownloadSync.php
new file mode 100644
index 0000000000000000000000000000000000000000..d519f0925f9ce58e3a9ca000da015be492d145d4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/DownloadSync.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+use Aws\Common\Exception\RuntimeException;
+use Aws\S3\ResumableDownload;
+use Aws\S3\S3Client;
+use Aws\S3\Model\MultipartUpload\AbstractTransfer;
+use Guzzle\Http\EntityBody;
+
+/**
+ * Downloads and Amazon S3 bucket to a local directory
+ */
+class DownloadSync extends AbstractSync
+{
+    protected function createTransferAction(\SplFileInfo $file)
+    {
+        $sourceFilename = $file->getPathname();
+        list($bucket, $key) = explode('/', substr($sourceFilename, 5), 2);
+        $filename = '/' . ltrim($this->options['source_converter']->convert($sourceFilename), '/');
+
+        $this->createDirectory($filename);
+
+        // Some S3 buckets contains nested files under the same name as a directory
+        if (is_dir($filename)) {
+            return false;
+        }
+
+        // Allow a previously interrupted download to resume
+        if (file_exists($filename) && $this->options['resumable']) {
+            return new ResumableDownload($this->options['client'], $bucket, $key, $filename);
+        }
+
+        return $this->options['client']->getCommand('GetObject', array(
+            'Bucket' => $bucket,
+            'Key'    => $key,
+            'SaveAs' => $filename
+        ));
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    protected function createDirectory($filename)
+    {
+        $directory = dirname($filename);
+        // Some S3 clients create empty files to denote directories. Remove these so that we can create the directory.
+        if (is_file($directory) && filesize($directory) == 0) {
+            unlink($directory);
+        }
+        // Create the directory if it does not exist
+        if (!is_dir($directory) && !mkdir($directory, 0777, true)) {
+            $errors = error_get_last();
+            throw new RuntimeException('Could not create directory: ' . $directory . ' - ' . $errors['message']);
+        }
+    }
+
+    protected function filterCommands(array $commands)
+    {
+        // Build a list of all of the directories in each command so that we don't attempt to create an empty dir in
+        // the same parallel transfer as attempting to create a file in that dir
+        $dirs = array();
+        foreach ($commands as $command) {
+            $parts = array_values(array_filter(explode('/', $command['SaveAs'])));
+            for ($i = 0, $total = count($parts); $i < $total; $i++) {
+                $dir = '';
+                for ($j = 0; $j < $i; $j++) {
+                    $dir .= '/' . $parts[$j];
+                }
+                if ($dir && !in_array($dir, $dirs)) {
+                    $dirs[] = $dir;
+                }
+            }
+        }
+
+        return array_filter($commands, function ($command) use ($dirs) {
+            return !in_array($command['SaveAs'], $dirs);
+        });
+    }
+
+    protected function transferCommands(array $commands)
+    {
+        parent::transferCommands($this->filterCommands($commands));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/DownloadSyncBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/DownloadSyncBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..285439464e6175f9cf6a4caa63d59b95b176fff1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/DownloadSyncBuilder.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+use Aws\Common\Exception\RuntimeException;
+use Aws\Common\Model\MultipartUpload\AbstractTransfer;
+use Aws\S3\ResumableDownload;
+use Aws\S3\S3Client;
+use Guzzle\Common\Event;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Service\Command\CommandInterface;
+
+class DownloadSyncBuilder extends AbstractSyncBuilder
+{
+    /** @var bool */
+    protected $resumable = false;
+
+    /** @var string */
+    protected $directory;
+
+    /** @var int Number of files that can be transferred concurrently */
+    protected $concurrency = 5;
+
+    /**
+     * Set the directory where the objects from be downloaded to
+     *
+     * @param string $directory Directory
+     *
+     * @return self
+     */
+    public function setDirectory($directory)
+    {
+        $this->directory = $directory;
+
+        return $this;
+    }
+
+    /**
+     * Call this function to allow partial downloads to be resumed if the download was previously interrupted
+     *
+     * @return self
+     */
+    public function allowResumableDownloads()
+    {
+        $this->resumable = true;
+
+        return $this;
+    }
+
+    protected function specificBuild()
+    {
+        $sync = new DownloadSync(array(
+            'client'           => $this->client,
+            'bucket'           => $this->bucket,
+            'iterator'         => $this->sourceIterator,
+            'source_converter' => $this->sourceConverter,
+            'target_converter' => $this->targetConverter,
+            'concurrency'      => $this->concurrency,
+            'resumable'        => $this->resumable,
+            'directory'        => $this->directory
+        ));
+
+        return $sync;
+    }
+
+    protected function getTargetIterator()
+    {
+        if (!$this->directory) {
+            throw new RuntimeException('A directory is required');
+        }
+
+        if (!is_dir($this->directory) && !mkdir($this->directory, 0777, true)) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('Unable to create root download directory: ' . $this->directory);
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this->filterIterator(
+            new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory))
+        );
+    }
+
+    protected function getDefaultSourceConverter()
+    {
+        return new KeyConverter(
+            "s3://{$this->bucket}/{$this->baseDir}",
+            $this->directory . DIRECTORY_SEPARATOR, $this->delimiter
+        );
+    }
+
+    protected function getDefaultTargetConverter()
+    {
+        return new KeyConverter("s3://{$this->bucket}/{$this->baseDir}", '', $this->delimiter);
+    }
+
+    protected function assertFileIteratorSet()
+    {
+        $this->sourceIterator = $this->sourceIterator ?: $this->createS3Iterator();
+    }
+
+    protected function addDebugListener(AbstractSync $sync, $resource)
+    {
+        $sync->getEventDispatcher()->addListener(UploadSync::BEFORE_TRANSFER, function (Event $e) use ($resource) {
+            if ($e['command'] instanceof CommandInterface) {
+                $from = $e['command']['Bucket'] . '/' . $e['command']['Key'];
+                $to = $e['command']['SaveAs'] instanceof EntityBodyInterface
+                    ? $e['command']['SaveAs']->getUri()
+                    : $e['command']['SaveAs'];
+                fwrite($resource, "Downloading {$from} -> {$to}\n");
+            } elseif ($e['command'] instanceof ResumableDownload) {
+                $from = $e['command']->getBucket() . '/' . $e['command']->getKey();
+                $to = $e['command']->getFilename();
+                fwrite($resource, "Resuming {$from} -> {$to}\n");
+            }
+        });
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/FilenameConverterInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/FilenameConverterInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..ded2cfb465a9a90eb72705f14ea32154a1435aa0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/FilenameConverterInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+/**
+ * Converts filenames from one system to another (e.g. local to Amazon S3)
+ */
+interface FilenameConverterInterface
+{
+    /**
+     * Convert a filename
+     *
+     * @param string $filename Name of the file to convert
+     *
+     * @return string
+     */
+    public function convert($filename);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/KeyConverter.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/KeyConverter.php
new file mode 100644
index 0000000000000000000000000000000000000000..27087ce2a60f84c521c6c9b5e3e9234246ee6d1e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/KeyConverter.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+/**
+ * Converts filenames from one system to another
+ */
+class KeyConverter implements FilenameConverterInterface
+{
+    /** @var string Directory separator for Amazon S3 keys */
+    protected $delimiter;
+
+    /** @var string Prefix to prepend to each Amazon S3 object key */
+    protected $prefix;
+
+    /** @var string Base directory to remove from each file path before converting to an object key */
+    protected $baseDir;
+
+    /**
+     * @param string $baseDir   Base directory to remove from each converted name
+     * @param string $prefix    Amazon S3 prefix
+     * @param string $delimiter Directory separator used with generated names
+     */
+    public function __construct($baseDir = '', $prefix = '', $delimiter = '/')
+    {
+        $this->baseDir = $baseDir;
+        $this->prefix = $prefix;
+        $this->delimiter = $delimiter;
+    }
+
+    public function convert($filename)
+    {
+        // Remove base directory from the key
+        $key = str_replace($this->baseDir, '', $filename);
+        // Replace Windows directory separators to become Unix style, and convert that to the custom dir separator
+        $key = str_replace('/', $this->delimiter, str_replace('\\', '/', $key));
+        // Add the key prefix and remove double slashes
+        $key = str_replace($this->delimiter . $this->delimiter, $this->delimiter, $this->prefix . $key);
+
+        return ltrim($key, $this->delimiter);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/UploadSync.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/UploadSync.php
new file mode 100644
index 0000000000000000000000000000000000000000..57f979fd485903424a787469dbd893c5af950e05
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/UploadSync.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+use Aws\Common\Exception\RuntimeException;
+use Aws\S3\S3Client;
+use Aws\S3\Model\MultipartUpload\UploadBuilder;
+use Aws\S3\Model\MultipartUpload\AbstractTransfer;
+use Guzzle\Http\EntityBody;
+
+/**
+ * Uploads a local directory tree to Amazon S3
+ */
+class UploadSync extends AbstractSync
+{
+    protected function init()
+    {
+        if (null == $this->options['multipart_upload_size']) {
+            $this->options['multipart_upload_size'] = AbstractTransfer::MIN_PART_SIZE;
+        }
+    }
+
+    protected function createTransferAction(\SplFileInfo $file)
+    {
+        // Open the file for reading
+        $filename = $file->getPathName();
+        if (!($resource = fopen($filename, 'r'))) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException("Could not open {$filename} for reading");
+            // @codeCoverageIgnoreEnd
+        }
+
+        $key = $this->options['source_converter']->convert($filename);
+        $body = EntityBody::factory($resource);
+
+        // Determine how the ACL should be applied
+        if ($acl = $this->options['acl']) {
+            $aclType = is_string($this->options['acl']) ? 'ACL' : 'ACP';
+        } else {
+            $acl = 'private';
+            $aclType = 'ACL';
+        }
+
+        // Use a multi-part upload if the file is larger than the cutoff size and is a regular file
+        if ($body->getWrapper() == 'plainfile' && $file->getSize() >= $this->options['multipart_upload_size']) {
+            return UploadBuilder::newInstance()
+                ->setBucket($this->options['bucket'])
+                ->setKey($key)
+                ->setMinPartSize($this->options['multipart_upload_size'])
+                ->setOption($aclType, $acl)
+                ->setClient($this->options['client'])
+                ->setSource($body)
+                ->setConcurrency($this->options['concurrency'])
+                ->build();
+        }
+
+        return $this->options['client']->getCommand('PutObject', array(
+            'Bucket' => $this->options['bucket'],
+            'Key'    => $key,
+            'Body'   => $body,
+            $aclType => $acl
+        ));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/UploadSyncBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/UploadSyncBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..e6b2cb06b8218d7f7f1efaad68cc1d460df73ce9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Aws/S3/Sync/UploadSyncBuilder.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+namespace Aws\S3\Sync;
+
+use \FilesystemIterator as FI;
+use Aws\Common\Model\MultipartUpload\AbstractTransfer;
+use Aws\S3\Model\Acp;
+use Aws\S3\S3Client;
+use Guzzle\Common\Event;
+use Guzzle\Service\Command\CommandInterface;
+
+class UploadSyncBuilder extends AbstractSyncBuilder
+{
+    /** @var string|Acp Access control policy to set on each object */
+    protected $acp = 'private';
+
+    /** @var int */
+    protected $multipartUploadSize;
+
+    /**
+     * Set the path that contains files to recursively upload to Amazon S3
+     *
+     * @param string $path Path that contains files to upload
+     *
+     * @return self
+     */
+    public function uploadFromDirectory($path)
+    {
+        $this->baseDir = $path;
+        $this->sourceIterator = $this->filterIterator(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(
+            $path,
+            FI::SKIP_DOTS | FI::UNIX_PATHS | FI::FOLLOW_SYMLINKS
+        )));
+
+        return $this;
+    }
+
+    /**
+     * Set a glob expression that will match files to upload to Amazon S3
+     *
+     * @param string $glob Glob expression
+     *
+     * @return self
+     * @link http://www.php.net/manual/en/function.glob.php
+     */
+    public function uploadFromGlob($glob)
+    {
+        $this->sourceIterator = $this->filterIterator(
+            new \GlobIterator($glob, FI::SKIP_DOTS | FI::UNIX_PATHS | FI::FOLLOW_SYMLINKS)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Set a canned ACL to apply to each uploaded object
+     *
+     * @param string $acl Canned ACL for each upload
+     *
+     * @return self
+     */
+    public function setAcl($acl)
+    {
+        $this->acp = $acl;
+
+        return $this;
+    }
+
+    /**
+     * Set an Access Control Policy to apply to each uploaded object
+     *
+     * @param Acp $acp Access control policy
+     *
+     * @return self
+     */
+    public function setAcp(Acp $acp)
+    {
+        $this->acp = $acp;
+
+        return $this;
+    }
+
+    /**
+     * Set the multipart upload size threshold. When the size of a file exceeds this value, the file will be uploaded
+     * using a multipart upload.
+     *
+     * @param int $size Size threshold
+     *
+     * @return self
+     */
+    public function setMultipartUploadSize($size)
+    {
+        $this->multipartUploadSize = $size;
+
+        return $this;
+    }
+
+    protected function specificBuild()
+    {
+        $sync = new UploadSync(array(
+            'client' => $this->client,
+            'bucket' => $this->bucket,
+            'iterator' => $this->sourceIterator,
+            'source_converter' => $this->sourceConverter,
+            'target_converter' => $this->targetConverter,
+            'concurrency' => $this->concurrency,
+            'multipart_upload_size' => $this->multipartUploadSize,
+            'acl' => $this->acp
+        ));
+
+        return $sync;
+    }
+
+    protected function getTargetIterator()
+    {
+        return $this->createS3Iterator();
+    }
+
+    protected function getDefaultSourceConverter()
+    {
+        return new KeyConverter($this->baseDir, $this->keyPrefix . $this->delimiter, $this->delimiter);
+    }
+
+    protected function getDefaultTargetConverter()
+    {
+        return new KeyConverter('s3://' . $this->bucket . '/', '', DIRECTORY_SEPARATOR);
+    }
+
+    protected function addDebugListener(AbstractSync $sync, $resource)
+    {
+        $sync->getEventDispatcher()->addListener(UploadSync::BEFORE_TRANSFER, function (Event $e) use ($resource) {
+
+            $c = $e['command'];
+
+            if ($c instanceof CommandInterface) {
+                $uri = $c['Body']->getUri();
+                $size = $c['Body']->getSize();
+                fwrite($resource, "Uploading {$uri} -> {$c['Key']} ({$size} bytes)\n");
+                return;
+            }
+
+            // Multipart upload
+            $body = $c->getSource();
+            $totalSize = $body->getSize();
+            $progress = 0;
+            fwrite($resource, "Beginning multipart upload: " . $body->getUri() . ' -> ');
+            fwrite($resource, $c->getState()->getFromId('Key') . " ({$totalSize} bytes)\n");
+
+            $c->getEventDispatcher()->addListener(
+                AbstractTransfer::BEFORE_PART_UPLOAD,
+                function ($e) use (&$progress, $totalSize, $resource) {
+                    $command = $e['command'];
+                    $size = $command['Body']->getContentLength();
+                    $percentage = number_format(($progress / $totalSize) * 100, 2);
+                    fwrite($resource, "- Part {$command['PartNumber']} ({$size} bytes, {$percentage}%)\n");
+                    $progress .=  $size;
+                }
+            );
+        });
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ApcCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ApcCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d0cd23afdd2b72bbd8c34c957e101d8b32c26ad
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ApcCache.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * APC cache provider.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.0
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  David Abdemoulaie <dave@hobodave.com>
+ */
+class ApcCache extends CacheProvider
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return apc_fetch($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return apc_exists($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        return (bool) apc_store($id, $data, (int) $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return apc_delete($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        return apc_clear_cache() && apc_clear_cache('user');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $info = apc_cache_info();
+        $sma  = apc_sma_info();
+
+        return array(
+            Cache::STATS_HITS              => $info['num_hits'],
+            Cache::STATS_MISSES            => $info['num_misses'],
+            Cache::STATS_UPTIME            => $info['start_time'],
+            Cache::STATS_MEMORY_USAGE      => $info['mem_size'],
+            Cache::STATS_MEMORY_AVAILIABLE => $sma['avail_mem'],
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ArrayCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ArrayCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7a70aad51ce7c781e7365d72fc5014d15804543
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ArrayCache.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Array cache driver.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.0
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  David Abdemoulaie <dave@hobodave.com>
+ */
+class ArrayCache extends CacheProvider
+{
+    /**
+     * @var array $data
+     */
+    private $data = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return (isset($this->data[$id])) ? $this->data[$id] : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return isset($this->data[$id]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        $this->data[$id] = $data;
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        unset($this->data[$id]);
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        $this->data = array();
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        return null;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/Cache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/Cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4e86f4739aac99c5fc232c7ecbaadcb486aed6b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/Cache.php
@@ -0,0 +1,102 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Interface for cache drivers.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.0
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+interface Cache
+{
+    const STATS_HITS    = 'hits';
+    const STATS_MISSES  = 'misses';
+    const STATS_UPTIME  = 'uptime';
+    const STATS_MEMORY_USAGE        = 'memory_usage';
+    const STATS_MEMORY_AVAILIABLE   = 'memory_available';
+
+    /**
+     * Fetches an entry from the cache.
+     *
+     * @param string $id cache id The id of the cache entry to fetch.
+     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
+     */
+    function fetch($id);
+
+    /**
+     * Test if an entry exists in the cache.
+     *
+     * @param string $id cache id The cache id of the entry to check for.
+     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     */
+    function contains($id);
+
+    /**
+     * Puts data into the cache.
+     *
+     * @param string $id The cache id.
+     * @param mixed $data The cache entry/data.
+     * @param int $lifeTime The lifetime. If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime).
+     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     */
+    function save($id, $data, $lifeTime = 0);
+
+    /**
+     * Deletes a cache entry.
+     *
+     * @param string $id cache id
+     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     */
+    function delete($id);
+
+    /**
+     * Retrieves cached information from data store
+     *
+     * The server's statistics array has the following values:
+     *
+     * - <b>hits</b>
+     * Number of keys that have been requested and found present.
+     *
+     * - <b>misses</b>
+     * Number of items that have been requested and not found.
+     *
+     * - <b>uptime</b>
+     * Time that the server is running.
+     *
+     * - <b>memory_usage</b>
+     * Memory used by this server to store items.
+     *
+     * - <b>memory_available</b>
+     * Memory allowed to use for storage.
+     *
+     * @since   2.2
+     * @return  array Associative array with server's statistics if available, NULL otherwise.
+     */
+    function getStats();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/CacheProvider.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/CacheProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..4221a62e593078109ae2edb8344d8464ab556b63
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/CacheProvider.php
@@ -0,0 +1,231 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Base class for cache provider implementations.
+ *
+ * @since   2.2
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+abstract class CacheProvider implements Cache
+{
+    const DOCTRINE_NAMESPACE_CACHEKEY = 'DoctrineNamespaceCacheKey[%s]';
+
+    /**
+     * @var string The namespace to prefix all cache ids with
+     */
+    private $namespace = '';
+
+    /**
+     * @var string The namespace version
+     */
+    private $namespaceVersion;
+
+    /**
+     * Set the namespace to prefix all cache ids with.
+     *
+     * @param string $namespace
+     * @return void
+     */
+    public function setNamespace($namespace)
+    {
+        $this->namespace = (string) $namespace;
+    }
+
+    /**
+     * Retrieve the namespace that prefixes all cache ids.
+     *
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fetch($id)
+    {
+        return $this->doFetch($this->getNamespacedId($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function contains($id)
+    {
+        return $this->doContains($this->getNamespacedId($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save($id, $data, $lifeTime = 0)
+    {
+        return $this->doSave($this->getNamespacedId($id), $data, $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete($id)
+    {
+        return $this->doDelete($this->getNamespacedId($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStats()
+    {
+        return $this->doGetStats();
+    }
+
+    /**
+     * Deletes all cache entries.
+     *
+     * @return boolean TRUE if the cache entries were successfully flushed, FALSE otherwise.
+     */
+    public function flushAll()
+    {
+        return $this->doFlush();
+    }
+
+    /**
+     * Delete all cache entries.
+     *
+     * @return boolean TRUE if the cache entries were successfully deleted, FALSE otherwise.
+     */
+    public function deleteAll()
+    {
+        $namespaceCacheKey = $this->getNamespaceCacheKey();
+        $namespaceVersion  = $this->getNamespaceVersion() + 1;
+
+        $this->namespaceVersion = $namespaceVersion;
+
+        return $this->doSave($namespaceCacheKey, $namespaceVersion);
+    }
+
+    /**
+     * Prefix the passed id with the configured namespace value
+     *
+     * @param string $id  The id to namespace
+     * @return string $id The namespaced id
+     */
+    private function getNamespacedId($id)
+    {
+        $namespaceVersion  = $this->getNamespaceVersion();
+
+        return sprintf('%s[%s][%s]', $this->namespace, $id, $namespaceVersion);
+    }
+
+    /**
+     * Namespace cache key
+     *
+     * @return string $namespaceCacheKey
+     */
+    private function getNamespaceCacheKey()
+    {
+        return sprintf(self::DOCTRINE_NAMESPACE_CACHEKEY, $this->namespace);
+    }
+
+    /**
+     * Namespace version
+     *
+     * @return string $namespaceVersion
+     */
+    private function getNamespaceVersion()
+    {
+        if (null !== $this->namespaceVersion) {
+            return $this->namespaceVersion;
+        }
+
+        $namespaceCacheKey = $this->getNamespaceCacheKey();
+        $namespaceVersion = $this->doFetch($namespaceCacheKey);
+
+        if (false === $namespaceVersion) {
+            $namespaceVersion = 1;
+
+            $this->doSave($namespaceCacheKey, $namespaceVersion);
+        }
+
+        $this->namespaceVersion = $namespaceVersion;
+
+        return $this->namespaceVersion;
+    }
+
+    /**
+     * Fetches an entry from the cache.
+     *
+     * @param string $id cache id The id of the cache entry to fetch.
+     * @return string The cached data or FALSE, if no cache entry exists for the given id.
+     */
+    abstract protected function doFetch($id);
+
+    /**
+     * Test if an entry exists in the cache.
+     *
+     * @param string $id cache id The cache id of the entry to check for.
+     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     */
+    abstract protected function doContains($id);
+
+    /**
+     * Puts data into the cache.
+     *
+     * @param string $id The cache id.
+     * @param string $data The cache entry/data.
+     * @param bool|int $lifeTime The lifetime. If != false, sets a specific lifetime for this
+     *                           cache entry (null => infinite lifeTime).
+     *
+     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     */
+    abstract protected function doSave($id, $data, $lifeTime = false);
+
+    /**
+     * Deletes a cache entry.
+     *
+     * @param string $id cache id
+     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     */
+    abstract protected function doDelete($id);
+
+    /**
+     * Deletes all cache entries.
+     *
+     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     */
+    abstract protected function doFlush();
+
+     /**
+     * Retrieves cached information from data store
+     *
+     * @since   2.2
+     * @return  array An associative array with server's statistics if available, NULL otherwise.
+     */
+    abstract protected function doGetStats();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/CouchbaseCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/CouchbaseCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..f0e5f9072aca14bca11cc59df3a05e25d34d3968
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/CouchbaseCache.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+use \Couchbase;
+
+/**
+ * Couchbase cache provider.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.4
+ * @author  Michael Nitschinger <michael@nitschinger.at>
+ */
+class CouchbaseCache extends CacheProvider
+{
+
+    /**
+     * @var Couchbase
+     */
+    private $couchbase;
+
+    /**
+     * Sets the Couchbase instance to use.
+     *
+     * @param Couchbase $couchbase
+     */
+    public function setCouchbase(Couchbase $couchbase)
+    {
+        $this->couchbase = $couchbase;
+    }
+
+    /**
+     * Gets the Couchbase instance used by the cache.
+     *
+     * @return Couchbase
+     */
+    public function getCouchbase()
+    {
+        return $this->couchbase;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return $this->couchbase->get($id) ?: false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return (null !== $this->couchbase->get($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        if ($lifeTime > 30 * 24 * 3600) {
+            $lifeTime = time() + $lifeTime;
+        }
+        return $this->couchbase->set($id, $data, (int) $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return $this->couchbase->delete($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        return $this->couchbase->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $stats   = $this->couchbase->getStats();
+        $servers = $this->couchbase->getServers();
+        $server  = explode(":", $servers[0]);
+        $key     = $server[0] . ":" . "11210";
+        $stats   = $stats[$key];
+        return array(
+            Cache::STATS_HITS   => $stats['get_hits'],
+            Cache::STATS_MISSES => $stats['get_misses'],
+            Cache::STATS_UPTIME => $stats['uptime'],
+            Cache::STATS_MEMORY_USAGE       => $stats['bytes'],
+            Cache::STATS_MEMORY_AVAILIABLE  => $stats['limit_maxbytes'],
+        );
+    }
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/FileCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/FileCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..da650b4c6e6b47faf62a49fc6a8465c8160d51f0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/FileCache.php
@@ -0,0 +1,132 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Base file cache driver.
+ *
+ * @since   2.3
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+abstract class FileCache extends CacheProvider
+{
+    /**
+     * @var string Cache directory.
+     */
+    protected $directory;
+
+    /**
+     * @var string Cache file extension.
+     */
+    protected $extension;
+
+    /**
+     * Constructor
+     *
+     * @param string $directory Cache directory.
+     * @param string $directory Cache file extension.
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function __construct($directory, $extension = null)
+    {
+        if ( ! is_dir($directory) && ! @mkdir($directory, 0777, true)) {
+            throw new \InvalidArgumentException(sprintf(
+                'The directory "%s" does not exist and could not be created.',
+                $directory
+            ));
+        }
+
+        if ( ! is_writable($directory)) {
+            throw new \InvalidArgumentException(sprintf(
+                'The directory "%s" is not writable.',
+                $directory
+            ));
+        }
+
+        $this->directory = realpath($directory);
+        $this->extension = $extension ?: $this->extension;
+    }
+
+    /**
+     * Gets the cache directory.
+     * 
+     * @return string
+     */
+    public function getDirectory()
+    {
+        return $this->directory;
+    }
+
+    /**
+     * Gets the cache file extension.
+     * 
+     * @return string
+     */
+    public function getExtension()
+    {
+        return $this->extension;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getFilename($id)
+    {
+        $path = implode(str_split(md5($id), 12), DIRECTORY_SEPARATOR);
+        $path = $this->directory . DIRECTORY_SEPARATOR . $path;
+
+        return $path . DIRECTORY_SEPARATOR . $id . $this->extension;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return @unlink($this->getFilename($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        $pattern  = '/^.+\\' . $this->extension . '$/i';
+        $iterator = new \RecursiveDirectoryIterator($this->directory);
+        $iterator = new \RecursiveIteratorIterator($iterator);
+        $iterator = new \RegexIterator($iterator, $pattern);
+
+        foreach ($iterator as $name => $file) {
+            @unlink($name);
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/FilesystemCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/FilesystemCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..a431438e2f5d72f13bd08a7c4d4c726085836b42
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/FilesystemCache.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Filesystem cache driver.
+ *
+ * @since   2.3
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+class FilesystemCache extends FileCache
+{
+    const EXTENSION = '.doctrinecache.data';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected $extension = self::EXTENSION;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        $data     = '';
+        $lifetime = -1;
+        $filename = $this->getFilename($id);
+
+        if ( ! is_file($filename)) {
+            return false;
+        }
+
+        $resource = fopen($filename, "r");
+
+        if (false !== ($line = fgets($resource))) {
+            $lifetime = (integer) $line;
+        }
+
+        if ($lifetime !== 0 && $lifetime < time()) {
+            fclose($resource);
+
+            return false;
+        }
+
+        while (false !== ($line = fgets($resource))) {
+            $data .= $line;
+        }
+
+        fclose($resource);
+
+        return unserialize($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        $lifetime = -1;
+        $filename = $this->getFilename($id);
+
+        if ( ! is_file($filename)) {
+            return false;
+        }
+
+        $resource = fopen($filename, "r");
+
+        if (false !== ($line = fgets($resource))) {
+            $lifetime = (integer) $line;
+        }
+
+        fclose($resource);
+
+        return $lifetime === 0 || $lifetime > time();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        if ($lifeTime > 0) {
+            $lifeTime = time() + $lifeTime;
+        }
+
+        $data       = serialize($data);
+        $filename   = $this->getFilename($id);
+        $filepath   = pathinfo($filename, PATHINFO_DIRNAME);
+
+        if ( ! is_dir($filepath)) {
+            mkdir($filepath, 0777, true);
+        }
+
+        return file_put_contents($filename, $lifeTime . PHP_EOL . $data);
+    }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcacheCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcacheCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..5687b965f1d5f3ad1cdbabea38d53e8a460fa2ba
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcacheCache.php
@@ -0,0 +1,121 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+use \Memcache;
+
+/**
+ * Memcache cache provider.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.0
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  David Abdemoulaie <dave@hobodave.com>
+ */
+class MemcacheCache extends CacheProvider
+{
+    /**
+     * @var Memcache
+     */
+    private $memcache;
+
+    /**
+     * Sets the memcache instance to use.
+     *
+     * @param Memcache $memcache
+     */
+    public function setMemcache(Memcache $memcache)
+    {
+        $this->memcache = $memcache;
+    }
+
+    /**
+     * Gets the memcache instance used by the cache.
+     *
+     * @return Memcache
+     */
+    public function getMemcache()
+    {
+        return $this->memcache;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return $this->memcache->get($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return (bool) $this->memcache->get($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        if ($lifeTime > 30 * 24 * 3600) {
+            $lifeTime = time() + $lifeTime;
+        }
+        return $this->memcache->set($id, $data, 0, (int) $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return $this->memcache->delete($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        return $this->memcache->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $stats = $this->memcache->getStats();
+        return array(
+            Cache::STATS_HITS   => $stats['get_hits'],
+            Cache::STATS_MISSES => $stats['get_misses'],
+            Cache::STATS_UPTIME => $stats['uptime'],
+            Cache::STATS_MEMORY_USAGE       => $stats['bytes'],
+            Cache::STATS_MEMORY_AVAILIABLE  => $stats['limit_maxbytes'],
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcachedCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcachedCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..75f1345550affbdd9c4f2f3486ed7759d88d8fbd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/MemcachedCache.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+use \Memcached;
+
+/**
+ * Memcached cache provider.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.2
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  David Abdemoulaie <dave@hobodave.com>
+ */
+class MemcachedCache extends CacheProvider
+{
+    /**
+     * @var Memcached
+     */
+    private $memcached;
+
+    /**
+     * Sets the memcache instance to use.
+     *
+     * @param Memcached $memcached
+     */
+    public function setMemcached(Memcached $memcached)
+    {
+        $this->memcached = $memcached;
+    }
+
+    /**
+     * Gets the memcached instance used by the cache.
+     *
+     * @return Memcached
+     */
+    public function getMemcached()
+    {
+        return $this->memcached;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return $this->memcached->get($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return (false !== $this->memcached->get($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        if ($lifeTime > 30 * 24 * 3600) {
+            $lifeTime = time() + $lifeTime;
+        }
+        return $this->memcached->set($id, $data, (int) $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return $this->memcached->delete($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        return $this->memcached->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $stats   = $this->memcached->getStats();
+        $servers = $this->memcached->getServerList();
+        $key     = $servers[0]['host'] . ':' . $servers[0]['port'];
+        $stats   = $stats[$key];
+        return array(
+            Cache::STATS_HITS   => $stats['get_hits'],
+            Cache::STATS_MISSES => $stats['get_misses'],
+            Cache::STATS_UPTIME => $stats['uptime'],
+            Cache::STATS_MEMORY_USAGE       => $stats['bytes'],
+            Cache::STATS_MEMORY_AVAILIABLE  => $stats['limit_maxbytes'],
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/PhpFileCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/PhpFileCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d69d3d660b9527d195b5aa6f21da02b8791d382
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/PhpFileCache.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Php file cache driver.
+ *
+ * @since   2.3
+ * @author  Fabio B. Silva <fabio.bat.silva@gmail.com>
+ */
+class PhpFileCache extends FileCache
+{
+    const EXTENSION = '.doctrinecache.php';
+
+     /**
+     * {@inheritdoc}
+     */
+    protected $extension = self::EXTENSION;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        $filename = $this->getFilename($id);
+
+        if ( ! is_file($filename)) {
+            return false;
+        }
+
+        $value = include $filename;
+
+        if ($value['lifetime'] !== 0 && $value['lifetime'] < time()) {
+            return false;
+        }
+
+        return $value['data'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        $filename = $this->getFilename($id);
+
+        if ( ! is_file($filename)) {
+            return false;
+        }
+
+        $value = include $filename;
+
+        return $value['lifetime'] === 0 || $value['lifetime'] > time();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        if ($lifeTime > 0) {
+            $lifeTime = time() + $lifeTime;
+        }
+
+        if (is_object($data) && ! method_exists($data, '__set_state')) {
+            throw new \InvalidArgumentException(
+                "Invalid argument given, PhpFileCache only allows objects that implement __set_state() " .
+                "and fully support var_export(). You can use the FilesystemCache to save arbitrary object " .
+                "graphs using serialize()/deserialize()."
+            );
+        }
+
+        $filename   = $this->getFilename($id);
+        $filepath   = pathinfo($filename, PATHINFO_DIRNAME);
+
+        if ( ! is_dir($filepath)) {
+            mkdir($filepath, 0777, true);
+        }
+
+        $value = array(
+            'lifetime'  => $lifeTime,
+            'data'      => $data
+        );
+
+        $value  = var_export($value, true);
+        $code   = sprintf('<?php return %s;', $value);
+
+        return file_put_contents($filename, $code);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/RedisCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/RedisCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d4814b5f5da03e1ab726c2d4128ce284b1948fc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/RedisCache.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+use Redis;
+
+/**
+ * Redis cache provider.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.2
+ * @author  Osman Ungur <osmanungur@gmail.com>
+ */
+class RedisCache extends CacheProvider
+{
+    /**
+     * @var Redis
+     */
+    private $redis;
+
+    /**
+     * Sets the redis instance to use.
+     *
+     * @param Redis $redis
+     */
+    public function setRedis(Redis $redis)
+    {
+        $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_IGBINARY);
+        $this->redis = $redis;
+    }
+
+    /**
+     * Gets the redis instance used by the cache.
+     *
+     * @return Redis
+     */
+    public function getRedis()
+    {
+        return $this->redis;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return $this->redis->get($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return $this->redis->exists($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        $result = $this->redis->set($id, $data);
+        if ($lifeTime > 0) {
+            $this->redis->expire($id, $lifeTime);        
+        }
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return $this->redis->delete($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        return $this->redis->flushDB();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $info = $this->redis->info();
+        return array(
+            Cache::STATS_HITS   => false,
+            Cache::STATS_MISSES => false,
+            Cache::STATS_UPTIME => $info['uptime_in_seconds'],
+            Cache::STATS_MEMORY_USAGE       => $info['used_memory'],
+            Cache::STATS_MEMORY_AVAILIABLE  => false
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/WinCacheCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/WinCacheCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..777d0fd53553719d2e2177776f14dc16f52a176c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/WinCacheCache.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * WinCache cache provider.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.2
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  David Abdemoulaie <dave@hobodave.com>
+ */
+class WinCacheCache extends CacheProvider
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return wincache_ucache_get($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return wincache_ucache_exists($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        return (bool) wincache_ucache_set($id, $data, (int) $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return wincache_ucache_delete($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        return wincache_ucache_clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $info    = wincache_ucache_info();
+        $meminfo = wincache_ucache_meminfo();
+
+        return array(
+            Cache::STATS_HITS              => $info['total_hit_count'],
+            Cache::STATS_MISSES            => $info['total_miss_count'],
+            Cache::STATS_UPTIME            => $info['total_cache_uptime'],
+            Cache::STATS_MEMORY_USAGE      => $meminfo['memory_total'],
+            Cache::STATS_MEMORY_AVAILIABLE => $meminfo['memory_free'],
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/XcacheCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/XcacheCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..8733e266cc00cb8f3cac7917c4c59141a6419e81
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/XcacheCache.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Xcache cache driver.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.0
+ * @author  Benjamin Eberlei <kontakt@beberlei.de>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  David Abdemoulaie <dave@hobodave.com>
+ */
+class XcacheCache extends CacheProvider
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return $this->doContains($id) ? unserialize(xcache_get($id)) : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return xcache_isset($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        return xcache_set($id, serialize($data), (int) $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return xcache_unset($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        $this->checkAuthorization();
+
+        xcache_clear_cache(XC_TYPE_VAR, 0);
+
+        return true;
+    }
+
+    /**
+     * Checks that xcache.admin.enable_auth is Off
+     *
+     * @throws \BadMethodCallException When xcache.admin.enable_auth is On
+     * @return void
+     */
+    protected function checkAuthorization()
+    {
+        if (ini_get('xcache.admin.enable_auth')) {
+            throw new \BadMethodCallException('To use all features of \Doctrine\Common\Cache\XcacheCache, you must set "xcache.admin.enable_auth" to "Off" in your php.ini.');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        $this->checkAuthorization();
+
+        $info = xcache_info(XC_TYPE_VAR, 0);
+        return array(
+            Cache::STATS_HITS   => $info['hits'],
+            Cache::STATS_MISSES => $info['misses'],
+            Cache::STATS_UPTIME => null,
+            Cache::STATS_MEMORY_USAGE       => $info['size'],
+            Cache::STATS_MEMORY_AVAILIABLE  => $info['avail'],
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ZendDataCache.php b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ZendDataCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..fc90bc690912c6fefaec01d9547b7043a8723328
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Doctrine/Common/Cache/ZendDataCache.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Cache;
+
+/**
+ * Zend Data Cache cache driver.
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link    www.doctrine-project.org
+ * @since   2.0
+ * @author  Ralph Schindler <ralph.schindler@zend.com>
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ */
+class ZendDataCache extends CacheProvider
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        return zend_shm_cache_fetch($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        return (false !== zend_shm_cache_fetch($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        return zend_shm_cache_store($id, $data, $lifeTime);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        return zend_shm_cache_delete($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        $namespace = $this->getNamespace();
+        if (empty($namespace)) {
+            return zend_shm_cache_clear();
+        }
+        return zend_shm_cache_clear($namespace);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        return null;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/AbstractBatchDecorator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/AbstractBatchDecorator.php
new file mode 100644
index 0000000000000000000000000000000000000000..0625d71c3029f66ee0984c128a3fb44a72228ca2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/AbstractBatchDecorator.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Guzzle\Batch;
+
+/**
+ * Abstract decorator used when decorating a BatchInterface
+ */
+abstract class AbstractBatchDecorator implements BatchInterface
+{
+    /** @var BatchInterface Decorated batch object */
+    protected $decoratedBatch;
+
+    /**
+     * @param BatchInterface $decoratedBatch  BatchInterface that is being decorated
+     */
+    public function __construct(BatchInterface $decoratedBatch)
+    {
+        $this->decoratedBatch = $decoratedBatch;
+    }
+
+    /**
+     * Allow decorators to implement custom methods
+     *
+     * @param string $method Missing method name
+     * @param array  $args   Method arguments
+     *
+     * @return mixed
+     * @codeCoverageIgnore
+     */
+    public function __call($method, array $args)
+    {
+        return call_user_func_array(array($this->decoratedBatch, $method), $args);
+    }
+
+    public function add($item)
+    {
+        $this->decoratedBatch->add($item);
+
+        return $this;
+    }
+
+    public function flush()
+    {
+        return $this->decoratedBatch->flush();
+    }
+
+    public function isEmpty()
+    {
+        return $this->decoratedBatch->isEmpty();
+    }
+
+    /**
+     * Trace the decorators associated with the batch
+     *
+     * @return array
+     */
+    public function getDecorators()
+    {
+        $found = array($this);
+        if (method_exists($this->decoratedBatch, 'getDecorators')) {
+            $found = array_merge($found, $this->decoratedBatch->getDecorators());
+        }
+
+        return $found;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/Batch.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/Batch.php
new file mode 100644
index 0000000000000000000000000000000000000000..4d41c54f887b7deebc614bea1149daec788e1f65
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/Batch.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Batch\Exception\BatchTransferException;
+
+/**
+ * Default batch implementation used to convert queued items into smaller chunks of batches using a
+ * {@see BatchDivisorIterface} and transfers each batch using a {@see BatchTransferInterface}.
+ *
+ * Any exception encountered during a flush operation will throw a {@see BatchTransferException} object containing the
+ * batch that failed. After an exception is encountered, you can flush the batch again to attempt to finish transferring
+ * any previously created batches or queued items.
+ */
+class Batch implements BatchInterface
+{
+    /** @var \SplQueue Queue of items in the queue */
+    protected $queue;
+
+    /** @var array Divided batches to be transferred */
+    protected $dividedBatches;
+
+    /** @var BatchTransferInterface */
+    protected $transferStrategy;
+
+    /** @var BatchDivisorInterface */
+    protected $divisionStrategy;
+
+    /**
+     * @param BatchTransferInterface $transferStrategy Strategy used to transfer items
+     * @param BatchDivisorInterface  $divisionStrategy Divisor used to create batches
+     */
+    public function __construct(BatchTransferInterface $transferStrategy, BatchDivisorInterface $divisionStrategy)
+    {
+        $this->transferStrategy = $transferStrategy;
+        $this->divisionStrategy = $divisionStrategy;
+        $this->queue = new \SplQueue();
+        $this->queue->setIteratorMode(\SplQueue::IT_MODE_DELETE);
+        $this->dividedBatches = array();
+    }
+
+    public function add($item)
+    {
+        $this->queue->enqueue($item);
+
+        return $this;
+    }
+
+    public function flush()
+    {
+        $this->createBatches();
+
+        $items = array();
+        foreach ($this->dividedBatches as $batchIndex => $dividedBatch) {
+            while ($dividedBatch->valid()) {
+                $batch = $dividedBatch->current();
+                $dividedBatch->next();
+                try {
+                    $this->transferStrategy->transfer($batch);
+                    $items = array_merge($items, $batch);
+                } catch (\Exception $e) {
+                    throw new BatchTransferException($batch, $items, $e, $this->transferStrategy, $this->divisionStrategy);
+                }
+            }
+            // Keep the divided batch down to a minimum in case of a later exception
+            unset($this->dividedBatches[$batchIndex]);
+        }
+
+        return $items;
+    }
+
+    public function isEmpty()
+    {
+        return count($this->queue) == 0 && count($this->dividedBatches) == 0;
+    }
+
+    /**
+     * Create batches for any queued items
+     */
+    protected function createBatches()
+    {
+        if (count($this->queue)) {
+            if ($batches = $this->divisionStrategy->createBatches($this->queue)) {
+                // Convert arrays into iterators
+                if (is_array($batches)) {
+                    $batches = new \ArrayIterator($batches);
+                }
+                $this->dividedBatches[] = $batches;
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea99b4dd090bf26e43700967f65a26b22201a0bc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchBuilder.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\RuntimeException;
+
+/**
+ * Builder used to create custom batch objects
+ */
+class BatchBuilder
+{
+    /** @var bool Whether or not the batch should automatically flush*/
+    protected $autoFlush = false;
+
+    /** @var bool Whether or not to maintain a batch history */
+    protected $history = false;
+
+    /** @var bool Whether or not to buffer exceptions encountered in transfer */
+    protected $exceptionBuffering = false;
+
+    /** @var mixed Callable to invoke each time a flush completes */
+    protected $afterFlush;
+
+    /** @var BatchTransferInterface Object used to transfer items in the queue */
+    protected $transferStrategy;
+
+    /** @var BatchDivisorInterface Object used to divide the queue into batches */
+    protected $divisorStrategy;
+
+    /** @var array of Mapped transfer strategies by handle name */
+    protected static $mapping = array(
+        'request' => 'Guzzle\Batch\BatchRequestTransfer',
+        'command' => 'Guzzle\Batch\BatchCommandTransfer'
+    );
+
+    /**
+     * Create a new instance of the BatchBuilder
+     *
+     * @return BatchBuilder
+     */
+    public static function factory()
+    {
+        return new self();
+    }
+
+    /**
+     * Automatically flush the batch when the size of the queue reaches a certain threshold. Adds {@see FlushingBatch}.
+     *
+     * @param $threshold Number of items to allow in the queue before a flush
+     *
+     * @return BatchBuilder
+     */
+    public function autoFlushAt($threshold)
+    {
+        $this->autoFlush = $threshold;
+
+        return $this;
+    }
+
+    /**
+     * Maintain a history of all items that have been transferred using the batch. Adds {@see HistoryBatch}.
+     *
+     * @return BatchBuilder
+     */
+    public function keepHistory()
+    {
+        $this->history = true;
+
+        return $this;
+    }
+
+    /**
+     * Buffer exceptions thrown during transfer so that you can transfer as much as possible, and after a transfer
+     * completes, inspect each exception that was thrown. Enables the {@see ExceptionBufferingBatch} decorator.
+     *
+     * @return BatchBuilder
+     */
+    public function bufferExceptions()
+    {
+        $this->exceptionBuffering = true;
+
+        return $this;
+    }
+
+    /**
+     * Notify a callable each time a batch flush completes. Enables the {@see NotifyingBatch} decorator.
+     *
+     * @param mixed $callable Callable function to notify
+     *
+     * @return BatchBuilder
+     * @throws InvalidArgumentException if the argument is not callable
+     */
+    public function notify($callable)
+    {
+        $this->afterFlush = $callable;
+
+        return $this;
+    }
+
+    /**
+     * Configures the batch to transfer batches of requests. Associates a {@see \Guzzle\Http\BatchRequestTransfer}
+     * object as both the transfer and divisor strategy.
+     *
+     * @param int $batchSize Batch size for each batch of requests
+     *
+     * @return BatchBuilder
+     */
+    public function transferRequests($batchSize = 50)
+    {
+        $className = self::$mapping['request'];
+        $this->transferStrategy = new $className($batchSize);
+        $this->divisorStrategy = $this->transferStrategy;
+
+        return $this;
+    }
+
+    /**
+     * Configures the batch to transfer batches commands. Associates as
+     * {@see \Guzzle\Service\Command\BatchCommandTransfer} as both the transfer and divisor strategy.
+     *
+     * @param int $batchSize Batch size for each batch of commands
+     *
+     * @return BatchBuilder
+     */
+    public function transferCommands($batchSize = 50)
+    {
+        $className = self::$mapping['command'];
+        $this->transferStrategy = new $className($batchSize);
+        $this->divisorStrategy = $this->transferStrategy;
+
+        return $this;
+    }
+
+    /**
+     * Specify the strategy used to divide the queue into an array of batches
+     *
+     * @param BatchDivisorInterface $divisorStrategy Strategy used to divide a batch queue into batches
+     *
+     * @return BatchBuilder
+     */
+    public function createBatchesWith(BatchDivisorInterface $divisorStrategy)
+    {
+        $this->divisorStrategy = $divisorStrategy;
+
+        return $this;
+    }
+
+    /**
+     * Specify the strategy used to transport the items when flush is called
+     *
+     * @param BatchTransferInterface $transferStrategy How items are transferred
+     *
+     * @return BatchBuilder
+     */
+    public function transferWith(BatchTransferInterface $transferStrategy)
+    {
+        $this->transferStrategy = $transferStrategy;
+
+        return $this;
+    }
+
+    /**
+     * Create and return the instantiated batch
+     *
+     * @return BatchInterface
+     * @throws RuntimeException if no transfer strategy has been specified
+     */
+    public function build()
+    {
+        if (!$this->transferStrategy) {
+            throw new RuntimeException('No transfer strategy has been specified');
+        }
+
+        if (!$this->divisorStrategy) {
+            throw new RuntimeException('No divisor strategy has been specified');
+        }
+
+        $batch = new Batch($this->transferStrategy, $this->divisorStrategy);
+
+        if ($this->exceptionBuffering) {
+            $batch = new ExceptionBufferingBatch($batch);
+        }
+
+        if ($this->afterFlush) {
+            $batch = new NotifyingBatch($batch, $this->afterFlush);
+        }
+
+        if ($this->autoFlush) {
+            $batch = new FlushingBatch($batch, $this->autoFlush);
+        }
+
+        if ($this->history) {
+            $batch = new HistoryBatch($batch);
+        }
+
+        return $batch;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchClosureDivisor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchClosureDivisor.php
new file mode 100644
index 0000000000000000000000000000000000000000..e0a2d9568c7ed66f6674255cc49e3b3cf5ddb2e7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchClosureDivisor.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * Divides batches using a callable
+ */
+class BatchClosureDivisor implements BatchDivisorInterface
+{
+    /** @var callable Method used to divide the batches */
+    protected $callable;
+
+    /** @var mixed $context Context passed to the callable */
+    protected $context;
+
+    /**
+     * @param callable $callable Method used to divide the batches. The method must accept an \SplQueue and return an
+     *                           array of arrays containing the divided items.
+     * @param mixed    $context  Optional context to pass to the batch divisor
+     *
+     * @throws InvalidArgumentException if the callable is not callable
+     */
+    public function __construct($callable, $context = null)
+    {
+        if (!is_callable($callable)) {
+            throw new InvalidArgumentException('Must pass a callable');
+        }
+
+        $this->callable = $callable;
+        $this->context = $context;
+    }
+
+    public function createBatches(\SplQueue $queue)
+    {
+        return call_user_func($this->callable, $queue, $this->context);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchClosureTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchClosureTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..9cbf1aba40b8e0370b512ba9abd2bc25c932f26b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchClosureTransfer.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * Batch transfer strategy where transfer logic can be defined via a Closure.
+ * This class is to be used with {@see Guzzle\Batch\BatchInterface}
+ */
+class BatchClosureTransfer implements BatchTransferInterface
+{
+    /** @var callable A closure that performs the transfer */
+    protected $callable;
+
+    /** @var mixed $context Context passed to the callable */
+    protected $context;
+
+    /**
+     * @param mixed $callable Callable that performs the transfer. This function should accept two arguments:
+     *                        (array $batch, mixed $context).
+     * @param mixed $context  Optional context to pass to the batch divisor
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct($callable, $context = null)
+    {
+        if (!is_callable($callable)) {
+            throw new InvalidArgumentException('Argument must be callable');
+        }
+
+        $this->callable = $callable;
+        $this->context = $context;
+    }
+
+    public function transfer(array $batch)
+    {
+        return empty($batch) ? null : call_user_func($this->callable, $batch, $this->context);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchCommandTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchCommandTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..d55ac7d1f32a4593a527f532a1d4e9bb1cccf637
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchCommandTransfer.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Batch\BatchTransferInterface;
+use Guzzle\Batch\BatchDivisorInterface;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Exception\InconsistentClientTransferException;
+
+/**
+ * Efficiently transfers multiple commands in parallel per client
+ * This class is to be used with {@see Guzzle\Batch\BatchInterface}
+ */
+class BatchCommandTransfer implements BatchTransferInterface, BatchDivisorInterface
+{
+    /** @var int Size of each command batch */
+    protected $batchSize;
+
+    /**
+     * @param int $batchSize Size of each batch
+     */
+    public function __construct($batchSize = 50)
+    {
+        $this->batchSize = $batchSize;
+    }
+
+    /**
+     * Creates batches by grouping commands by their associated client
+     * {@inheritdoc}
+     */
+    public function createBatches(\SplQueue $queue)
+    {
+        $groups = new \SplObjectStorage();
+        foreach ($queue as $item) {
+            if (!$item instanceof CommandInterface) {
+                throw new InvalidArgumentException('All items must implement Guzzle\Service\Command\CommandInterface');
+            }
+            $client = $item->getClient();
+            if (!$groups->contains($client)) {
+                $groups->attach($client, new \ArrayObject(array($item)));
+            } else {
+                $groups[$client]->append($item);
+            }
+        }
+
+        $batches = array();
+        foreach ($groups as $batch) {
+            $batches = array_merge($batches, array_chunk($groups[$batch]->getArrayCopy(), $this->batchSize));
+        }
+
+        return $batches;
+    }
+
+    public function transfer(array $batch)
+    {
+        if (empty($batch)) {
+            return;
+        }
+
+        // Get the client of the first found command
+        $client = reset($batch)->getClient();
+
+        // Keep a list of all commands with invalid clients
+        $invalid = array_filter($batch, function ($command) use ($client) {
+            return $command->getClient() !== $client;
+        });
+
+        if (!empty($invalid)) {
+            throw new InconsistentClientTransferException($invalid);
+        }
+
+        $client->execute($batch);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchDivisorInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchDivisorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..0214f05f4a0fd324539300b357d12bd7b61b492e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchDivisorInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Batch;
+
+/**
+ * Interface used for dividing a queue of items into an array of batches
+ */
+interface BatchDivisorInterface
+{
+    /**
+     * Divide a queue of items into an array batches
+     *
+     * @param \SplQueue $queue Queue of items to divide into batches. Items are removed as they are iterated.
+     *
+     * @return array|\Traversable Returns an array or Traversable object that contains arrays of items to transfer
+     */
+    public function createBatches(\SplQueue $queue);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..28ea65c800a9066835150fe281e40011b6cb48fb
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Guzzle\Batch;
+
+/**
+ * Interface for efficiently transferring items in a queue using batches
+ */
+interface BatchInterface
+{
+    /**
+     * Add an item to the queue
+     *
+     * @param mixed $item Item to add
+     *
+     * @return self
+     */
+    public function add($item);
+
+    /**
+     * Flush the batch and transfer the items
+     *
+     * @return array Returns an array flushed items
+     */
+    public function flush();
+
+    /**
+     * Check if the batch is empty and has further items to transfer
+     *
+     * @return bool
+     */
+    public function isEmpty();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchRequestTransfer.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchRequestTransfer.php
new file mode 100644
index 0000000000000000000000000000000000000000..4d8489c70579df9bd1e6af0f7eaeae792038f2a8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchRequestTransfer.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Batch\BatchTransferInterface;
+use Guzzle\Batch\BatchDivisorInterface;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Batch transfer strategy used to efficiently transfer a batch of requests.
+ * This class is to be used with {@see Guzzle\Batch\BatchInterface}
+ */
+class BatchRequestTransfer implements BatchTransferInterface, BatchDivisorInterface
+{
+    /** @var int Size of each command batch */
+    protected $batchSize;
+
+    /**
+     * Constructor used to specify how large each batch should be
+     *
+     * @param int $batchSize Size of each batch
+     */
+    public function __construct($batchSize = 50)
+    {
+        $this->batchSize = $batchSize;
+    }
+
+    /**
+     * Creates batches of requests by grouping requests by their associated curl multi object.
+     * {@inheritdoc}
+     */
+    public function createBatches(\SplQueue $queue)
+    {
+        // Create batches by client objects
+        $groups = new \SplObjectStorage();
+        foreach ($queue as $item) {
+            if (!$item instanceof RequestInterface) {
+                throw new InvalidArgumentException('All items must implement Guzzle\Http\Message\RequestInterface');
+            }
+            $client = $item->getClient();
+            if (!$groups->contains($client)) {
+                $groups->attach($client, array($item));
+            } else {
+                $current = $groups[$client];
+                $current[] = $item;
+                $groups[$client] = $current;
+            }
+        }
+
+        $batches = array();
+        foreach ($groups as $batch) {
+            $batches = array_merge($batches, array_chunk($groups[$batch], $this->batchSize));
+        }
+
+        return $batches;
+    }
+
+    public function transfer(array $batch)
+    {
+        if ($batch) {
+            reset($batch)->getClient()->send($batch);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchSizeDivisor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchSizeDivisor.php
new file mode 100644
index 0000000000000000000000000000000000000000..67f90a5818ea18cb50ba14ddc93cdf2ba5ad5747
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchSizeDivisor.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Guzzle\Batch;
+
+/**
+ * Divides batches into smaller batches under a certain size
+ */
+class BatchSizeDivisor implements BatchDivisorInterface
+{
+    /** @var int Size of each batch */
+    protected $size;
+
+    /** @param int $size Size of each batch */
+    public function __construct($size)
+    {
+        $this->size = $size;
+    }
+
+    /**
+     * Set the size of each batch
+     *
+     * @param int $size Size of each batch
+     *
+     * @return BatchSizeDivisor
+     */
+    public function setSize($size)
+    {
+        $this->size = $size;
+
+        return $this;
+    }
+
+    /**
+     * Get the size of each batch
+     *
+     * @return int
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    public function createBatches(\SplQueue $queue)
+    {
+        return array_chunk(iterator_to_array($queue, false), $this->size);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchTransferInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchTransferInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e0b60dad406c84fd37334943d0ef79d097ab9f6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/BatchTransferInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Guzzle\Batch;
+
+/**
+ * Interface used for transferring batches of items
+ */
+interface BatchTransferInterface
+{
+    /**
+     * Transfer an array of items
+     *
+     * @param array $batch Array of items to transfer
+     */
+    public function transfer(array $batch);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/Exception/BatchTransferException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/Exception/BatchTransferException.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e1f8175be5dd19877ae7698003aae1f2f458096
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/Exception/BatchTransferException.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Guzzle\Batch\Exception;
+
+use Guzzle\Common\Exception\GuzzleException;
+use Guzzle\Batch\BatchTransferInterface as TransferStrategy;
+use Guzzle\Batch\BatchDivisorInterface as DivisorStrategy;
+
+/**
+ * Exception thrown during a batch transfer
+ */
+class BatchTransferException extends \Exception implements GuzzleException
+{
+    /** @var array The batch being sent when the exception occurred */
+    protected $batch;
+
+    /** @var TransferStrategy The transfer strategy in use when the exception occurred */
+    protected $transferStrategy;
+
+    /** @var DivisorStrategy The divisor strategy in use when the exception occurred */
+    protected $divisorStrategy;
+
+    /** @var array Items transferred at the point in which the exception was encountered */
+    protected $transferredItems;
+
+    /**
+     * @param array            $batch            The batch being sent when the exception occurred
+     * @param array            $transferredItems Items transferred at the point in which the exception was encountered
+     * @param \Exception       $exception        Exception encountered
+     * @param TransferStrategy $transferStrategy The transfer strategy in use when the exception occurred
+     * @param DivisorStrategy  $divisorStrategy  The divisor strategy in use when the exception occurred
+     */
+    public function __construct(
+        array $batch,
+        array $transferredItems,
+        \Exception $exception,
+        TransferStrategy $transferStrategy = null,
+        DivisorStrategy $divisorStrategy = null
+    ) {
+        $this->batch = $batch;
+        $this->transferredItems = $transferredItems;
+        $this->transferStrategy = $transferStrategy;
+        $this->divisorStrategy = $divisorStrategy;
+        parent::__construct(
+            'Exception encountered while transferring batch: ' . $exception->getMessage(),
+            $exception->getCode(),
+            $exception
+        );
+    }
+
+    /**
+     * Get the batch that we being sent when the exception occurred
+     *
+     * @return array
+     */
+    public function getBatch()
+    {
+        return $this->batch;
+    }
+
+    /**
+     * Get the items transferred at the point in which the exception was encountered
+     *
+     * @return array
+     */
+    public function getTransferredItems()
+    {
+        return $this->transferredItems;
+    }
+
+    /**
+     * Get the transfer strategy
+     *
+     * @return TransferStrategy
+     */
+    public function getTransferStrategy()
+    {
+        return $this->transferStrategy;
+    }
+
+    /**
+     * Get the divisor strategy
+     *
+     * @return DivisorStrategy
+     */
+    public function getDivisorStrategy()
+    {
+        return $this->divisorStrategy;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/ExceptionBufferingBatch.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/ExceptionBufferingBatch.php
new file mode 100644
index 0000000000000000000000000000000000000000..d7a8928857e19b60b0665966ba9fe3e46bb7ed7a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/ExceptionBufferingBatch.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Batch\Exception\BatchTransferException;
+
+/**
+ * BatchInterface decorator used to buffer exceptions encountered during a transfer.  The exceptions can then later be
+ * processed after a batch flush has completed.
+ */
+class ExceptionBufferingBatch extends AbstractBatchDecorator
+{
+    /** @var array Array of BatchTransferException exceptions */
+    protected $exceptions = array();
+
+    public function flush()
+    {
+        $items = array();
+
+        while (!$this->decoratedBatch->isEmpty()) {
+            try {
+                $transferredItems = $this->decoratedBatch->flush();
+            } catch (BatchTransferException $e) {
+                $this->exceptions[] = $e;
+                $transferredItems = $e->getTransferredItems();
+            }
+            $items = array_merge($items, $transferredItems);
+        }
+
+        return $items;
+    }
+
+    /**
+     * Get the buffered exceptions
+     *
+     * @return array Array of BatchTransferException objects
+     */
+    public function getExceptions()
+    {
+        return $this->exceptions;
+    }
+
+    /**
+     * Clear the buffered exceptions
+     */
+    public function clearExceptions()
+    {
+        $this->exceptions = array();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/FlushingBatch.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/FlushingBatch.php
new file mode 100644
index 0000000000000000000000000000000000000000..367b6842716068c900a36b591956ddfa19f48492
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/FlushingBatch.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Guzzle\Batch;
+
+/**
+ * BatchInterface decorator used to add automatic flushing of the queue when the size of the queue reaches a threshold.
+ */
+class FlushingBatch extends AbstractBatchDecorator
+{
+    /** @var int The threshold for which to automatically flush */
+    protected $threshold;
+
+    /** @var int Current number of items known to be in the queue */
+    protected $currentTotal = 0;
+
+    /**
+     * @param BatchInterface $decoratedBatch  BatchInterface that is being decorated
+     * @param int            $threshold       Flush when the number in queue matches the threshold
+     */
+    public function __construct(BatchInterface $decoratedBatch, $threshold)
+    {
+        $this->threshold = $threshold;
+        parent::__construct($decoratedBatch);
+    }
+
+    /**
+     * Set the auto-flush threshold
+     *
+     * @param int $threshold The auto-flush threshold
+     *
+     * @return FlushingBatch
+     */
+    public function setThreshold($threshold)
+    {
+        $this->threshold = $threshold;
+
+        return $this;
+    }
+
+    /**
+     * Get the auto-flush threshold
+     *
+     * @return int
+     */
+    public function getThreshold()
+    {
+        return $this->threshold;
+    }
+
+    public function add($item)
+    {
+        $this->decoratedBatch->add($item);
+        if (++$this->currentTotal >= $this->threshold) {
+            $this->currentTotal = 0;
+            $this->decoratedBatch->flush();
+        }
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/HistoryBatch.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/HistoryBatch.php
new file mode 100644
index 0000000000000000000000000000000000000000..e345fdc349cbf899239844b82150fff5d22563b2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/HistoryBatch.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Guzzle\Batch;
+
+/**
+ * BatchInterface decorator used to keep a history of items that were added to the batch.  You must clear the history
+ * manually to remove items from the history.
+ */
+class HistoryBatch extends AbstractBatchDecorator
+{
+    /** @var array Items in the history */
+    protected $history = array();
+
+    public function add($item)
+    {
+        $this->history[] = $item;
+        $this->decoratedBatch->add($item);
+
+        return $this;
+    }
+
+    /**
+     * Get the batch history
+     *
+     * @return array
+     */
+    public function getHistory()
+    {
+        return $this->history;
+    }
+
+    /**
+     * Clear the batch history
+     */
+    public function clearHistory()
+    {
+        $this->history = array();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/NotifyingBatch.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/NotifyingBatch.php
new file mode 100644
index 0000000000000000000000000000000000000000..96d04daa82f30d79f7fa9bd0f56470a2a7dfb46f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Batch/NotifyingBatch.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Guzzle\Batch;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * BatchInterface decorator used to call a method each time flush is called
+ */
+class NotifyingBatch extends AbstractBatchDecorator
+{
+    /** @var mixed Callable to call */
+    protected $callable;
+
+    /**
+     * @param BatchInterface $decoratedBatch Batch object to decorate
+     * @param mixed          $callable       Callable to call
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct(BatchInterface $decoratedBatch, $callable)
+    {
+        if (!is_callable($callable)) {
+            throw new InvalidArgumentException('The passed argument is not callable');
+        }
+
+        $this->callable = $callable;
+        parent::__construct($decoratedBatch);
+    }
+
+    public function flush()
+    {
+        $items = $this->decoratedBatch->flush();
+        call_user_func($this->callable, $items);
+
+        return $items;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/AbstractCacheAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/AbstractCacheAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5c527167b82f2e236e6ad0479e8712fda46d85c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/AbstractCacheAdapter.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Guzzle\Cache;
+
+/**
+ * Abstract cache adapter
+ */
+abstract class AbstractCacheAdapter implements CacheAdapterInterface
+{
+    protected $cache;
+
+    /**
+     * Get the object owned by the adapter
+     *
+     * @return mixed
+     */
+    public function getCacheObject()
+    {
+        return $this->cache;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/CacheAdapterFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/CacheAdapterFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..d02219a69296ec0e92b2c05b1d4db07f52a3750e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/CacheAdapterFactory.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Guzzle\Cache;
+
+use Doctrine\Common\Cache\Cache;
+use Guzzle\Common\Version;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\FromConfigInterface;
+use Zend\Cache\Storage\StorageInterface;
+
+/**
+ * Generates cache adapters from any number of known cache implementations
+ */
+class CacheAdapterFactory implements FromConfigInterface
+{
+    /**
+     * Create a Guzzle cache adapter based on an array of options
+     *
+     * @param mixed $cache Cache value
+     *
+     * @return CacheAdapterInterface
+     * @throws InvalidArgumentException
+     */
+    public static function fromCache($cache)
+    {
+        if (!is_object($cache)) {
+            throw new InvalidArgumentException('Cache must be one of the known cache objects');
+        }
+
+        if ($cache instanceof CacheAdapterInterface) {
+            return $cache;
+        } elseif ($cache instanceof Cache) {
+            return new DoctrineCacheAdapter($cache);
+        } elseif ($cache instanceof StorageInterface) {
+            return new Zf2CacheAdapter($cache);
+        } else {
+            throw new InvalidArgumentException('Unknown cache type: ' . get_class($cache));
+        }
+    }
+
+    /**
+     * Create a Guzzle cache adapter based on an array of options
+     *
+     * @param array $config Array of configuration options
+     *
+     * @return CacheAdapterInterface
+     * @throws InvalidArgumentException
+     * @deprecated This will be removed in a future version
+     * @codeCoverageIgnore
+     */
+    public static function factory($config = array())
+    {
+        Version::warn(__METHOD__ . ' is deprecated');
+        if (!is_array($config)) {
+            throw new InvalidArgumentException('$config must be an array');
+        }
+
+        if (!isset($config['cache.adapter']) && !isset($config['cache.provider'])) {
+            $config['cache.adapter'] = 'Guzzle\Cache\NullCacheAdapter';
+            $config['cache.provider'] = null;
+        } else {
+            // Validate that the options are valid
+            foreach (array('cache.adapter', 'cache.provider') as $required) {
+                if (!isset($config[$required])) {
+                    throw new InvalidArgumentException("{$required} is a required CacheAdapterFactory option");
+                }
+                if (is_string($config[$required])) {
+                    // Convert dot notation to namespaces
+                    $config[$required] = str_replace('.', '\\', $config[$required]);
+                    if (!class_exists($config[$required])) {
+                        throw new InvalidArgumentException("{$config[$required]} is not a valid class for {$required}");
+                    }
+                }
+            }
+            // Instantiate the cache provider
+            if (is_string($config['cache.provider'])) {
+                $args = isset($config['cache.provider.args']) ? $config['cache.provider.args'] : null;
+                $config['cache.provider'] = self::createObject($config['cache.provider'], $args);
+            }
+        }
+
+        // Instantiate the cache adapter using the provider and options
+        if (is_string($config['cache.adapter'])) {
+            $args = isset($config['cache.adapter.args']) ? $config['cache.adapter.args'] : array();
+            array_unshift($args, $config['cache.provider']);
+            $config['cache.adapter'] = self::createObject($config['cache.adapter'], $args);
+        }
+
+        return $config['cache.adapter'];
+    }
+
+    /**
+     * Create a class using an array of constructor arguments
+     *
+     * @param string $className Class name
+     * @param array  $args      Arguments for the class constructor
+     *
+     * @return mixed
+     * @throws RuntimeException
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    private static function createObject($className, array $args = null)
+    {
+        try {
+            if (!$args) {
+                return new $className;
+            } else {
+                $c = new \ReflectionClass($className);
+                return $c->newInstanceArgs($args);
+            }
+        } catch (\Exception $e) {
+            throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/CacheAdapterInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/CacheAdapterInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..970c9e2283790b330947054a227773fca2e121e0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/CacheAdapterInterface.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Guzzle\Cache;
+
+/**
+ * Interface for cache adapters.
+ *
+ * Cache adapters allow Guzzle to utilize various frameworks for caching HTTP responses.
+ *
+ * @link http://www.doctrine-project.org/ Inspired by Doctrine 2
+ */
+interface CacheAdapterInterface
+{
+    /**
+     * Test if an entry exists in the cache.
+     *
+     * @param string $id      cache id The cache id of the entry to check for.
+     * @param array  $options Array of cache adapter options
+     *
+     * @return bool Returns TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     */
+    public function contains($id, array $options = null);
+
+    /**
+     * Deletes a cache entry.
+     *
+     * @param string $id      cache id
+     * @param array  $options Array of cache adapter options
+     *
+     * @return bool TRUE on success, FALSE on failure
+     */
+    public function delete($id, array $options = null);
+
+    /**
+     * Fetches an entry from the cache.
+     *
+     * @param string $id      cache id The id of the cache entry to fetch.
+     * @param array  $options Array of cache adapter options
+     *
+     * @return string The cached data or FALSE, if no cache entry exists for the given id.
+     */
+    public function fetch($id, array $options = null);
+
+    /**
+     * Puts data into the cache.
+     *
+     * @param string   $id       The cache id
+     * @param string   $data     The cache entry/data
+     * @param int|bool $lifeTime The lifetime. If != false, sets a specific lifetime for this cache entry
+     * @param array    $options  Array of cache adapter options
+     *
+     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     */
+    public function save($id, $data, $lifeTime = false, array $options = null);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/ClosureCacheAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/ClosureCacheAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..c7a3df436b6e9795c832af770c4b23e217be83ac
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/ClosureCacheAdapter.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Guzzle\Cache;
+
+/**
+ * Cache adapter that defers to closures for implementation
+ */
+class ClosureCacheAdapter implements CacheAdapterInterface
+{
+    /**
+     * @var array Mapping of method names to callables
+     */
+    protected $callables;
+
+    /**
+     * The callables array is an array mapping the actions of the cache adapter to callables.
+     * - contains: Callable that accepts an $id and $options argument
+     * - delete:   Callable that accepts an $id and $options argument
+     * - fetch:    Callable that accepts an $id and $options argument
+     * - save:     Callable that accepts an $id, $data, $lifeTime, and $options argument
+     *
+     * @param array $callables array of action names to callable
+     *
+     * @throws \InvalidArgumentException if the callable is not callable
+     */
+    public function __construct(array $callables)
+    {
+        // Validate each key to ensure it exists and is callable
+        foreach (array('contains', 'delete', 'fetch', 'save') as $key) {
+            if (!array_key_exists($key, $callables) || !is_callable($callables[$key])) {
+                throw new \InvalidArgumentException("callables must contain a callable {$key} key");
+            }
+        }
+
+        $this->callables = $callables;
+    }
+
+    public function contains($id, array $options = null)
+    {
+        return call_user_func($this->callables['contains'], $id, $options);
+    }
+
+    public function delete($id, array $options = null)
+    {
+        return call_user_func($this->callables['delete'], $id, $options);
+    }
+
+    public function fetch($id, array $options = null)
+    {
+        return call_user_func($this->callables['fetch'], $id, $options);
+    }
+
+    public function save($id, $data, $lifeTime = false, array $options = null)
+    {
+        return call_user_func($this->callables['save'], $id, $data, $lifeTime, $options);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/DoctrineCacheAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/DoctrineCacheAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..321dd6baf038608b884e0bbed204c0ccd9f05443
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/DoctrineCacheAdapter.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Guzzle\Cache;
+
+use Doctrine\Common\Cache\Cache;
+
+/**
+ * Doctrine 2 cache adapter
+ *
+ * @link http://www.doctrine-project.org/
+ */
+class DoctrineCacheAdapter extends AbstractCacheAdapter
+{
+    /**
+     * @param Cache $cache Doctrine cache object
+     */
+    public function __construct(Cache $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    public function contains($id, array $options = null)
+    {
+        return $this->cache->contains($id);
+    }
+
+    public function delete($id, array $options = null)
+    {
+        return $this->cache->delete($id);
+    }
+
+    public function fetch($id, array $options = null)
+    {
+        return $this->cache->fetch($id);
+    }
+
+    public function save($id, $data, $lifeTime = false, array $options = null)
+    {
+        return $this->cache->save($id, $data, $lifeTime);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/NullCacheAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/NullCacheAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..68bd4af97c5935c6d01d9b5dc269b85d926697e8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/NullCacheAdapter.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Guzzle\Cache;
+
+/**
+ * Null cache adapter
+ */
+class NullCacheAdapter extends AbstractCacheAdapter
+{
+    public function __construct() {}
+
+    public function contains($id, array $options = null)
+    {
+        return false;
+    }
+
+    public function delete($id, array $options = null)
+    {
+        return true;
+    }
+
+    public function fetch($id, array $options = null)
+    {
+        return false;
+    }
+
+    public function save($id, $data, $lifeTime = false, array $options = null)
+    {
+        return true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/Zf1CacheAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/Zf1CacheAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..48f8e2430c8249741b3aa42787e04034d2606899
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/Zf1CacheAdapter.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Guzzle\Cache;
+
+use Guzzle\Common\Version;
+
+/**
+ * Zend Framework 1 cache adapter
+ *
+ * @link http://framework.zend.com/manual/en/zend.cache.html
+ * @deprecated
+ * @codeCoverageIgnore
+ */
+class Zf1CacheAdapter extends AbstractCacheAdapter
+{
+    /**
+     * @param \Zend_Cache_Backend $cache Cache object to wrap
+     */
+    public function __construct(\Zend_Cache_Backend $cache)
+    {
+        Version::warn(__CLASS__ . ' is deprecated. Upgrade to ZF2 or use PsrCacheAdapter');
+        $this->cache = $cache;
+    }
+
+    public function contains($id, array $options = null)
+    {
+        return $this->cache->test($id);
+    }
+
+    public function delete($id, array $options = null)
+    {
+        return $this->cache->remove($id);
+    }
+
+    public function fetch($id, array $options = null)
+    {
+        return $this->cache->load($id);
+    }
+
+    public function save($id, $data, $lifeTime = false, array $options = null)
+    {
+        return $this->cache->save($data, $id, array(), $lifeTime);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/Zf2CacheAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/Zf2CacheAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fc18a555300205f0d5fd0073f0e1ab73f85fad7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Cache/Zf2CacheAdapter.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Guzzle\Cache;
+
+use Zend\Cache\Storage\StorageInterface;
+
+/**
+ * Zend Framework 2 cache adapter
+ *
+ * @link http://packages.zendframework.com/docs/latest/manual/en/zend.cache.html
+ */
+class Zf2CacheAdapter extends AbstractCacheAdapter
+{
+    /**
+     * @param StorageInterface $cache Zend Framework 2 cache adapter
+     */
+    public function __construct(StorageInterface $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    public function contains($id, array $options = null)
+    {
+        return $this->cache->hasItem($id);
+    }
+
+    public function delete($id, array $options = null)
+    {
+        return $this->cache->removeItem($id);
+    }
+
+    public function fetch($id, array $options = null)
+    {
+        return $this->cache->getItem($id);
+    }
+
+    public function save($id, $data, $lifeTime = false, array $options = null)
+    {
+        return $this->cache->setItem($id, $data);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/AbstractHasDispatcher.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/AbstractHasDispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c6874fb4e4b359c2324158e68374da40954c294
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/AbstractHasDispatcher.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Guzzle\Common;
+
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Class that holds an event dispatcher
+ */
+class AbstractHasDispatcher implements HasDispatcherInterface
+{
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+
+    public static function getAllEvents()
+    {
+        return array();
+    }
+
+    public function setEventDispatcher(EventDispatcherInterface $eventDispatcher)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+
+        return $this;
+    }
+
+    public function getEventDispatcher()
+    {
+        if (!$this->eventDispatcher) {
+            $this->eventDispatcher = new EventDispatcher();
+        }
+
+        return $this->eventDispatcher;
+    }
+
+    public function dispatch($eventName, array $context = array())
+    {
+        $this->getEventDispatcher()->dispatch($eventName, new Event($context));
+    }
+
+    public function addSubscriber(EventSubscriberInterface $subscriber)
+    {
+        $this->getEventDispatcher()->addSubscriber($subscriber);
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Collection.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Collection.php
new file mode 100644
index 0000000000000000000000000000000000000000..5cb1535d07a7074e00ec882d9f5b0f5333736dbe
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Collection.php
@@ -0,0 +1,403 @@
+<?php
+
+namespace Guzzle\Common;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\RuntimeException;
+
+/**
+ * Key value pair collection object
+ */
+class Collection implements \ArrayAccess, \IteratorAggregate, \Countable, ToArrayInterface
+{
+    /** @var array Data associated with the object. */
+    protected $data;
+
+    /**
+     * @param array $data Associative array of data to set
+     */
+    public function __construct(array $data = array())
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Create a new collection from an array, validate the keys, and add default values where missing
+     *
+     * @param array $config   Configuration values to apply.
+     * @param array $defaults Default parameters
+     * @param array $required Required parameter names
+     *
+     * @return self
+     * @throws InvalidArgumentException if a parameter is missing
+     */
+    public static function fromConfig(array $config = array(), array $defaults = array(), array $required = array())
+    {
+        $data = $config + $defaults;
+
+        if ($missing = array_diff($required, array_keys($data))) {
+            throw new InvalidArgumentException('Config is missing the following keys: ' . implode(', ', $missing));
+        }
+
+        return new self($data);
+    }
+
+    public function count()
+    {
+        return count($this->data);
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->data);
+    }
+
+    public function toArray()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Removes all key value pairs
+     *
+     * @return Collection
+     */
+    public function clear()
+    {
+        $this->data = array();
+
+        return $this;
+    }
+
+    /**
+     * Get all or a subset of matching key value pairs
+     *
+     * @param array $keys Pass an array of keys to retrieve only a subset of key value pairs
+     *
+     * @return array Returns an array of all matching key value pairs
+     */
+    public function getAll(array $keys = null)
+    {
+        return $keys ? array_intersect_key($this->data, array_flip($keys)) : $this->data;
+    }
+
+    /**
+     * Get a specific key value.
+     *
+     * @param string $key Key to retrieve.
+     *
+     * @return mixed|null Value of the key or NULL
+     */
+    public function get($key)
+    {
+        return isset($this->data[$key]) ? $this->data[$key] : null;
+    }
+
+    /**
+     * Set a key value pair
+     *
+     * @param string $key   Key to set
+     * @param mixed  $value Value to set
+     *
+     * @return Collection Returns a reference to the object
+     */
+    public function set($key, $value)
+    {
+        $this->data[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Add a value to a key.  If a key of the same name has already been added, the key value will be converted into an
+     * array and the new value will be pushed to the end of the array.
+     *
+     * @param string $key   Key to add
+     * @param mixed  $value Value to add to the key
+     *
+     * @return Collection Returns a reference to the object.
+     */
+    public function add($key, $value)
+    {
+        if (!array_key_exists($key, $this->data)) {
+            $this->data[$key] = $value;
+        } elseif (is_array($this->data[$key])) {
+            $this->data[$key][] = $value;
+        } else {
+            $this->data[$key] = array($this->data[$key], $value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove a specific key value pair
+     *
+     * @param string $key A key to remove
+     *
+     * @return Collection
+     */
+    public function remove($key)
+    {
+        unset($this->data[$key]);
+
+        return $this;
+    }
+
+    /**
+     * Get all keys in the collection
+     *
+     * @return array
+     */
+    public function getKeys()
+    {
+        return array_keys($this->data);
+    }
+
+    /**
+     * Returns whether or not the specified key is present.
+     *
+     * @param string $key The key for which to check the existence.
+     *
+     * @return bool
+     */
+    public function hasKey($key)
+    {
+        return array_key_exists($key, $this->data);
+    }
+
+    /**
+     * Case insensitive search the keys in the collection
+     *
+     * @param string $key Key to search for
+     *
+     * @return bool|string Returns false if not found, otherwise returns the key
+     */
+    public function keySearch($key)
+    {
+        foreach (array_keys($this->data) as $k) {
+            if (!strcasecmp($k, $key)) {
+                return $k;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks if any keys contains a certain value
+     *
+     * @param string $value Value to search for
+     *
+     * @return mixed Returns the key if the value was found FALSE if the value was not found.
+     */
+    public function hasValue($value)
+    {
+        return array_search($value, $this->data);
+    }
+
+    /**
+     * Replace the data of the object with the value of an array
+     *
+     * @param array $data Associative array of data
+     *
+     * @return Collection Returns a reference to the object
+     */
+    public function replace(array $data)
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    /**
+     * Add and merge in a Collection or array of key value pair data.
+     *
+     * @param Collection|array $data Associative array of key value pair data
+     *
+     * @return Collection Returns a reference to the object.
+     */
+    public function merge($data)
+    {
+        foreach ($data as $key => $value) {
+            $this->add($key, $value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Over write key value pairs in this collection with all of the data from an array or collection.
+     *
+     * @param array|\Traversable $data Values to override over this config
+     *
+     * @return self
+     */
+    public function overwriteWith($data)
+    {
+        if (is_array($data)) {
+            $this->data = $data + $this->data;
+        } elseif ($data instanceof Collection) {
+            $this->data = $data->toArray() + $this->data;
+        } else {
+            foreach ($data as $key => $value) {
+                $this->data[$key] = $value;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns a Collection containing all the elements of the collection after applying the callback function to each
+     * one. The Closure should accept three parameters: (string) $key, (string) $value, (array) $context and return a
+     * modified value
+     *
+     * @param \Closure $closure Closure to apply
+     * @param array    $context Context to pass to the closure
+     * @param bool     $static  Set to TRUE to use the same class as the return rather than returning a Collection
+     *
+     * @return Collection
+     */
+    public function map(\Closure $closure, array $context = array(), $static = true)
+    {
+        $collection = $static ? new static() : new self();
+        foreach ($this as $key => $value) {
+            $collection->add($key, $closure($key, $value, $context));
+        }
+
+        return $collection;
+    }
+
+    /**
+     * Iterates over each key value pair in the collection passing them to the Closure. If the  Closure function returns
+     * true, the current value from input is returned into the result Collection.  The Closure must accept three
+     * parameters: (string) $key, (string) $value and return Boolean TRUE or FALSE for each value.
+     *
+     * @param \Closure $closure Closure evaluation function
+     * @param bool     $static  Set to TRUE to use the same class as the return rather than returning a Collection
+     *
+     * @return Collection
+     */
+    public function filter(\Closure $closure, $static = true)
+    {
+        $collection = ($static) ? new static() : new self();
+        foreach ($this->data as $key => $value) {
+            if ($closure($key, $value)) {
+                $collection->add($key, $value);
+            }
+        }
+
+        return $collection;
+    }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->data[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return isset($this->data[$offset]) ? $this->data[$offset] : null;
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $this->data[$offset] = $value;
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->data[$offset]);
+    }
+
+    /**
+     * Set a value into a nested array key. Keys will be created as needed to set the value.
+     *
+     * @param string $path  Path to set
+     * @param mixed  $value Value to set at the key
+     *
+     * @return self
+     * @throws RuntimeException when trying to setPath using a nested path that travels through a scalar value
+     */
+    public function setPath($path, $value)
+    {
+        $current =& $this->data;
+        $queue = explode('/', $path);
+        while (null !== ($key = array_shift($queue))) {
+            if (!is_array($current)) {
+                throw new RuntimeException("Trying to setPath {$path}, but {$key} is set and is not an array");
+            } elseif (!$queue) {
+                $current[$key] = $value;
+            } elseif (isset($current[$key])) {
+                $current =& $current[$key];
+            } else {
+                $current[$key] = array();
+                $current =& $current[$key];
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Gets a value from the collection using an array path (e.g. foo/baz/bar would retrieve bar from two nested arrays)
+     * Allows for wildcard searches which recursively combine matches up to the level at which the wildcard occurs. This
+     * can be useful for accepting any key of a sub-array and combining matching keys from each diverging path.
+     *
+     * @param string $path      Path to traverse and retrieve a value from
+     * @param string $separator Character used to add depth to the search
+     * @param mixed  $data      Optional data to descend into (used when wildcards are encountered)
+     *
+     * @return mixed|null
+     */
+    public function getPath($path, $separator = '/', $data = null)
+    {
+        if ($data === null) {
+            $data =& $this->data;
+        }
+
+        $path = is_array($path) ? $path : explode($separator, $path);
+        while (null !== ($part = array_shift($path))) {
+            if (!is_array($data)) {
+                return null;
+            } elseif (isset($data[$part])) {
+                $data =& $data[$part];
+            } elseif ($part != '*') {
+                return null;
+            } else {
+                // Perform a wildcard search by diverging and merging paths
+                $result = array();
+                foreach ($data as $value) {
+                    if (!$path) {
+                        $result = array_merge_recursive($result, (array) $value);
+                    } elseif (null !== ($test = $this->getPath($path, $separator, $value))) {
+                        $result = array_merge_recursive($result, (array) $test);
+                    }
+                }
+                return $result;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Inject configuration settings into an input string
+     *
+     * @param string $input Input to inject
+     *
+     * @return string
+     * @deprecated
+     */
+    public function inject($input)
+    {
+        Version::warn(__METHOD__ . ' is deprecated');
+        $replace = array();
+        foreach ($this->data as $key => $val) {
+            $replace['{' . $key . '}'] = $val;
+        }
+
+        return strtr($input, $replace);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Event.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Event.php
new file mode 100644
index 0000000000000000000000000000000000000000..fad76a9b817847782cabc7387a56c9358bae442c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Event.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Guzzle\Common;
+
+use Symfony\Component\EventDispatcher\Event as SymfonyEvent;
+
+/**
+ * Default event for Guzzle notifications
+ */
+class Event extends SymfonyEvent implements ToArrayInterface, \ArrayAccess, \IteratorAggregate
+{
+    /** @var array */
+    private $context;
+
+    /**
+     * @param array $context Contextual information
+     */
+    public function __construct(array $context = array())
+    {
+        $this->context = $context;
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->context);
+    }
+
+    public function offsetGet($offset)
+    {
+        return isset($this->context[$offset]) ? $this->context[$offset] : null;
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $this->context[$offset] = $value;
+    }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->context[$offset]);
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->context[$offset]);
+    }
+
+    public function toArray()
+    {
+        return $this->context;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/BadMethodCallException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/BadMethodCallException.php
new file mode 100644
index 0000000000000000000000000000000000000000..08d1c7256d720db4282233c4d30486f2c6073c35
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/BadMethodCallException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Guzzle\Common\Exception;
+
+class BadMethodCallException extends \BadMethodCallException implements GuzzleException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/ExceptionCollection.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/ExceptionCollection.php
new file mode 100644
index 0000000000000000000000000000000000000000..185d05cddac3d7e9b6d658e47a7ed2c9a22d694e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/ExceptionCollection.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Guzzle\Common\Exception;
+
+/**
+ * Collection of exceptions
+ */
+class ExceptionCollection extends \Exception implements GuzzleException, \IteratorAggregate, \Countable
+{
+    /** @var array Array of Exceptions */
+    protected $exceptions = array();
+
+    /**
+     * Set all of the exceptions
+     *
+     * @param array $exceptions Array of exceptions
+     *
+     * @return self
+     */
+    public function setExceptions(array $exceptions)
+    {
+        $this->exceptions = array();
+        foreach ($exceptions as $exception) {
+            $this->add($exception);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add exceptions to the collection
+     *
+     * @param ExceptionCollection|\Exception $e Exception to add
+     *
+     * @return ExceptionCollection;
+     */
+    public function add($e)
+    {
+        if ($this->message) {
+            $this->message .= "\n";
+        }
+
+        if ($e instanceof self) {
+            $this->message .= '(' . get_class($e) . ")";
+            foreach (explode("\n", $e->getMessage()) as $message) {
+                $this->message .= "\n    {$message}";
+            }
+        } elseif ($e instanceof \Exception) {
+            $this->exceptions[] = $e;
+            $this->message .= '(' . get_class($e) . ') ' . $e->getMessage();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the total number of request exceptions
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->exceptions);
+    }
+
+    /**
+     * Allows array-like iteration over the request exceptions
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->exceptions);
+    }
+
+    /**
+     * Get the first exception in the collection
+     *
+     * @return \Exception
+     */
+    public function getFirst()
+    {
+        return $this->exceptions ? $this->exceptions[0] : null;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/GuzzleException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/GuzzleException.php
new file mode 100644
index 0000000000000000000000000000000000000000..458e6f2ea1653c312ee1d203bbf6f1b402b88fbe
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/GuzzleException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Guzzle\Common\Exception;
+
+/**
+ * Guzzle exception
+ */
+interface GuzzleException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/InvalidArgumentException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae674be8790c2b252fc132708480531a07452582
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/InvalidArgumentException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Guzzle\Common\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements GuzzleException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/RuntimeException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/RuntimeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..9254094f3e301f4d3a8d63cd3b63a0b4e6c9d165
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/RuntimeException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Guzzle\Common\Exception;
+
+class RuntimeException extends \RuntimeException implements GuzzleException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/UnexpectedValueException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/UnexpectedValueException.php
new file mode 100644
index 0000000000000000000000000000000000000000..843c0179ebf16f91ea9d938fed88801b41ad6ec5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Exception/UnexpectedValueException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Guzzle\Common\Exception;
+
+class UnexpectedValueException extends \UnexpectedValueException implements GuzzleException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/FromConfigInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/FromConfigInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8b1317c446dd97873e1bbb7a9fd859cb6b7e467
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/FromConfigInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Common;
+
+/**
+ * Interfaces that adds a factory method which is used to instantiate a class from an array of configuration options.
+ */
+interface FromConfigInterface
+{
+    /**
+     * Static factory method used to turn an array or collection of configuration data into an instantiated object.
+     *
+     * @param array|Collection $config Configuration data
+     *
+     * @return FromConfigInterface
+     */
+    public static function factory($config = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/HasDispatcherInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/HasDispatcherInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..75727ed9e2599ffaf8bf37136cc9c510890e3ef7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/HasDispatcherInterface.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Guzzle\Common;
+
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Holds an event dispatcher
+ */
+interface HasDispatcherInterface
+{
+    /**
+     * Get a list of all of the events emitted from the class
+     *
+     * @return array
+     */
+    public static function getAllEvents();
+
+    /**
+     * Set the EventDispatcher of the request
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     *
+     * @return self
+     */
+    public function setEventDispatcher(EventDispatcherInterface $eventDispatcher);
+
+    /**
+     * Get the EventDispatcher of the request
+     *
+     * @return EventDispatcherInterface
+     */
+    public function getEventDispatcher();
+
+    /**
+     * Helper to dispatch Guzzle events and set the event name on the event
+     *
+     * @param string $eventName Name of the event to dispatch
+     * @param array  $context   Context of the event
+     */
+    public function dispatch($eventName, array $context = array());
+
+    /**
+     * Add an event subscriber to the dispatcher
+     *
+     * @param EventSubscriberInterface $subscriber Event subscriber
+     *
+     * @return self
+     */
+    public function addSubscriber(EventSubscriberInterface $subscriber);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/ToArrayInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/ToArrayInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..245328c1b3a851be20063dc2619a804a2ead1a26
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/ToArrayInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Guzzle\Common;
+
+/**
+ * An object that can be represented as an array
+ */
+interface ToArrayInterface
+{
+    /**
+     * Get the array representation of an object
+     *
+     * @return array
+     */
+    public function toArray();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Version.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Version.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e394659b71a171674c896ed70c0a583cf07b91c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Common/Version.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Guzzle\Common;
+
+/**
+ * Guzzle version information
+ */
+class Version
+{
+    const VERSION = '3.7.0';
+
+    /**
+     * @var bool Set this value to true to enable warnings for deprecated functionality use. This should be on in your
+     *           unit tests, but probably not in production.
+     */
+    public static $emitWarnings = false;
+
+    /**
+     * Emit a deprecation warning
+     *
+     * @param string $message Warning message
+     */
+    public static function warn($message)
+    {
+        if (self::$emitWarnings) {
+            trigger_error('Deprecation warning: ' . $message, E_USER_DEPRECATED);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/AbstractEntityBodyDecorator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/AbstractEntityBodyDecorator.php
new file mode 100644
index 0000000000000000000000000000000000000000..5005a887cf5d407e115a6f3906bdd4cd573a88f8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/AbstractEntityBodyDecorator.php
@@ -0,0 +1,221 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Stream\Stream;
+
+/**
+ * Abstract decorator used to wrap entity bodies
+ */
+class AbstractEntityBodyDecorator implements EntityBodyInterface
+{
+    /** @var EntityBodyInterface Decorated entity body */
+    protected $body;
+
+    /**
+     * @param EntityBodyInterface $body Entity body to decorate
+     */
+    public function __construct(EntityBodyInterface $body)
+    {
+        $this->body = $body;
+    }
+
+    public function __toString()
+    {
+        return (string) $this->body;
+    }
+
+    /**
+     * Allow decorators to implement custom methods
+     *
+     * @param string $method Missing method name
+     * @param array  $args   Method arguments
+     *
+     * @return mixed
+     */
+    public function __call($method, array $args)
+    {
+        return call_user_func_array(array($this->body, $method), $args);
+    }
+
+    public function close()
+    {
+        return $this->body->close();
+    }
+
+    public function setRewindFunction($callable)
+    {
+        $this->body->setRewindFunction($callable);
+
+        return $this;
+    }
+
+    public function rewind()
+    {
+        return $this->body->rewind();
+    }
+
+    public function compress($filter = 'zlib.deflate')
+    {
+        return $this->body->compress($filter);
+    }
+
+    public function uncompress($filter = 'zlib.inflate')
+    {
+        return $this->body->uncompress($filter);
+    }
+
+    public function getContentLength()
+    {
+        return $this->getSize();
+    }
+
+    public function getContentType()
+    {
+        return $this->body->getContentType();
+    }
+
+    public function getContentMd5($rawOutput = false, $base64Encode = false)
+    {
+        $hash = Stream::getHash($this, 'md5', $rawOutput);
+
+        return $hash && $base64Encode ? base64_encode($hash) : $hash;
+    }
+
+    public function getContentEncoding()
+    {
+        return $this->body->getContentEncoding();
+    }
+
+    public function getMetaData($key = null)
+    {
+        return $this->body->getMetaData($key);
+    }
+
+    public function getStream()
+    {
+        return $this->body->getStream();
+    }
+
+    public function setStream($stream, $size = 0)
+    {
+        $this->body->setStream($stream, $size);
+
+        return $this;
+    }
+
+    public function detachStream()
+    {
+        $this->body->detachStream();
+
+        return $this;
+    }
+
+    public function getWrapper()
+    {
+        return $this->body->getWrapper();
+    }
+
+    public function getWrapperData()
+    {
+        return $this->body->getWrapperData();
+    }
+
+    public function getStreamType()
+    {
+        return $this->body->getStreamType();
+    }
+
+    public function getUri()
+    {
+        return $this->body->getUri();
+    }
+
+    public function getSize()
+    {
+        return $this->body->getSize();
+    }
+
+    public function isReadable()
+    {
+        return $this->body->isReadable();
+    }
+
+    public function isRepeatable()
+    {
+        return $this->isSeekable() && $this->isReadable();
+    }
+
+    public function isWritable()
+    {
+        return $this->body->isWritable();
+    }
+
+    public function isConsumed()
+    {
+        return $this->body->isConsumed();
+    }
+
+    /**
+     * Alias of isConsumed()
+     * {@inheritdoc}
+     */
+    public function feof()
+    {
+        return $this->isConsumed();
+    }
+
+    public function isLocal()
+    {
+        return $this->body->isLocal();
+    }
+
+    public function isSeekable()
+    {
+        return $this->body->isSeekable();
+    }
+
+    public function setSize($size)
+    {
+        $this->body->setSize($size);
+
+        return $this;
+    }
+
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        return $this->body->seek($offset, $whence);
+    }
+
+    public function read($length)
+    {
+        return $this->body->read($length);
+    }
+
+    public function write($string)
+    {
+        return $this->body->write($string);
+    }
+
+    public function readLine($maxLength = null)
+    {
+        return $this->body->readLine($maxLength);
+    }
+
+    public function ftell()
+    {
+        return $this->body->ftell();
+    }
+
+    public function getCustomData($key)
+    {
+        return $this->body->getCustomData($key);
+    }
+
+    public function setCustomData($key, $value)
+    {
+        $this->body->setCustomData($key, $value);
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/CachingEntityBody.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/CachingEntityBody.php
new file mode 100644
index 0000000000000000000000000000000000000000..c65c1365042f0a5a2b2372c3d46d1bb804ce3b7b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/CachingEntityBody.php
@@ -0,0 +1,229 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+/**
+ * EntityBody decorator that can cache previously read bytes from a sequentially read tstream
+ */
+class CachingEntityBody extends AbstractEntityBodyDecorator
+{
+    /** @var EntityBody Remote stream used to actually pull data onto the buffer */
+    protected $remoteStream;
+
+    /** @var int The number of bytes to skip reading due to a write on the temporary buffer */
+    protected $skipReadBytes = 0;
+
+    /**
+     * We will treat the buffer object as the body of the entity body
+     * {@inheritdoc}
+     */
+    public function __construct(EntityBodyInterface $body)
+    {
+        $this->remoteStream = $body;
+        $this->body = new EntityBody(fopen('php://temp', 'r+'));
+    }
+
+    /**
+     * Will give the contents of the buffer followed by the exhausted remote stream.
+     *
+     * Warning: Loads the entire stream into memory
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $pos = $this->ftell();
+        $this->rewind();
+
+        $str = '';
+        while (!$this->isConsumed()) {
+            $str .= $this->read(16384);
+        }
+
+        $this->seek($pos);
+
+        return $str;
+    }
+
+    public function getSize()
+    {
+        return max($this->body->getSize(), $this->remoteStream->getSize());
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws RuntimeException When seeking with SEEK_END or when seeking past the total size of the buffer stream
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        if ($whence == SEEK_SET) {
+            $byte = $offset;
+        } elseif ($whence == SEEK_CUR) {
+            $byte = $offset + $this->ftell();
+        } else {
+            throw new RuntimeException(__CLASS__ . ' supports only SEEK_SET and SEEK_CUR seek operations');
+        }
+
+        // You cannot skip ahead past where you've read from the remote stream
+        if ($byte > $this->body->getSize()) {
+            throw new RuntimeException(
+                "Cannot seek to byte {$byte} when the buffered stream only contains {$this->body->getSize()} bytes"
+            );
+        }
+
+        return $this->body->seek($byte);
+    }
+
+    public function rewind()
+    {
+        return $this->seek(0);
+    }
+
+    /**
+     * Does not support custom rewind functions
+     *
+     * @throws RuntimeException
+     */
+    public function setRewindFunction($callable)
+    {
+        throw new RuntimeException(__CLASS__ . ' does not support custom stream rewind functions');
+    }
+
+    public function read($length)
+    {
+        // Perform a regular read on any previously read data from the buffer
+        $data = $this->body->read($length);
+        $remaining = $length - strlen($data);
+
+        // More data was requested so read from the remote stream
+        if ($remaining) {
+            // If data was written to the buffer in a position that would have been filled from the remote stream,
+            // then we must skip bytes on the remote stream to emulate overwriting bytes from that position. This
+            // mimics the behavior of other PHP stream wrappers.
+            $remoteData = $this->remoteStream->read($remaining + $this->skipReadBytes);
+
+            if ($this->skipReadBytes) {
+                $len = strlen($remoteData);
+                $remoteData = substr($remoteData, $this->skipReadBytes);
+                $this->skipReadBytes = max(0, $this->skipReadBytes - $len);
+            }
+
+            $data .= $remoteData;
+            $this->body->write($remoteData);
+        }
+
+        return $data;
+    }
+
+    public function write($string)
+    {
+        // When appending to the end of the currently read stream, you'll want to skip bytes from being read from
+        // the remote stream to emulate other stream wrappers. Basically replacing bytes of data of a fixed length.
+        $overflow = (strlen($string) + $this->ftell()) - $this->remoteStream->ftell();
+        if ($overflow > 0) {
+            $this->skipReadBytes += $overflow;
+        }
+
+        return $this->body->write($string);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @link http://php.net/manual/en/function.fgets.php
+     */
+    public function readLine($maxLength = null)
+    {
+        $buffer = '';
+        $size = 0;
+        while (!$this->isConsumed()) {
+            $byte = $this->read(1);
+            $buffer .= $byte;
+            // Break when a new line is found or the max length - 1 is reached
+            if ($byte == PHP_EOL || ++$size == $maxLength - 1) {
+                break;
+            }
+        }
+
+        return $buffer;
+    }
+
+    public function isConsumed()
+    {
+        return $this->body->isConsumed() && $this->remoteStream->isConsumed();
+    }
+
+    /**
+     * Close both the remote stream and buffer stream
+     */
+    public function close()
+    {
+        return $this->remoteStream->close() && $this->body->close();
+    }
+
+    public function setStream($stream, $size = 0)
+    {
+        $this->remoteStream->setStream($stream, $size);
+    }
+
+    public function getContentType()
+    {
+        return $this->remoteStream->getContentType();
+    }
+
+    public function getContentEncoding()
+    {
+        return $this->remoteStream->getContentEncoding();
+    }
+
+    public function getMetaData($key = null)
+    {
+        return $this->remoteStream->getMetaData($key);
+    }
+
+    public function getStream()
+    {
+        return $this->remoteStream->getStream();
+    }
+
+    public function getWrapper()
+    {
+        return $this->remoteStream->getWrapper();
+    }
+
+    public function getWrapperData()
+    {
+        return $this->remoteStream->getWrapperData();
+    }
+
+    public function getStreamType()
+    {
+        return $this->remoteStream->getStreamType();
+    }
+
+    public function getUri()
+    {
+        return $this->remoteStream->getUri();
+    }
+
+    /**
+     * Always retrieve custom data from the remote stream
+     * {@inheritdoc}
+     */
+    public function getCustomData($key)
+    {
+        return $this->remoteStream->getCustomData($key);
+    }
+
+    /**
+     * Always set custom data on the remote stream
+     * {@inheritdoc}
+     */
+    public function setCustomData($key, $value)
+    {
+        $this->remoteStream->setCustomData($key, $value);
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Client.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Client.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f34203acf87ade560ad09523a4b35d8604bfeea
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Client.php
@@ -0,0 +1,507 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Common\Exception\ExceptionCollection;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\RuntimeException;
+use Guzzle\Common\Version;
+use Guzzle\Parser\ParserRegistry;
+use Guzzle\Parser\UriTemplate\UriTemplateInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\RequestFactory;
+use Guzzle\Http\Message\RequestFactoryInterface;
+use Guzzle\Http\Curl\CurlMultiInterface;
+use Guzzle\Http\Curl\CurlMultiProxy;
+use Guzzle\Http\Curl\CurlHandle;
+use Guzzle\Http\Curl\CurlVersion;
+
+/**
+ * HTTP client
+ */
+class Client extends AbstractHasDispatcher implements ClientInterface
+{
+    /** @deprecated Use [request.options][params] */
+    const REQUEST_PARAMS = 'request.params';
+
+    const REQUEST_OPTIONS = 'request.options';
+    const CURL_OPTIONS = 'curl.options';
+    const SSL_CERT_AUTHORITY = 'ssl.certificate_authority';
+    const DISABLE_REDIRECTS = RedirectPlugin::DISABLE;
+
+    /** @var Collection Default HTTP headers to set on each request */
+    protected $defaultHeaders;
+
+    /** @var string The user agent string to set on each request */
+    protected $userAgent;
+
+    /** @var Collection Parameter object holding configuration data */
+    private $config;
+
+    /** @var Url Base URL of the client */
+    private $baseUrl;
+
+    /** @var CurlMultiInterface CurlMulti object used internally */
+    private $curlMulti;
+
+    /** @var UriTemplateInterface URI template owned by the client */
+    private $uriTemplate;
+
+    /** @var RequestFactoryInterface Request factory used by the client */
+    protected $requestFactory;
+
+    public static function getAllEvents()
+    {
+        return array(self::CREATE_REQUEST);
+    }
+
+    /**
+     * @param string           $baseUrl Base URL of the web service
+     * @param array|Collection $config  Configuration settings
+     *
+     * @throws RuntimeException if cURL is not installed
+     */
+    public function __construct($baseUrl = '', $config = null)
+    {
+        if (!extension_loaded('curl')) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('The PHP cURL extension must be installed to use Guzzle.');
+            // @codeCoverageIgnoreEnd
+        }
+        $this->setConfig($config ?: new Collection());
+        $this->initSsl();
+        $this->setBaseUrl($baseUrl);
+        $this->defaultHeaders = new Collection();
+        $this->setRequestFactory(RequestFactory::getInstance());
+        $this->userAgent = $this->getDefaultUserAgent();
+        if (!$this->config[self::DISABLE_REDIRECTS]) {
+            $this->addSubscriber(new RedirectPlugin());
+        }
+    }
+
+    final public function setConfig($config)
+    {
+        if ($config instanceof Collection) {
+            $this->config = $config;
+        } elseif (is_array($config)) {
+            $this->config = new Collection($config);
+        } else {
+            throw new InvalidArgumentException('Config must be an array or Collection');
+        }
+
+        return $this;
+    }
+
+    final public function getConfig($key = false)
+    {
+        return $key ? $this->config[$key] : $this->config;
+    }
+
+    /**
+     * Set a default request option on the client that will be used as a default for each request
+     *
+     * @param string $keyOrPath request.options key (e.g. allow_redirects) or path to a nested key (e.g. headers/foo)
+     * @param mixed  $value     Value to set
+     *
+     * @return $this
+     */
+    public function setDefaultOption($keyOrPath, $value)
+    {
+        if (strpos($keyOrPath, '/')) {
+            $this->config->setPath($keyOrPath, $value);
+        } else {
+            $this->config[$keyOrPath] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve a default request option from the client
+     *
+     * @param string $keyOrPath request.options key (e.g. allow_redirects) or path to a nested key (e.g. headers/foo)
+     *
+     * @return mixed|null
+     */
+    public function getDefaultOption($keyOrPath)
+    {
+        return strpos($keyOrPath, '/') ? $this->config->getPath($keyOrPath) : $this->config[$keyOrPath];
+    }
+
+    final public function setSslVerification($certificateAuthority = true, $verifyPeer = true, $verifyHost = 2)
+    {
+        $opts = $this->config[self::CURL_OPTIONS] ?: array();
+
+        if ($certificateAuthority === true) {
+            // use bundled CA bundle, set secure defaults
+            $opts[CURLOPT_CAINFO] = __DIR__ . '/Resources/cacert.pem';
+            $opts[CURLOPT_SSL_VERIFYPEER] = true;
+            $opts[CURLOPT_SSL_VERIFYHOST] = 2;
+        } elseif ($certificateAuthority === false) {
+            unset($opts[CURLOPT_CAINFO]);
+            $opts[CURLOPT_SSL_VERIFYPEER] = false;
+            $opts[CURLOPT_SSL_VERIFYHOST] = 2;
+        } elseif ($verifyPeer !== true && $verifyPeer !== false && $verifyPeer !== 1 && $verifyPeer !== 0) {
+            throw new InvalidArgumentException('verifyPeer must be 1, 0 or boolean');
+        } elseif ($verifyHost !== 0 && $verifyHost !== 1 && $verifyHost !== 2) {
+            throw new InvalidArgumentException('verifyHost must be 0, 1 or 2');
+        } else {
+            $opts[CURLOPT_SSL_VERIFYPEER] = $verifyPeer;
+            $opts[CURLOPT_SSL_VERIFYHOST] = $verifyHost;
+            if (is_file($certificateAuthority)) {
+                unset($opts[CURLOPT_CAPATH]);
+                $opts[CURLOPT_CAINFO] = $certificateAuthority;
+            } elseif (is_dir($certificateAuthority)) {
+                unset($opts[CURLOPT_CAINFO]);
+                $opts[CURLOPT_CAPATH] = $certificateAuthority;
+            } else {
+                throw new RuntimeException(
+                    'Invalid option passed to ' . self::SSL_CERT_AUTHORITY . ': ' . $certificateAuthority
+                );
+            }
+        }
+
+        $this->config->set(self::CURL_OPTIONS, $opts);
+
+        return $this;
+    }
+
+    public function createRequest($method = 'GET', $uri = null, $headers = null, $body = null, array $options = array())
+    {
+        if (!$uri) {
+            $url = $this->getBaseUrl();
+        } else {
+            if (!is_array($uri)) {
+                $templateVars = null;
+            } else {
+                list($uri, $templateVars) = $uri;
+            }
+            if (substr($uri, 0, 4) === 'http') {
+                // Use absolute URLs as-is
+                $url = $this->expandTemplate($uri, $templateVars);
+            } else {
+                $url = Url::factory($this->getBaseUrl())->combine($this->expandTemplate($uri, $templateVars));
+            }
+        }
+
+        // If default headers are provided, then merge them under any explicitly provided headers for the request
+        if (count($this->defaultHeaders)) {
+            if (!$headers) {
+                $headers = $this->defaultHeaders->toArray();
+            } elseif (is_array($headers)) {
+                $headers += $this->defaultHeaders->toArray();
+            } elseif ($headers instanceof Collection) {
+                $headers = $headers->toArray() + $this->defaultHeaders->toArray();
+            }
+        }
+
+        return $this->prepareRequest($this->requestFactory->create($method, (string) $url, $headers, $body), $options);
+    }
+
+    public function getBaseUrl($expand = true)
+    {
+        return $expand ? $this->expandTemplate($this->baseUrl) : $this->baseUrl;
+    }
+
+    public function setBaseUrl($url)
+    {
+        $this->baseUrl = $url;
+
+        return $this;
+    }
+
+    public function setUserAgent($userAgent, $includeDefault = false)
+    {
+        if ($includeDefault) {
+            $userAgent .= ' ' . $this->getDefaultUserAgent();
+        }
+        $this->userAgent = $userAgent;
+
+        return $this;
+    }
+
+    /**
+     * Get the default User-Agent string to use with Guzzle
+     *
+     * @return string
+     */
+    public function getDefaultUserAgent()
+    {
+        return 'Guzzle/' . Version::VERSION
+            . ' curl/' . CurlVersion::getInstance()->get('version')
+            . ' PHP/' . PHP_VERSION;
+    }
+
+    public function get($uri = null, $headers = null, $options = array())
+    {
+        // BC compat: $options can be a string, resource, etc to specify where the response body is downloaded
+        return is_array($options)
+            ? $this->createRequest('GET', $uri, $headers, null, $options)
+            : $this->createRequest('GET', $uri, $headers, $options);
+    }
+
+    public function head($uri = null, $headers = null, array $options = array())
+    {
+        return $this->createRequest('HEAD', $uri, $headers, $options);
+    }
+
+    public function delete($uri = null, $headers = null, $body = null, array $options = array())
+    {
+        return $this->createRequest('DELETE', $uri, $headers, $body, $options);
+    }
+
+    public function put($uri = null, $headers = null, $body = null, array $options = array())
+    {
+        return $this->createRequest('PUT', $uri, $headers, $body, $options);
+    }
+
+    public function patch($uri = null, $headers = null, $body = null, array $options = array())
+    {
+        return $this->createRequest('PATCH', $uri, $headers, $body, $options);
+    }
+
+    public function post($uri = null, $headers = null, $postBody = null, array $options = array())
+    {
+        return $this->createRequest('POST', $uri, $headers, $postBody, $options);
+    }
+
+    public function options($uri = null, array $options = array())
+    {
+        return $this->createRequest('OPTIONS', $uri, $options);
+    }
+
+    public function send($requests)
+    {
+        if (!($requests instanceof RequestInterface)) {
+            return $this->sendMultiple($requests);
+        }
+
+        try {
+            /** @var $requests RequestInterface  */
+            $this->getCurlMulti()->add($requests)->send();
+            return $requests->getResponse();
+        } catch (ExceptionCollection $e) {
+            throw $e->getFirst();
+        }
+    }
+
+    /**
+     * Set a curl multi object to be used internally by the client for transferring requests.
+     *
+     * @param CurlMultiInterface $curlMulti Multi object
+     *
+     * @return self
+     */
+    public function setCurlMulti(CurlMultiInterface $curlMulti)
+    {
+        $this->curlMulti = $curlMulti;
+
+        return $this;
+    }
+
+    /**
+     * @return CurlMultiInterface|CurlMultiProxy
+     */
+    public function getCurlMulti()
+    {
+        if (!$this->curlMulti) {
+            $this->curlMulti = new CurlMultiProxy();
+        }
+
+        return $this->curlMulti;
+    }
+
+    public function setRequestFactory(RequestFactoryInterface $factory)
+    {
+        $this->requestFactory = $factory;
+
+        return $this;
+    }
+
+    /**
+     * Set the URI template expander to use with the client
+     *
+     * @param UriTemplateInterface $uriTemplate URI template expander
+     *
+     * @return self
+     */
+    public function setUriTemplate(UriTemplateInterface $uriTemplate)
+    {
+        $this->uriTemplate = $uriTemplate;
+
+        return $this;
+    }
+
+    /**
+     * Copy the cacert.pem file from the phar if it is not in the temp folder and validate the MD5 checksum
+     *
+     * @param bool $md5Check Set to false to not perform the MD5 validation
+     *
+     * @return string Returns the path to the extracted cacert
+     * @throws RuntimeException if the file cannot be copied or there is a MD5 mismatch
+     */
+    public function preparePharCacert($md5Check = true)
+    {
+        $from = __DIR__ . '/Resources/cacert.pem';
+        $certFile = sys_get_temp_dir() . '/guzzle-cacert.pem';
+        if (!file_exists($certFile) && !copy($from, $certFile)) {
+            throw new RuntimeException("Could not copy {$from} to {$certFile}: " . var_export(error_get_last(), true));
+        } elseif ($md5Check) {
+            $actualMd5 = md5_file($certFile);
+            $expectedMd5 = trim(file_get_contents("{$from}.md5"));
+            if ($actualMd5 != $expectedMd5) {
+                throw new RuntimeException("{$certFile} MD5 mismatch: expected {$expectedMd5} but got {$actualMd5}");
+            }
+        }
+
+        return $certFile;
+    }
+
+    /**
+     * Expand a URI template while merging client config settings into the template variables
+     *
+     * @param string $template  Template to expand
+     * @param array  $variables Variables to inject
+     *
+     * @return string
+     */
+    protected function expandTemplate($template, array $variables = null)
+    {
+        $expansionVars = $this->getConfig()->toArray();
+        if ($variables) {
+            $expansionVars = $variables + $expansionVars;
+        }
+
+        return $this->getUriTemplate()->expand($template, $expansionVars);
+    }
+
+    /**
+     * Get the URI template expander used by the client
+     *
+     * @return UriTemplateInterface
+     */
+    protected function getUriTemplate()
+    {
+        if (!$this->uriTemplate) {
+            $this->uriTemplate = ParserRegistry::getInstance()->getParser('uri_template');
+        }
+
+        return $this->uriTemplate;
+    }
+
+    /**
+     * Send multiple requests in parallel
+     *
+     * @param array $requests Array of RequestInterface objects
+     *
+     * @return array Returns an array of Response objects
+     */
+    protected function sendMultiple(array $requests)
+    {
+        $curlMulti = $this->getCurlMulti();
+        foreach ($requests as $request) {
+            $curlMulti->add($request);
+        }
+        $curlMulti->send();
+
+        /** @var $request RequestInterface */
+        $result = array();
+        foreach ($requests as $request) {
+            $result[] = $request->getResponse();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Prepare a request to be sent from the Client by adding client specific behaviors and properties to the request.
+     *
+     * @param RequestInterface $request Request to prepare for the client
+     * @param array            $options Options to apply to the request
+     *
+     * @return RequestInterface
+     */
+    protected function prepareRequest(RequestInterface $request, array $options = array())
+    {
+        $request->setClient($this)->setEventDispatcher(clone $this->getEventDispatcher());
+
+        if ($curl = $this->config[self::CURL_OPTIONS]) {
+            $request->getCurlOptions()->overwriteWith(CurlHandle::parseCurlConfig($curl));
+        }
+
+        if ($params = $this->config[self::REQUEST_PARAMS]) {
+            Version::warn('request.params is deprecated. Use request.options to add default request options.');
+            $request->getParams()->overwriteWith($params);
+        }
+
+        if ($this->userAgent && !$request->hasHeader('User-Agent')) {
+            $request->setHeader('User-Agent', $this->userAgent);
+        }
+
+        if ($defaults = $this->config[self::REQUEST_OPTIONS]) {
+            $this->requestFactory->applyOptions($request, $defaults, RequestFactoryInterface::OPTIONS_AS_DEFAULTS);
+        }
+
+        if ($options) {
+            $this->requestFactory->applyOptions($request, $options);
+        }
+
+        $this->dispatch('client.create_request', array('client' => $this, 'request' => $request));
+
+        return $request;
+    }
+
+    /**
+     * Initializes SSL settings
+     */
+    protected function initSsl()
+    {
+        if ('system' == ($authority = $this->config[self::SSL_CERT_AUTHORITY])) {
+            return;
+        }
+
+        if ($authority === null) {
+            $authority = true;
+        }
+
+        if ($authority === true && substr(__FILE__, 0, 7) == 'phar://') {
+            $authority = $this->preparePharCacert();
+            $that = $this;
+            $this->getEventDispatcher()->addListener('request.before_send', function ($event) use ($authority, $that) {
+                if ($authority == $event['request']->getCurlOptions()->get(CURLOPT_CAINFO)) {
+                    $that->preparePharCacert(false);
+                }
+            });
+        }
+
+        $this->setSslVerification($authority);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function getDefaultHeaders()
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use the request.options array to retrieve default request options');
+        return $this->defaultHeaders;
+    }
+
+    /**
+     * @deprecated
+     */
+    public function setDefaultHeaders($headers)
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use the request.options array to specify default request options');
+        if ($headers instanceof Collection) {
+            $this->defaultHeaders = $headers;
+        } elseif (is_array($headers)) {
+            $this->defaultHeaders = new Collection($headers);
+        } else {
+            throw new InvalidArgumentException('Headers must be an array or Collection');
+        }
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/ClientInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/ClientInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..10e4de2ab09951369d13b186d3667aa6c40d1ada
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/ClientInterface.php
@@ -0,0 +1,223 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\HasDispatcherInterface;
+use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Client interface for send HTTP requests
+ */
+interface ClientInterface extends HasDispatcherInterface
+{
+    const CREATE_REQUEST = 'client.create_request';
+
+    /** @var string RFC 1123 HTTP-Date */
+    const HTTP_DATE = 'D, d M Y H:i:s \G\M\T';
+
+    /**
+     * Set the configuration object to use with the client
+     *
+     * @param array|Collection $config Parameters that define how the client behaves
+     *
+     * @return self
+     */
+    public function setConfig($config);
+
+    /**
+     * Get a configuration setting or all of the configuration settings. The Collection result of this method can be
+     * modified to change the configuration settings of a client.
+     *
+     * A client should honor the following special values:
+     *
+     * - request.options: Associative array of default RequestFactory options to apply to each request
+     * - request.params: Associative array of request parameters (data values) to apply to each request
+     * - curl.options: Associative array of cURL configuration settings to apply to each request
+     * - ssl.certificate_authority: Path a CAINFO, CAPATH, true to use strict defaults, or false to disable verification
+     * - redirect.disable: Set to true to disable redirects
+     *
+     * @param bool|string $key Configuration value to retrieve. Set to FALSE to retrieve all values of the client.
+     *                         The object return can be modified, and modifications will affect the client's config.
+     * @return mixed|Collection
+     * @see \Guzzle\Http\Message\RequestFactoryInterface::applyOptions for a full list of request.options options
+     */
+    public function getConfig($key = false);
+
+    /**
+     * Create and return a new {@see RequestInterface} configured for the client.
+     *
+     * Use an absolute path to override the base path of the client, or a relative path to append to the base path of
+     * the client. The URI can contain the query string as well. Use an array to provide a URI template and additional
+     * variables to use in the URI template expansion.
+     *
+     * @param string                                    $method  HTTP method. Defaults to GET
+     * @param string|array                              $uri     Resource URI.
+     * @param array|Collection                          $headers HTTP headers
+     * @param string|resource|array|EntityBodyInterface $body    Entity body of request (POST/PUT) or response (GET)
+     * @param array                                     $options Array of options to apply to the request
+     *
+     * @return RequestInterface
+     * @throws InvalidArgumentException if a URI array is passed that does not contain exactly two elements: the URI
+     *                                  followed by template variables
+     */
+    public function createRequest(
+        $method = RequestInterface::GET,
+        $uri = null,
+        $headers = null,
+        $body = null,
+        array $options = array()
+    );
+
+    /**
+     * Create a GET request for the client
+     *
+     * @param string|array     $uri     Resource URI
+     * @param array|Collection $headers HTTP headers
+     * @param array            $options Options to apply to the request. For BC compatibility, you can also pass a
+     *                                  string to tell Guzzle to download the body of the response to a particular
+     *                                  location. Use the 'body' option instead for forward compatibility.
+     * @return RequestInterface
+     * @see    Guzzle\Http\ClientInterface::createRequest()
+     */
+    public function get($uri = null, $headers = null, $options = array());
+
+    /**
+     * Create a HEAD request for the client
+     *
+     * @param string|array     $uri     Resource URI
+     * @param array|Collection $headers HTTP headers
+     * @param array            $options Options to apply to the request
+     *
+     * @return RequestInterface
+     * @see    Guzzle\Http\ClientInterface::createRequest()
+     */
+    public function head($uri = null, $headers = null, array $options = array());
+
+    /**
+     * Create a DELETE request for the client
+     *
+     * @param string|array                        $uri     Resource URI
+     * @param array|Collection                    $headers HTTP headers
+     * @param string|resource|EntityBodyInterface $body    Body to send in the request
+     * @param array                               $options Options to apply to the request
+     *
+     * @return EntityEnclosingRequestInterface
+     * @see    Guzzle\Http\ClientInterface::createRequest()
+     */
+    public function delete($uri = null, $headers = null, $body = null, array $options = array());
+
+    /**
+     * Create a PUT request for the client
+     *
+     * @param string|array                        $uri     Resource URI
+     * @param array|Collection                    $headers HTTP headers
+     * @param string|resource|EntityBodyInterface $body    Body to send in the request
+     * @param array                               $options Options to apply to the request
+     *
+     * @return EntityEnclosingRequestInterface
+     * @see    Guzzle\Http\ClientInterface::createRequest()
+     */
+    public function put($uri = null, $headers = null, $body = null, array $options = array());
+
+    /**
+     * Create a PATCH request for the client
+     *
+     * @param string|array                        $uri     Resource URI
+     * @param array|Collection                    $headers HTTP headers
+     * @param string|resource|EntityBodyInterface $body    Body to send in the request
+     * @param array                               $options Options to apply to the request
+     *
+     * @return EntityEnclosingRequestInterface
+     * @see    Guzzle\Http\ClientInterface::createRequest()
+     */
+    public function patch($uri = null, $headers = null, $body = null, array $options = array());
+
+    /**
+     * Create a POST request for the client
+     *
+     * @param string|array                                $uri      Resource URI
+     * @param array|Collection                            $headers  HTTP headers
+     * @param array|Collection|string|EntityBodyInterface $postBody POST body. Can be a string, EntityBody, or
+     *                                                    associative array of POST fields to send in the body of the
+     *                                                    request. Prefix a value in the array with the @ symbol to
+     *                                                    reference a file.
+     * @param array                                       $options Options to apply to the request
+     *
+     * @return EntityEnclosingRequestInterface
+     * @see    Guzzle\Http\ClientInterface::createRequest()
+     */
+    public function post($uri = null, $headers = null, $postBody = null, array $options = array());
+
+    /**
+     * Create an OPTIONS request for the client
+     *
+     * @param string|array $uri     Resource URI
+     * @param array        $options Options to apply to the request
+     *
+     * @return RequestInterface
+     * @see    Guzzle\Http\ClientInterface::createRequest()
+     */
+    public function options($uri = null, array $options = array());
+
+    /**
+     * Sends a single request or an array of requests in parallel
+     *
+     * @param array|RequestInterface $requests One or more RequestInterface objects to send
+     *
+     * @return \Guzzle\Http\Message\Response|array Returns a single Response or an array of Response objects
+     */
+    public function send($requests);
+
+    /**
+     * Get the client's base URL as either an expanded or raw URI template
+     *
+     * @param bool $expand Set to FALSE to get the raw base URL without URI template expansion
+     *
+     * @return string|null
+     */
+    public function getBaseUrl($expand = true);
+
+    /**
+     * Set the base URL of the client
+     *
+     * @param string $url The base service endpoint URL of the webservice
+     *
+     * @return self
+     */
+    public function setBaseUrl($url);
+
+    /**
+     * Set the User-Agent header to be used on all requests from the client
+     *
+     * @param string $userAgent      User agent string
+     * @param bool   $includeDefault Set to true to prepend the value to Guzzle's default user agent string
+     *
+     * @return self
+     */
+    public function setUserAgent($userAgent, $includeDefault = false);
+
+    /**
+     * Set SSL verification options.
+     *
+     * Setting $certificateAuthority to TRUE will result in the bundled cacert.pem being used to verify against the
+     * remote host.
+     *
+     * Alternate certificates to verify against can be specified with the $certificateAuthority option set to the full
+     * path to a certificate file, or the path to a directory containing certificates.
+     *
+     * Setting $certificateAuthority to FALSE will turn off peer verification, unset the bundled cacert.pem, and
+     * disable host verification. Please don't do this unless you really know what you're doing, and why you're doing
+     * it.
+     *
+     * @param string|bool $certificateAuthority bool, file path, or directory path
+     * @param bool        $verifyPeer           FALSE to stop from verifying the peer's certificate.
+     * @param int         $verifyHost           Set to 1 to check the existence of a common name in the SSL peer
+     *                                          certificate. 2 to check the existence of a common name and also verify
+     *                                          that it matches the hostname provided.
+     * @return self
+     */
+    public function setSslVerification($certificateAuthority = true, $verifyPeer = true, $verifyHost = 2);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlHandle.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlHandle.php
new file mode 100644
index 0000000000000000000000000000000000000000..78f9bde87f632c5c77d4a4a565c1f40fed29bec8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlHandle.php
@@ -0,0 +1,451 @@
+<?php
+
+namespace Guzzle\Http\Curl;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\RuntimeException;
+use Guzzle\Common\Collection;
+use Guzzle\Http\Message\EntityEnclosingRequest;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Parser\ParserRegistry;
+use Guzzle\Http\Url;
+
+/**
+ * Immutable wrapper for a cURL handle
+ */
+class CurlHandle
+{
+    const BODY_AS_STRING = 'body_as_string';
+    const PROGRESS = 'progress';
+    const DEBUG = 'debug';
+
+    /** @var Collection Curl options */
+    protected $options;
+
+    /** @var resource Curl resource handle */
+    protected $handle;
+
+    /** @var int CURLE_* error */
+    protected $errorNo = CURLE_OK;
+
+    /**
+     * Factory method to create a new curl handle based on an HTTP request.
+     *
+     * There are some helpful options you can set to enable specific behavior:
+     * - debug:    Set to true to enable cURL debug functionality to track the actual headers sent over the wire.
+     * - progress: Set to true to enable progress function callbacks.
+     *
+     * @param RequestInterface $request Request
+     *
+     * @return CurlHandle
+     * @throws RuntimeException
+     */
+    public static function factory(RequestInterface $request)
+    {
+        $requestCurlOptions = $request->getCurlOptions();
+        $mediator = new RequestMediator($request, $requestCurlOptions->get('emit_io'));
+        $tempContentLength = null;
+        $method = $request->getMethod();
+        $bodyAsString = $requestCurlOptions->get(self::BODY_AS_STRING);
+
+        // Array of default cURL options.
+        $curlOptions = array(
+            CURLOPT_URL            => $request->getUrl(),
+            CURLOPT_CONNECTTIMEOUT => 150,
+            CURLOPT_RETURNTRANSFER => false,
+            CURLOPT_HEADER         => false,
+            CURLOPT_PORT           => $request->getPort(),
+            CURLOPT_HTTPHEADER     => array(),
+            CURLOPT_WRITEFUNCTION  => array($mediator, 'writeResponseBody'),
+            CURLOPT_HEADERFUNCTION => array($mediator, 'receiveResponseHeader'),
+            CURLOPT_HTTP_VERSION   => $request->getProtocolVersion() === '1.0'
+                ? CURL_HTTP_VERSION_1_0 : CURL_HTTP_VERSION_1_1,
+            // Verifies the authenticity of the peer's certificate
+            CURLOPT_SSL_VERIFYPEER => 1,
+            // Certificate must indicate that the server is the server to which you meant to connect
+            CURLOPT_SSL_VERIFYHOST => 2
+        );
+
+        if (defined('CURLOPT_PROTOCOLS')) {
+            // Allow only HTTP and HTTPS protocols
+            $curlOptions[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+        // Add CURLOPT_ENCODING if Accept-Encoding header is provided
+        if ($acceptEncodingHeader = $request->getHeader('Accept-Encoding')) {
+            $curlOptions[CURLOPT_ENCODING] = (string) $acceptEncodingHeader;
+            // Let cURL set the Accept-Encoding header, prevents duplicate values
+            $request->removeHeader('Accept-Encoding');
+        }
+
+        // Enable curl debug information if the 'debug' param was set
+        if ($requestCurlOptions->get('debug')) {
+            $curlOptions[CURLOPT_STDERR] = fopen('php://temp', 'r+');
+            // @codeCoverageIgnoreStart
+            if (false === $curlOptions[CURLOPT_STDERR]) {
+                throw new RuntimeException('Unable to create a stream for CURLOPT_STDERR');
+            }
+            // @codeCoverageIgnoreEnd
+            $curlOptions[CURLOPT_VERBOSE] = true;
+        }
+
+        // Specify settings according to the HTTP method
+        if ($method == 'GET') {
+            $curlOptions[CURLOPT_HTTPGET] = true;
+        } elseif ($method == 'HEAD') {
+            $curlOptions[CURLOPT_NOBODY] = true;
+            // HEAD requests do not use a write function
+            unset($curlOptions[CURLOPT_WRITEFUNCTION]);
+        } elseif (!($request instanceof EntityEnclosingRequest)) {
+            $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
+        } else {
+
+            $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
+
+            // Handle sending raw bodies in a request
+            if ($request->getBody()) {
+                // You can send the body as a string using curl's CURLOPT_POSTFIELDS
+                if ($bodyAsString) {
+                    $curlOptions[CURLOPT_POSTFIELDS] = (string) $request->getBody();
+                    // Allow curl to add the Content-Length for us to account for the times when
+                    // POST redirects are followed by GET requests
+                    if ($tempContentLength = $request->getHeader('Content-Length')) {
+                        $tempContentLength = (int) (string) $tempContentLength;
+                    }
+                    // Remove the curl generated Content-Type header if none was set manually
+                    if (!$request->hasHeader('Content-Type')) {
+                        $curlOptions[CURLOPT_HTTPHEADER][] = 'Content-Type:';
+                    }
+                } else {
+                    $curlOptions[CURLOPT_UPLOAD] = true;
+                    // Let cURL handle setting the Content-Length header
+                    if ($tempContentLength = $request->getHeader('Content-Length')) {
+                        $tempContentLength = (int) (string) $tempContentLength;
+                        $curlOptions[CURLOPT_INFILESIZE] = $tempContentLength;
+                    }
+                    // Add a callback for curl to read data to send with the request only if a body was specified
+                    $curlOptions[CURLOPT_READFUNCTION] = array($mediator, 'readRequestBody');
+                    // Attempt to seek to the start of the stream
+                    $request->getBody()->seek(0);
+                }
+
+            } else {
+
+                // Special handling for POST specific fields and files
+                $postFields = false;
+                if (count($request->getPostFiles())) {
+                    $postFields = $request->getPostFields()->useUrlEncoding(false)->urlEncode();
+                    foreach ($request->getPostFiles() as $key => $data) {
+                        $prefixKeys = count($data) > 1;
+                        foreach ($data as $index => $file) {
+                            // Allow multiple files in the same key
+                            $fieldKey = $prefixKeys ? "{$key}[{$index}]" : $key;
+                            $postFields[$fieldKey] = $file->getCurlValue();
+                        }
+                    }
+                } elseif (count($request->getPostFields())) {
+                    $postFields = (string) $request->getPostFields()->useUrlEncoding(true);
+                }
+
+                if ($postFields !== false) {
+                    if ($method == 'POST') {
+                        unset($curlOptions[CURLOPT_CUSTOMREQUEST]);
+                        $curlOptions[CURLOPT_POST] = true;
+                    }
+                    $curlOptions[CURLOPT_POSTFIELDS] = $postFields;
+                    $request->removeHeader('Content-Length');
+                }
+            }
+
+            // If the Expect header is not present, prevent curl from adding it
+            if (!$request->hasHeader('Expect')) {
+                $curlOptions[CURLOPT_HTTPHEADER][] = 'Expect:';
+            }
+        }
+
+        // If a Content-Length header was specified but we want to allow curl to set one for us
+        if (null !== $tempContentLength) {
+            $request->removeHeader('Content-Length');
+        }
+
+        // Set custom cURL options
+        foreach ($requestCurlOptions->toArray() as $key => $value) {
+            if (is_numeric($key)) {
+                $curlOptions[$key] = $value;
+            }
+        }
+
+        // Do not set an Accept header by default
+        if (!isset($curlOptions[CURLOPT_ENCODING])) {
+            $curlOptions[CURLOPT_HTTPHEADER][] = 'Accept:';
+        }
+
+        // Add any custom headers to the request. Empty headers will cause curl to not send the header at all.
+        foreach ($request->getHeaderLines() as $line) {
+            $curlOptions[CURLOPT_HTTPHEADER][] = $line;
+        }
+
+        // Add the content-length header back if it was temporarily removed
+        if ($tempContentLength) {
+            $request->setHeader('Content-Length', $tempContentLength);
+        }
+
+        // Apply the options to a new cURL handle.
+        $handle = curl_init();
+
+        // Enable the progress function if the 'progress' param was set
+        if ($requestCurlOptions->get('progress')) {
+            // Wrap the function in a function that provides the curl handle to the mediator's progress function
+            // Using this rather than injecting the handle into the mediator prevents a circular reference
+            $curlOptions[CURLOPT_PROGRESSFUNCTION] = function () use ($mediator, $handle) {
+                $args = func_get_args();
+                $args[] = $handle;
+                call_user_func_array(array($mediator, 'progress'), $args);
+            };
+            $curlOptions[CURLOPT_NOPROGRESS] = false;
+        }
+
+        curl_setopt_array($handle, $curlOptions);
+
+        return new static($handle, $curlOptions);
+    }
+
+    /**
+     * Construct a new CurlHandle object that wraps a cURL handle
+     *
+     * @param resource         $handle  Configured cURL handle resource
+     * @param Collection|array $options Curl options to use with the handle
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct($handle, $options)
+    {
+        if (!is_resource($handle)) {
+            throw new InvalidArgumentException('Invalid handle provided');
+        }
+        if (is_array($options)) {
+            $this->options = new Collection($options);
+        } elseif ($options instanceof Collection) {
+            $this->options = $options;
+        } else {
+            throw new InvalidArgumentException('Expected array or Collection');
+        }
+        $this->handle = $handle;
+    }
+
+    /**
+     * Destructor
+     */
+    public function __destruct()
+    {
+        $this->close();
+    }
+
+    /**
+     * Close the curl handle
+     */
+    public function close()
+    {
+        if (is_resource($this->handle)) {
+            curl_close($this->handle);
+        }
+        $this->handle = null;
+    }
+
+    /**
+     * Check if the handle is available and still OK
+     *
+     * @return bool
+     */
+    public function isAvailable()
+    {
+        return is_resource($this->handle);
+    }
+
+    /**
+     * Get the last error that occurred on the cURL handle
+     *
+     * @return string
+     */
+    public function getError()
+    {
+        return $this->isAvailable() ? curl_error($this->handle) : '';
+    }
+
+    /**
+     * Get the last error number that occurred on the cURL handle
+     *
+     * @return int
+     */
+    public function getErrorNo()
+    {
+        if ($this->errorNo) {
+            return $this->errorNo;
+        }
+
+        return $this->isAvailable() ? curl_errno($this->handle) : CURLE_OK;
+    }
+
+    /**
+     * Set the curl error number
+     *
+     * @param int $error Error number to set
+     *
+     * @return CurlHandle
+     */
+    public function setErrorNo($error)
+    {
+        $this->errorNo = $error;
+
+        return $this;
+    }
+
+    /**
+     * Get cURL curl_getinfo data
+     *
+     * @param int $option Option to retrieve. Pass null to retrieve all data as an array.
+     *
+     * @return array|mixed
+     */
+    public function getInfo($option = null)
+    {
+        if (!is_resource($this->handle)) {
+            return null;
+        }
+
+        if (null !== $option) {
+            return curl_getinfo($this->handle, $option) ?: null;
+        }
+
+        return curl_getinfo($this->handle) ?: array();
+    }
+
+    /**
+     * Get the stderr output
+     *
+     * @param bool $asResource Set to TRUE to get an fopen resource
+     *
+     * @return string|resource|null
+     */
+    public function getStderr($asResource = false)
+    {
+        $stderr = $this->getOptions()->get(CURLOPT_STDERR);
+        if (!$stderr) {
+            return null;
+        }
+
+        if ($asResource) {
+            return $stderr;
+        }
+
+        fseek($stderr, 0);
+        $e = stream_get_contents($stderr);
+        fseek($stderr, 0, SEEK_END);
+
+        return $e;
+    }
+
+    /**
+     * Get the URL that this handle is connecting to
+     *
+     * @return Url
+     */
+    public function getUrl()
+    {
+        return Url::factory($this->options->get(CURLOPT_URL));
+    }
+
+    /**
+     * Get the wrapped curl handle
+     *
+     * @return resource|null Returns the cURL handle or null if it was closed
+     */
+    public function getHandle()
+    {
+        return $this->isAvailable() ? $this->handle : null;
+    }
+
+    /**
+     * Get the cURL setopt options of the handle. Changing values in the return object will have no effect on the curl
+     * handle after it is created.
+     *
+     * @return Collection
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * Update a request based on the log messages of the CurlHandle
+     *
+     * @param RequestInterface $request Request to update
+     */
+    public function updateRequestFromTransfer(RequestInterface $request)
+    {
+        if (!$request->getResponse()) {
+            return;
+        }
+
+        // Update the transfer stats of the response
+        $request->getResponse()->setInfo($this->getInfo());
+
+        if (!$log = $this->getStderr(true)) {
+            return;
+        }
+
+        // Parse the cURL stderr output for outgoing requests
+        $headers = '';
+        fseek($log, 0);
+        while (($line = fgets($log)) !== false) {
+            if ($line && $line[0] == '>') {
+                $headers = substr(trim($line), 2) . "\r\n";
+                while (($line = fgets($log)) !== false) {
+                    if ($line[0] == '*' || $line[0] == '<') {
+                        break;
+                    } else {
+                        $headers .= trim($line) . "\r\n";
+                    }
+                }
+            }
+        }
+
+        // Add request headers to the request exactly as they were sent
+        if ($headers) {
+            $parsed = ParserRegistry::getInstance()->getParser('message')->parseRequest($headers);
+            if (!empty($parsed['headers'])) {
+                $request->setHeaders(array());
+                foreach ($parsed['headers'] as $name => $value) {
+                    $request->setHeader($name, $value);
+                }
+            }
+            if (!empty($parsed['version'])) {
+                $request->setProtocolVersion($parsed['version']);
+            }
+        }
+    }
+
+    /**
+     * Parse the config and replace curl.* configurators into the constant based values so it can be used elsewhere
+     *
+     * @param array|Collection $config The configuration we want to parse
+     *
+     * @return array
+     */
+    public static function parseCurlConfig($config)
+    {
+        $curlOptions = array();
+        foreach ($config as $key => $value) {
+            if (is_string($key) && defined($key)) {
+                // Convert constants represented as string to constant int values
+                $key = constant($key);
+            }
+            if (is_string($value) && defined($value)) {
+                $value = constant($value);
+            }
+            $curlOptions[$key] = $value;
+        }
+
+        return $curlOptions;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMulti.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMulti.php
new file mode 100644
index 0000000000000000000000000000000000000000..a8c569984d2a08a567869aee29085478f83b0ef2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMulti.php
@@ -0,0 +1,390 @@
+<?php
+
+namespace Guzzle\Http\Curl;
+
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Common\Event;
+use Guzzle\Http\Exception\MultiTransferException;
+use Guzzle\Http\Exception\CurlException;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Send {@see RequestInterface} objects in parallel using curl_multi
+ */
+class CurlMulti extends AbstractHasDispatcher implements CurlMultiInterface
+{
+    /** @var resource cURL multi handle. */
+    protected $multiHandle;
+
+    /** @var array Attached {@see RequestInterface} objects. */
+    protected $requests;
+
+    /** @var \SplObjectStorage RequestInterface to CurlHandle hash */
+    protected $handles;
+
+    /** @var array Hash mapping curl handle resource IDs to request objects */
+    protected $resourceHash;
+
+    /** @var array Queued exceptions */
+    protected $exceptions = array();
+
+    /** @var array Requests that succeeded */
+    protected $successful = array();
+
+    /** @var array cURL multi error values and codes */
+    protected $multiErrors = array(
+        CURLM_BAD_HANDLE      => array('CURLM_BAD_HANDLE', 'The passed-in handle is not a valid CURLM handle.'),
+        CURLM_BAD_EASY_HANDLE => array('CURLM_BAD_EASY_HANDLE', "An easy handle was not good/valid. It could mean that it isn't an easy handle at all, or possibly that the handle already is in used by this or another multi handle."),
+        CURLM_OUT_OF_MEMORY   => array('CURLM_OUT_OF_MEMORY', 'You are doomed.'),
+        CURLM_INTERNAL_ERROR  => array('CURLM_INTERNAL_ERROR', 'This can only be returned if libcurl bugs. Please report it to us!')
+    );
+
+    public function __construct()
+    {
+        $this->multiHandle = curl_multi_init();
+        // @codeCoverageIgnoreStart
+        if ($this->multiHandle === false) {
+            throw new CurlException('Unable to create multi handle');
+        }
+        // @codeCoverageIgnoreEnd
+        $this->reset();
+    }
+
+    public function __destruct()
+    {
+        if (is_resource($this->multiHandle)) {
+            curl_multi_close($this->multiHandle);
+        }
+    }
+
+    public function add(RequestInterface $request)
+    {
+        $this->requests[] = $request;
+        // If requests are currently transferring and this is async, then the
+        // request must be prepared now as the send() method is not called.
+        $this->beforeSend($request);
+        $this->dispatch(self::ADD_REQUEST, array('request' => $request));
+
+        return $this;
+    }
+
+    public function all()
+    {
+        return $this->requests;
+    }
+
+    public function remove(RequestInterface $request)
+    {
+        $this->removeHandle($request);
+        foreach ($this->requests as $i => $r) {
+            if ($request === $r) {
+                unset($this->requests[$i]);
+                $this->requests = array_values($this->requests);
+                $this->dispatch(self::REMOVE_REQUEST, array('request' => $request));
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function reset($hard = false)
+    {
+        // Remove each request
+        if ($this->requests) {
+            foreach ($this->requests as $request) {
+                $this->remove($request);
+            }
+        }
+
+        $this->handles = new \SplObjectStorage();
+        $this->requests = $this->resourceHash = $this->exceptions = $this->successful = array();
+    }
+
+    public function send()
+    {
+        $this->perform();
+        $exceptions = $this->exceptions;
+        $successful = $this->successful;
+        $this->reset();
+
+        if ($exceptions) {
+            $this->throwMultiException($exceptions, $successful);
+        }
+    }
+
+    public function count()
+    {
+        return count($this->requests);
+    }
+
+    /**
+     * Build and throw a MultiTransferException
+     *
+     * @param array $exceptions Exceptions encountered
+     * @param array $successful Successful requests
+     * @throws MultiTransferException
+     */
+    protected function throwMultiException(array $exceptions, array $successful)
+    {
+        $multiException = new MultiTransferException('Errors during multi transfer');
+
+        while ($e = array_shift($exceptions)) {
+            $multiException->add($e['exception']);
+            $multiException->addFailedRequest($e['request']);
+        }
+
+        // Add successful requests
+        foreach ($successful as $request) {
+            if (!$multiException->containsRequest($request)) {
+                $multiException->addSuccessfulRequest($request);
+            }
+        }
+
+        throw $multiException;
+    }
+
+    /**
+     * Prepare for sending
+     *
+     * @param RequestInterface $request Request to prepare
+     * @throws \Exception on error preparing the request
+     */
+    protected function beforeSend(RequestInterface $request)
+    {
+        try {
+            $state = $request->setState(RequestInterface::STATE_TRANSFER);
+            if ($state == RequestInterface::STATE_TRANSFER) {
+                // Add the request curl handle to the multi handle
+                $this->checkCurlResult(curl_multi_add_handle($this->multiHandle, $this->createCurlHandle($request)->getHandle()));
+            } else {
+                // Requests might decide they don't need to be sent just before transfer (e.g. CachePlugin)
+                $this->remove($request);
+                if ($state == RequestInterface::STATE_COMPLETE) {
+                    $this->successful[] = $request;
+                }
+            }
+        } catch (\Exception $e) {
+            // Queue the exception to be thrown when sent
+            $this->removeErroredRequest($request, $e);
+        }
+    }
+
+    /**
+     * Create a curl handle for a request
+     *
+     * @param RequestInterface $request Request
+     *
+     * @return CurlHandle
+     */
+    protected function createCurlHandle(RequestInterface $request)
+    {
+        $wrapper = CurlHandle::factory($request);
+        $this->handles[$request] = $wrapper;
+        $this->resourceHash[(int) $wrapper->getHandle()] = $request;
+
+        return $wrapper;
+    }
+
+    /**
+     * Get the data from the multi handle
+     */
+    protected function perform()
+    {
+        if (!$this->requests) {
+            return;
+        }
+
+        // Initialize the handles with a very quick select timeout
+        $active = $mrc = null;
+        $this->executeHandles($active, $mrc, 0.001);
+        $event = new Event(array('curl_multi' => $this));
+        $this->processMessages();
+
+        while ($this->requests) {
+
+            // Notify each request as polling
+            $blocking = $total = 0;
+            foreach ($this->requests as $request) {
+                ++$total;
+                $event['request'] = $request;
+                $request->getEventDispatcher()->dispatch(self::POLLING_REQUEST, $event);
+                // The blocking variable just has to be non-falsey to block the loop
+                if ($request->getParams()->hasKey(self::BLOCKING)) {
+                    ++$blocking;
+                }
+            }
+
+            if ($blocking == $total) {
+                // Sleep to prevent eating CPU because no requests are actually pending a select call
+                usleep(500);
+            } else {
+                do {
+                    $this->executeHandles($active, $mrc, 1);
+                } while ($active);
+            }
+            $this->processMessages();
+        }
+    }
+
+    /**
+     * Process any received curl multi messages
+     */
+    private function processMessages()
+    {
+        // Get messages from curl handles
+        while ($done = curl_multi_info_read($this->multiHandle)) {
+            try {
+                $request = $this->resourceHash[(int) $done['handle']];
+                $this->processResponse($request, $this->handles[$request], $done);
+                $this->successful[] = $request;
+            } catch (MultiTransferException $e) {
+                $this->removeErroredRequest($request, $e, false);
+                throw $e;
+            } catch (\Exception $e) {
+                $this->removeErroredRequest($request, $e);
+            }
+        }
+    }
+
+    /**
+     * Execute and select curl handles until there is activity
+     *
+     * @param int $active  Active value to update
+     * @param int $mrc     Multi result value to update
+     * @param int $timeout Select timeout in seconds
+     */
+    private function executeHandles(&$active, &$mrc, $timeout = 1)
+    {
+        do {
+            $mrc = curl_multi_exec($this->multiHandle, $active);
+        } while ($mrc == CURLM_CALL_MULTI_PERFORM && $active);
+        $this->checkCurlResult($mrc);
+
+        // @codeCoverageIgnoreStart
+        // Select the curl handles until there is any activity on any of the open file descriptors
+        // See https://github.com/php/php-src/blob/master/ext/curl/multi.c#L170
+        if ($active && $mrc == CURLM_OK && curl_multi_select($this->multiHandle, $timeout) == -1) {
+            // Perform a usleep if a previously executed select returned -1
+            // @see https://bugs.php.net/bug.php?id=61141
+            usleep(100);
+        }
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * Remove a request that encountered an exception
+     *
+     * @param RequestInterface $request Request to remove
+     * @param \Exception       $e       Exception encountered
+     * @param bool             $buffer  Set to false to not buffer the exception
+     */
+    protected function removeErroredRequest(RequestInterface $request, \Exception $e = null, $buffer = true)
+    {
+        if ($buffer) {
+            $this->exceptions[] = array('request' => $request, 'exception' => $e);
+        }
+
+        $this->remove($request);
+        $this->dispatch(self::MULTI_EXCEPTION, array('exception' => $e, 'all_exceptions' => $this->exceptions));
+    }
+
+    /**
+     * Check for errors and fix headers of a request based on a curl response
+     *
+     * @param RequestInterface $request Request to process
+     * @param CurlHandle       $handle  Curl handle object
+     * @param array            $curl    Array returned from curl_multi_info_read
+     *
+     * @throws CurlException on Curl error
+     */
+    protected function processResponse(RequestInterface $request, CurlHandle $handle, array $curl)
+    {
+        // Set the transfer stats on the response
+        $handle->updateRequestFromTransfer($request);
+        // Check if a cURL exception occurred, and if so, notify things
+        $curlException = $this->isCurlException($request, $handle, $curl);
+
+        // Always remove completed curl handles.  They can be added back again
+        // via events if needed (e.g. ExponentialBackoffPlugin)
+        $this->removeHandle($request);
+
+        if (!$curlException) {
+            $state = $request->setState(RequestInterface::STATE_COMPLETE, array('handle' => $handle));
+            // Only remove the request if it wasn't resent as a result of the state change
+            if ($state != RequestInterface::STATE_TRANSFER) {
+                $this->remove($request);
+            }
+        } else {
+            // Set the state of the request to an error
+            $state = $request->setState(RequestInterface::STATE_ERROR, array('exception' => $curlException));
+            // Allow things to ignore the error if possible
+            if ($state != RequestInterface::STATE_TRANSFER) {
+                $this->remove($request);
+            }
+            // The error was not handled, so fail
+            if ($state == RequestInterface::STATE_ERROR) {
+                /** @var CurlException $curlException */
+                throw $curlException;
+            }
+        }
+    }
+
+    /**
+     * Remove a curl handle from the curl multi object
+     *
+     * @param RequestInterface $request Request that owns the handle
+     */
+    protected function removeHandle(RequestInterface $request)
+    {
+        if (isset($this->handles[$request])) {
+            $handle = $this->handles[$request];
+            unset($this->handles[$request]);
+            unset($this->resourceHash[(int) $handle->getHandle()]);
+            curl_multi_remove_handle($this->multiHandle, $handle->getHandle());
+            $handle->close();
+        }
+    }
+
+    /**
+     * Check if a cURL transfer resulted in what should be an exception
+     *
+     * @param RequestInterface $request Request to check
+     * @param CurlHandle       $handle  Curl handle object
+     * @param array            $curl    Array returned from curl_multi_info_read
+     *
+     * @return CurlException|bool
+     */
+    private function isCurlException(RequestInterface $request, CurlHandle $handle, array $curl)
+    {
+        if (CURLM_OK == $curl['result'] || CURLM_CALL_MULTI_PERFORM == $curl['result']) {
+            return false;
+        }
+
+        $handle->setErrorNo($curl['result']);
+        $e = new CurlException(sprintf('[curl] %s: %s [url] %s',
+            $handle->getErrorNo(), $handle->getError(), $handle->getUrl()));
+        $e->setCurlHandle($handle)
+            ->setRequest($request)
+            ->setCurlInfo($handle->getInfo())
+            ->setError($handle->getError(), $handle->getErrorNo());
+
+        return $e;
+    }
+
+    /**
+     * Throw an exception for a cURL multi response if needed
+     *
+     * @param int $code Curl response code
+     * @throws CurlException
+     */
+    private function checkCurlResult($code)
+    {
+        if ($code != CURLM_OK && $code != CURLM_CALL_MULTI_PERFORM) {
+            throw new CurlException(isset($this->multiErrors[$code])
+                ? "cURL error: {$code} ({$this->multiErrors[$code][0]}): cURL message: {$this->multiErrors[$code][1]}"
+                : 'Unexpected cURL error: ' . $code
+            );
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMultiInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMultiInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ead7573502be73f53fe96851d3ac8ac538f81e7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMultiInterface.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Guzzle\Http\Curl;
+
+use Guzzle\Common\HasDispatcherInterface;
+use Guzzle\Common\Exception\ExceptionCollection;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Interface for sending a pool of {@see RequestInterface} objects in parallel
+ */
+interface CurlMultiInterface extends \Countable, HasDispatcherInterface
+{
+    const POLLING_REQUEST = 'curl_multi.polling_request';
+    const ADD_REQUEST = 'curl_multi.add_request';
+    const REMOVE_REQUEST = 'curl_multi.remove_request';
+    const MULTI_EXCEPTION = 'curl_multi.exception';
+    const BLOCKING = 'curl_multi.blocking';
+
+    /**
+     * Add a request to the pool.
+     *
+     * @param RequestInterface $request Request to add
+     *
+     * @return CurlMultiInterface
+     */
+    public function add(RequestInterface $request);
+
+    /**
+     * Get an array of attached {@see RequestInterface} objects
+     *
+     * @return array
+     */
+    public function all();
+
+    /**
+     * Remove a request from the pool.
+     *
+     * @param RequestInterface $request Request to remove
+     *
+     * @return bool Returns true on success or false on failure
+     */
+    public function remove(RequestInterface $request);
+
+    /**
+     * Reset the state and remove any attached RequestInterface objects
+     *
+     * @param bool $hard Set to true to close and reopen any open multi handles
+     */
+    public function reset($hard = false);
+
+    /**
+     * Send a pool of {@see RequestInterface} requests.
+     *
+     * @throws ExceptionCollection if any requests threw exceptions during the transfer.
+     */
+    public function send();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMultiProxy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMultiProxy.php
new file mode 100644
index 0000000000000000000000000000000000000000..665f029a79d9b841bc2d1addd34f2932c52b2332
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlMultiProxy.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace Guzzle\Http\Curl;
+
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Proxies requests and connections to a pool of internal curl_multi handles. Each recursive call will add requests
+ * to the next available CurlMulti handle.
+ */
+class CurlMultiProxy extends AbstractHasDispatcher implements CurlMultiInterface
+{
+    protected $handles = array();
+    protected $groups = array();
+    protected $queued = array();
+    protected $maxHandles;
+
+    /**
+     * @param int $maxHandles The maximum number of idle CurlMulti handles to allow to remain open
+     */
+    public function __construct($maxHandles = 3)
+    {
+        $this->maxHandles = $maxHandles;
+        // You can get some weird "Too many open files" errors when sending a large amount of requests in parallel.
+        // These two statements autoload classes before a system runs out of file descriptors so that you can get back
+        // valuable error messages if you run out.
+        class_exists('Guzzle\Http\Message\Response');
+        class_exists('Guzzle\Http\Exception\CurlException');
+    }
+
+    public function add(RequestInterface $request)
+    {
+        $this->queued[] = $request;
+
+        return $this;
+    }
+
+    public function all()
+    {
+        $requests = $this->queued;
+        foreach ($this->handles as $handle) {
+            $requests = array_merge($requests, $handle->all());
+        }
+
+        return $requests;
+    }
+
+    public function remove(RequestInterface $request)
+    {
+        foreach ($this->queued as $i => $r) {
+            if ($request === $r) {
+                unset($this->queued[$i]);
+                return true;
+            }
+        }
+
+        foreach ($this->handles as $handle) {
+            if ($handle->remove($request)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public function reset($hard = false)
+    {
+        $this->queued = array();
+        $this->groups = array();
+        foreach ($this->handles as $handle) {
+            $handle->reset();
+        }
+        if ($hard) {
+            $this->handles = array();
+        }
+
+        return $this;
+    }
+
+    public function send()
+    {
+        if ($this->queued) {
+            $group = $this->getAvailableHandle();
+            // Add this handle to a list of handles than is claimed
+            $this->groups[] = $group;
+            while ($request = array_shift($this->queued)) {
+                $group->add($request);
+            }
+            try {
+                $group->send();
+                array_pop($this->groups);
+                $this->cleanupHandles();
+            } catch (\Exception $e) {
+                // Remove the group and cleanup if an exception was encountered and no more requests in group
+                if (!$group->count()) {
+                    array_pop($this->groups);
+                    $this->cleanupHandles();
+                }
+                throw $e;
+            }
+        }
+    }
+
+    public function count()
+    {
+        return count($this->all());
+    }
+
+    /**
+     * Get an existing available CurlMulti handle or create a new one
+     *
+     * @return CurlMulti
+     */
+    protected function getAvailableHandle()
+    {
+        // Grab a handle that is not claimed
+        foreach ($this->handles as $h) {
+            if (!in_array($h, $this->groups, true)) {
+                return $h;
+            }
+        }
+
+        // All are claimed, so create one
+        $handle = new CurlMulti();
+        $handle->setEventDispatcher($this->getEventDispatcher());
+        $this->handles[] = $handle;
+
+        return $handle;
+    }
+
+    /**
+     * Trims down unused CurlMulti handles to limit the number of open connections
+     */
+    protected function cleanupHandles()
+    {
+        if ($diff = max(0, count($this->handles) - $this->maxHandles)) {
+            for ($i = count($this->handles) - 1; $i > 0 && $diff > 0; $i--) {
+                if (!count($this->handles[$i])) {
+                    unset($this->handles[$i]);
+                    $diff--;
+                }
+            }
+            $this->handles = array_values($this->handles);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlVersion.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlVersion.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3f99dd25dd8efc625154ab42d1814a7f5fe67d7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/CurlVersion.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Guzzle\Http\Curl;
+
+/**
+ * Class used for querying curl_version data
+ */
+class CurlVersion
+{
+    /** @var array curl_version() information */
+    protected $version;
+
+    /** @var CurlVersion */
+    protected static $instance;
+
+    /** @var string Default user agent */
+    protected $userAgent;
+
+    /**
+     * @return CurlVersion
+     */
+    public static function getInstance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get all of the curl_version() data
+     *
+     * @return array
+     */
+    public function getAll()
+    {
+        if (!$this->version) {
+            $this->version = curl_version();
+        }
+
+        return $this->version;
+    }
+
+    /**
+     * Get a specific type of curl information
+     *
+     * @param string $type Version information to retrieve. This value is one of:
+     *     - version_number:     cURL 24 bit version number
+     *     - version:            cURL version number, as a string
+     *     - ssl_version_number: OpenSSL 24 bit version number
+     *     - ssl_version:        OpenSSL version number, as a string
+     *     - libz_version:       zlib version number, as a string
+     *     - host:               Information about the host where cURL was built
+     *     - features:           A bitmask of the CURL_VERSION_XXX constants
+     *     - protocols:          An array of protocols names supported by cURL
+     *
+     * @return string|float|bool if the $type is found, and false if not found
+     */
+    public function get($type)
+    {
+        $version = $this->getAll();
+
+        return isset($version[$type]) ? $version[$type] : false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/RequestMediator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/RequestMediator.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a70c626bf05e22cedf36e04852abf758908e3b1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Curl/RequestMediator.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace Guzzle\Http\Curl;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Mediator between curl handles and request objects
+ */
+class RequestMediator
+{
+    /** @var RequestInterface */
+    protected $request;
+
+    /** @var bool Whether or not to emit read/write events */
+    protected $emitIo;
+
+    /**
+     * @param RequestInterface $request Request to mediate
+     * @param bool             $emitIo  Set to true to dispatch events on input and output
+     */
+    public function __construct(RequestInterface $request, $emitIo = false)
+    {
+        $this->request = $request;
+        $this->emitIo = $emitIo;
+    }
+
+    /**
+     * Receive a response header from curl
+     *
+     * @param resource $curl   Curl handle
+     * @param string   $header Received header
+     *
+     * @return int
+     */
+    public function receiveResponseHeader($curl, $header)
+    {
+        static $normalize = array("\r", "\n");
+        $length = strlen($header);
+        $header = str_replace($normalize, '', $header);
+
+        if (strpos($header, 'HTTP/') === 0) {
+
+            $startLine = explode(' ', $header, 3);
+            $code = $startLine[1];
+            $status = isset($startLine[2]) ? $startLine[2] : '';
+
+            // Only download the body of the response to the specified response
+            // body when a successful response is received.
+            if ($code >= 200 && $code < 300) {
+                $body = $this->request->getResponseBody();
+            } else {
+                $body = EntityBody::factory();
+            }
+
+            $response = new Response($code, null, $body);
+            $response->setStatus($code, $status);
+            $this->request->startResponse($response);
+
+            $this->request->dispatch('request.receive.status_line', array(
+                'request'       => $this,
+                'line'          => $header,
+                'status_code'   => $code,
+                'reason_phrase' => $status
+            ));
+
+        } elseif ($pos = strpos($header, ':')) {
+            $this->request->getResponse()->addHeader(
+                trim(substr($header, 0, $pos)),
+                trim(substr($header, $pos + 1))
+            );
+        }
+
+        return $length;
+    }
+
+    /**
+     * Received a progress notification
+     *
+     * @param int        $downloadSize Total download size
+     * @param int        $downloaded   Amount of bytes downloaded
+     * @param int        $uploadSize   Total upload size
+     * @param int        $uploaded     Amount of bytes uploaded
+     * @param resource   $handle       CurlHandle object
+     */
+    public function progress($downloadSize, $downloaded, $uploadSize, $uploaded, $handle = null)
+    {
+        $this->request->dispatch('curl.callback.progress', array(
+            'request'       => $this->request,
+            'handle'        => $handle,
+            'download_size' => $downloadSize,
+            'downloaded'    => $downloaded,
+            'upload_size'   => $uploadSize,
+            'uploaded'      => $uploaded
+        ));
+    }
+
+    /**
+     * Write data to the response body of a request
+     *
+     * @param resource $curl  Curl handle
+     * @param string   $write Data that was received
+     *
+     * @return int
+     */
+    public function writeResponseBody($curl, $write)
+    {
+        if ($this->emitIo) {
+            $this->request->dispatch('curl.callback.write', array(
+                'request' => $this->request,
+                'write'   => $write
+            ));
+        }
+
+        return $this->request->getResponse()->getBody()->write($write);
+    }
+
+    /**
+     * Read data from the request body and send it to curl
+     *
+     * @param resource $ch     Curl handle
+     * @param resource $fd     File descriptor
+     * @param int      $length Amount of data to read
+     *
+     * @return string
+     */
+    public function readRequestBody($ch, $fd, $length)
+    {
+        $read = '';
+
+        if ($this->request->getBody()) {
+            $read = $this->request->getBody()->read($length);
+            if ($this->emitIo) {
+                $this->request->dispatch('curl.callback.read', array(
+                    'request' => $this->request,
+                    'read'    => $read
+                ));
+            }
+        }
+
+        return !$read ? '' : $read;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/EntityBody.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/EntityBody.php
new file mode 100644
index 0000000000000000000000000000000000000000..625be6ee173d953f291e25abd1b589afa7e31de4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/EntityBody.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\Version;
+use Guzzle\Stream\Stream;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Mimetypes;
+
+/**
+ * Entity body used with an HTTP request or response
+ */
+class EntityBody extends Stream implements EntityBodyInterface
+{
+    /** @var bool Content-Encoding of the entity body if known */
+    protected $contentEncoding = false;
+
+    /** @var callable Method to invoke for rewinding a stream */
+    protected $rewindFunction;
+
+    /**
+     * Create a new EntityBody based on the input type
+     *
+     * @param resource|string|EntityBody $resource Entity body data
+     * @param int                        $size     Size of the data contained in the resource
+     *
+     * @return EntityBody
+     * @throws InvalidArgumentException if the $resource arg is not a resource or string
+     */
+    public static function factory($resource = '', $size = null)
+    {
+        if ($resource instanceof EntityBodyInterface) {
+            return $resource;
+        }
+
+        switch (gettype($resource)) {
+            case 'string':
+                return self::fromString($resource);
+            case 'resource':
+                return new static($resource, $size);
+            case 'object':
+                if (method_exists($resource, '__toString')) {
+                    return self::fromString((string) $resource);
+                }
+                break;
+            case 'array':
+                return self::fromString(http_build_query($resource));
+        }
+
+        throw new InvalidArgumentException('Invalid resource type');
+    }
+
+    public function setRewindFunction($callable)
+    {
+        if (!is_callable($callable)) {
+            throw new InvalidArgumentException('Must specify a callable');
+        }
+
+        $this->rewindFunction = $callable;
+
+        return $this;
+    }
+
+    public function rewind()
+    {
+        return $this->rewindFunction ? call_user_func($this->rewindFunction, $this) : parent::rewind();
+    }
+
+    /**
+     * Create a new EntityBody from a string
+     *
+     * @param string $string String of data
+     *
+     * @return EntityBody
+     */
+    public static function fromString($string)
+    {
+        $stream = fopen('php://temp', 'r+');
+        if ($string !== '') {
+            fwrite($stream, $string);
+            rewind($stream);
+        }
+
+        return new static($stream);
+    }
+
+    public function compress($filter = 'zlib.deflate')
+    {
+        $result = $this->handleCompression($filter);
+        $this->contentEncoding = $result ? $filter : false;
+
+        return $result;
+    }
+
+    public function uncompress($filter = 'zlib.inflate')
+    {
+        $offsetStart = 0;
+
+        // When inflating gzipped data, the first 10 bytes must be stripped
+        // if a gzip header is present
+        if ($filter == 'zlib.inflate') {
+            // @codeCoverageIgnoreStart
+            if (!$this->isReadable() || ($this->isConsumed() && !$this->isSeekable())) {
+                return false;
+            }
+            // @codeCoverageIgnoreEnd
+            if (stream_get_contents($this->stream, 3, 0) === "\x1f\x8b\x08") {
+                $offsetStart = 10;
+            }
+        }
+
+        $this->contentEncoding = false;
+
+        return $this->handleCompression($filter, $offsetStart);
+    }
+
+    public function getContentLength()
+    {
+        return $this->getSize();
+    }
+
+    public function getContentType()
+    {
+        return $this->getUri() ? Mimetypes::getInstance()->fromFilename($this->getUri()) : null;
+    }
+
+    public function getContentMd5($rawOutput = false, $base64Encode = false)
+    {
+        $hash = self::getHash($this, 'md5', $rawOutput);
+
+        return $hash && $base64Encode ? base64_encode($hash) : $hash;
+    }
+
+    /**
+     * Calculate the MD5 hash of an entity body
+     *
+     * @param EntityBodyInterface $body         Entity body to calculate the hash for
+     * @param bool                $rawOutput    Whether or not to use raw output
+     * @param bool                $base64Encode Whether or not to base64 encode raw output (only if raw output is true)
+     *
+     * @return bool|string Returns an MD5 string on success or FALSE on failure
+     * @deprecated This will be deprecated soon
+     * @codeCoverageIgnore
+     */
+    public static function calculateMd5(EntityBodyInterface $body, $rawOutput = false, $base64Encode = false)
+    {
+        Version::warn(__CLASS__ . ' is deprecated. Use getContentMd5()');
+        return $body->getContentMd5($rawOutput, $base64Encode);
+    }
+
+    public function setStreamFilterContentEncoding($streamFilterContentEncoding)
+    {
+        $this->contentEncoding = $streamFilterContentEncoding;
+
+        return $this;
+    }
+
+    public function getContentEncoding()
+    {
+        return strtr($this->contentEncoding, array(
+            'zlib.deflate' => 'gzip',
+            'bzip2.compress' => 'compress'
+        )) ?: false;
+    }
+
+    protected function handleCompression($filter, $offsetStart = 0)
+    {
+        // @codeCoverageIgnoreStart
+        if (!$this->isReadable() || ($this->isConsumed() && !$this->isSeekable())) {
+            return false;
+        }
+        // @codeCoverageIgnoreEnd
+
+        $handle = fopen('php://temp', 'r+');
+        $filter = @stream_filter_append($handle, $filter, STREAM_FILTER_WRITE);
+        if (!$filter) {
+            return false;
+        }
+
+        // Seek to the offset start if possible
+        $this->seek($offsetStart);
+        while ($data = fread($this->stream, 8096)) {
+            fwrite($handle, $data);
+        }
+
+        fclose($this->stream);
+        $this->stream = $handle;
+        stream_filter_remove($filter);
+        $stat = fstat($this->stream);
+        $this->size = $stat['size'];
+        $this->rebuildCache();
+        $this->seek(0);
+
+        // Remove any existing rewind function as the underlying stream has been replaced
+        $this->rewindFunction = null;
+
+        return true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/EntityBodyInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/EntityBodyInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..e640f578501c65b8933144724273b1ed07eb5ee7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/EntityBodyInterface.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Stream\StreamInterface;
+
+/**
+ * Entity body used with an HTTP request or response
+ */
+interface EntityBodyInterface extends StreamInterface
+{
+    /**
+     * Specify a custom callback used to rewind a non-seekable stream. This can be useful entity enclosing requests
+     * that are redirected.
+     *
+     * @param mixed $callable Callable to invoke to rewind a non-seekable stream. The callback must accept an
+     *                        EntityBodyInterface object, perform the rewind if possible, and return a boolean
+     *                        representing whether or not the rewind was successful.
+     * @return self
+     */
+    public function setRewindFunction($callable);
+
+    /**
+     * If the stream is readable, compress the data in the stream using deflate compression. The uncompressed stream is
+     * then closed, and the compressed stream then becomes the wrapped stream.
+     *
+     * @param string $filter Compression filter
+     *
+     * @return bool Returns TRUE on success or FALSE on failure
+     */
+    public function compress($filter = 'zlib.deflate');
+
+    /**
+     * Decompress a deflated string. Once uncompressed, the uncompressed string is then used as the wrapped stream.
+     *
+     * @param string $filter De-compression filter
+     *
+     * @return bool Returns TRUE on success or FALSE on failure
+     */
+    public function uncompress($filter = 'zlib.inflate');
+
+    /**
+     * Get the Content-Length of the entity body if possible (alias of getSize)
+     *
+     * @return int|bool Returns the Content-Length or false on failure
+     */
+    public function getContentLength();
+
+    /**
+     * Guess the Content-Type of a local stream
+     *
+     * @return string|null
+     * @see http://www.php.net/manual/en/function.finfo-open.php
+     */
+    public function getContentType();
+
+    /**
+     * Get an MD5 checksum of the stream's contents
+     *
+     * @param bool $rawOutput    Whether or not to use raw output
+     * @param bool $base64Encode Whether or not to base64 encode raw output (only if raw output is true)
+     *
+     * @return bool|string Returns an MD5 string on success or FALSE on failure
+     */
+    public function getContentMd5($rawOutput = false, $base64Encode = false);
+
+    /**
+     * Get the Content-Encoding of the EntityBody
+     *
+     * @return bool|string
+     */
+    public function getContentEncoding();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/BadResponseException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/BadResponseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b98a8642ba78f02ccd12ff815748bdf47969782
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/BadResponseException.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Http request exception thrown when a bad response is received
+ */
+class BadResponseException extends RequestException
+{
+    /** @var Response */
+    private $response;
+
+    /**
+     * Factory method to create a new response exception based on the response code.
+     *
+     * @param RequestInterface $request  Request
+     * @param Response         $response Response received
+     *
+     * @return BadResponseException
+     */
+    public static function factory(RequestInterface $request, Response $response)
+    {
+        if ($response->isClientError()) {
+            $label = 'Client error response';
+            $class = __NAMESPACE__ . '\\ClientErrorResponseException';
+        } elseif ($response->isServerError()) {
+            $label = 'Server error response';
+            $class = __NAMESPACE__ . '\\ServerErrorResponseException';
+        } else {
+            $label = 'Unsuccessful response';
+            $class = __CLASS__;
+            $e = new self();
+        }
+
+        $message = $label . PHP_EOL . implode(PHP_EOL, array(
+            '[status code] ' . $response->getStatusCode(),
+            '[reason phrase] ' . $response->getReasonPhrase(),
+            '[url] ' . $request->getUrl(),
+        ));
+
+        $e = new $class($message);
+        $e->setResponse($response);
+        $e->setRequest($request);
+
+        return $e;
+    }
+
+    /**
+     * Set the response that caused the exception
+     *
+     * @param Response $response Response to set
+     */
+    public function setResponse(Response $response)
+    {
+        $this->response = $response;
+    }
+
+    /**
+     * Get the response that caused the exception
+     *
+     * @return Response
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/ClientErrorResponseException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/ClientErrorResponseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..04d7ddc05ef03f776caab904712a5e0ced1cefa4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/ClientErrorResponseException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+/**
+ * Exception when a client error is encountered (4xx codes)
+ */
+class ClientErrorResponseException extends BadResponseException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/CouldNotRewindStreamException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/CouldNotRewindStreamException.php
new file mode 100644
index 0000000000000000000000000000000000000000..63e4ec74dec3841a747fb548212b079590bc997e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/CouldNotRewindStreamException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+class CouldNotRewindStreamException extends RuntimeException implements HttpException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/CurlException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/CurlException.php
new file mode 100644
index 0000000000000000000000000000000000000000..a6a744a74bb24e90cb7bc36a2a4b29cc2f3500a0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/CurlException.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+use Guzzle\Http\Curl\CurlHandle;
+
+/**
+ * cURL request exception
+ */
+class CurlException extends RequestException
+{
+    private $curlError;
+    private $curlErrorNo;
+    private $handle;
+    private $curlInfo = array();
+
+    /**
+     * Set the cURL error message
+     *
+     * @param string $error  Curl error
+     * @param int    $number Curl error number
+     *
+     * @return self
+     */
+    public function setError($error, $number)
+    {
+        $this->curlError = $error;
+        $this->curlErrorNo = $number;
+
+        return $this;
+    }
+
+    /**
+     * Set the associated curl handle
+     *
+     * @param CurlHandle $handle Curl handle
+     *
+     * @return self
+     */
+    public function setCurlHandle(CurlHandle $handle)
+    {
+        $this->handle = $handle;
+
+        return $this;
+    }
+
+    /**
+     * Get the associated cURL handle
+     *
+     * @return CurlHandle|null
+     */
+    public function getCurlHandle()
+    {
+        return $this->handle;
+    }
+
+    /**
+     * Get the associated cURL error message
+     *
+     * @return string|null
+     */
+    public function getError()
+    {
+        return $this->curlError;
+    }
+
+    /**
+     * Get the associated cURL error number
+     *
+     * @return int|null
+     */
+    public function getErrorNo()
+    {
+        return $this->curlErrorNo;
+    }
+
+    /**
+     * Returns curl information about the transfer
+     *
+     * @return array
+     */
+    public function getCurlInfo()
+    {
+        return $this->curlInfo;
+    }
+
+    /**
+     * Set curl transfer information
+     *
+     * @param array $info Array of curl transfer information
+     *
+     * @return self
+     * @link http://php.net/manual/en/function.curl-getinfo.php
+     */
+    public function setCurlInfo(array $info)
+    {
+        $this->curlInfo = $info;
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/HttpException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/HttpException.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee87295d36eec2d398217fe832a33d1ac985416d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/HttpException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+use Guzzle\Common\Exception\GuzzleException;
+
+/**
+ * Http exception interface
+ */
+interface HttpException extends GuzzleException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/MultiTransferException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/MultiTransferException.php
new file mode 100644
index 0000000000000000000000000000000000000000..5bea80f3337f1cf35ce495d12d279943265ea4c2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/MultiTransferException.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+use Guzzle\Common\Exception\ExceptionCollection;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Exception encountered during a multi transfer
+ */
+class MultiTransferException extends ExceptionCollection
+{
+    protected $successfulRequests = array();
+    protected $failedRequests = array();
+
+    /**
+     * Get all of the requests in the transfer
+     *
+     * @return array
+     */
+    public function getAllRequests()
+    {
+        return array_merge($this->successfulRequests, $this->failedRequests);
+    }
+
+    /**
+     * Add to the array of successful requests
+     *
+     * @param RequestInterface $request Successful request
+     *
+     * @return self
+     */
+    public function addSuccessfulRequest(RequestInterface $request)
+    {
+        $this->successfulRequests[] = $request;
+
+        return $this;
+    }
+
+    /**
+     * Add to the array of failed requests
+     *
+     * @param RequestInterface $request Failed request
+     *
+     * @return self
+     */
+    public function addFailedRequest(RequestInterface $request)
+    {
+        $this->failedRequests[] = $request;
+
+        return $this;
+    }
+
+    /**
+     * Set all of the successful requests
+     *
+     * @param array Array of requests
+     *
+     * @return self
+     */
+    public function setSuccessfulRequests(array $requests)
+    {
+        $this->successfulRequests = $requests;
+
+        return $this;
+    }
+
+    /**
+     * Set all of the failed requests
+     *
+     * @param array Array of requests
+     *
+     * @return self
+     */
+    public function setFailedRequests(array $requests)
+    {
+        $this->failedRequests = $requests;
+
+        return $this;
+    }
+
+    /**
+     * Get an array of successful requests sent in the multi transfer
+     *
+     * @return array
+     */
+    public function getSuccessfulRequests()
+    {
+        return $this->successfulRequests;
+    }
+
+    /**
+     * Get an array of failed requests sent in the multi transfer
+     *
+     * @return array
+     */
+    public function getFailedRequests()
+    {
+        return $this->failedRequests;
+    }
+
+    /**
+     * Check if the exception object contains a request
+     *
+     * @param RequestInterface $request Request to check
+     *
+     * @return bool
+     */
+    public function containsRequest(RequestInterface $request)
+    {
+        return in_array($request, $this->failedRequests, true) || in_array($request, $this->successfulRequests, true);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/RequestException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/RequestException.php
new file mode 100644
index 0000000000000000000000000000000000000000..274df2cb1673e1b01674521f56262c1ab41688c4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/RequestException.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Http request exception
+ */
+class RequestException extends RuntimeException implements HttpException
+{
+    /** @var RequestInterface */
+    protected $request;
+
+    /**
+     * Set the request that caused the exception
+     *
+     * @param RequestInterface $request Request to set
+     *
+     * @return RequestException
+     */
+    public function setRequest(RequestInterface $request)
+    {
+        $this->request = $request;
+
+        return $this;
+    }
+
+    /**
+     * Get the request that caused the exception
+     *
+     * @return RequestInterface
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/ServerErrorResponseException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/ServerErrorResponseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..f0f7cfe48107a251db887dc163c578bcada46689
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/ServerErrorResponseException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+/**
+ * Exception when a server error is encountered (5xx codes)
+ */
+class ServerErrorResponseException extends BadResponseException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/TooManyRedirectsException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/TooManyRedirectsException.php
new file mode 100644
index 0000000000000000000000000000000000000000..2aa43d11d4fe1f95bdf821c785034b6373e62f4e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Exception/TooManyRedirectsException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Guzzle\Http\Exception;
+
+class TooManyRedirectsException extends BadResponseException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/IoEmittingEntityBody.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/IoEmittingEntityBody.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae32dee90571106e23e704365cd62a31d7b4ab0d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/IoEmittingEntityBody.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\Event;
+use Guzzle\Common\HasDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * EntityBody decorator that emits events for read and write methods
+ */
+class IoEmittingEntityBody extends AbstractEntityBodyDecorator implements HasDispatcherInterface
+{
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+
+    public static function getAllEvents()
+    {
+        return array('body.read', 'body.write');
+    }
+
+    /**
+     * {@inheritdoc}
+     * @codeCoverageIgnore
+     */
+    public function setEventDispatcher(EventDispatcherInterface $eventDispatcher)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+
+        return $this;
+    }
+
+    public function getEventDispatcher()
+    {
+        if (!$this->eventDispatcher) {
+            $this->eventDispatcher = new EventDispatcher();
+        }
+
+        return $this->eventDispatcher;
+    }
+
+    public function dispatch($eventName, array $context = array())
+    {
+        $this->getEventDispatcher()->dispatch($eventName, new Event($context));
+    }
+
+    /**
+     * {@inheritdoc}
+     * @codeCoverageIgnore
+     */
+    public function addSubscriber(EventSubscriberInterface $subscriber)
+    {
+        $this->getEventDispatcher()->addSubscriber($subscriber);
+
+        return $this;
+    }
+
+    public function read($length)
+    {
+        $event = array(
+            'body'   => $this,
+            'length' => $length,
+            'read'   => $this->body->read($length)
+        );
+        $this->dispatch('body.read', $event);
+
+        return $event['read'];
+    }
+
+    public function write($string)
+    {
+        $event = array(
+            'body'   => $this,
+            'write'  => $string,
+            'result' => $this->body->write($string)
+        );
+        $this->dispatch('body.write', $event);
+
+        return $event['result'];
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/AbstractMessage.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/AbstractMessage.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d066ffceb098d7954b70fcda94bbac58fd3e16d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/AbstractMessage.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Version;
+use Guzzle\Common\Collection;
+use Guzzle\Http\Message\Header\HeaderCollection;
+use Guzzle\Http\Message\Header\HeaderFactory;
+use Guzzle\Http\Message\Header\HeaderFactoryInterface;
+use Guzzle\Http\Message\Header\HeaderInterface;
+
+/**
+ * Abstract HTTP request/response message
+ */
+abstract class AbstractMessage implements MessageInterface
+{
+    /** @var array HTTP header collection */
+    protected $headers;
+
+    /** @var HeaderFactoryInterface $headerFactory */
+    protected $headerFactory;
+
+    /** @var Collection Custom message parameters that are extendable by plugins */
+    protected $params;
+
+    /** @var string Message protocol */
+    protected $protocol = 'HTTP';
+
+    /** @var string HTTP protocol version of the message */
+    protected $protocolVersion = '1.1';
+
+    public function __construct()
+    {
+        $this->params = new Collection();
+        $this->headerFactory = new HeaderFactory();
+        $this->headers = new HeaderCollection();
+    }
+
+    /**
+     * Set the header factory to use to create headers
+     *
+     * @param HeaderFactoryInterface $factory
+     *
+     * @return self
+     */
+    public function setHeaderFactory(HeaderFactoryInterface $factory)
+    {
+        $this->headerFactory = $factory;
+
+        return $this;
+    }
+
+    public function getParams()
+    {
+        return $this->params;
+    }
+
+    public function addHeader($header, $value)
+    {
+        if (isset($this->headers[$header])) {
+            $this->headers[$header]->add($value);
+        } elseif ($value instanceof HeaderInterface) {
+            $this->headers[$header] = $value;
+        } else {
+            $this->headers[$header] = $this->headerFactory->createHeader($header, $value);
+        }
+
+        return $this;
+    }
+
+    public function addHeaders(array $headers)
+    {
+        foreach ($headers as $key => $value) {
+            $this->addHeader($key, $value);
+        }
+
+        return $this;
+    }
+
+    public function getHeader($header)
+    {
+        return $this->headers[$header];
+    }
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    public function getHeaderLines()
+    {
+        $headers = array();
+        foreach ($this->headers as $value) {
+            $headers[] = $value->getName() . ': ' . $value;
+        }
+
+        return $headers;
+    }
+
+    public function setHeader($header, $value)
+    {
+        unset($this->headers[$header]);
+        $this->addHeader($header, $value);
+
+        return $this;
+    }
+
+    public function setHeaders(array $headers)
+    {
+        $this->headers->clear();
+        foreach ($headers as $key => $value) {
+            $this->addHeader($key, $value);
+        }
+
+        return $this;
+    }
+
+    public function hasHeader($header)
+    {
+        return isset($this->headers[$header]);
+    }
+
+    public function removeHeader($header)
+    {
+        unset($this->headers[$header]);
+
+        return $this;
+    }
+
+    /**
+     * @deprecated Use $message->getHeader()->parseParams()
+     * @codeCoverageIgnore
+     */
+    public function getTokenizedHeader($header, $token = ';')
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use $message->getHeader()->parseParams()');
+        if ($this->hasHeader($header)) {
+            $data = new Collection();
+            foreach ($this->getHeader($header)->parseParams() as $values) {
+                foreach ($values as $key => $value) {
+                    if ($value === '') {
+                        $data->set($data->count(), $key);
+                    } else {
+                        $data->add($key, $value);
+                    }
+                }
+            }
+            return $data;
+        }
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function setTokenizedHeader($header, $data, $token = ';')
+    {
+        Version::warn(__METHOD__ . ' is deprecated.');
+        return $this;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function getCacheControlDirective($directive)
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use $message->getHeader(\'Cache-Control\')->getDirective()');
+        if (!($header = $this->getHeader('Cache-Control'))) {
+            return null;
+        }
+
+        return $header->getDirective($directive);
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function hasCacheControlDirective($directive)
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use $message->getHeader(\'Cache-Control\')->hasDirective()');
+        if ($header = $this->getHeader('Cache-Control')) {
+            return $header->hasDirective($directive);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function addCacheControlDirective($directive, $value = true)
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use $message->getHeader(\'Cache-Control\')->addDirective()');
+        if (!($header = $this->getHeader('Cache-Control'))) {
+            $this->addHeader('Cache-Control', '');
+            $header = $this->getHeader('Cache-Control');
+        }
+
+        $header->addDirective($directive, $value);
+
+        return $this;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function removeCacheControlDirective($directive)
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use $message->getHeader(\'Cache-Control\')->removeDirective()');
+        if ($header = $this->getHeader('Cache-Control')) {
+            $header->removeDirective($directive);
+        }
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/EntityEnclosingRequest.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/EntityEnclosingRequest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d9c83d815bed3ad55b0ea3b67ff1572099fb1186
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/EntityEnclosingRequest.php
@@ -0,0 +1,248 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Http\QueryString;
+use Guzzle\Http\RedirectPlugin;
+use Guzzle\Http\Exception\RequestException;
+use Guzzle\Http\Mimetypes;
+
+/**
+ * HTTP request that sends an entity-body in the request message (POST, PUT, PATCH, DELETE)
+ */
+class EntityEnclosingRequest extends Request implements EntityEnclosingRequestInterface
+{
+    /** @var int When the size of the body is greater than 1MB, then send Expect: 100-Continue */
+    protected $expectCutoff = 1048576;
+
+    /** @var EntityBodyInterface $body Body of the request */
+    protected $body;
+
+    /** @var QueryString POST fields to use in the EntityBody */
+    protected $postFields;
+
+    /** @var array POST files to send with the request */
+    protected $postFiles = array();
+
+    public function __construct($method, $url, $headers = array())
+    {
+        $this->postFields = new QueryString();
+        parent::__construct($method, $url, $headers);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        // Only attempt to include the POST data if it's only fields
+        if (count($this->postFields) && empty($this->postFiles)) {
+            return parent::__toString() . (string) $this->postFields;
+        }
+
+        return parent::__toString() . $this->body;
+    }
+
+    public function setState($state, array $context = array())
+    {
+        parent::setState($state, $context);
+        if ($state == self::STATE_TRANSFER && !$this->body && !count($this->postFields) && !count($this->postFiles)) {
+            $this->setHeader('Content-Length', 0)->removeHeader('Transfer-Encoding');
+        }
+
+        return $this->state;
+    }
+
+    public function setBody($body, $contentType = null)
+    {
+        $this->body = EntityBody::factory($body);
+
+        // Auto detect the Content-Type from the path of the request if possible
+        if ($contentType === null && !$this->hasHeader('Content-Type')) {
+            $contentType = $this->body->getContentType() ?: Mimetypes::getInstance()->fromFilename($this->getPath());
+        }
+
+        if ($contentType) {
+            $this->setHeader('Content-Type', $contentType);
+        }
+
+        // Always add the Expect 100-Continue header if the body cannot be rewound. This helps with redirects.
+        if (!$this->body->isSeekable() && $this->expectCutoff !== false) {
+            $this->setHeader('Expect', '100-Continue');
+        }
+
+        // Set the Content-Length header if it can be determined
+        $size = $this->body->getContentLength();
+        if ($size !== null && $size !== false) {
+            $this->setHeader('Content-Length', $size);
+            if ($size > $this->expectCutoff) {
+                $this->setHeader('Expect', '100-Continue');
+            }
+        } elseif (!$this->hasHeader('Content-Length')) {
+            if ('1.1' == $this->protocolVersion) {
+                $this->setHeader('Transfer-Encoding', 'chunked');
+            } else {
+                throw new RequestException(
+                    'Cannot determine Content-Length and cannot use chunked Transfer-Encoding when using HTTP/1.0'
+                );
+            }
+        }
+
+        return $this;
+    }
+
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * Set the size that the entity body of the request must exceed before adding the Expect: 100-Continue header.
+     *
+     * @param int|bool $size Cutoff in bytes. Set to false to never send the expect header (even with non-seekable data)
+     *
+     * @return self
+     */
+    public function setExpectHeaderCutoff($size)
+    {
+        $this->expectCutoff = $size;
+        if ($size === false || !$this->body) {
+            $this->removeHeader('Expect');
+        } elseif ($this->body && $this->body->getSize() && $this->body->getSize() > $size) {
+            $this->setHeader('Expect', '100-Continue');
+        }
+
+        return $this;
+    }
+
+    public function configureRedirects($strict = false, $maxRedirects = 5)
+    {
+        $this->getParams()->set(RedirectPlugin::STRICT_REDIRECTS, $strict);
+        if ($maxRedirects == 0) {
+            $this->getParams()->set(RedirectPlugin::DISABLE, true);
+        } else {
+            $this->getParams()->set(RedirectPlugin::MAX_REDIRECTS, $maxRedirects);
+        }
+
+        return $this;
+    }
+
+    public function getPostField($field)
+    {
+        return $this->postFields->get($field);
+    }
+
+    public function getPostFields()
+    {
+        return $this->postFields;
+    }
+
+    public function setPostField($key, $value)
+    {
+        $this->postFields->set($key, $value);
+        $this->processPostFields();
+
+        return $this;
+    }
+
+    public function addPostFields($fields)
+    {
+        $this->postFields->merge($fields);
+        $this->processPostFields();
+
+        return $this;
+    }
+
+    public function removePostField($field)
+    {
+        $this->postFields->remove($field);
+        $this->processPostFields();
+
+        return $this;
+    }
+
+    public function getPostFiles()
+    {
+        return $this->postFiles;
+    }
+
+    public function getPostFile($fieldName)
+    {
+        return isset($this->postFiles[$fieldName]) ? $this->postFiles[$fieldName] : null;
+    }
+
+    public function removePostFile($fieldName)
+    {
+        unset($this->postFiles[$fieldName]);
+        $this->processPostFields();
+
+        return $this;
+    }
+
+    public function addPostFile($field, $filename = null, $contentType = null)
+    {
+        $data = null;
+
+        if ($field instanceof PostFileInterface) {
+            $data = $field;
+        } elseif (is_array($filename)) {
+            // Allow multiple values to be set in a single key
+            foreach ($filename as $file) {
+                $this->addPostFile($field, $file, $contentType);
+            }
+            return $this;
+        } elseif (!is_string($filename)) {
+            throw new RequestException('The path to a file must be a string');
+        } elseif (!empty($filename)) {
+            // Adding an empty file will cause cURL to error out
+            $data = new PostFile($field, $filename, $contentType);
+        }
+
+        if ($data) {
+            if (!isset($this->postFiles[$data->getFieldName()])) {
+                $this->postFiles[$data->getFieldName()] = array($data);
+            } else {
+                $this->postFiles[$data->getFieldName()][] = $data;
+            }
+            $this->processPostFields();
+        }
+
+        return $this;
+    }
+
+    public function addPostFiles(array $files)
+    {
+        foreach ($files as $key => $file) {
+            if ($file instanceof PostFileInterface) {
+                $this->addPostFile($file, null, null, false);
+            } elseif (is_string($file)) {
+                // Convert non-associative array keys into 'file'
+                if (is_numeric($key)) {
+                    $key = 'file';
+                }
+                $this->addPostFile($key, $file, null, false);
+            } else {
+                throw new RequestException('File must be a string or instance of PostFileInterface');
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Determine what type of request should be sent based on post fields
+     */
+    protected function processPostFields()
+    {
+        if (!$this->postFiles) {
+            $this->removeHeader('Expect')->setHeader('Content-Type', self::URL_ENCODED);
+        } else {
+            $this->setHeader('Content-Type', self::MULTIPART);
+            if ($this->expectCutoff !== false) {
+                $this->setHeader('Expect', '100-Continue');
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/EntityEnclosingRequestInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/EntityEnclosingRequestInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d9c037de683b03ea0654735074a1a4b01b878947
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/EntityEnclosingRequestInterface.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Http\Exception\RequestException;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Http\QueryString;
+
+/**
+ * HTTP request that sends an entity-body in the request message (POST, PUT)
+ */
+interface EntityEnclosingRequestInterface extends RequestInterface
+{
+    const URL_ENCODED = 'application/x-www-form-urlencoded; charset=utf-8';
+    const MULTIPART = 'multipart/form-data';
+
+    /**
+     * Set the body of the request
+     *
+     * @param string|resource|EntityBodyInterface $body        Body to use in the entity body of the request
+     * @param string                              $contentType Content-Type to set. Leave null to use an existing
+     *                                                         Content-Type or to guess the Content-Type
+     * @return self
+     * @throws RequestException if the protocol is < 1.1 and Content-Length can not be determined
+     */
+    public function setBody($body, $contentType = null);
+
+    /**
+     * Get the body of the request if set
+     *
+     * @return EntityBodyInterface|null
+     */
+    public function getBody();
+
+    /**
+     * Get a POST field from the request
+     *
+     * @param string $field Field to retrieve
+     *
+     * @return mixed|null
+     */
+    public function getPostField($field);
+
+    /**
+     * Get the post fields that will be used in the request
+     *
+     * @return QueryString
+     */
+    public function getPostFields();
+
+    /**
+     * Set a POST field value
+     *
+     * @param string $key   Key to set
+     * @param string $value Value to set
+     *
+     * @return self
+     */
+    public function setPostField($key, $value);
+
+    /**
+     * Add POST fields to use in the request
+     *
+     * @param QueryString|array $fields POST fields
+     *
+     * @return self
+     */
+    public function addPostFields($fields);
+
+    /**
+     * Remove a POST field or file by name
+     *
+     * @param string $field Name of the POST field or file to remove
+     *
+     * @return self
+     */
+    public function removePostField($field);
+
+    /**
+     * Returns an associative array of POST field names to PostFileInterface objects
+     *
+     * @return array
+     */
+    public function getPostFiles();
+
+    /**
+     * Get a POST file from the request
+     *
+     * @param string $fieldName POST fields to retrieve
+     *
+     * @return array|null Returns an array wrapping an array of PostFileInterface objects
+     */
+    public function getPostFile($fieldName);
+
+    /**
+     * Remove a POST file from the request
+     *
+     * @param string $fieldName POST file field name to remove
+     *
+     * @return self
+     */
+    public function removePostFile($fieldName);
+
+    /**
+     * Add a POST file to the upload
+     *
+     * @param string $field       POST field to use (e.g. file). Used to reference content from the server.
+     * @param string $filename    Full path to the file. Do not include the @ symbol.
+     * @param string $contentType Optional Content-Type to add to the Content-Disposition.
+     *                            Default behavior is to guess. Set to false to not specify.
+     * @return self
+     */
+    public function addPostFile($field, $filename = null, $contentType = null);
+
+    /**
+     * Add POST files to use in the upload
+     *
+     * @param array $files An array of POST fields => filenames where filename can be a string or PostFileInterface
+     *
+     * @return self
+     */
+    public function addPostFiles(array $files);
+
+    /**
+     * Configure how redirects are handled for the request
+     *
+     * @param bool $strict       Set to true to follow strict RFC compliance when redirecting POST requests. Most
+     *                           browsers with follow a 301-302 redirect for a POST request with a GET request. This is
+     *                           the default behavior of Guzzle. Enable strict redirects to redirect these responses
+     *                           with a POST rather than a GET request.
+     * @param int  $maxRedirects Specify the maximum number of allowed redirects. Set to 0 to disable redirects.
+     *
+     * @return self
+     */
+    public function configureRedirects($strict = false, $maxRedirects = 5);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e82176a8953e14e6322abc3c61b8313703ea762
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Version;
+use Guzzle\Http\Message\Header\HeaderInterface;
+
+/**
+ * Represents a header and all of the values stored by that header
+ */
+class Header implements HeaderInterface
+{
+    protected $values = array();
+    protected $header;
+    protected $glue;
+
+    /**
+     * @param string       $header Name of the header
+     * @param array|string $values Values of the header as an array or a scalar
+     * @param string       $glue   Glue used to combine multiple values into a string
+     */
+    public function __construct($header, $values = array(), $glue = ',')
+    {
+        $this->header = trim($header);
+        $this->glue = $glue;
+
+        foreach ((array) $values as $value) {
+            foreach ((array) $value as $v) {
+                $this->values[] = $v;
+            }
+        }
+    }
+
+    public function __toString()
+    {
+        return implode($this->glue . ' ', $this->toArray());
+    }
+
+    public function add($value)
+    {
+        $this->values[] = $value;
+
+        return $this;
+    }
+
+    public function getName()
+    {
+        return $this->header;
+    }
+
+    public function setName($name)
+    {
+        $this->header = $name;
+
+        return $this;
+    }
+
+    public function setGlue($glue)
+    {
+        $this->glue = $glue;
+
+        return $this;
+    }
+
+    public function getGlue()
+    {
+        return $this->glue;
+    }
+
+    /**
+     * Normalize the header to be a single header with an array of values.
+     *
+     * If any values of the header contains the glue string value (e.g. ","), then the value will be exploded into
+     * multiple entries in the header.
+     *
+     * @return self
+     */
+    public function normalize()
+    {
+        $values = $this->toArray();
+
+        for ($i = 0, $total = count($values); $i < $total; $i++) {
+            if (strpos($values[$i], $this->glue) !== false) {
+                foreach (explode($this->glue, $values[$i]) as $v) {
+                    $values[] = trim($v);
+                }
+                unset($values[$i]);
+            }
+        }
+
+        $this->values = array_values($values);
+
+        return $this;
+    }
+
+    public function hasValue($searchValue)
+    {
+        return in_array($searchValue, $this->toArray());
+    }
+
+    public function removeValue($searchValue)
+    {
+        $this->values = array_values(array_filter($this->values, function ($value) use ($searchValue) {
+            return $value != $searchValue;
+        }));
+
+        return $this;
+    }
+
+    public function toArray()
+    {
+        return $this->values;
+    }
+
+    public function count()
+    {
+        return count($this->toArray());
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->toArray());
+    }
+
+    /**
+     * {@inheritdoc}
+     * @todo Do not split semicolons when enclosed in quotes (e.g. foo="baz;bar")
+     */
+    public function parseParams()
+    {
+        $params = array();
+        $callback = array($this, 'trimHeader');
+
+        // Normalize the header into a single array and iterate over all values
+        foreach ($this->normalize()->toArray() as $val) {
+            $part = array();
+            foreach (explode(';', $val) as $kvp) {
+                $pieces = array_map($callback, explode('=', $kvp, 2));
+                $part[$pieces[0]] = isset($pieces[1]) ? $pieces[1] : '';
+            }
+            $params[] = $part;
+        }
+
+        return $params;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function hasExactHeader($header)
+    {
+        Version::warn(__METHOD__ . ' is deprecated');
+        return $this->header == $header;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function raw()
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use toArray()');
+        return $this->toArray();
+    }
+
+    /**
+     * Trim a header by removing excess spaces and wrapping quotes
+     *
+     * @param $str
+     *
+     * @return string
+     */
+    protected function trimHeader($str)
+    {
+        static $trimmed = "\"'  \n\t";
+
+        return trim($str, $trimmed);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/CacheControl.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/CacheControl.php
new file mode 100644
index 0000000000000000000000000000000000000000..77789e51fd42ad9e97b078c8724a7c755d9ac635
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/CacheControl.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Guzzle\Http\Message\Header;
+
+use Guzzle\Http\Message\Header;
+
+/**
+ * Provides helpful functionality for Cache-Control headers
+ */
+class CacheControl extends Header
+{
+    /** @var array */
+    protected $directives;
+
+    public function add($value)
+    {
+        parent::add($value);
+        $this->directives = null;
+    }
+
+    public function removeValue($searchValue)
+    {
+        parent::removeValue($searchValue);
+        $this->directives = null;
+    }
+
+    /**
+     * Check if a specific cache control directive exists
+     *
+     * @param string $param Directive to retrieve
+     *
+     * @return bool
+     */
+    public function hasDirective($param)
+    {
+        $directives = $this->getDirectives();
+
+        return isset($directives[$param]);
+    }
+
+    /**
+     * Get a specific cache control directive
+     *
+     * @param string $param Directive to retrieve
+     *
+     * @return string|bool|null
+     */
+    public function getDirective($param)
+    {
+        $directives = $this->getDirectives();
+
+        return isset($directives[$param]) ? $directives[$param] : null;
+    }
+
+    /**
+     * Add a cache control directive
+     *
+     * @param string $param Directive to add
+     * @param string $value Value to set
+     *
+     * @return self
+     */
+    public function addDirective($param, $value)
+    {
+        $directives = $this->getDirectives();
+        $directives[$param] = $value;
+        $this->updateFromDirectives($directives);
+
+        return $this;
+    }
+
+    /**
+     * Remove a cache control directive by name
+     *
+     * @param string $param Directive to remove
+     *
+     * @return self
+     */
+    public function removeDirective($param)
+    {
+        $directives = $this->getDirectives();
+        unset($directives[$param]);
+        $this->updateFromDirectives($directives);
+
+        return $this;
+    }
+
+    /**
+     * Get an associative array of cache control directives
+     *
+     * @return array
+     */
+    public function getDirectives()
+    {
+        if ($this->directives === null) {
+            $this->directives = array();
+            foreach ($this->parseParams() as $collection) {
+                foreach ($collection as $key => $value) {
+                    $this->directives[$key] = $value === '' ? true : $value;
+                }
+            }
+        }
+
+        return $this->directives;
+    }
+
+    /**
+     * Updates the header value based on the parsed directives
+     *
+     * @param array $directives Array of cache control directives
+     */
+    protected function updateFromDirectives(array $directives)
+    {
+        $this->directives = $directives;
+        $this->values = array();
+
+        foreach ($directives as $key => $value) {
+            $this->values[] = $value === true ? $key : "{$key}={$value}";
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderCollection.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderCollection.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec282d9a91187501f550e0b33f888dcc784e7b9e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderCollection.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Guzzle\Http\Message\Header;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * Provides a case-insensitive collection of headers
+ */
+class HeaderCollection implements \IteratorAggregate, \Countable, \ArrayAccess, ToArrayInterface
+{
+    /** @var array */
+    protected $headers;
+
+    public function __construct($headers = array())
+    {
+        $this->headers = $headers;
+    }
+
+    public function __clone()
+    {
+        foreach ($this->headers as &$header) {
+            $header = clone $header;
+        }
+    }
+
+    /**
+     * Clears the header collection
+     */
+    public function clear()
+    {
+        $this->headers = array();
+    }
+
+    /**
+     * Set a header on the collection
+     *
+     * @param HeaderInterface $header Header to add
+     *
+     * @return self
+     */
+    public function add(HeaderInterface $header)
+    {
+        $this->headers[strtolower($header->getName())] = $header;
+
+        return $this;
+    }
+
+    /**
+     * Get an array of header objects
+     *
+     * @return array
+     */
+    public function getAll()
+    {
+        return $this->headers;
+    }
+
+    /**
+     * Alias of offsetGet
+     */
+    public function get($key)
+    {
+        return $this->offsetGet($key);
+    }
+
+    public function count()
+    {
+        return count($this->headers);
+    }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->headers[strtolower($offset)]);
+    }
+
+    public function offsetGet($offset)
+    {
+        $l = strtolower($offset);
+
+        return isset($this->headers[$l]) ? $this->headers[$l] : null;
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $this->add($value);
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->headers[strtolower($offset)]);
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->headers);
+    }
+
+    public function toArray()
+    {
+        $result = array();
+        foreach ($this->headers as $header) {
+            $result[$header->getName()] = $header->toArray();
+        }
+
+        return $result;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..0273be52f81086a819f32f57ccdeae0313d9f92d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderFactory.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Guzzle\Http\Message\Header;
+
+use Guzzle\Http\Message\Header;
+
+/**
+ * Default header factory implementation
+ */
+class HeaderFactory implements HeaderFactoryInterface
+{
+    /** @var array */
+    protected $mapping = array(
+        'cache-control' => 'Guzzle\Http\Message\Header\CacheControl',
+        'link'          => 'Guzzle\Http\Message\Header\Link',
+    );
+
+    public function createHeader($header, $value = null)
+    {
+        $lowercase = strtolower($header);
+
+        return isset($this->mapping[$lowercase])
+            ? new $this->mapping[$lowercase]($header, $value)
+            : new Header($header, $value);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderFactoryInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderFactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..9457cf64a1c7ed1f2d5644435c2d9c49d411d5fa
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderFactoryInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Guzzle\Http\Message\Header;
+
+/**
+ * Interface for creating headers
+ */
+interface HeaderFactoryInterface
+{
+    /**
+     * Create a header from a header name and a single value
+     *
+     * @param string $header Name of the header to create
+     * @param string $value  Value to set on the header
+     *
+     * @return HeaderInterface
+     */
+    public function createHeader($header, $value = null);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..adcc78e09b93cebf4acbfca9fe17ce81baa5f4ac
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/HeaderInterface.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Guzzle\Http\Message\Header;
+
+use Guzzle\Common\ToArrayInterface;
+
+interface HeaderInterface extends ToArrayInterface, \Countable, \IteratorAggregate
+{
+    /**
+     * Convert the header to a string
+     *
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Add a value to the list of header values
+     *
+     * @param string $value Value to add to the header
+     *
+     * @return self
+     */
+    public function add($value);
+
+    /**
+     * Get the name of the header
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Change the name of the header
+     *
+     * @param string $name Name to change to
+     *
+     * @return self
+     */
+    public function setName($name);
+
+    /**
+     * Change the glue used to implode the values
+     *
+     * @param string $glue Glue used to implode multiple values
+     *
+     * @return self
+     */
+    public function setGlue($glue);
+
+    /**
+     * Get the glue used to implode multiple values into a string
+     *
+     * @return string
+     */
+    public function getGlue();
+
+    /**
+     * Check if the collection of headers has a particular value
+     *
+     * @param string $searchValue Value to search for
+     *
+     * @return bool
+     */
+    public function hasValue($searchValue);
+
+    /**
+     * Remove a specific value from the header
+     *
+     * @param string $searchValue Value to remove
+     *
+     * @return self
+     */
+    public function removeValue($searchValue);
+
+    /**
+     * Parse a header containing ";" separated data into an array of associative arrays representing the header
+     * key value pair data of the header. When a parameter does not contain a value, but just contains a key, this
+     * function will inject a key with a '' string value.
+     *
+     * @return array
+     */
+    public function parseParams();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/Link.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/Link.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9fb961443cf270617fecb7dd554c80a535db32d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Header/Link.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Guzzle\Http\Message\Header;
+
+use Guzzle\Http\Message\Header;
+
+/**
+ * Provides helpful functionality for link headers
+ */
+class Link extends Header
+{
+    /**
+     * Add a link to the header
+     *
+     * @param string $url    Link URL
+     * @param string $rel    Link rel
+     * @param array  $params Other link parameters
+     *
+     * @return self
+     */
+    public function addLink($url, $rel, array $params = array())
+    {
+        $values = array("<{$url}>", "rel=\"{$rel}\"");
+
+        foreach ($params as $k => $v) {
+            $values[] = "{$k}=\"{$v}\"";
+        }
+
+        return $this->add(implode('; ', $values));
+    }
+
+    /**
+     * Check if a specific link exists for a given rel attribute
+     *
+     * @param string $rel rel value
+     *
+     * @return bool
+     */
+    public function hasLink($rel)
+    {
+        return $this->getLink($rel) !== null;
+    }
+
+    /**
+     * Get a specific link for a given rel attribute
+     *
+     * @param string $rel Rel value
+     *
+     * @return array|null
+     */
+    public function getLink($rel)
+    {
+        foreach ($this->getLinks() as $link) {
+            if (isset($link['rel']) && $link['rel'] == $rel) {
+                return $link;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get an associative array of links
+     *
+     * For example:
+     * Link: <http:/.../front.jpeg>; rel=front; type="image/jpeg", <http://.../back.jpeg>; rel=back; type="image/jpeg"
+     *
+     * <code>
+     * var_export($response->getLinks());
+     * array(
+     *     array(
+     *         'url' => 'http:/.../front.jpeg',
+     *         'rel' => 'back',
+     *         'type' => 'image/jpeg',
+     *     )
+     * )
+     * </code>
+     *
+     * @return array
+     */
+    public function getLinks()
+    {
+        $links = $this->parseParams();
+
+        foreach ($links as &$link) {
+            $key = key($link);
+            unset($link[$key]);
+            $link['url'] = trim($key, '<> ');
+        }
+
+        return $links;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/MessageInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/MessageInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..62bcd4391339802327691ca1d2cffd138ebb2e2e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/MessageInterface.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+/**
+ * Request and response message interface
+ */
+interface MessageInterface
+{
+    /**
+     * Get application and plugin specific parameters set on the message.
+     *
+     * @return \Guzzle\Common\Collection
+     */
+    public function getParams();
+
+    /**
+     * Add a header to an existing collection of headers.
+     *
+     * @param string $header Header name to add
+     * @param string $value  Value of the header
+     *
+     * @return self
+     */
+    public function addHeader($header, $value);
+
+    /**
+     * Add and merge in an array of HTTP headers.
+     *
+     * @param array $headers Associative array of header data.
+     *
+     * @return self
+     */
+    public function addHeaders(array $headers);
+
+    /**
+     * Retrieve an HTTP header by name. Performs a case-insensitive search of all headers.
+     *
+     * @param string $header Header to retrieve.
+     *
+     * @return Header|null
+     */
+    public function getHeader($header);
+
+    /**
+     * Get all headers as a collection
+     *
+     * @return \Guzzle\Http\Message\Header\HeaderCollection
+     */
+    public function getHeaders();
+
+    /**
+     * Check if the specified header is present.
+     *
+     * @param string $header The header to check.
+     *
+     * @return bool
+     */
+    public function hasHeader($header);
+
+    /**
+     * Remove a specific HTTP header.
+     *
+     * @param string $header HTTP header to remove.
+     *
+     * @return self
+     */
+    public function removeHeader($header);
+
+    /**
+     * Set an HTTP header and overwrite any existing value for the header
+     *
+     * @param string $header Name of the header to set.
+     * @param mixed  $value  Value to set.
+     *
+     * @return self
+     */
+    public function setHeader($header, $value);
+
+    /**
+     * Overwrite all HTTP headers with the supplied array of headers
+     *
+     * @param array $headers Associative array of header data.
+     *
+     * @return self
+     */
+    public function setHeaders(array $headers);
+
+    /**
+     * Get an array of message header lines (e.g. ["Host: example.com", ...])
+     *
+     * @return array
+     */
+    public function getHeaderLines();
+
+    /**
+     * Get the raw message headers as a string
+     *
+     * @return string
+     */
+    public function getRawHeaders();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/PostFile.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/PostFile.php
new file mode 100644
index 0000000000000000000000000000000000000000..0beb7a7ce6b85041d0066de7020ebe4b00c92af7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/PostFile.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Version;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Mimetypes;
+
+/**
+ * POST file upload
+ */
+class PostFile implements PostFileInterface
+{
+    protected $fieldName;
+    protected $contentType;
+    protected $filename;
+
+    /**
+     * @param string $fieldName   Name of the field
+     * @param string $filename    Path to the file
+     * @param string $contentType Content-Type of the upload
+     */
+    public function __construct($fieldName, $filename, $contentType = null)
+    {
+        $this->fieldName = $fieldName;
+        $this->setFilename($filename);
+        $this->contentType = $contentType ?: $this->guessContentType();
+    }
+
+    public function setFieldName($name)
+    {
+        $this->fieldName = $name;
+
+        return $this;
+    }
+
+    public function getFieldName()
+    {
+        return $this->fieldName;
+    }
+
+    public function setFilename($filename)
+    {
+        // Remove leading @ symbol
+        if (strpos($filename, '@') === 0) {
+            $filename = substr($filename, 1);
+        }
+
+        if (!is_readable($filename)) {
+            throw new InvalidArgumentException("Unable to open {$filename} for reading");
+        }
+
+        $this->filename = $filename;
+
+        return $this;
+    }
+
+    public function getFilename()
+    {
+        return $this->filename;
+    }
+
+    public function setContentType($type)
+    {
+        $this->contentType = $type;
+
+        return $this;
+    }
+
+    public function getContentType()
+    {
+        return $this->contentType;
+    }
+
+    public function getCurlValue()
+    {
+        // PHP 5.5 introduced a CurlFile object that deprecates the old @filename syntax
+        // See: https://wiki.php.net/rfc/curl-file-upload
+        if (function_exists('curl_file_create')) {
+            return curl_file_create($this->filename, $this->contentType, basename($this->filename));
+        }
+
+        // Use the old style if using an older version of PHP
+        $value = "@{$this->filename};filename=" . basename($this->filename);
+        if ($this->contentType) {
+            $value .= ';type=' . $this->contentType;
+        }
+
+        return $value;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function getCurlString()
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use getCurlValue()');
+        return $this->getCurlValue();
+    }
+
+    /**
+     * Determine the Content-Type of the file
+     */
+    protected function guessContentType()
+    {
+        return Mimetypes::getInstance()->fromFilename($this->filename) ?: 'application/octet-stream';
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/PostFileInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/PostFileInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..99dc706946f5b50e1a94d183873b9a2585f91f6a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/PostFileInterface.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * POST file upload
+ */
+interface PostFileInterface
+{
+    /**
+     * Set the name of the field
+     *
+     * @param string $name Field name
+     *
+     * @return self
+     */
+    public function setFieldName($name);
+
+    /**
+     * Get the name of the field
+     *
+     * @return string
+     */
+    public function getFieldName();
+
+    /**
+     * Set the path to the file
+     *
+     * @param string $path Full path to the file
+     *
+     * @return self
+     * @throws InvalidArgumentException if the file cannot be read
+     */
+    public function setFilename($path);
+
+    /**
+     * Get the full path to the file
+     *
+     * @return string
+     */
+    public function getFilename();
+
+    /**
+     * Set the Content-Type of the file
+     *
+     * @param string $type Content type
+     *
+     * @return self
+     */
+    public function setContentType($type);
+
+    /**
+     * Get the Content-Type of the file
+     *
+     * @return string
+     */
+    public function getContentType();
+
+    /**
+     * Get a cURL ready string or CurlFile object for the upload
+     *
+     * @return string
+     */
+    public function getCurlValue();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Request.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Request.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fb9a01e1654788720f018c58899467bc28c2207
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Request.php
@@ -0,0 +1,652 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Version;
+use Guzzle\Common\Event;
+use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\RuntimeException;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Exception\RequestException;
+use Guzzle\Http\Exception\BadResponseException;
+use Guzzle\Http\ClientInterface;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Http\Message\Header\HeaderInterface;
+use Guzzle\Http\Url;
+use Guzzle\Parser\ParserRegistry;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * HTTP request class to send requests
+ */
+class Request extends AbstractMessage implements RequestInterface
+{
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+
+    /** @var Url HTTP Url */
+    protected $url;
+
+    /** @var string HTTP method (GET, PUT, POST, DELETE, HEAD, OPTIONS, TRACE) */
+    protected $method;
+
+    /** @var ClientInterface */
+    protected $client;
+
+    /** @var Response Response of the request */
+    protected $response;
+
+    /** @var EntityBodyInterface Response body */
+    protected $responseBody;
+
+    /** @var string State of the request object */
+    protected $state;
+
+    /** @var string Authentication username */
+    protected $username;
+
+    /** @var string Auth password */
+    protected $password;
+
+    /** @var Collection cURL specific transfer options */
+    protected $curlOptions;
+
+    /** @var bool */
+    protected $isRedirect = false;
+
+    public static function getAllEvents()
+    {
+        return array(
+            // Called when receiving or uploading data through cURL
+            'curl.callback.read', 'curl.callback.write', 'curl.callback.progress',
+            // Cloning a request
+            'request.clone',
+            // About to send the request, sent request, completed transaction
+            'request.before_send', 'request.sent', 'request.complete',
+            // A request received a successful response
+            'request.success',
+            // A request received an unsuccessful response
+            'request.error',
+            // An exception is being thrown because of an unsuccessful response
+            'request.exception',
+            // Received response status line
+            'request.receive.status_line'
+        );
+    }
+
+    /**
+     * @param string           $method  HTTP method
+     * @param string|Url       $url     HTTP URL to connect to. The URI scheme, host header, and URI are parsed from the
+     *                                  full URL. If query string parameters are present they will be parsed as well.
+     * @param array|Collection $headers HTTP headers
+     */
+    public function __construct($method, $url, $headers = array())
+    {
+        parent::__construct();
+        $this->method = strtoupper($method);
+        $this->curlOptions = new Collection();
+        $this->setUrl($url);
+
+        if ($headers) {
+            // Special handling for multi-value headers
+            foreach ($headers as $key => $value) {
+                // Deal with collisions with Host and Authorization
+                if ($key == 'host' || $key == 'Host') {
+                    $this->setHeader($key, $value);
+                } elseif ($value instanceof HeaderInterface) {
+                    $this->addHeader($key, $value);
+                } else {
+                    foreach ((array) $value as $v) {
+                        $this->addHeader($key, $v);
+                    }
+                }
+            }
+        }
+
+        $this->setState(self::STATE_NEW);
+    }
+
+    public function __clone()
+    {
+        if ($this->eventDispatcher) {
+            $this->eventDispatcher = clone $this->eventDispatcher;
+        }
+        $this->curlOptions = clone $this->curlOptions;
+        $this->params = clone $this->params;
+        $this->url = clone $this->url;
+        $this->response = $this->responseBody = null;
+        $this->headers = clone $this->headers;
+
+        $this->setState(RequestInterface::STATE_NEW);
+        $this->dispatch('request.clone', array('request' => $this));
+    }
+
+    /**
+     * Get the HTTP request as a string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getRawHeaders() . "\r\n\r\n";
+    }
+
+    /**
+     * Default method that will throw exceptions if an unsuccessful response is received.
+     *
+     * @param Event $event Received
+     * @throws BadResponseException if the response is not successful
+     */
+    public static function onRequestError(Event $event)
+    {
+        $e = BadResponseException::factory($event['request'], $event['response']);
+        $event['request']->setState(self::STATE_ERROR, array('exception' => $e) + $event->toArray());
+        throw $e;
+    }
+
+    public function setClient(ClientInterface $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    public function getRawHeaders()
+    {
+        $protocolVersion = $this->protocolVersion ?: '1.1';
+
+        return trim($this->method . ' ' . $this->getResource()) . ' '
+            . strtoupper(str_replace('https', 'http', $this->url->getScheme()))
+            . '/' . $protocolVersion . "\r\n" . implode("\r\n", $this->getHeaderLines());
+    }
+
+    public function setUrl($url)
+    {
+        if ($url instanceof Url) {
+            $this->url = $url;
+        } else {
+            $this->url = Url::factory($url);
+        }
+
+        // Update the port and host header
+        $this->setPort($this->url->getPort());
+
+        if ($this->url->getUsername() || $this->url->getPassword()) {
+            $this->setAuth($this->url->getUsername(), $this->url->getPassword());
+            // Remove the auth info from the URL
+            $this->url->setUsername(null);
+            $this->url->setPassword(null);
+        }
+
+        return $this;
+    }
+
+    public function send()
+    {
+        if (!$this->client) {
+            throw new RuntimeException('A client must be set on the request');
+        }
+
+        return $this->client->send($this);
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+    public function getQuery($asString = false)
+    {
+        return $asString
+            ? (string) $this->url->getQuery()
+            : $this->url->getQuery();
+    }
+
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    public function getScheme()
+    {
+        return $this->url->getScheme();
+    }
+
+    public function setScheme($scheme)
+    {
+        $this->url->setScheme($scheme);
+
+        return $this;
+    }
+
+    public function getHost()
+    {
+        return $this->url->getHost();
+    }
+
+    public function setHost($host)
+    {
+        $this->url->setHost($host);
+        $this->setPort($this->url->getPort());
+
+        return $this;
+    }
+
+    public function getProtocolVersion()
+    {
+        return $this->protocolVersion;
+    }
+
+    public function setProtocolVersion($protocol)
+    {
+        $this->protocolVersion = $protocol;
+
+        return $this;
+    }
+
+    public function getPath()
+    {
+        return '/' . ltrim($this->url->getPath(), '/');
+    }
+
+    public function setPath($path)
+    {
+        $this->url->setPath($path);
+
+        return $this;
+    }
+
+    public function getPort()
+    {
+        return $this->url->getPort();
+    }
+
+    public function setPort($port)
+    {
+        $this->url->setPort($port);
+
+        // Include the port in the Host header if it is not the default port for the scheme of the URL
+        $scheme = $this->url->getScheme();
+        if (($scheme == 'http' && $port != 80) || ($scheme == 'https' && $port != 443)) {
+            $this->headers['host'] = $this->headerFactory->createHeader('Host', $this->url->getHost() . ':' . $port);
+        } else {
+            $this->headers['host'] = $this->headerFactory->createHeader('Host', $this->url->getHost());
+        }
+
+        return $this;
+    }
+
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    public function setAuth($user, $password = '', $scheme = CURLAUTH_BASIC)
+    {
+        static $authMap = array(
+            'basic'  => CURLAUTH_BASIC,
+            'digest' => CURLAUTH_DIGEST,
+            'ntlm'   => CURLAUTH_NTLM,
+            'any'    => CURLAUTH_ANY
+        );
+
+        // If we got false or null, disable authentication
+        if (!$user) {
+            $this->password = $this->username = null;
+            $this->removeHeader('Authorization');
+            $this->getCurlOptions()->remove(CURLOPT_HTTPAUTH);
+            return $this;
+        }
+
+        if (!is_numeric($scheme)) {
+            $scheme = strtolower($scheme);
+            if (!isset($authMap[$scheme])) {
+                throw new InvalidArgumentException($scheme . ' is not a valid authentication type');
+            }
+            $scheme = $authMap[$scheme];
+        }
+
+        $this->username = $user;
+        $this->password = $password;
+
+        // Bypass CURL when using basic auth to promote connection reuse
+        if ($scheme == CURLAUTH_BASIC) {
+            $this->getCurlOptions()->remove(CURLOPT_HTTPAUTH);
+            $this->setHeader('Authorization', 'Basic ' . base64_encode($this->username . ':' . $this->password));
+        } else {
+            $this->getCurlOptions()
+                ->set(CURLOPT_HTTPAUTH, $scheme)
+                ->set(CURLOPT_USERPWD, $this->username . ':' . $this->password);
+        }
+
+        return $this;
+    }
+
+    public function getResource()
+    {
+        $resource = $this->getPath();
+        if ($query = (string) $this->url->getQuery()) {
+            $resource .= '?' . $query;
+        }
+
+        return $resource;
+    }
+
+    public function getUrl($asObject = false)
+    {
+        return $asObject ? clone $this->url : (string) $this->url;
+    }
+
+    public function getState()
+    {
+        return $this->state;
+    }
+
+    public function setState($state, array $context = array())
+    {
+        $oldState = $this->state;
+        $this->state = $state;
+
+        switch ($state) {
+            case self::STATE_NEW:
+                $this->response = null;
+                break;
+            case self::STATE_TRANSFER:
+                if ($oldState !== $state) {
+                    // Fix Content-Length and Transfer-Encoding collisions
+                    if ($this->hasHeader('Transfer-Encoding') && $this->hasHeader('Content-Length')) {
+                        $this->removeHeader('Transfer-Encoding');
+                    }
+                    $this->dispatch('request.before_send', array('request' => $this));
+                }
+                break;
+            case self::STATE_COMPLETE:
+                if ($oldState !== $state) {
+                    $this->processResponse($context);
+                    $this->responseBody = null;
+                }
+                break;
+            case self::STATE_ERROR:
+                if (isset($context['exception'])) {
+                    $this->dispatch('request.exception', array(
+                        'request'   => $this,
+                        'response'  => isset($context['response']) ? $context['response'] : $this->response,
+                        'exception' => isset($context['exception']) ? $context['exception'] : null
+                    ));
+                }
+        }
+
+        return $this->state;
+    }
+
+    public function getCurlOptions()
+    {
+        return $this->curlOptions;
+    }
+
+    public function startResponse(Response $response)
+    {
+        $this->state = self::STATE_TRANSFER;
+        $response->setEffectiveUrl((string) $this->getUrl());
+        $this->response = $response;
+
+        return $this;
+    }
+
+    public function setResponse(Response $response, $queued = false)
+    {
+        $response->setEffectiveUrl((string) $this->url);
+
+        if ($queued) {
+            $ed = $this->getEventDispatcher();
+            $ed->addListener('request.before_send', $f = function ($e) use ($response, &$f, $ed) {
+                $e['request']->setResponse($response);
+                $ed->removeListener('request.before_send', $f);
+            }, -9999);
+        } else {
+            $this->response = $response;
+            // If a specific response body is specified, then use it instead of the response's body
+            if ($this->responseBody && !$this->responseBody->getCustomData('default') && !$response->isRedirect()) {
+                $this->getResponseBody()->write((string) $this->response->getBody());
+            } else {
+                $this->responseBody = $this->response->getBody();
+            }
+            $this->setState(self::STATE_COMPLETE);
+        }
+
+        return $this;
+    }
+
+    public function setResponseBody($body)
+    {
+        // Attempt to open a file for writing if a string was passed
+        if (is_string($body)) {
+            // @codeCoverageIgnoreStart
+            if (!($body = fopen($body, 'w+'))) {
+                throw new InvalidArgumentException('Could not open ' . $body . ' for writing');
+            }
+            // @codeCoverageIgnoreEnd
+        }
+
+        $this->responseBody = EntityBody::factory($body);
+
+        return $this;
+    }
+
+    public function getResponseBody()
+    {
+        if ($this->responseBody === null) {
+            $this->responseBody = EntityBody::factory()->setCustomData('default', true);
+        }
+
+        return $this->responseBody;
+    }
+
+    /**
+     * Determine if the response body is repeatable (readable + seekable)
+     *
+     * @return bool
+     * @deprecated Use getResponseBody()->isSeekable()
+     * @codeCoverageIgnore
+     */
+    public function isResponseBodyRepeatable()
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use $request->getResponseBody()->isRepeatable()');
+        return !$this->responseBody ? true : $this->responseBody->isRepeatable();
+    }
+
+    public function getCookies()
+    {
+        if ($cookie = $this->getHeader('Cookie')) {
+            $data = ParserRegistry::getInstance()->getParser('cookie')->parseCookie($cookie);
+            return $data['cookies'];
+        }
+
+        return array();
+    }
+
+    public function getCookie($name)
+    {
+        $cookies = $this->getCookies();
+
+        return isset($cookies[$name]) ? $cookies[$name] : null;
+    }
+
+    public function addCookie($name, $value)
+    {
+        if (!$this->hasHeader('Cookie')) {
+            $this->setHeader('Cookie', "{$name}={$value}");
+        } else {
+            $this->getHeader('Cookie')->add("{$name}={$value}");
+        }
+
+        // Always use semicolons to separate multiple cookie headers
+        $this->getHeader('Cookie')->setGlue(';');
+
+        return $this;
+    }
+
+    public function removeCookie($name)
+    {
+        if ($cookie = $this->getHeader('Cookie')) {
+            foreach ($cookie as $cookieValue) {
+                if (strpos($cookieValue, $name . '=') === 0) {
+                    $cookie->removeValue($cookieValue);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    public function setEventDispatcher(EventDispatcherInterface $eventDispatcher)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+        $this->eventDispatcher->addListener('request.error', array(__CLASS__, 'onRequestError'), -255);
+
+        return $this;
+    }
+
+    public function getEventDispatcher()
+    {
+        if (!$this->eventDispatcher) {
+            $this->setEventDispatcher(new EventDispatcher());
+        }
+
+        return $this->eventDispatcher;
+    }
+
+    public function dispatch($eventName, array $context = array())
+    {
+        $context['request'] = $this;
+        $this->getEventDispatcher()->dispatch($eventName, new Event($context));
+    }
+
+    public function addSubscriber(EventSubscriberInterface $subscriber)
+    {
+        $this->getEventDispatcher()->addSubscriber($subscriber);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     * Adds a check for Host header changes
+     */
+    public function addHeader($header, $value)
+    {
+        parent::addHeader($header, $value);
+
+        if ($header == 'host' || $header == 'Host') {
+            $this->setHost((string) $this->getHeader('Host'));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get an array containing the request and response for event notifications
+     *
+     * @return array
+     */
+    protected function getEventArray()
+    {
+        return array(
+            'request'  => $this,
+            'response' => $this->response
+        );
+    }
+
+    /**
+     * Process a received response
+     *
+     * @param array $context Contextual information
+     * @throws RequestException|BadResponseException on unsuccessful responses
+     */
+    protected function processResponse(array $context = array())
+    {
+        if (!$this->response) {
+            // If no response, then processResponse shouldn't have been called
+            $e = new RequestException('Error completing request');
+            $e->setRequest($this);
+            throw $e;
+        }
+
+        $this->state = self::STATE_COMPLETE;
+
+        // A request was sent, but we don't know if we'll send more or if the final response will be successful
+        $this->dispatch('request.sent', $this->getEventArray() + $context);
+
+        // Some response processors will remove the response or reset the state (example: ExponentialBackoffPlugin)
+        if ($this->state == RequestInterface::STATE_COMPLETE) {
+
+            // The request completed, so the HTTP transaction is complete
+            $this->dispatch('request.complete', $this->getEventArray());
+
+            // If the response is bad, allow listeners to modify it or throw exceptions. You can change the response by
+            // modifying the Event object in your listeners or calling setResponse() on the request
+            if ($this->response->isError()) {
+                $event = new Event($this->getEventArray());
+                $this->getEventDispatcher()->dispatch('request.error', $event);
+                // Allow events of request.error to quietly change the response
+                if ($event['response'] !== $this->response) {
+                    $this->response = $event['response'];
+                }
+            }
+
+            // If a successful response was received, dispatch an event
+            if ($this->response->isSuccessful()) {
+                $this->dispatch('request.success', $this->getEventArray());
+            }
+        }
+    }
+
+    /**
+     * @deprecated Use Guzzle\Plugin\Cache\DefaultCanCacheStrategy
+     * @codeCoverageIgnore
+     */
+    public function canCache()
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use Guzzle\Plugin\Cache\DefaultCanCacheStrategy.');
+        if (class_exists('Guzzle\Plugin\Cache\DefaultCanCacheStrategy')) {
+            $canCache = new \Guzzle\Plugin\Cache\DefaultCanCacheStrategy();
+            return $canCache->canCacheRequest($this);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @deprecated Use the history plugin (not emitting a warning as this is built-into the RedirectPlugin for now)
+     * @codeCoverageIgnore
+     */
+    public function setIsRedirect($isRedirect)
+    {
+        $this->isRedirect = $isRedirect;
+
+        return $this;
+    }
+
+    /**
+     * @deprecated Use the history plugin
+     * @codeCoverageIgnore
+     */
+    public function isRedirect()
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use the HistoryPlugin to track this.');
+        return $this->isRedirect;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..f14d0879c36cefc74aa83104326a0aa82d7dcc38
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestFactory.php
@@ -0,0 +1,336 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\RedirectPlugin;
+use Guzzle\Http\Url;
+use Guzzle\Parser\ParserRegistry;
+use Guzzle\Plugin\Log\LogPlugin;
+
+/**
+ * Default HTTP request factory used to create the default {@see Request} and {@see EntityEnclosingRequest} objects.
+ */
+class RequestFactory implements RequestFactoryInterface
+{
+    /** @var RequestFactory Singleton instance of the default request factory */
+    protected static $instance;
+
+    /** @var array Hash of methods available to the class (provides fast isset() lookups) */
+    protected $methods;
+
+    /** @var string Class to instantiate for requests with no body */
+    protected $requestClass = 'Guzzle\\Http\\Message\\Request';
+
+    /** @var string Class to instantiate for requests with a body */
+    protected $entityEnclosingRequestClass = 'Guzzle\\Http\\Message\\EntityEnclosingRequest';
+
+    /**
+     * Get a cached instance of the default request factory
+     *
+     * @return RequestFactory
+     */
+    public static function getInstance()
+    {
+        // @codeCoverageIgnoreStart
+        if (!static::$instance) {
+            static::$instance = new static();
+        }
+        // @codeCoverageIgnoreEnd
+
+        return static::$instance;
+    }
+
+    public function __construct()
+    {
+        $this->methods = array_flip(get_class_methods(__CLASS__));
+    }
+
+    public function fromMessage($message)
+    {
+        $parsed = ParserRegistry::getInstance()->getParser('message')->parseRequest($message);
+
+        if (!$parsed) {
+            return false;
+        }
+
+        $request = $this->fromParts($parsed['method'], $parsed['request_url'],
+            $parsed['headers'], $parsed['body'], $parsed['protocol'],
+            $parsed['version']);
+
+        // EntityEnclosingRequest adds an "Expect: 100-Continue" header when using a raw request body for PUT or POST
+        // requests. This factory method should accurately reflect the message, so here we are removing the Expect
+        // header if one was not supplied in the message.
+        if (!isset($parsed['headers']['Expect']) && !isset($parsed['headers']['expect'])) {
+            $request->removeHeader('Expect');
+        }
+
+        return $request;
+    }
+
+    public function fromParts(
+        $method,
+        array $urlParts,
+        $headers = null,
+        $body = null,
+        $protocol = 'HTTP',
+        $protocolVersion = '1.1'
+    ) {
+        return $this->create($method, Url::buildUrl($urlParts), $headers, $body)
+                    ->setProtocolVersion($protocolVersion);
+    }
+
+    public function create($method, $url, $headers = null, $body = null, array $options = array())
+    {
+        $method = strtoupper($method);
+
+        if ($method == 'GET' || $method == 'HEAD' || $method == 'TRACE' || $method == 'OPTIONS') {
+            // Handle non-entity-enclosing request methods
+            $request = new $this->requestClass($method, $url, $headers);
+            if ($body) {
+                // The body is where the response body will be stored
+                $type = gettype($body);
+                if ($type == 'string' || $type == 'resource' || $type == 'object') {
+                    $request->setResponseBody($body);
+                }
+            }
+        } else {
+            // Create an entity enclosing request by default
+            $request = new $this->entityEnclosingRequestClass($method, $url, $headers);
+            if ($body) {
+                // Add POST fields and files to an entity enclosing request if an array is used
+                if (is_array($body) || $body instanceof Collection) {
+                    // Normalize PHP style cURL uploads with a leading '@' symbol
+                    foreach ($body as $key => $value) {
+                        if (is_string($value) && substr($value, 0, 1) == '@') {
+                            $request->addPostFile($key, $value);
+                            unset($body[$key]);
+                        }
+                    }
+                    // Add the fields if they are still present and not all files
+                    $request->addPostFields($body);
+                } else {
+                    // Add a raw entity body body to the request
+                    $request->setBody($body, (string) $request->getHeader('Content-Type'));
+                    if ((string) $request->getHeader('Transfer-Encoding') == 'chunked') {
+                        $request->removeHeader('Content-Length');
+                    }
+                }
+            }
+        }
+
+        if ($options) {
+            $this->applyOptions($request, $options);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Clone a request while changing the method. Emulates the behavior of
+     * {@see Guzzle\Http\Message\Request::clone}, but can change the HTTP method.
+     *
+     * @param RequestInterface $request Request to clone
+     * @param string           $method  Method to set
+     *
+     * @return RequestInterface
+     */
+    public function cloneRequestWithMethod(RequestInterface $request, $method)
+    {
+        // Create the request with the same client if possible
+        if ($client = $request->getClient()) {
+            $cloned = $request->getClient()->createRequest($method, $request->getUrl(), $request->getHeaders());
+        } else {
+            $cloned = $this->create($method, $request->getUrl(), $request->getHeaders());
+        }
+
+        $cloned->getCurlOptions()->replace($request->getCurlOptions()->toArray());
+        $cloned->setEventDispatcher(clone $request->getEventDispatcher());
+        // Ensure that that the Content-Length header is not copied if changing to GET or HEAD
+        if (!($cloned instanceof EntityEnclosingRequestInterface)) {
+            $cloned->removeHeader('Content-Length');
+        } elseif ($request instanceof EntityEnclosingRequestInterface) {
+            $cloned->setBody($request->getBody());
+        }
+        $cloned->getParams()->replace($request->getParams()->toArray());
+        $cloned->dispatch('request.clone', array('request' => $cloned));
+
+        return $cloned;
+    }
+
+    public function applyOptions(RequestInterface $request, array $options = array(), $flags = self::OPTIONS_NONE)
+    {
+        // Iterate over each key value pair and attempt to apply a config using function visitors
+        foreach ($options as $key => $value) {
+            $method = "visit_{$key}";
+            if (isset($this->methods[$method])) {
+                $this->{$method}($request, $value, $flags);
+            }
+        }
+    }
+
+    protected function visit_headers(RequestInterface $request, $value, $flags)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('headers value must be an array');
+        }
+
+        if ($flags & self::OPTIONS_AS_DEFAULTS) {
+            // Merge headers in but do not overwrite existing values
+            foreach ($value as $key => $header) {
+                if (!$request->hasHeader($key)) {
+                    $request->setHeader($key, $header);
+                }
+            }
+        } else {
+            $request->addHeaders($value);
+        }
+    }
+
+    protected function visit_body(RequestInterface $request, $value, $flags)
+    {
+        if ($request instanceof EntityEnclosingRequestInterface) {
+            $request->setBody($value);
+        } else {
+            throw new InvalidArgumentException('Attempting to set a body on a non-entity-enclosing request');
+        }
+    }
+
+    protected function visit_allow_redirects(RequestInterface $request, $value, $flags)
+    {
+        if ($value === false) {
+            $request->getParams()->set(RedirectPlugin::DISABLE, true);
+        }
+    }
+
+    protected function visit_auth(RequestInterface $request, $value, $flags)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('auth value must be an array');
+        }
+
+        $request->setAuth($value[0], isset($value[1]) ? $value[1] : null, isset($value[2]) ? $value[2] : 'basic');
+    }
+
+    protected function visit_query(RequestInterface $request, $value, $flags)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('query value must be an array');
+        }
+
+        if ($flags & self::OPTIONS_AS_DEFAULTS) {
+            // Merge query string values in but do not overwrite existing values
+            $query = $request->getQuery();
+            $query->overwriteWith(array_diff_key($value, $query->toArray()));
+        } else {
+            $request->getQuery()->overwriteWith($value);
+        }
+    }
+
+    protected function visit_cookies(RequestInterface $request, $value, $flags)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('cookies value must be an array');
+        }
+
+        foreach ($value as $name => $v) {
+            $request->addCookie($name, $v);
+        }
+    }
+
+    protected function visit_events(RequestInterface $request, $value, $flags)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('events value must be an array');
+        }
+
+        foreach ($value as $name => $method) {
+            if (is_array($method)) {
+                $request->getEventDispatcher()->addListener($name, $method[0], $method[1]);
+            } else {
+                $request->getEventDispatcher()->addListener($name, $method);
+            }
+        }
+    }
+
+    protected function visit_plugins(RequestInterface $request, $value, $flags)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('plugins value must be an array');
+        }
+
+        foreach ($value as $plugin) {
+            $request->addSubscriber($plugin);
+        }
+    }
+
+    protected function visit_exceptions(RequestInterface $request, $value, $flags)
+    {
+        if ($value === false || $value === 0) {
+            $dispatcher = $request->getEventDispatcher();
+            foreach ($dispatcher->getListeners('request.error') as $listener) {
+                if ($listener[0] == 'Guzzle\Http\Message\Request' && $listener[1] = 'onRequestError') {
+                    $dispatcher->removeListener('request.error', $listener);
+                    break;
+                }
+            }
+        }
+    }
+
+    protected function visit_save_to(RequestInterface $request, $value, $flags)
+    {
+        $request->setResponseBody($value);
+    }
+
+    protected function visit_params(RequestInterface $request, $value, $flags)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('params value must be an array');
+        }
+
+        $request->getParams()->overwriteWith($value);
+    }
+
+    protected function visit_timeout(RequestInterface $request, $value, $flags)
+    {
+        $request->getCurlOptions()->set(CURLOPT_TIMEOUT_MS, $value * 1000);
+    }
+
+    protected function visit_connect_timeout(RequestInterface $request, $value, $flags)
+    {
+        $request->getCurlOptions()->set(CURLOPT_CONNECTTIMEOUT_MS, $value * 1000);
+    }
+
+    protected function visit_debug(RequestInterface $request, $value, $flags)
+    {
+        if (class_exists('Guzzle\Plugin\Log\LogPlugin')) {
+            $request->addSubscriber(LogPlugin::getDebugPlugin());
+        } else {
+            // @codeCoverageIgnoreStart
+            $request->getCurlOptions()->set(CURLOPT_VERBOSE, true);
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+    protected function visit_verify(RequestInterface $request, $value, $flags)
+    {
+        $curl = $request->getCurlOptions();
+        if ($value === true || is_string($value)) {
+            $curl[CURLOPT_SSL_VERIFYHOST] = 2;
+            $curl[CURLOPT_SSL_VERIFYPEER] = true;
+            if ($value !== true) {
+                $curl[CURLOPT_CAINFO] = $value;
+            }
+        } elseif ($value === false) {
+            unset($curl[CURLOPT_CAINFO]);
+            $curl[CURLOPT_SSL_VERIFYHOST] = 0;
+            $curl[CURLOPT_SSL_VERIFYPEER] = false;
+        }
+    }
+
+    protected function visit_proxy(RequestInterface $request, $value, $flags)
+    {
+        $request->getCurlOptions()->set(CURLOPT_PROXY, $value, $flags);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestFactoryInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestFactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..5f31b5060be930f9274315fc5dcb50eacb258d35
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestFactoryInterface.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Collection;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Http\Url;
+
+/**
+ * Request factory used to create HTTP requests
+ */
+interface RequestFactoryInterface
+{
+    const OPTIONS_NONE = 0;
+    const OPTIONS_AS_DEFAULTS = 1;
+
+    /**
+     * Create a new request based on an HTTP message
+     *
+     * @param string $message HTTP message as a string
+     *
+     * @return RequestInterface
+     */
+    public function fromMessage($message);
+
+    /**
+     * Create a request from URL parts as returned from parse_url()
+     *
+     * @param string $method HTTP method (GET, POST, PUT, HEAD, DELETE, etc)
+     *
+     * @param array $urlParts URL parts containing the same keys as parse_url()
+     *     - scheme: e.g. http
+     *     - host:   e.g. www.guzzle-project.com
+     *     - port:   e.g. 80
+     *     - user:   e.g. michael
+     *     - pass:   e.g. rocks
+     *     - path:   e.g. / OR /index.html
+     *     - query:  after the question mark ?
+     * @param array|Collection                          $headers         HTTP headers
+     * @param string|resource|array|EntityBodyInterface $body            Body to send in the request
+     * @param string                                    $protocol        Protocol (HTTP, SPYDY, etc)
+     * @param string                                    $protocolVersion 1.0, 1.1, etc
+     *
+     * @return RequestInterface
+     */
+    public function fromParts(
+        $method,
+        array $urlParts,
+        $headers = null,
+        $body = null,
+        $protocol = 'HTTP',
+        $protocolVersion = '1.1'
+    );
+
+    /**
+     * Create a new request based on the HTTP method
+     *
+     * @param string                                    $method  HTTP method (GET, POST, PUT, PATCH, HEAD, DELETE, ...)
+     * @param string|Url                                $url     HTTP URL to connect to
+     * @param array|Collection                          $headers HTTP headers
+     * @param string|resource|array|EntityBodyInterface $body    Body to send in the request
+     * @param array                                     $options Array of options to apply to the request
+     *
+     * @return RequestInterface
+     */
+    public function create($method, $url, $headers = null, $body = null, array $options = array());
+
+    /**
+     * Apply an associative array of options to the request
+     *
+     * @param RequestInterface $request Request to update
+     * @param array            $options Options to use with the request. Available options are:
+     *        "headers": Associative array of headers
+     *        "query": Associative array of query string values to add to the request
+     *        "body": Body of a request, including an EntityBody, string, or array when sending POST requests.
+     *        "auth": Array of HTTP authentication parameters to use with the request. The array must contain the
+     *            username in index [0], the password in index [2], and can optionally contain the authentication type
+     *            in index [3]. The authentication types are: "Basic", "Digest", "NTLM", "Any" (defaults to "Basic").
+     *        "cookies": Associative array of cookies
+     *        "allow_redirects": Set to false to disable redirects
+     *        "save_to": String, fopen resource, or EntityBody object used to store the body of the response
+     *        "events": Associative array mapping event names to a closure or array of (priority, closure)
+     *        "plugins": Array of plugins to add to the request
+     *        "exceptions": Set to false to disable throwing exceptions on an HTTP level error (e.g. 404, 500, etc)
+     *        "params": Set custom request data parameters on a request. (Note: these are not query string parameters)
+     *        "timeout": Float describing the timeout of the request in seconds
+     *        "connect_timeout": Float describing the number of seconds to wait while trying to connect. Use 0 to wait
+     *            indefinitely.
+     *        "verify": Set to true to enable SSL cert validation (the default), false to disable, or supply the path
+     *            to a CA bundle to enable verification using a custom certificate.
+     *        "proxy": Specify an HTTP proxy (e.g. "http://username:password@192.168.16.1:10")
+     *        "debug": Set to true to display all data sent over the wire
+     * @param int $flags Bitwise flags to apply when applying the options to the request. Defaults to no special
+     *                   options. `1` (OPTIONS_AS_DEFAULTS): When specified, options will only update a request when
+     *                   the value does not already exist on the request. This is only supported by "query" and
+     *                   "headers". Other bitwise options may be added in the future.
+     */
+    public function applyOptions(RequestInterface $request, array $options = array(), $flags = self::OPTIONS_NONE);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..2f6b3c8d722c6b6dd6e5914cd6aa46f1c3ef9080
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/RequestInterface.php
@@ -0,0 +1,318 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\HasDispatcherInterface;
+use Guzzle\Http\Exception\RequestException;
+use Guzzle\Http\ClientInterface;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Http\Url;
+use Guzzle\Http\QueryString;
+
+/**
+ * Generic HTTP request interface
+ */
+interface RequestInterface extends MessageInterface, HasDispatcherInterface
+{
+    const STATE_NEW = 'new';
+    const STATE_COMPLETE = 'complete';
+    const STATE_TRANSFER = 'transfer';
+    const STATE_ERROR = 'error';
+
+    const GET = 'GET';
+    const PUT = 'PUT';
+    const POST = 'POST';
+    const DELETE = 'DELETE';
+    const HEAD = 'HEAD';
+    const CONNECT = 'CONNECT';
+    const OPTIONS = 'OPTIONS';
+    const TRACE = 'TRACE';
+    const PATCH = 'PATCH';
+
+    /**
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Send the request
+     *
+     * @return Response
+     * @throws RequestException on a request error
+     */
+    public function send();
+
+    /**
+     * Set the client used to transport the request
+     *
+     * @param ClientInterface $client
+     *
+     * @return self
+     */
+    public function setClient(ClientInterface $client);
+
+    /**
+     * Get the client used to transport the request
+     *
+     * @return ClientInterface $client
+     */
+    public function getClient();
+
+    /**
+     * Set the URL of the request
+     *
+     * @param string $url|Url Full URL to set including query string
+     *
+     * @return self
+     */
+    public function setUrl($url);
+
+    /**
+     * Get the full URL of the request (e.g. 'http://www.guzzle-project.com/')
+     *
+     * @param bool $asObject Set to TRUE to retrieve the URL as a clone of the URL object owned by the request.
+     *
+     * @return string|Url
+     */
+    public function getUrl($asObject = false);
+
+    /**
+     * Get the resource part of the the request, including the path, query string, and fragment
+     *
+     * @return string
+     */
+    public function getResource();
+
+    /**
+     * Get the collection of key value pairs that will be used as the query string in the request
+     *
+     * @return QueryString
+     */
+    public function getQuery();
+
+    /**
+     * Get the HTTP method of the request
+     *
+     * @return string
+     */
+    public function getMethod();
+
+    /**
+     * Get the URI scheme of the request (http, https, ftp, etc)
+     *
+     * @return string
+     */
+    public function getScheme();
+
+    /**
+     * Set the URI scheme of the request (http, https, ftp, etc)
+     *
+     * @param string $scheme Scheme to set
+     *
+     * @return self
+     */
+    public function setScheme($scheme);
+
+    /**
+     * Get the host of the request
+     *
+     * @return string
+     */
+    public function getHost();
+
+    /**
+     * Set the host of the request. Including a port in the host will modify the port of the request.
+     *
+     * @param string $host Host to set (e.g. www.yahoo.com, www.yahoo.com:80)
+     *
+     * @return self
+     */
+    public function setHost($host);
+
+    /**
+     * Get the path of the request (e.g. '/', '/index.html')
+     *
+     * @return string
+     */
+    public function getPath();
+
+    /**
+     * Set the path of the request (e.g. '/', '/index.html')
+     *
+     * @param string|array $path Path to set or array of segments to implode
+     *
+     * @return self
+     */
+    public function setPath($path);
+
+    /**
+     * Get the port that the request will be sent on if it has been set
+     *
+     * @return int|null
+     */
+    public function getPort();
+
+    /**
+     * Set the port that the request will be sent on
+     *
+     * @param int $port Port number to set
+     *
+     * @return self
+     */
+    public function setPort($port);
+
+    /**
+     * Get the username to pass in the URL if set
+     *
+     * @return string|null
+     */
+    public function getUsername();
+
+    /**
+     * Get the password to pass in the URL if set
+     *
+     * @return string|null
+     */
+    public function getPassword();
+
+    /**
+     * Set HTTP authorization parameters
+     *
+     * @param string|bool $user     User name or false disable authentication
+     * @param string      $password Password
+     * @param string      $scheme   Authentication scheme ('Basic', 'Digest', or a CURLAUTH_* constant (deprecated))
+     *
+     * @return self
+     * @link http://www.ietf.org/rfc/rfc2617.txt
+     * @link http://php.net/manual/en/function.curl-setopt.php See the available options for CURLOPT_HTTPAUTH
+     * @throws RequestException
+     */
+    public function setAuth($user, $password = '', $scheme = 'Basic');
+
+    /**
+     * Get the HTTP protocol version of the request
+     *
+     * @return string
+     */
+    public function getProtocolVersion();
+
+    /**
+     * Set the HTTP protocol version of the request (e.g. 1.1 or 1.0)
+     *
+     * @param string $protocol HTTP protocol version to use with the request
+     *
+     * @return self
+     */
+    public function setProtocolVersion($protocol);
+
+    /**
+     * Get the previously received {@see Response} or NULL if the request has not been sent
+     *
+     * @return Response|null
+     */
+    public function getResponse();
+
+    /**
+     * Manually set a response for the request.
+     *
+     * This method is useful for specifying a mock response for the request or setting the response using a cache.
+     * Manually setting a response will bypass the actual sending of a request.
+     *
+     * @param Response $response Response object to set
+     * @param bool     $queued   Set to TRUE to keep the request in a state of not having been sent, but queue the
+     *                           response for send()
+     *
+     * @return self Returns a reference to the object.
+     */
+    public function setResponse(Response $response, $queued = false);
+
+    /**
+     * The start of a response has been received for a request and the request is still in progress
+     *
+     * @param Response $response Response that has been received so far
+     *
+     * @return self
+     */
+    public function startResponse(Response $response);
+
+    /**
+     * Set the EntityBody that will hold a successful response message's entity body.
+     *
+     * This method should be invoked when you need to send the response's entity body somewhere other than the normal
+     * php://temp buffer. For example, you can send the entity body to a socket, file, or some other custom stream.
+     *
+     * @param EntityBodyInterface|string|resource $body Response body object. Pass a string to attempt to store the
+     *                                                  response body in a local file.
+     * @return Request
+     */
+    public function setResponseBody($body);
+
+    /**
+     * Get the EntityBody that will hold the resulting response message's entity body. This response body will only
+     * be used for successful responses. Intermediate responses (e.g. redirects) will not use the targeted response
+     * body.
+     *
+     * @return EntityBodyInterface
+     */
+    public function getResponseBody();
+
+    /**
+     * Get the state of the request. One of 'complete', 'transfer', 'new', 'error'
+     *
+     * @return string
+     */
+    public function getState();
+
+    /**
+     * Set the state of the request
+     *
+     * @param string $state   State of the request ('complete', 'transfer', 'new', 'error')
+     * @param array  $context Contextual information about the state change
+     *
+     * @return string Returns the current state of the request (which may have changed due to events being fired)
+     */
+    public function setState($state, array $context = array());
+
+    /**
+     * Get the cURL options that will be applied when the cURL handle is created
+     *
+     * @return Collection
+     */
+    public function getCurlOptions();
+
+    /**
+     * Get an array of Cookies
+     *
+     * @return array
+     */
+    public function getCookies();
+
+    /**
+     * Get a cookie value by name
+     *
+     * @param string $name Cookie to retrieve
+     *
+     * @return null|string
+     */
+    public function getCookie($name);
+
+    /**
+     * Add a Cookie value by name to the Cookie header
+     *
+     * @param string $name  Name of the cookie to add
+     * @param string $value Value to set
+     *
+     * @return self
+     */
+    public function addCookie($name, $value);
+
+    /**
+     * Remove a specific cookie value by name
+     *
+     * @param string $name Cookie to remove by name
+     *
+     * @return self
+     */
+    public function removeCookie($name);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Response.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Response.php
new file mode 100644
index 0000000000000000000000000000000000000000..654ea761ff36684acdef9b6aea124177e7debb96
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Message/Response.php
@@ -0,0 +1,948 @@
+<?php
+
+namespace Guzzle\Http\Message;
+
+use Guzzle\Common\Version;
+use Guzzle\Common\ToArrayInterface;
+use Guzzle\Common\Exception\RuntimeException;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\Exception\BadResponseException;
+use Guzzle\Http\RedirectPlugin;
+use Guzzle\Parser\ParserRegistry;
+
+/**
+ * Guzzle HTTP response object
+ */
+class Response extends AbstractMessage implements \Serializable
+{
+    /**
+     * @var array Array of reason phrases and their corresponding status codes
+     */
+    private static $statusTexts = array(
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-Status',
+        208 => 'Already Reported',
+        226 => 'IM Used',
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        307 => 'Temporary Redirect',
+        308 => 'Permanent Redirect',
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        425 => 'Reserved for WebDAV advanced collections expired proposal',
+        426 => 'Upgrade required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
+        506 => 'Variant Also Negotiates (Experimental)',
+        507 => 'Insufficient Storage',
+        508 => 'Loop Detected',
+        510 => 'Not Extended',
+        511 => 'Network Authentication Required',
+    );
+
+    /** @var EntityBodyInterface The response body */
+    protected $body;
+
+    /** @var string The reason phrase of the response (human readable code) */
+    protected $reasonPhrase;
+
+    /** @var string The status code of the response */
+    protected $statusCode;
+
+    /** @var array Information about the request */
+    protected $info = array();
+
+    /** @var string The effective URL that returned this response */
+    protected $effectiveUrl;
+
+    /** @var array Cacheable response codes (see RFC 2616:13.4) */
+    protected static $cacheResponseCodes = array(200, 203, 206, 300, 301, 410);
+
+    /**
+     * Create a new Response based on a raw response message
+     *
+     * @param string $message Response message
+     *
+     * @return self|bool Returns false on error
+     */
+    public static function fromMessage($message)
+    {
+        $data = ParserRegistry::getInstance()->getParser('message')->parseResponse($message);
+        if (!$data) {
+            return false;
+        }
+
+        $response = new static($data['code'], $data['headers'], $data['body']);
+        $response->setProtocol($data['protocol'], $data['version'])
+                 ->setStatus($data['code'], $data['reason_phrase']);
+
+        // Set the appropriate Content-Length if the one set is inaccurate (e.g. setting to X)
+        $contentLength = (string) $response->getHeader('Content-Length');
+        $actualLength = strlen($data['body']);
+        if (strlen($data['body']) > 0 && $contentLength != $actualLength) {
+            $response->setHeader('Content-Length', $actualLength);
+        }
+
+        return $response;
+    }
+
+    /**
+     * Construct the response
+     *
+     * @param string                              $statusCode The response status code (e.g. 200, 404, etc)
+     * @param ToArrayInterface|array              $headers    The response headers
+     * @param string|resource|EntityBodyInterface $body       The body of the response
+     *
+     * @throws BadResponseException if an invalid response code is given
+     */
+    public function __construct($statusCode, $headers = null, $body = null)
+    {
+        parent::__construct();
+        $this->setStatus($statusCode);
+        $this->body = EntityBody::factory($body !== null ? $body : '');
+
+        if ($headers) {
+            if (is_array($headers)) {
+                $this->setHeaders($headers);
+            } elseif ($headers instanceof ToArrayInterface) {
+                $this->setHeaders($headers->toArray());
+            } else {
+                throw new BadResponseException('Invalid headers argument received');
+            }
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getMessage();
+    }
+
+    public function serialize()
+    {
+        return json_encode(array(
+            'status'  => $this->statusCode,
+            'body'    => (string) $this->body,
+            'headers' => $this->headers->toArray()
+        ));
+    }
+
+    public function unserialize($serialize)
+    {
+        $data = json_decode($serialize, true);
+        $this->__construct($data['status'], $data['headers'], $data['body']);
+    }
+
+    /**
+     * Get the response entity body
+     *
+     * @param bool $asString Set to TRUE to return a string of the body rather than a full body object
+     *
+     * @return EntityBodyInterface|string
+     */
+    public function getBody($asString = false)
+    {
+        return $asString ? (string) $this->body : $this->body;
+    }
+
+    /**
+     * Set the response entity body
+     *
+     * @param EntityBodyInterface|string $body Body to set
+     *
+     * @return self
+     */
+    public function setBody($body)
+    {
+        $this->body = EntityBody::factory($body);
+
+        return $this;
+    }
+
+    /**
+     * Set the protocol and protocol version of the response
+     *
+     * @param string $protocol Response protocol
+     * @param string $version  Protocol version
+     *
+     * @return self
+     */
+    public function setProtocol($protocol, $version)
+    {
+        $this->protocol = $protocol;
+        $this->protocolVersion = $version;
+
+        return $this;
+    }
+
+    /**
+     * Get the protocol used for the response (e.g. HTTP)
+     *
+     * @return string
+     */
+    public function getProtocol()
+    {
+        return $this->protocol;
+    }
+
+    /**
+     * Get the HTTP protocol version
+     *
+     * @return string
+     */
+    public function getProtocolVersion()
+    {
+        return $this->protocolVersion;
+    }
+
+    /**
+     * Get a cURL transfer information
+     *
+     * @param string $key A single statistic to check
+     *
+     * @return array|string|null Returns all stats if no key is set, a single stat if a key is set, or null if a key
+     *                           is set and not found
+     * @link http://www.php.net/manual/en/function.curl-getinfo.php
+     */
+    public function getInfo($key = null)
+    {
+        if ($key === null) {
+            return $this->info;
+        } elseif (array_key_exists($key, $this->info)) {
+            return $this->info[$key];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Set the transfer information
+     *
+     * @param array $info Array of cURL transfer stats
+     *
+     * @return self
+     */
+    public function setInfo(array $info)
+    {
+        $this->info = $info;
+
+        return $this;
+    }
+
+    /**
+     * Set the response status
+     *
+     * @param int    $statusCode   Response status code to set
+     * @param string $reasonPhrase Response reason phrase
+     *
+     * @return self
+     * @throws BadResponseException when an invalid response code is received
+     */
+    public function setStatus($statusCode, $reasonPhrase = '')
+    {
+        $this->statusCode = (int) $statusCode;
+
+        if (!$reasonPhrase && isset(self::$statusTexts[$this->statusCode])) {
+            $this->reasonPhrase = self::$statusTexts[$this->statusCode];
+        } else {
+            $this->reasonPhrase = $reasonPhrase;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the response status code
+     *
+     * @return integer
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    /**
+     * Get the entire response as a string
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        $message = $this->getRawHeaders();
+
+        // Only include the body in the message if the size is < 2MB
+        $size = $this->body->getSize();
+        if ($size < 2097152) {
+            $message .= (string) $this->body;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Get the the raw message headers as a string
+     *
+     * @return string
+     */
+    public function getRawHeaders()
+    {
+        $headers = 'HTTP/1.1 ' . $this->statusCode . ' ' . $this->reasonPhrase . "\r\n";
+        $lines = $this->getHeaderLines();
+        if (!empty($lines)) {
+            $headers .= implode("\r\n", $lines) . "\r\n";
+        }
+
+        return $headers . "\r\n";
+    }
+
+    /**
+     * Get the response reason phrase- a human readable version of the numeric
+     * status code
+     *
+     * @return string
+     */
+    public function getReasonPhrase()
+    {
+        return $this->reasonPhrase;
+    }
+
+    /**
+     * Get the Accept-Ranges HTTP header
+     *
+     * @return string Returns what partial content range types this server supports.
+     */
+    public function getAcceptRanges()
+    {
+        return (string) $this->getHeader('Accept-Ranges');
+    }
+
+    /**
+     * Calculate the age of the response
+     *
+     * @return integer
+     */
+    public function calculateAge()
+    {
+        $age = $this->getHeader('Age');
+
+        if ($age === null && $this->getDate()) {
+            $age = time() - strtotime($this->getDate());
+        }
+
+        return $age === null ? null : (int) (string) $age;
+    }
+
+    /**
+     * Get the Age HTTP header
+     *
+     * @return integer|null Returns the age the object has been in a proxy cache in seconds.
+     */
+    public function getAge()
+    {
+        return (string) $this->getHeader('Age');
+    }
+
+    /**
+     * Get the Allow HTTP header
+     *
+     * @return string|null Returns valid actions for a specified resource. To be used for a 405 Method not allowed.
+     */
+    public function getAllow()
+    {
+        return (string) $this->getHeader('Allow');
+    }
+
+    /**
+     * Check if an HTTP method is allowed by checking the Allow response header
+     *
+     * @param string $method Method to check
+     *
+     * @return bool
+     */
+    public function isMethodAllowed($method)
+    {
+        $allow = $this->getHeader('Allow');
+        if ($allow) {
+            foreach (explode(',', $allow) as $allowable) {
+                if (!strcasecmp(trim($allowable), $method)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the Cache-Control HTTP header
+     *
+     * @return string
+     */
+    public function getCacheControl()
+    {
+        return (string) $this->getHeader('Cache-Control');
+    }
+
+    /**
+     * Get the Connection HTTP header
+     *
+     * @return string
+     */
+    public function getConnection()
+    {
+        return (string) $this->getHeader('Connection');
+    }
+
+    /**
+     * Get the Content-Encoding HTTP header
+     *
+     * @return string|null
+     */
+    public function getContentEncoding()
+    {
+        return (string) $this->getHeader('Content-Encoding');
+    }
+
+    /**
+     * Get the Content-Language HTTP header
+     *
+     * @return string|null Returns the language the content is in.
+     */
+    public function getContentLanguage()
+    {
+        return (string) $this->getHeader('Content-Language');
+    }
+
+    /**
+     * Get the Content-Length HTTP header
+     *
+     * @return integer Returns the length of the response body in bytes
+     */
+    public function getContentLength()
+    {
+        return (int) (string) $this->getHeader('Content-Length');
+    }
+
+    /**
+     * Get the Content-Location HTTP header
+     *
+     * @return string|null Returns an alternate location for the returned data (e.g /index.htm)
+     */
+    public function getContentLocation()
+    {
+        return (string) $this->getHeader('Content-Location');
+    }
+
+    /**
+     * Get the Content-Disposition HTTP header
+     *
+     * @return string|null Returns the Content-Disposition header
+     */
+    public function getContentDisposition()
+    {
+        return (string) $this->getHeader('Content-Disposition');
+    }
+
+    /**
+     * Get the Content-MD5 HTTP header
+     *
+     * @return string|null Returns a Base64-encoded binary MD5 sum of the content of the response.
+     */
+    public function getContentMd5()
+    {
+        return (string) $this->getHeader('Content-MD5');
+    }
+
+    /**
+     * Get the Content-Range HTTP header
+     *
+     * @return string Returns where in a full body message this partial message belongs (e.g. bytes 21010-47021/47022).
+     */
+    public function getContentRange()
+    {
+        return (string) $this->getHeader('Content-Range');
+    }
+
+    /**
+     * Get the Content-Type HTTP header
+     *
+     * @return string Returns the mime type of this content.
+     */
+    public function getContentType()
+    {
+        return (string) $this->getHeader('Content-Type');
+    }
+
+    /**
+     * Checks if the Content-Type is of a certain type.  This is useful if the
+     * Content-Type header contains charset information and you need to know if
+     * the Content-Type matches a particular type.
+     *
+     * @param string $type Content type to check against
+     *
+     * @return bool
+     */
+    public function isContentType($type)
+    {
+        return stripos($this->getHeader('Content-Type'), $type) !== false;
+    }
+
+    /**
+     * Get the Date HTTP header
+     *
+     * @return string|null Returns the date and time that the message was sent.
+     */
+    public function getDate()
+    {
+        return (string) $this->getHeader('Date');
+    }
+
+    /**
+     * Get the ETag HTTP header
+     *
+     * @return string|null Returns an identifier for a specific version of a resource, often a Message digest.
+     */
+    public function getEtag()
+    {
+        return (string) $this->getHeader('ETag');
+    }
+
+    /**
+     * Get the Expires HTTP header
+     *
+     * @return string|null Returns the date/time after which the response is considered stale.
+     */
+    public function getExpires()
+    {
+        return (string) $this->getHeader('Expires');
+    }
+
+    /**
+     * Get the Last-Modified HTTP header
+     *
+     * @return string|null Returns the last modified date for the requested object, in RFC 2822 format
+     *                     (e.g. Tue, 15 Nov 1994 12:45:26 GMT)
+     */
+    public function getLastModified()
+    {
+        return (string) $this->getHeader('Last-Modified');
+    }
+
+    /**
+     * Get the Location HTTP header
+     *
+     * @return string|null Used in redirection, or when a new resource has been created.
+     */
+    public function getLocation()
+    {
+        return (string) $this->getHeader('Location');
+    }
+
+    /**
+     * Get the Pragma HTTP header
+     *
+     * @return Header|null Returns the implementation-specific headers that may have various effects anywhere along
+     *                     the request-response chain.
+     */
+    public function getPragma()
+    {
+        return (string) $this->getHeader('Pragma');
+    }
+
+    /**
+     * Get the Proxy-Authenticate HTTP header
+     *
+     * @return string|null Authentication to access the proxy (e.g. Basic)
+     */
+    public function getProxyAuthenticate()
+    {
+        return (string) $this->getHeader('Proxy-Authenticate');
+    }
+
+    /**
+     * Get the Retry-After HTTP header
+     *
+     * @return int|null If an entity is temporarily unavailable, this instructs the client to try again after a
+     *                  specified period of time.
+     */
+    public function getRetryAfter()
+    {
+        return (string) $this->getHeader('Retry-After');
+    }
+
+    /**
+     * Get the Server HTTP header
+     *
+     * @return string|null A name for the server
+     */
+    public function getServer()
+    {
+        return (string)  $this->getHeader('Server');
+    }
+
+    /**
+     * Get the Set-Cookie HTTP header
+     *
+     * @return string|null An HTTP cookie.
+     */
+    public function getSetCookie()
+    {
+        return (string) $this->getHeader('Set-Cookie');
+    }
+
+    /**
+     * Get the Trailer HTTP header
+     *
+     * @return string|null The Trailer general field value indicates that the given set of header fields is present in
+     *                     the trailer of a message encoded with chunked transfer-coding.
+     */
+    public function getTrailer()
+    {
+        return (string) $this->getHeader('Trailer');
+    }
+
+    /**
+     * Get the Transfer-Encoding HTTP header
+     *
+     * @return string|null The form of encoding used to safely transfer the entity to the user
+     */
+    public function getTransferEncoding()
+    {
+        return (string) $this->getHeader('Transfer-Encoding');
+    }
+
+    /**
+     * Get the Vary HTTP header
+     *
+     * @return string|null Tells downstream proxies how to match future request headers to decide whether the cached
+     *                     response can be used rather than requesting a fresh one from the origin server.
+     */
+    public function getVary()
+    {
+        return (string) $this->getHeader('Vary');
+    }
+
+    /**
+     * Get the Via HTTP header
+     *
+     * @return string|null Informs the client of proxies through which the response was sent.
+     */
+    public function getVia()
+    {
+        return (string) $this->getHeader('Via');
+    }
+
+    /**
+     * Get the Warning HTTP header
+     *
+     * @return string|null A general warning about possible problems with the entity body
+     */
+    public function getWarning()
+    {
+        return (string) $this->getHeader('Warning');
+    }
+
+    /**
+     * Get the WWW-Authenticate HTTP header
+     *
+     * @return string|null Indicates the authentication scheme that should be used to access the requested entity
+     */
+    public function getWwwAuthenticate()
+    {
+        return (string) $this->getHeader('WWW-Authenticate');
+    }
+
+    /**
+     * Checks if HTTP Status code is a Client Error (4xx)
+     *
+     * @return bool
+     */
+    public function isClientError()
+    {
+        return $this->statusCode >= 400 && $this->statusCode < 500;
+    }
+
+    /**
+     * Checks if HTTP Status code is Server OR Client Error (4xx or 5xx)
+     *
+     * @return boolean
+     */
+    public function isError()
+    {
+        return $this->isClientError() || $this->isServerError();
+    }
+
+    /**
+     * Checks if HTTP Status code is Information (1xx)
+     *
+     * @return bool
+     */
+    public function isInformational()
+    {
+        return $this->statusCode < 200;
+    }
+
+    /**
+     * Checks if HTTP Status code is a Redirect (3xx)
+     *
+     * @return bool
+     */
+    public function isRedirect()
+    {
+        return $this->statusCode >= 300 && $this->statusCode < 400;
+    }
+
+    /**
+     * Checks if HTTP Status code is Server Error (5xx)
+     *
+     * @return bool
+     */
+    public function isServerError()
+    {
+        return $this->statusCode >= 500 && $this->statusCode < 600;
+    }
+
+    /**
+     * Checks if HTTP Status code is Successful (2xx | 304)
+     *
+     * @return bool
+     */
+    public function isSuccessful()
+    {
+        return ($this->statusCode >= 200 && $this->statusCode < 300) || $this->statusCode == 304;
+    }
+
+    /**
+     * Check if the response can be cached based on the response headers
+     *
+     * @return bool Returns TRUE if the response can be cached or false if not
+     */
+    public function canCache()
+    {
+        // Check if the response is cacheable based on the code
+        if (!in_array((int) $this->getStatusCode(), self::$cacheResponseCodes)) {
+            return false;
+        }
+
+        // Make sure a valid body was returned and can be cached
+        if ((!$this->getBody()->isReadable() || !$this->getBody()->isSeekable())
+            && ($this->getContentLength() > 0 || $this->getTransferEncoding() == 'chunked')) {
+            return false;
+        }
+
+        // Never cache no-store resources (this is a private cache, so private
+        // can be cached)
+        if ($this->getHeader('Cache-Control') && $this->getHeader('Cache-Control')->hasDirective('no-store')) {
+            return false;
+        }
+
+        return $this->isFresh() || $this->getFreshness() === null || $this->canValidate();
+    }
+
+    /**
+     * Gets the number of seconds from the current time in which this response is still considered fresh
+     *
+     * @return int|null Returns the number of seconds
+     */
+    public function getMaxAge()
+    {
+        if ($header = $this->getHeader('Cache-Control')) {
+            // s-max-age, then max-age, then Expires
+            if ($age = $header->getDirective('s-maxage')) {
+                return $age;
+            }
+            if ($age = $header->getDirective('max-age')) {
+                return $age;
+            }
+        }
+
+        if ($this->getHeader('Expires')) {
+            return strtotime($this->getExpires()) - time();
+        }
+
+        return null;
+    }
+
+    /**
+     * Check if the response is considered fresh.
+     *
+     * A response is considered fresh when its age is less than or equal to the freshness lifetime (maximum age) of the
+     * response.
+     *
+     * @return bool|null
+     */
+    public function isFresh()
+    {
+        $fresh = $this->getFreshness();
+
+        return $fresh === null ? null : $fresh >= 0;
+    }
+
+    /**
+     * Check if the response can be validated against the origin server using a conditional GET request.
+     *
+     * @return bool
+     */
+    public function canValidate()
+    {
+        return $this->getEtag() || $this->getLastModified();
+    }
+
+    /**
+     * Get the freshness of the response by returning the difference of the maximum lifetime of the response and the
+     * age of the response (max-age - age).
+     *
+     * Freshness values less than 0 mean that the response is no longer fresh and is ABS(freshness) seconds expired.
+     * Freshness values of greater than zero is the number of seconds until the response is no longer fresh. A NULL
+     * result means that no freshness information is available.
+     *
+     * @return int
+     */
+    public function getFreshness()
+    {
+        $maxAge = $this->getMaxAge();
+        $age = $this->calculateAge();
+
+        return $maxAge && $age ? ($maxAge - $age) : null;
+    }
+
+    /**
+     * Parse the JSON response body and return an array
+     *
+     * @return array|string|int|bool|float
+     * @throws RuntimeException if the response body is not in JSON format
+     */
+    public function json()
+    {
+        $data = json_decode((string) $this->body, true);
+        if (JSON_ERROR_NONE !== json_last_error()) {
+            throw new RuntimeException('Unable to parse response body into JSON: ' . json_last_error());
+        }
+
+        return $data === null ? array() : $data;
+    }
+
+    /**
+     * Parse the XML response body and return a SimpleXMLElement
+     *
+     * @return \SimpleXMLElement
+     * @throws RuntimeException if the response body is not in XML format
+     */
+    public function xml()
+    {
+        try {
+            // Allow XML to be retrieved even if there is no response body
+            $xml = new \SimpleXMLElement((string) $this->body ?: '<root />');
+        } catch (\Exception $e) {
+            throw new RuntimeException('Unable to parse response body into XML: ' . $e->getMessage());
+        }
+
+        return $xml;
+    }
+
+    /**
+     * Get the redirect count of this response
+     *
+     * @return int
+     */
+    public function getRedirectCount()
+    {
+        return (int) $this->params->get(RedirectPlugin::REDIRECT_COUNT);
+    }
+
+    /**
+     * Set the effective URL that resulted in this response (e.g. the last redirect URL)
+     *
+     * @param string $url The effective URL
+     *
+     * @return self
+     */
+    public function setEffectiveUrl($url)
+    {
+        $this->effectiveUrl = $url;
+
+        return $this;
+    }
+
+    /**
+     * Get the effective URL that resulted in this response (e.g. the last redirect URL)
+     *
+     * @return string
+     */
+    public function getEffectiveUrl()
+    {
+        return $this->effectiveUrl;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function getPreviousResponse()
+    {
+        Version::warn(__METHOD__ . ' is deprecated. Use the HistoryPlugin.');
+        return null;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function setRequest($request)
+    {
+        Version::warn(__METHOD__ . ' is deprecated');
+        return $this;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function getRequest()
+    {
+        Version::warn(__METHOD__ . ' is deprecated');
+        return null;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Mimetypes.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Mimetypes.php
new file mode 100644
index 0000000000000000000000000000000000000000..15af061f6f3d8e162ac0d3d3feb8ead6d0dc4bbc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Mimetypes.php
@@ -0,0 +1,960 @@
+<?php
+
+namespace Guzzle\Http;
+
+/**
+ * Provides mappings of file extensions to mimetypes
+ * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types
+ */
+class Mimetypes
+{
+    /** @var self */
+    protected static $instance;
+
+    /** @var array Mapping of extension to mimetype */
+    protected $mimetypes = array(
+        '3dml' => 'text/vnd.in3d.3dml',
+        '3g2' => 'video/3gpp2',
+        '3gp' => 'video/3gpp',
+        '7z' => 'application/x-7z-compressed',
+        'aab' => 'application/x-authorware-bin',
+        'aac' => 'audio/x-aac',
+        'aam' => 'application/x-authorware-map',
+        'aas' => 'application/x-authorware-seg',
+        'abw' => 'application/x-abiword',
+        'ac' => 'application/pkix-attr-cert',
+        'acc' => 'application/vnd.americandynamics.acc',
+        'ace' => 'application/x-ace-compressed',
+        'acu' => 'application/vnd.acucobol',
+        'acutc' => 'application/vnd.acucorp',
+        'adp' => 'audio/adpcm',
+        'aep' => 'application/vnd.audiograph',
+        'afm' => 'application/x-font-type1',
+        'afp' => 'application/vnd.ibm.modcap',
+        'ahead' => 'application/vnd.ahead.space',
+        'ai' => 'application/postscript',
+        'aif' => 'audio/x-aiff',
+        'aifc' => 'audio/x-aiff',
+        'aiff' => 'audio/x-aiff',
+        'air' => 'application/vnd.adobe.air-application-installer-package+zip',
+        'ait' => 'application/vnd.dvb.ait',
+        'ami' => 'application/vnd.amiga.ami',
+        'apk' => 'application/vnd.android.package-archive',
+        'application' => 'application/x-ms-application',
+        'apr' => 'application/vnd.lotus-approach',
+        'asa' => 'text/plain',
+        'asax' => 'application/octet-stream',
+        'asc' => 'application/pgp-signature',
+        'ascx' => 'text/plain',
+        'asf' => 'video/x-ms-asf',
+        'ashx' => 'text/plain',
+        'asm' => 'text/x-asm',
+        'asmx' => 'text/plain',
+        'aso' => 'application/vnd.accpac.simply.aso',
+        'asp' => 'text/plain',
+        'aspx' => 'text/plain',
+        'asx' => 'video/x-ms-asf',
+        'atc' => 'application/vnd.acucorp',
+        'atom' => 'application/atom+xml',
+        'atomcat' => 'application/atomcat+xml',
+        'atomsvc' => 'application/atomsvc+xml',
+        'atx' => 'application/vnd.antix.game-component',
+        'au' => 'audio/basic',
+        'avi' => 'video/x-msvideo',
+        'aw' => 'application/applixware',
+        'axd' => 'text/plain',
+        'azf' => 'application/vnd.airzip.filesecure.azf',
+        'azs' => 'application/vnd.airzip.filesecure.azs',
+        'azw' => 'application/vnd.amazon.ebook',
+        'bat' => 'application/x-msdownload',
+        'bcpio' => 'application/x-bcpio',
+        'bdf' => 'application/x-font-bdf',
+        'bdm' => 'application/vnd.syncml.dm+wbxml',
+        'bed' => 'application/vnd.realvnc.bed',
+        'bh2' => 'application/vnd.fujitsu.oasysprs',
+        'bin' => 'application/octet-stream',
+        'bmi' => 'application/vnd.bmi',
+        'bmp' => 'image/bmp',
+        'book' => 'application/vnd.framemaker',
+        'box' => 'application/vnd.previewsystems.box',
+        'boz' => 'application/x-bzip2',
+        'bpk' => 'application/octet-stream',
+        'btif' => 'image/prs.btif',
+        'bz' => 'application/x-bzip',
+        'bz2' => 'application/x-bzip2',
+        'c' => 'text/x-c',
+        'c11amc' => 'application/vnd.cluetrust.cartomobile-config',
+        'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg',
+        'c4d' => 'application/vnd.clonk.c4group',
+        'c4f' => 'application/vnd.clonk.c4group',
+        'c4g' => 'application/vnd.clonk.c4group',
+        'c4p' => 'application/vnd.clonk.c4group',
+        'c4u' => 'application/vnd.clonk.c4group',
+        'cab' => 'application/vnd.ms-cab-compressed',
+        'car' => 'application/vnd.curl.car',
+        'cat' => 'application/vnd.ms-pki.seccat',
+        'cc' => 'text/x-c',
+        'cct' => 'application/x-director',
+        'ccxml' => 'application/ccxml+xml',
+        'cdbcmsg' => 'application/vnd.contact.cmsg',
+        'cdf' => 'application/x-netcdf',
+        'cdkey' => 'application/vnd.mediastation.cdkey',
+        'cdmia' => 'application/cdmi-capability',
+        'cdmic' => 'application/cdmi-container',
+        'cdmid' => 'application/cdmi-domain',
+        'cdmio' => 'application/cdmi-object',
+        'cdmiq' => 'application/cdmi-queue',
+        'cdx' => 'chemical/x-cdx',
+        'cdxml' => 'application/vnd.chemdraw+xml',
+        'cdy' => 'application/vnd.cinderella',
+        'cer' => 'application/pkix-cert',
+        'cfc' => 'application/x-coldfusion',
+        'cfm' => 'application/x-coldfusion',
+        'cgm' => 'image/cgm',
+        'chat' => 'application/x-chat',
+        'chm' => 'application/vnd.ms-htmlhelp',
+        'chrt' => 'application/vnd.kde.kchart',
+        'cif' => 'chemical/x-cif',
+        'cii' => 'application/vnd.anser-web-certificate-issue-initiation',
+        'cil' => 'application/vnd.ms-artgalry',
+        'cla' => 'application/vnd.claymore',
+        'class' => 'application/java-vm',
+        'clkk' => 'application/vnd.crick.clicker.keyboard',
+        'clkp' => 'application/vnd.crick.clicker.palette',
+        'clkt' => 'application/vnd.crick.clicker.template',
+        'clkw' => 'application/vnd.crick.clicker.wordbank',
+        'clkx' => 'application/vnd.crick.clicker',
+        'clp' => 'application/x-msclip',
+        'cmc' => 'application/vnd.cosmocaller',
+        'cmdf' => 'chemical/x-cmdf',
+        'cml' => 'chemical/x-cml',
+        'cmp' => 'application/vnd.yellowriver-custom-menu',
+        'cmx' => 'image/x-cmx',
+        'cod' => 'application/vnd.rim.cod',
+        'com' => 'application/x-msdownload',
+        'conf' => 'text/plain',
+        'cpio' => 'application/x-cpio',
+        'cpp' => 'text/x-c',
+        'cpt' => 'application/mac-compactpro',
+        'crd' => 'application/x-mscardfile',
+        'crl' => 'application/pkix-crl',
+        'crt' => 'application/x-x509-ca-cert',
+        'cryptonote' => 'application/vnd.rig.cryptonote',
+        'cs' => 'text/plain',
+        'csh' => 'application/x-csh',
+        'csml' => 'chemical/x-csml',
+        'csp' => 'application/vnd.commonspace',
+        'css' => 'text/css',
+        'cst' => 'application/x-director',
+        'csv' => 'text/csv',
+        'cu' => 'application/cu-seeme',
+        'curl' => 'text/vnd.curl',
+        'cww' => 'application/prs.cww',
+        'cxt' => 'application/x-director',
+        'cxx' => 'text/x-c',
+        'dae' => 'model/vnd.collada+xml',
+        'daf' => 'application/vnd.mobius.daf',
+        'dataless' => 'application/vnd.fdsn.seed',
+        'davmount' => 'application/davmount+xml',
+        'dcr' => 'application/x-director',
+        'dcurl' => 'text/vnd.curl.dcurl',
+        'dd2' => 'application/vnd.oma.dd2+xml',
+        'ddd' => 'application/vnd.fujixerox.ddd',
+        'deb' => 'application/x-debian-package',
+        'def' => 'text/plain',
+        'deploy' => 'application/octet-stream',
+        'der' => 'application/x-x509-ca-cert',
+        'dfac' => 'application/vnd.dreamfactory',
+        'dic' => 'text/x-c',
+        'dir' => 'application/x-director',
+        'dis' => 'application/vnd.mobius.dis',
+        'dist' => 'application/octet-stream',
+        'distz' => 'application/octet-stream',
+        'djv' => 'image/vnd.djvu',
+        'djvu' => 'image/vnd.djvu',
+        'dll' => 'application/x-msdownload',
+        'dmg' => 'application/octet-stream',
+        'dms' => 'application/octet-stream',
+        'dna' => 'application/vnd.dna',
+        'doc' => 'application/msword',
+        'docm' => 'application/vnd.ms-word.document.macroenabled.12',
+        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'dot' => 'application/msword',
+        'dotm' => 'application/vnd.ms-word.template.macroenabled.12',
+        'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+        'dp' => 'application/vnd.osgi.dp',
+        'dpg' => 'application/vnd.dpgraph',
+        'dra' => 'audio/vnd.dra',
+        'dsc' => 'text/prs.lines.tag',
+        'dssc' => 'application/dssc+der',
+        'dtb' => 'application/x-dtbook+xml',
+        'dtd' => 'application/xml-dtd',
+        'dts' => 'audio/vnd.dts',
+        'dtshd' => 'audio/vnd.dts.hd',
+        'dump' => 'application/octet-stream',
+        'dvi' => 'application/x-dvi',
+        'dwf' => 'model/vnd.dwf',
+        'dwg' => 'image/vnd.dwg',
+        'dxf' => 'image/vnd.dxf',
+        'dxp' => 'application/vnd.spotfire.dxp',
+        'dxr' => 'application/x-director',
+        'ecelp4800' => 'audio/vnd.nuera.ecelp4800',
+        'ecelp7470' => 'audio/vnd.nuera.ecelp7470',
+        'ecelp9600' => 'audio/vnd.nuera.ecelp9600',
+        'ecma' => 'application/ecmascript',
+        'edm' => 'application/vnd.novadigm.edm',
+        'edx' => 'application/vnd.novadigm.edx',
+        'efif' => 'application/vnd.picsel',
+        'ei6' => 'application/vnd.pg.osasli',
+        'elc' => 'application/octet-stream',
+        'eml' => 'message/rfc822',
+        'emma' => 'application/emma+xml',
+        'eol' => 'audio/vnd.digital-winds',
+        'eot' => 'application/vnd.ms-fontobject',
+        'eps' => 'application/postscript',
+        'epub' => 'application/epub+zip',
+        'es3' => 'application/vnd.eszigno3+xml',
+        'esf' => 'application/vnd.epson.esf',
+        'et3' => 'application/vnd.eszigno3+xml',
+        'etx' => 'text/x-setext',
+        'exe' => 'application/x-msdownload',
+        'exi' => 'application/exi',
+        'ext' => 'application/vnd.novadigm.ext',
+        'ez' => 'application/andrew-inset',
+        'ez2' => 'application/vnd.ezpix-album',
+        'ez3' => 'application/vnd.ezpix-package',
+        'f' => 'text/x-fortran',
+        'f4v' => 'video/x-f4v',
+        'f77' => 'text/x-fortran',
+        'f90' => 'text/x-fortran',
+        'fbs' => 'image/vnd.fastbidsheet',
+        'fcs' => 'application/vnd.isac.fcs',
+        'fdf' => 'application/vnd.fdf',
+        'fe_launch' => 'application/vnd.denovo.fcselayout-link',
+        'fg5' => 'application/vnd.fujitsu.oasysgp',
+        'fgd' => 'application/x-director',
+        'fh' => 'image/x-freehand',
+        'fh4' => 'image/x-freehand',
+        'fh5' => 'image/x-freehand',
+        'fh7' => 'image/x-freehand',
+        'fhc' => 'image/x-freehand',
+        'fig' => 'application/x-xfig',
+        'fli' => 'video/x-fli',
+        'flo' => 'application/vnd.micrografx.flo',
+        'flv' => 'video/x-flv',
+        'flw' => 'application/vnd.kde.kivio',
+        'flx' => 'text/vnd.fmi.flexstor',
+        'fly' => 'text/vnd.fly',
+        'fm' => 'application/vnd.framemaker',
+        'fnc' => 'application/vnd.frogans.fnc',
+        'for' => 'text/x-fortran',
+        'fpx' => 'image/vnd.fpx',
+        'frame' => 'application/vnd.framemaker',
+        'fsc' => 'application/vnd.fsc.weblaunch',
+        'fst' => 'image/vnd.fst',
+        'ftc' => 'application/vnd.fluxtime.clip',
+        'fti' => 'application/vnd.anser-web-funds-transfer-initiation',
+        'fvt' => 'video/vnd.fvt',
+        'fxp' => 'application/vnd.adobe.fxp',
+        'fxpl' => 'application/vnd.adobe.fxp',
+        'fzs' => 'application/vnd.fuzzysheet',
+        'g2w' => 'application/vnd.geoplan',
+        'g3' => 'image/g3fax',
+        'g3w' => 'application/vnd.geospace',
+        'gac' => 'application/vnd.groove-account',
+        'gdl' => 'model/vnd.gdl',
+        'geo' => 'application/vnd.dynageo',
+        'gex' => 'application/vnd.geometry-explorer',
+        'ggb' => 'application/vnd.geogebra.file',
+        'ggt' => 'application/vnd.geogebra.tool',
+        'ghf' => 'application/vnd.groove-help',
+        'gif' => 'image/gif',
+        'gim' => 'application/vnd.groove-identity-message',
+        'gmx' => 'application/vnd.gmx',
+        'gnumeric' => 'application/x-gnumeric',
+        'gph' => 'application/vnd.flographit',
+        'gqf' => 'application/vnd.grafeq',
+        'gqs' => 'application/vnd.grafeq',
+        'gram' => 'application/srgs',
+        'gre' => 'application/vnd.geometry-explorer',
+        'grv' => 'application/vnd.groove-injector',
+        'grxml' => 'application/srgs+xml',
+        'gsf' => 'application/x-font-ghostscript',
+        'gtar' => 'application/x-gtar',
+        'gtm' => 'application/vnd.groove-tool-message',
+        'gtw' => 'model/vnd.gtw',
+        'gv' => 'text/vnd.graphviz',
+        'gxt' => 'application/vnd.geonext',
+        'h' => 'text/x-c',
+        'h261' => 'video/h261',
+        'h263' => 'video/h263',
+        'h264' => 'video/h264',
+        'hal' => 'application/vnd.hal+xml',
+        'hbci' => 'application/vnd.hbci',
+        'hdf' => 'application/x-hdf',
+        'hh' => 'text/x-c',
+        'hlp' => 'application/winhlp',
+        'hpgl' => 'application/vnd.hp-hpgl',
+        'hpid' => 'application/vnd.hp-hpid',
+        'hps' => 'application/vnd.hp-hps',
+        'hqx' => 'application/mac-binhex40',
+        'hta' => 'application/octet-stream',
+        'htc' => 'text/html',
+        'htke' => 'application/vnd.kenameaapp',
+        'htm' => 'text/html',
+        'html' => 'text/html',
+        'hvd' => 'application/vnd.yamaha.hv-dic',
+        'hvp' => 'application/vnd.yamaha.hv-voice',
+        'hvs' => 'application/vnd.yamaha.hv-script',
+        'i2g' => 'application/vnd.intergeo',
+        'icc' => 'application/vnd.iccprofile',
+        'ice' => 'x-conference/x-cooltalk',
+        'icm' => 'application/vnd.iccprofile',
+        'ico' => 'image/x-icon',
+        'ics' => 'text/calendar',
+        'ief' => 'image/ief',
+        'ifb' => 'text/calendar',
+        'ifm' => 'application/vnd.shana.informed.formdata',
+        'iges' => 'model/iges',
+        'igl' => 'application/vnd.igloader',
+        'igm' => 'application/vnd.insors.igm',
+        'igs' => 'model/iges',
+        'igx' => 'application/vnd.micrografx.igx',
+        'iif' => 'application/vnd.shana.informed.interchange',
+        'imp' => 'application/vnd.accpac.simply.imp',
+        'ims' => 'application/vnd.ms-ims',
+        'in' => 'text/plain',
+        'ini' => 'text/plain',
+        'ipfix' => 'application/ipfix',
+        'ipk' => 'application/vnd.shana.informed.package',
+        'irm' => 'application/vnd.ibm.rights-management',
+        'irp' => 'application/vnd.irepository.package+xml',
+        'iso' => 'application/octet-stream',
+        'itp' => 'application/vnd.shana.informed.formtemplate',
+        'ivp' => 'application/vnd.immervision-ivp',
+        'ivu' => 'application/vnd.immervision-ivu',
+        'jad' => 'text/vnd.sun.j2me.app-descriptor',
+        'jam' => 'application/vnd.jam',
+        'jar' => 'application/java-archive',
+        'java' => 'text/x-java-source',
+        'jisp' => 'application/vnd.jisp',
+        'jlt' => 'application/vnd.hp-jlyt',
+        'jnlp' => 'application/x-java-jnlp-file',
+        'joda' => 'application/vnd.joost.joda-archive',
+        'jpe' => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'jpg' => 'image/jpeg',
+        'jpgm' => 'video/jpm',
+        'jpgv' => 'video/jpeg',
+        'jpm' => 'video/jpm',
+        'js' => 'text/javascript',
+        'json' => 'application/json',
+        'kar' => 'audio/midi',
+        'karbon' => 'application/vnd.kde.karbon',
+        'kfo' => 'application/vnd.kde.kformula',
+        'kia' => 'application/vnd.kidspiration',
+        'kml' => 'application/vnd.google-earth.kml+xml',
+        'kmz' => 'application/vnd.google-earth.kmz',
+        'kne' => 'application/vnd.kinar',
+        'knp' => 'application/vnd.kinar',
+        'kon' => 'application/vnd.kde.kontour',
+        'kpr' => 'application/vnd.kde.kpresenter',
+        'kpt' => 'application/vnd.kde.kpresenter',
+        'ksp' => 'application/vnd.kde.kspread',
+        'ktr' => 'application/vnd.kahootz',
+        'ktx' => 'image/ktx',
+        'ktz' => 'application/vnd.kahootz',
+        'kwd' => 'application/vnd.kde.kword',
+        'kwt' => 'application/vnd.kde.kword',
+        'lasxml' => 'application/vnd.las.las+xml',
+        'latex' => 'application/x-latex',
+        'lbd' => 'application/vnd.llamagraphics.life-balance.desktop',
+        'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml',
+        'les' => 'application/vnd.hhe.lesson-player',
+        'lha' => 'application/octet-stream',
+        'link66' => 'application/vnd.route66.link66+xml',
+        'list' => 'text/plain',
+        'list3820' => 'application/vnd.ibm.modcap',
+        'listafp' => 'application/vnd.ibm.modcap',
+        'log' => 'text/plain',
+        'lostxml' => 'application/lost+xml',
+        'lrf' => 'application/octet-stream',
+        'lrm' => 'application/vnd.ms-lrm',
+        'ltf' => 'application/vnd.frogans.ltf',
+        'lvp' => 'audio/vnd.lucent.voice',
+        'lwp' => 'application/vnd.lotus-wordpro',
+        'lzh' => 'application/octet-stream',
+        'm13' => 'application/x-msmediaview',
+        'm14' => 'application/x-msmediaview',
+        'm1v' => 'video/mpeg',
+        'm21' => 'application/mp21',
+        'm2a' => 'audio/mpeg',
+        'm2v' => 'video/mpeg',
+        'm3a' => 'audio/mpeg',
+        'm3u' => 'audio/x-mpegurl',
+        'm3u8' => 'application/vnd.apple.mpegurl',
+        'm4a' => 'audio/mp4',
+        'm4u' => 'video/vnd.mpegurl',
+        'm4v' => 'video/mp4',
+        'ma' => 'application/mathematica',
+        'mads' => 'application/mads+xml',
+        'mag' => 'application/vnd.ecowin.chart',
+        'maker' => 'application/vnd.framemaker',
+        'man' => 'text/troff',
+        'mathml' => 'application/mathml+xml',
+        'mb' => 'application/mathematica',
+        'mbk' => 'application/vnd.mobius.mbk',
+        'mbox' => 'application/mbox',
+        'mc1' => 'application/vnd.medcalcdata',
+        'mcd' => 'application/vnd.mcd',
+        'mcurl' => 'text/vnd.curl.mcurl',
+        'mdb' => 'application/x-msaccess',
+        'mdi' => 'image/vnd.ms-modi',
+        'me' => 'text/troff',
+        'mesh' => 'model/mesh',
+        'meta4' => 'application/metalink4+xml',
+        'mets' => 'application/mets+xml',
+        'mfm' => 'application/vnd.mfmp',
+        'mgp' => 'application/vnd.osgeo.mapguide.package',
+        'mgz' => 'application/vnd.proteus.magazine',
+        'mid' => 'audio/midi',
+        'midi' => 'audio/midi',
+        'mif' => 'application/vnd.mif',
+        'mime' => 'message/rfc822',
+        'mj2' => 'video/mj2',
+        'mjp2' => 'video/mj2',
+        'mlp' => 'application/vnd.dolby.mlp',
+        'mmd' => 'application/vnd.chipnuts.karaoke-mmd',
+        'mmf' => 'application/vnd.smaf',
+        'mmr' => 'image/vnd.fujixerox.edmics-mmr',
+        'mny' => 'application/x-msmoney',
+        'mobi' => 'application/x-mobipocket-ebook',
+        'mods' => 'application/mods+xml',
+        'mov' => 'video/quicktime',
+        'movie' => 'video/x-sgi-movie',
+        'mp2' => 'audio/mpeg',
+        'mp21' => 'application/mp21',
+        'mp2a' => 'audio/mpeg',
+        'mp3' => 'audio/mpeg',
+        'mp4' => 'video/mp4',
+        'mp4a' => 'audio/mp4',
+        'mp4s' => 'application/mp4',
+        'mp4v' => 'video/mp4',
+        'mpc' => 'application/vnd.mophun.certificate',
+        'mpe' => 'video/mpeg',
+        'mpeg' => 'video/mpeg',
+        'mpg' => 'video/mpeg',
+        'mpg4' => 'video/mp4',
+        'mpga' => 'audio/mpeg',
+        'mpkg' => 'application/vnd.apple.installer+xml',
+        'mpm' => 'application/vnd.blueice.multipass',
+        'mpn' => 'application/vnd.mophun.application',
+        'mpp' => 'application/vnd.ms-project',
+        'mpt' => 'application/vnd.ms-project',
+        'mpy' => 'application/vnd.ibm.minipay',
+        'mqy' => 'application/vnd.mobius.mqy',
+        'mrc' => 'application/marc',
+        'mrcx' => 'application/marcxml+xml',
+        'ms' => 'text/troff',
+        'mscml' => 'application/mediaservercontrol+xml',
+        'mseed' => 'application/vnd.fdsn.mseed',
+        'mseq' => 'application/vnd.mseq',
+        'msf' => 'application/vnd.epson.msf',
+        'msh' => 'model/mesh',
+        'msi' => 'application/x-msdownload',
+        'msl' => 'application/vnd.mobius.msl',
+        'msty' => 'application/vnd.muvee.style',
+        'mts' => 'model/vnd.mts',
+        'mus' => 'application/vnd.musician',
+        'musicxml' => 'application/vnd.recordare.musicxml+xml',
+        'mvb' => 'application/x-msmediaview',
+        'mwf' => 'application/vnd.mfer',
+        'mxf' => 'application/mxf',
+        'mxl' => 'application/vnd.recordare.musicxml',
+        'mxml' => 'application/xv+xml',
+        'mxs' => 'application/vnd.triscape.mxs',
+        'mxu' => 'video/vnd.mpegurl',
+        'n-gage' => 'application/vnd.nokia.n-gage.symbian.install',
+        'n3' => 'text/n3',
+        'nb' => 'application/mathematica',
+        'nbp' => 'application/vnd.wolfram.player',
+        'nc' => 'application/x-netcdf',
+        'ncx' => 'application/x-dtbncx+xml',
+        'ngdat' => 'application/vnd.nokia.n-gage.data',
+        'nlu' => 'application/vnd.neurolanguage.nlu',
+        'nml' => 'application/vnd.enliven',
+        'nnd' => 'application/vnd.noblenet-directory',
+        'nns' => 'application/vnd.noblenet-sealer',
+        'nnw' => 'application/vnd.noblenet-web',
+        'npx' => 'image/vnd.net-fpx',
+        'nsf' => 'application/vnd.lotus-notes',
+        'oa2' => 'application/vnd.fujitsu.oasys2',
+        'oa3' => 'application/vnd.fujitsu.oasys3',
+        'oas' => 'application/vnd.fujitsu.oasys',
+        'obd' => 'application/x-msbinder',
+        'oda' => 'application/oda',
+        'odb' => 'application/vnd.oasis.opendocument.database',
+        'odc' => 'application/vnd.oasis.opendocument.chart',
+        'odf' => 'application/vnd.oasis.opendocument.formula',
+        'odft' => 'application/vnd.oasis.opendocument.formula-template',
+        'odg' => 'application/vnd.oasis.opendocument.graphics',
+        'odi' => 'application/vnd.oasis.opendocument.image',
+        'odm' => 'application/vnd.oasis.opendocument.text-master',
+        'odp' => 'application/vnd.oasis.opendocument.presentation',
+        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+        'odt' => 'application/vnd.oasis.opendocument.text',
+        'oga' => 'audio/ogg',
+        'ogg' => 'audio/ogg',
+        'ogv' => 'video/ogg',
+        'ogx' => 'application/ogg',
+        'onepkg' => 'application/onenote',
+        'onetmp' => 'application/onenote',
+        'onetoc' => 'application/onenote',
+        'onetoc2' => 'application/onenote',
+        'opf' => 'application/oebps-package+xml',
+        'oprc' => 'application/vnd.palm',
+        'org' => 'application/vnd.lotus-organizer',
+        'osf' => 'application/vnd.yamaha.openscoreformat',
+        'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
+        'otc' => 'application/vnd.oasis.opendocument.chart-template',
+        'otf' => 'application/x-font-otf',
+        'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+        'oth' => 'application/vnd.oasis.opendocument.text-web',
+        'oti' => 'application/vnd.oasis.opendocument.image-template',
+        'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+        'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+        'ott' => 'application/vnd.oasis.opendocument.text-template',
+        'oxt' => 'application/vnd.openofficeorg.extension',
+        'p' => 'text/x-pascal',
+        'p10' => 'application/pkcs10',
+        'p12' => 'application/x-pkcs12',
+        'p7b' => 'application/x-pkcs7-certificates',
+        'p7c' => 'application/pkcs7-mime',
+        'p7m' => 'application/pkcs7-mime',
+        'p7r' => 'application/x-pkcs7-certreqresp',
+        'p7s' => 'application/pkcs7-signature',
+        'p8' => 'application/pkcs8',
+        'pas' => 'text/x-pascal',
+        'paw' => 'application/vnd.pawaafile',
+        'pbd' => 'application/vnd.powerbuilder6',
+        'pbm' => 'image/x-portable-bitmap',
+        'pcf' => 'application/x-font-pcf',
+        'pcl' => 'application/vnd.hp-pcl',
+        'pclxl' => 'application/vnd.hp-pclxl',
+        'pct' => 'image/x-pict',
+        'pcurl' => 'application/vnd.curl.pcurl',
+        'pcx' => 'image/x-pcx',
+        'pdb' => 'application/vnd.palm',
+        'pdf' => 'application/pdf',
+        'pfa' => 'application/x-font-type1',
+        'pfb' => 'application/x-font-type1',
+        'pfm' => 'application/x-font-type1',
+        'pfr' => 'application/font-tdpfr',
+        'pfx' => 'application/x-pkcs12',
+        'pgm' => 'image/x-portable-graymap',
+        'pgn' => 'application/x-chess-pgn',
+        'pgp' => 'application/pgp-encrypted',
+        'php' => 'text/x-php',
+        'phps' => 'application/x-httpd-phps',
+        'pic' => 'image/x-pict',
+        'pkg' => 'application/octet-stream',
+        'pki' => 'application/pkixcmp',
+        'pkipath' => 'application/pkix-pkipath',
+        'plb' => 'application/vnd.3gpp.pic-bw-large',
+        'plc' => 'application/vnd.mobius.plc',
+        'plf' => 'application/vnd.pocketlearn',
+        'pls' => 'application/pls+xml',
+        'pml' => 'application/vnd.ctc-posml',
+        'png' => 'image/png',
+        'pnm' => 'image/x-portable-anymap',
+        'portpkg' => 'application/vnd.macports.portpkg',
+        'pot' => 'application/vnd.ms-powerpoint',
+        'potm' => 'application/vnd.ms-powerpoint.template.macroenabled.12',
+        'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+        'ppam' => 'application/vnd.ms-powerpoint.addin.macroenabled.12',
+        'ppd' => 'application/vnd.cups-ppd',
+        'ppm' => 'image/x-portable-pixmap',
+        'pps' => 'application/vnd.ms-powerpoint',
+        'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroenabled.12',
+        'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+        'ppt' => 'application/vnd.ms-powerpoint',
+        'pptm' => 'application/vnd.ms-powerpoint.presentation.macroenabled.12',
+        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'pqa' => 'application/vnd.palm',
+        'prc' => 'application/x-mobipocket-ebook',
+        'pre' => 'application/vnd.lotus-freelance',
+        'prf' => 'application/pics-rules',
+        'ps' => 'application/postscript',
+        'psb' => 'application/vnd.3gpp.pic-bw-small',
+        'psd' => 'image/vnd.adobe.photoshop',
+        'psf' => 'application/x-font-linux-psf',
+        'pskcxml' => 'application/pskc+xml',
+        'ptid' => 'application/vnd.pvi.ptid1',
+        'pub' => 'application/x-mspublisher',
+        'pvb' => 'application/vnd.3gpp.pic-bw-var',
+        'pwn' => 'application/vnd.3m.post-it-notes',
+        'pya' => 'audio/vnd.ms-playready.media.pya',
+        'pyv' => 'video/vnd.ms-playready.media.pyv',
+        'qam' => 'application/vnd.epson.quickanime',
+        'qbo' => 'application/vnd.intu.qbo',
+        'qfx' => 'application/vnd.intu.qfx',
+        'qps' => 'application/vnd.publishare-delta-tree',
+        'qt' => 'video/quicktime',
+        'qwd' => 'application/vnd.quark.quarkxpress',
+        'qwt' => 'application/vnd.quark.quarkxpress',
+        'qxb' => 'application/vnd.quark.quarkxpress',
+        'qxd' => 'application/vnd.quark.quarkxpress',
+        'qxl' => 'application/vnd.quark.quarkxpress',
+        'qxt' => 'application/vnd.quark.quarkxpress',
+        'ra' => 'audio/x-pn-realaudio',
+        'ram' => 'audio/x-pn-realaudio',
+        'rar' => 'application/x-rar-compressed',
+        'ras' => 'image/x-cmu-raster',
+        'rb' => 'text/plain',
+        'rcprofile' => 'application/vnd.ipunplugged.rcprofile',
+        'rdf' => 'application/rdf+xml',
+        'rdz' => 'application/vnd.data-vision.rdz',
+        'rep' => 'application/vnd.businessobjects',
+        'res' => 'application/x-dtbresource+xml',
+        'resx' => 'text/xml',
+        'rgb' => 'image/x-rgb',
+        'rif' => 'application/reginfo+xml',
+        'rip' => 'audio/vnd.rip',
+        'rl' => 'application/resource-lists+xml',
+        'rlc' => 'image/vnd.fujixerox.edmics-rlc',
+        'rld' => 'application/resource-lists-diff+xml',
+        'rm' => 'application/vnd.rn-realmedia',
+        'rmi' => 'audio/midi',
+        'rmp' => 'audio/x-pn-realaudio-plugin',
+        'rms' => 'application/vnd.jcp.javame.midlet-rms',
+        'rnc' => 'application/relax-ng-compact-syntax',
+        'roff' => 'text/troff',
+        'rp9' => 'application/vnd.cloanto.rp9',
+        'rpss' => 'application/vnd.nokia.radio-presets',
+        'rpst' => 'application/vnd.nokia.radio-preset',
+        'rq' => 'application/sparql-query',
+        'rs' => 'application/rls-services+xml',
+        'rsd' => 'application/rsd+xml',
+        'rss' => 'application/rss+xml',
+        'rtf' => 'application/rtf',
+        'rtx' => 'text/richtext',
+        's' => 'text/x-asm',
+        'saf' => 'application/vnd.yamaha.smaf-audio',
+        'sbml' => 'application/sbml+xml',
+        'sc' => 'application/vnd.ibm.secure-container',
+        'scd' => 'application/x-msschedule',
+        'scm' => 'application/vnd.lotus-screencam',
+        'scq' => 'application/scvp-cv-request',
+        'scs' => 'application/scvp-cv-response',
+        'scurl' => 'text/vnd.curl.scurl',
+        'sda' => 'application/vnd.stardivision.draw',
+        'sdc' => 'application/vnd.stardivision.calc',
+        'sdd' => 'application/vnd.stardivision.impress',
+        'sdkd' => 'application/vnd.solent.sdkm+xml',
+        'sdkm' => 'application/vnd.solent.sdkm+xml',
+        'sdp' => 'application/sdp',
+        'sdw' => 'application/vnd.stardivision.writer',
+        'see' => 'application/vnd.seemail',
+        'seed' => 'application/vnd.fdsn.seed',
+        'sema' => 'application/vnd.sema',
+        'semd' => 'application/vnd.semd',
+        'semf' => 'application/vnd.semf',
+        'ser' => 'application/java-serialized-object',
+        'setpay' => 'application/set-payment-initiation',
+        'setreg' => 'application/set-registration-initiation',
+        'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data',
+        'sfs' => 'application/vnd.spotfire.sfs',
+        'sgl' => 'application/vnd.stardivision.writer-global',
+        'sgm' => 'text/sgml',
+        'sgml' => 'text/sgml',
+        'sh' => 'application/x-sh',
+        'shar' => 'application/x-shar',
+        'shf' => 'application/shf+xml',
+        'sig' => 'application/pgp-signature',
+        'silo' => 'model/mesh',
+        'sis' => 'application/vnd.symbian.install',
+        'sisx' => 'application/vnd.symbian.install',
+        'sit' => 'application/x-stuffit',
+        'sitx' => 'application/x-stuffitx',
+        'skd' => 'application/vnd.koan',
+        'skm' => 'application/vnd.koan',
+        'skp' => 'application/vnd.koan',
+        'skt' => 'application/vnd.koan',
+        'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12',
+        'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+        'slt' => 'application/vnd.epson.salt',
+        'sm' => 'application/vnd.stepmania.stepchart',
+        'smf' => 'application/vnd.stardivision.math',
+        'smi' => 'application/smil+xml',
+        'smil' => 'application/smil+xml',
+        'snd' => 'audio/basic',
+        'snf' => 'application/x-font-snf',
+        'so' => 'application/octet-stream',
+        'spc' => 'application/x-pkcs7-certificates',
+        'spf' => 'application/vnd.yamaha.smaf-phrase',
+        'spl' => 'application/x-futuresplash',
+        'spot' => 'text/vnd.in3d.spot',
+        'spp' => 'application/scvp-vp-response',
+        'spq' => 'application/scvp-vp-request',
+        'spx' => 'audio/ogg',
+        'src' => 'application/x-wais-source',
+        'sru' => 'application/sru+xml',
+        'srx' => 'application/sparql-results+xml',
+        'sse' => 'application/vnd.kodak-descriptor',
+        'ssf' => 'application/vnd.epson.ssf',
+        'ssml' => 'application/ssml+xml',
+        'st' => 'application/vnd.sailingtracker.track',
+        'stc' => 'application/vnd.sun.xml.calc.template',
+        'std' => 'application/vnd.sun.xml.draw.template',
+        'stf' => 'application/vnd.wt.stf',
+        'sti' => 'application/vnd.sun.xml.impress.template',
+        'stk' => 'application/hyperstudio',
+        'stl' => 'application/vnd.ms-pki.stl',
+        'str' => 'application/vnd.pg.format',
+        'stw' => 'application/vnd.sun.xml.writer.template',
+        'sub' => 'image/vnd.dvb.subtitle',
+        'sus' => 'application/vnd.sus-calendar',
+        'susp' => 'application/vnd.sus-calendar',
+        'sv4cpio' => 'application/x-sv4cpio',
+        'sv4crc' => 'application/x-sv4crc',
+        'svc' => 'application/vnd.dvb.service',
+        'svd' => 'application/vnd.svd',
+        'svg' => 'image/svg+xml',
+        'svgz' => 'image/svg+xml',
+        'swa' => 'application/x-director',
+        'swf' => 'application/x-shockwave-flash',
+        'swi' => 'application/vnd.aristanetworks.swi',
+        'sxc' => 'application/vnd.sun.xml.calc',
+        'sxd' => 'application/vnd.sun.xml.draw',
+        'sxg' => 'application/vnd.sun.xml.writer.global',
+        'sxi' => 'application/vnd.sun.xml.impress',
+        'sxm' => 'application/vnd.sun.xml.math',
+        'sxw' => 'application/vnd.sun.xml.writer',
+        't' => 'text/troff',
+        'tao' => 'application/vnd.tao.intent-module-archive',
+        'tar' => 'application/x-tar',
+        'tcap' => 'application/vnd.3gpp2.tcap',
+        'tcl' => 'application/x-tcl',
+        'teacher' => 'application/vnd.smart.teacher',
+        'tei' => 'application/tei+xml',
+        'teicorpus' => 'application/tei+xml',
+        'tex' => 'application/x-tex',
+        'texi' => 'application/x-texinfo',
+        'texinfo' => 'application/x-texinfo',
+        'text' => 'text/plain',
+        'tfi' => 'application/thraud+xml',
+        'tfm' => 'application/x-tex-tfm',
+        'thmx' => 'application/vnd.ms-officetheme',
+        'tif' => 'image/tiff',
+        'tiff' => 'image/tiff',
+        'tmo' => 'application/vnd.tmobile-livetv',
+        'torrent' => 'application/x-bittorrent',
+        'tpl' => 'application/vnd.groove-tool-template',
+        'tpt' => 'application/vnd.trid.tpt',
+        'tr' => 'text/troff',
+        'tra' => 'application/vnd.trueapp',
+        'trm' => 'application/x-msterminal',
+        'tsd' => 'application/timestamped-data',
+        'tsv' => 'text/tab-separated-values',
+        'ttc' => 'application/x-font-ttf',
+        'ttf' => 'application/x-font-ttf',
+        'ttl' => 'text/turtle',
+        'twd' => 'application/vnd.simtech-mindmapper',
+        'twds' => 'application/vnd.simtech-mindmapper',
+        'txd' => 'application/vnd.genomatix.tuxedo',
+        'txf' => 'application/vnd.mobius.txf',
+        'txt' => 'text/plain',
+        'u32' => 'application/x-authorware-bin',
+        'udeb' => 'application/x-debian-package',
+        'ufd' => 'application/vnd.ufdl',
+        'ufdl' => 'application/vnd.ufdl',
+        'umj' => 'application/vnd.umajin',
+        'unityweb' => 'application/vnd.unity',
+        'uoml' => 'application/vnd.uoml+xml',
+        'uri' => 'text/uri-list',
+        'uris' => 'text/uri-list',
+        'urls' => 'text/uri-list',
+        'ustar' => 'application/x-ustar',
+        'utz' => 'application/vnd.uiq.theme',
+        'uu' => 'text/x-uuencode',
+        'uva' => 'audio/vnd.dece.audio',
+        'uvd' => 'application/vnd.dece.data',
+        'uvf' => 'application/vnd.dece.data',
+        'uvg' => 'image/vnd.dece.graphic',
+        'uvh' => 'video/vnd.dece.hd',
+        'uvi' => 'image/vnd.dece.graphic',
+        'uvm' => 'video/vnd.dece.mobile',
+        'uvp' => 'video/vnd.dece.pd',
+        'uvs' => 'video/vnd.dece.sd',
+        'uvt' => 'application/vnd.dece.ttml+xml',
+        'uvu' => 'video/vnd.uvvu.mp4',
+        'uvv' => 'video/vnd.dece.video',
+        'uvva' => 'audio/vnd.dece.audio',
+        'uvvd' => 'application/vnd.dece.data',
+        'uvvf' => 'application/vnd.dece.data',
+        'uvvg' => 'image/vnd.dece.graphic',
+        'uvvh' => 'video/vnd.dece.hd',
+        'uvvi' => 'image/vnd.dece.graphic',
+        'uvvm' => 'video/vnd.dece.mobile',
+        'uvvp' => 'video/vnd.dece.pd',
+        'uvvs' => 'video/vnd.dece.sd',
+        'uvvt' => 'application/vnd.dece.ttml+xml',
+        'uvvu' => 'video/vnd.uvvu.mp4',
+        'uvvv' => 'video/vnd.dece.video',
+        'uvvx' => 'application/vnd.dece.unspecified',
+        'uvx' => 'application/vnd.dece.unspecified',
+        'vcd' => 'application/x-cdlink',
+        'vcf' => 'text/x-vcard',
+        'vcg' => 'application/vnd.groove-vcard',
+        'vcs' => 'text/x-vcalendar',
+        'vcx' => 'application/vnd.vcx',
+        'vis' => 'application/vnd.visionary',
+        'viv' => 'video/vnd.vivo',
+        'vor' => 'application/vnd.stardivision.writer',
+        'vox' => 'application/x-authorware-bin',
+        'vrml' => 'model/vrml',
+        'vsd' => 'application/vnd.visio',
+        'vsf' => 'application/vnd.vsf',
+        'vss' => 'application/vnd.visio',
+        'vst' => 'application/vnd.visio',
+        'vsw' => 'application/vnd.visio',
+        'vtu' => 'model/vnd.vtu',
+        'vxml' => 'application/voicexml+xml',
+        'w3d' => 'application/x-director',
+        'wad' => 'application/x-doom',
+        'wav' => 'audio/x-wav',
+        'wax' => 'audio/x-ms-wax',
+        'wbmp' => 'image/vnd.wap.wbmp',
+        'wbs' => 'application/vnd.criticaltools.wbs+xml',
+        'wbxml' => 'application/vnd.wap.wbxml',
+        'wcm' => 'application/vnd.ms-works',
+        'wdb' => 'application/vnd.ms-works',
+        'weba' => 'audio/webm',
+        'webm' => 'video/webm',
+        'webp' => 'image/webp',
+        'wg' => 'application/vnd.pmi.widget',
+        'wgt' => 'application/widget',
+        'wks' => 'application/vnd.ms-works',
+        'wm' => 'video/x-ms-wm',
+        'wma' => 'audio/x-ms-wma',
+        'wmd' => 'application/x-ms-wmd',
+        'wmf' => 'application/x-msmetafile',
+        'wml' => 'text/vnd.wap.wml',
+        'wmlc' => 'application/vnd.wap.wmlc',
+        'wmls' => 'text/vnd.wap.wmlscript',
+        'wmlsc' => 'application/vnd.wap.wmlscriptc',
+        'wmv' => 'video/x-ms-wmv',
+        'wmx' => 'video/x-ms-wmx',
+        'wmz' => 'application/x-ms-wmz',
+        'woff' => 'application/x-font-woff',
+        'wpd' => 'application/vnd.wordperfect',
+        'wpl' => 'application/vnd.ms-wpl',
+        'wps' => 'application/vnd.ms-works',
+        'wqd' => 'application/vnd.wqd',
+        'wri' => 'application/x-mswrite',
+        'wrl' => 'model/vrml',
+        'wsdl' => 'application/wsdl+xml',
+        'wspolicy' => 'application/wspolicy+xml',
+        'wtb' => 'application/vnd.webturbo',
+        'wvx' => 'video/x-ms-wvx',
+        'x32' => 'application/x-authorware-bin',
+        'x3d' => 'application/vnd.hzn-3d-crossword',
+        'xap' => 'application/x-silverlight-app',
+        'xar' => 'application/vnd.xara',
+        'xbap' => 'application/x-ms-xbap',
+        'xbd' => 'application/vnd.fujixerox.docuworks.binder',
+        'xbm' => 'image/x-xbitmap',
+        'xdf' => 'application/xcap-diff+xml',
+        'xdm' => 'application/vnd.syncml.dm+xml',
+        'xdp' => 'application/vnd.adobe.xdp+xml',
+        'xdssc' => 'application/dssc+xml',
+        'xdw' => 'application/vnd.fujixerox.docuworks',
+        'xenc' => 'application/xenc+xml',
+        'xer' => 'application/patch-ops-error+xml',
+        'xfdf' => 'application/vnd.adobe.xfdf',
+        'xfdl' => 'application/vnd.xfdl',
+        'xht' => 'application/xhtml+xml',
+        'xhtml' => 'application/xhtml+xml',
+        'xhvml' => 'application/xv+xml',
+        'xif' => 'image/vnd.xiff',
+        'xla' => 'application/vnd.ms-excel',
+        'xlam' => 'application/vnd.ms-excel.addin.macroenabled.12',
+        'xlc' => 'application/vnd.ms-excel',
+        'xlm' => 'application/vnd.ms-excel',
+        'xls' => 'application/vnd.ms-excel',
+        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroenabled.12',
+        'xlsm' => 'application/vnd.ms-excel.sheet.macroenabled.12',
+        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xlt' => 'application/vnd.ms-excel',
+        'xltm' => 'application/vnd.ms-excel.template.macroenabled.12',
+        'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+        'xlw' => 'application/vnd.ms-excel',
+        'xml' => 'application/xml',
+        'xo' => 'application/vnd.olpc-sugar',
+        'xop' => 'application/xop+xml',
+        'xpi' => 'application/x-xpinstall',
+        'xpm' => 'image/x-xpixmap',
+        'xpr' => 'application/vnd.is-xpr',
+        'xps' => 'application/vnd.ms-xpsdocument',
+        'xpw' => 'application/vnd.intercon.formnet',
+        'xpx' => 'application/vnd.intercon.formnet',
+        'xsl' => 'application/xml',
+        'xslt' => 'application/xslt+xml',
+        'xsm' => 'application/vnd.syncml+xml',
+        'xspf' => 'application/xspf+xml',
+        'xul' => 'application/vnd.mozilla.xul+xml',
+        'xvm' => 'application/xv+xml',
+        'xvml' => 'application/xv+xml',
+        'xwd' => 'image/x-xwindowdump',
+        'xyz' => 'chemical/x-xyz',
+        'yaml' => 'text/yaml',
+        'yang' => 'application/yang',
+        'yin' => 'application/yin+xml',
+        'yml' => 'text/yaml',
+        'zaz' => 'application/vnd.zzazz.deck+xml',
+        'zip' => 'application/zip',
+        'zir' => 'application/vnd.zul',
+        'zirz' => 'application/vnd.zul',
+        'zmm' => 'application/vnd.handheld-entertainment+xml'
+    );
+
+    /**
+     * Get a singleton instance of the class
+     *
+     * @return self
+     * @codeCoverageIgnore
+     */
+    public static function getInstance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get a mimetype value from a file extension
+     *
+     * @param string $extension File extension
+     *
+     * @return string|null
+     *
+     */
+    public function fromExtension($extension)
+    {
+        return isset($this->mimetypes[$extension]) ? $this->mimetypes[$extension] : null;
+    }
+
+    /**
+     * Get a mimetype from a filename
+     *
+     * @param string $filename Filename to generate a mimetype from
+     *
+     * @return string|null
+     */
+    public function fromFilename($filename)
+    {
+        return $this->fromExtension(pathinfo($filename, PATHINFO_EXTENSION));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/CommaAggregator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/CommaAggregator.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b4e49d05201e5d1de6645acf82fec4489d11c11
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/CommaAggregator.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Guzzle\Http\QueryAggregator;
+
+use Guzzle\Http\QueryString;
+
+/**
+ * Aggregates nested query string variables using commas
+ */
+class CommaAggregator implements QueryAggregatorInterface
+{
+    public function aggregate($key, $value, QueryString $query)
+    {
+        if ($query->isUrlEncoding()) {
+            return array($query->encodeValue($key) => implode(',', array_map(array($query, 'encodeValue'), $value)));
+        } else {
+            return array($key => implode(',', $value));
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/DuplicateAggregator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/DuplicateAggregator.php
new file mode 100644
index 0000000000000000000000000000000000000000..1bf1730e4e697bc6796fd4c3ef037b2a3d0f43ef
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/DuplicateAggregator.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Guzzle\Http\QueryAggregator;
+
+use Guzzle\Http\QueryString;
+
+/**
+ * Does not aggregate nested query string values and allows duplicates in the resulting array
+ *
+ * Example: http://test.com?q=1&q=2
+ */
+class DuplicateAggregator implements QueryAggregatorInterface
+{
+    public function aggregate($key, $value, QueryString $query)
+    {
+        if ($query->isUrlEncoding()) {
+            return array($query->encodeValue($key) => array_map(array($query, 'encodeValue'), $value));
+        } else {
+            return array($key => $value);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/PhpAggregator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/PhpAggregator.php
new file mode 100644
index 0000000000000000000000000000000000000000..133ea2bd9622fa3e8695226804c51bd2850ae5f5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/PhpAggregator.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Guzzle\Http\QueryAggregator;
+
+use Guzzle\Http\QueryString;
+
+/**
+ * Aggregates nested query string variables using PHP style []
+ */
+class PhpAggregator implements QueryAggregatorInterface
+{
+    public function aggregate($key, $value, QueryString $query)
+    {
+        $ret = array();
+
+        foreach ($value as $k => $v) {
+            $k = "{$key}[{$k}]";
+            if (is_array($v)) {
+                $ret = array_merge($ret, self::aggregate($k, $v, $query));
+            } else {
+                $ret[$query->encodeValue($k)] = $query->encodeValue($v);
+            }
+        }
+
+        return $ret;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/QueryAggregatorInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/QueryAggregatorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..72bee620c825166dcde60c1c05bf6a8c40745336
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryAggregator/QueryAggregatorInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Guzzle\Http\QueryAggregator;
+
+use Guzzle\Http\QueryString;
+
+/**
+ * Interface used for aggregating nested query string variables into a flattened array of key value pairs
+ */
+interface QueryAggregatorInterface
+{
+    /**
+     * Aggregate multi-valued parameters into a flattened associative array
+     *
+     * @param string      $key   The name of the query string parameter
+     * @param array       $value The values of the parameter
+     * @param QueryString $query The query string that is being aggregated
+     *
+     * @return array Returns an array of the combined values
+     */
+    public function aggregate($key, $value, QueryString $query);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryString.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryString.php
new file mode 100644
index 0000000000000000000000000000000000000000..62bdfa8c7ae122f566c986c2eedc9962eb90c30b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/QueryString.php
@@ -0,0 +1,267 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\Collection;
+use Guzzle\Http\QueryAggregator\QueryAggregatorInterface;
+use Guzzle\Http\QueryAggregator\PhpAggregator;
+
+/**
+ * Query string object to handle managing query string parameters and aggregating those parameters together as a string.
+ */
+class QueryString extends Collection
+{
+    /** @var string Used to URL encode with rawurlencode */
+    const RFC_3986 = 'RFC 3986';
+
+    /** @var string Used to encode with urlencode */
+    const FORM_URLENCODED = 'application/x-www-form-urlencoded';
+
+    /** @var string Constant used to create blank query string values (e.g. ?foo) */
+    const BLANK = "_guzzle_blank_";
+
+    /** @var string The query string field separator (e.g. '&') */
+    protected $fieldSeparator = '&';
+
+    /** @var string The query string value separator (e.g. '=') */
+    protected $valueSeparator = '=';
+
+    /** @var bool URL encode fields and values */
+    protected $urlEncode = 'RFC 3986';
+
+    /** @var QueryAggregatorInterface */
+    protected $aggregator;
+
+    /** @var array Cached PHP aggregator */
+    protected static $defaultAggregator = null;
+
+    /**
+     * Parse a query string into a QueryString object
+     *
+     * @param string $query Query string to parse
+     *
+     * @return self
+     */
+    public static function fromString($query)
+    {
+        $q = new static();
+
+        if ($query || $query === '0') {
+            if ($query[0] == '?') {
+                $query = substr($query, 1);
+            }
+            foreach (explode('&', $query) as $kvp) {
+                $parts = explode('=', $kvp, 2);
+                $key = rawurldecode($parts[0]);
+
+                if ($paramIsPhpStyleArray = substr($key, -2) == '[]') {
+                    $key = substr($key, 0, -2);
+                }
+
+                if (isset($parts[1])) {
+                    $value = rawurldecode(str_replace('+', '%20', $parts[1]));
+                    if ($paramIsPhpStyleArray && !$q->hasKey($key)) {
+                        $value = array($value);
+                    }
+                    $q->add($key, $value);
+                } else {
+                    $q->add($key, null);
+                }
+            }
+        }
+
+        return $q;
+    }
+
+    /**
+     * Convert the query string parameters to a query string string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        if (!$this->data) {
+            return '';
+        }
+
+        $queryString = '';
+
+        foreach ($this->prepareData($this->data) as $name => $value) {
+            foreach ((array) $value as $v) {
+                if ($queryString) {
+                    $queryString .= $this->fieldSeparator;
+                }
+                $queryString .= $name;
+                if ($v !== self::BLANK) {
+                    $queryString .= $this->valueSeparator . $v;
+                }
+            }
+        }
+
+        return $queryString;
+    }
+
+    /**
+     * Get the query string field separator
+     *
+     * @return string
+     */
+    public function getFieldSeparator()
+    {
+        return $this->fieldSeparator;
+    }
+
+    /**
+     * Get the query string value separator
+     *
+     * @return string
+     */
+    public function getValueSeparator()
+    {
+        return $this->valueSeparator;
+    }
+
+    /**
+     * Returns the type of URL encoding used by the query string
+     *
+     * One of: false, "RFC 3986", or "application/x-www-form-urlencoded"
+     *
+     * @return bool|string
+     */
+    public function getUrlEncoding()
+    {
+        return $this->urlEncode;
+    }
+
+    /**
+     * Returns true or false if using URL encoding
+     *
+     * @return bool
+     */
+    public function isUrlEncoding()
+    {
+        return $this->urlEncode !== false;
+    }
+
+    /**
+     * Provide a function for combining multi-valued query string parameters into a single or multiple fields
+     *
+     * @param null|QueryAggregatorInterface $aggregator Pass in a QueryAggregatorInterface object to handle converting
+     *                                                  deeply nested query string variables into a flattened array.
+     *                                                  Pass null to use the default PHP style aggregator. For legacy
+     *                                                  reasons, this function accepts a callable that must accepts a
+     *                                                  $key, $value, and query object.
+     * @return self
+     * @see \Guzzle\Http\QueryString::aggregateUsingComma()
+     */
+    public function setAggregator(QueryAggregatorInterface $aggregator = null)
+    {
+        // Use the default aggregator if none was set
+        if (!$aggregator) {
+            if (!self::$defaultAggregator) {
+                self::$defaultAggregator = new PhpAggregator();
+            }
+            $aggregator = self::$defaultAggregator;
+        }
+
+        $this->aggregator = $aggregator;
+
+        return $this;
+    }
+
+    /**
+     * Set whether or not field names and values should be rawurlencoded
+     *
+     * @param bool|string $encode Set to TRUE to use RFC 3986 encoding (rawurlencode), false to disable encoding, or
+     *                            form_urlencoding to use application/x-www-form-urlencoded encoding (urlencode)
+     * @return self
+     */
+    public function useUrlEncoding($encode)
+    {
+        $this->urlEncode = ($encode === true) ? self::RFC_3986 : $encode;
+
+        return $this;
+    }
+
+    /**
+     * Set the query string separator
+     *
+     * @param string $separator The query string separator that will separate fields
+     *
+     * @return self
+     */
+    public function setFieldSeparator($separator)
+    {
+        $this->fieldSeparator = $separator;
+
+        return $this;
+    }
+
+    /**
+     * Set the query string value separator
+     *
+     * @param string $separator The query string separator that will separate values from fields
+     *
+     * @return self
+     */
+    public function setValueSeparator($separator)
+    {
+        $this->valueSeparator = $separator;
+
+        return $this;
+    }
+
+    /**
+     * Returns an array of url encoded field names and values
+     *
+     * @return array
+     */
+    public function urlEncode()
+    {
+        return $this->prepareData($this->data);
+    }
+
+    /**
+     * URL encodes a value based on the url encoding type of the query string object
+     *
+     * @param string $value Value to encode
+     *
+     * @return string
+     */
+    public function encodeValue($value)
+    {
+        if ($this->urlEncode == self::RFC_3986) {
+            return rawurlencode($value);
+        } elseif ($this->urlEncode == self::FORM_URLENCODED) {
+            return urlencode($value);
+        } else {
+            return (string) $value;
+        }
+    }
+
+    /**
+     * Url encode parameter data and convert nested query strings into a flattened hash.
+     *
+     * @param array $data The data to encode
+     *
+     * @return array Returns an array of encoded values and keys
+     */
+    protected function prepareData(array $data)
+    {
+        // If no aggregator is present then set the default
+        if (!$this->aggregator) {
+            $this->setAggregator(null);
+        }
+
+        $temp = array();
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $temp = array_merge($temp, $this->aggregator->aggregate($key, $value, $this));
+            } else {
+                $temp[$this->encodeValue($key)] = $this->encodeValue($value);
+            }
+        }
+
+        return $temp;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/ReadLimitEntityBody.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/ReadLimitEntityBody.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0bc867e3aa7ad544064dc2405f08c0c54a4daec
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/ReadLimitEntityBody.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Guzzle\Http;
+
+/**
+ * EntityBody decorator used to return only a subset of an entity body
+ */
+class ReadLimitEntityBody extends AbstractEntityBodyDecorator
+{
+    /** @var int Limit the number of bytes that can be read */
+    protected $limit;
+
+    /** @var int Offset to start reading from */
+    protected $offset;
+
+    /**
+     * @param EntityBodyInterface $body   Body to wrap
+     * @param int                 $limit  Total number of bytes to allow to be read from the stream
+     * @param int                 $offset Position to seek to before reading (only works on seekable streams)
+     */
+    public function __construct(EntityBodyInterface $body, $limit, $offset = 0)
+    {
+        parent::__construct($body);
+        $this->setLimit($limit)->setOffset($offset);
+        $this->body->seek($offset);
+    }
+
+    /**
+     * Returns only a subset of the decorated entity body when cast as a string
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        return substr((string) $this->body, $this->offset, $this->limit) ?: '';
+    }
+
+    public function isConsumed()
+    {
+        return (($this->offset + $this->limit) - $this->body->ftell()) <= 0;
+    }
+
+    /**
+     * Returns the Content-Length of the limited subset of data
+     * {@inheritdoc}
+     */
+    public function getContentLength()
+    {
+        $length = $this->body->getContentLength();
+
+        return $length === false
+            ? $this->limit
+            : min($this->limit, min($length, $this->offset + $this->limit) - $this->offset);
+    }
+
+    /**
+     * Allow for a bounded seek on the read limited entity body
+     * {@inheritdoc}
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        return $whence === SEEK_SET
+            ? $this->body->seek(max($this->offset, min($this->offset + $this->limit, $offset)))
+            : false;
+    }
+
+    /**
+     * Set the offset to start limiting from
+     *
+     * @param int $offset Offset to seek to and begin byte limiting from
+     *
+     * @return self
+     */
+    public function setOffset($offset)
+    {
+        $this->body->seek($offset);
+        $this->offset = $offset;
+
+        return $this;
+    }
+
+    /**
+     * Set the limit of bytes that the decorator allows to be read from the stream
+     *
+     * @param int $limit Total number of bytes to allow to be read from the stream
+     *
+     * @return self
+     */
+    public function setLimit($limit)
+    {
+        $this->limit = $limit;
+
+        return $this;
+    }
+
+    public function read($length)
+    {
+        // Check if the current position is less than the total allowed bytes + original offset
+        $remaining = ($this->offset + $this->limit) - $this->body->ftell();
+        if ($remaining > 0) {
+            // Only return the amount of requested data, ensuring that the byte limit is not exceeded
+            return $this->body->read(min($remaining, $length));
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/RedirectPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/RedirectPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..391edb152b769911385361881cb29914075075f7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/RedirectPlugin.php
@@ -0,0 +1,250 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\Event;
+use Guzzle\Http\Exception\BadResponseException;
+use Guzzle\Http\Url;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\RequestFactory;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Exception\TooManyRedirectsException;
+use Guzzle\Http\Exception\CouldNotRewindStreamException;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Plugin to implement HTTP redirects. Can redirect like a web browser or using strict RFC 2616 compliance
+ */
+class RedirectPlugin implements EventSubscriberInterface
+{
+    const REDIRECT_COUNT = 'redirect.count';
+    const MAX_REDIRECTS = 'redirect.max';
+    const STRICT_REDIRECTS = 'redirect.strict';
+    const PARENT_REQUEST = 'redirect.parent_request';
+    const DISABLE = 'redirect.disable';
+
+    /**
+     * @var int Default number of redirects allowed when no setting is supplied by a request
+     */
+    protected $defaultMaxRedirects = 5;
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'request.sent'        => array('onRequestSent', 100),
+            'request.clone'       => 'cleanupRequest',
+            'request.before_send' => 'cleanupRequest'
+        );
+    }
+
+    /**
+     * Clean up the parameters of a request when it is cloned
+     *
+     * @param Event $event Event emitted
+     */
+    public function cleanupRequest(Event $event)
+    {
+        $params = $event['request']->getParams();
+        unset($params[self::REDIRECT_COUNT]);
+        unset($params[self::PARENT_REQUEST]);
+    }
+
+    /**
+     * Called when a request receives a redirect response
+     *
+     * @param Event $event Event emitted
+     */
+    public function onRequestSent(Event $event)
+    {
+        $response = $event['response'];
+        $request = $event['request'];
+
+        // Only act on redirect requests with Location headers
+        if (!$response || $request->getParams()->get(self::DISABLE)) {
+            return;
+        }
+
+        // Trace the original request based on parameter history
+        $original = $this->getOriginalRequest($request);
+
+        // Terminating condition to set the effective repsonse on the original request
+        if (!$response->isRedirect() || !$response->hasHeader('Location')) {
+            if ($request !== $original) {
+                // This is a terminating redirect response, so set it on the original request
+                $response->getParams()->set(self::REDIRECT_COUNT, $original->getParams()->get(self::REDIRECT_COUNT));
+                $original->setResponse($response);
+                $response->setEffectiveUrl($request->getUrl());
+            }
+            return;
+        }
+
+        $this->sendRedirectRequest($original, $request, $response);
+    }
+
+    /**
+     * Get the original request that initiated a series of redirects
+     *
+     * @param RequestInterface $request Request to get the original request from
+     *
+     * @return RequestInterface
+     */
+    protected function getOriginalRequest(RequestInterface $request)
+    {
+        $original = $request;
+        // The number of redirects is held on the original request, so determine which request that is
+        while ($parent = $original->getParams()->get(self::PARENT_REQUEST)) {
+            $original = $parent;
+        }
+
+        return $original;
+    }
+
+    /**
+     * Create a redirect request for a specific request object
+     *
+     * Takes into account strict RFC compliant redirection (e.g. redirect POST with POST) vs doing what most clients do
+     * (e.g. redirect POST with GET).
+     *
+     * @param RequestInterface $request    Request being redirected
+     * @param RequestInterface $original   Original request
+     * @param int              $statusCode Status code of the redirect
+     * @param string           $location   Location header of the redirect
+     *
+     * @return RequestInterface Returns a new redirect request
+     * @throws CouldNotRewindStreamException If the body needs to be rewound but cannot
+     */
+    protected function createRedirectRequest(
+        RequestInterface $request,
+        $statusCode,
+        $location,
+        RequestInterface $original
+    ) {
+        $redirectRequest = null;
+        $strict = $original->getParams()->get(self::STRICT_REDIRECTS);
+
+        // Use a GET request if this is an entity enclosing request and we are not forcing RFC compliance, but rather
+        // emulating what all browsers would do
+        if ($request instanceof EntityEnclosingRequestInterface && !$strict && $statusCode <= 302) {
+            $redirectRequest = RequestFactory::getInstance()->cloneRequestWithMethod($request, 'GET');
+        } else {
+            $redirectRequest = clone $request;
+        }
+
+        $redirectRequest->setIsRedirect(true);
+        // Always use the same response body when redirecting
+        $redirectRequest->setResponseBody($request->getResponseBody());
+
+        $location = Url::factory($location);
+        // If the location is not absolute, then combine it with the original URL
+        if (!$location->isAbsolute()) {
+            $originalUrl = $redirectRequest->getUrl(true);
+            // Remove query string parameters and just take what is present on the redirect Location header
+            $originalUrl->getQuery()->clear();
+            $location = $originalUrl->combine((string) $location);
+        }
+
+        $redirectRequest->setUrl($location);
+
+        // Add the parent request to the request before it sends (make sure it's before the onRequestClone event too)
+        $redirectRequest->getEventDispatcher()->addListener(
+            'request.before_send',
+            $func = function ($e) use (&$func, $request, $redirectRequest) {
+                $redirectRequest->getEventDispatcher()->removeListener('request.before_send', $func);
+                $e['request']->getParams()->set(RedirectPlugin::PARENT_REQUEST, $request);
+            }
+        );
+
+        // Rewind the entity body of the request if needed
+        if ($redirectRequest instanceof EntityEnclosingRequestInterface && $redirectRequest->getBody()) {
+            $body = $redirectRequest->getBody();
+            // Only rewind the body if some of it has been read already, and throw an exception if the rewind fails
+            if ($body->ftell() && !$body->rewind()) {
+                throw new CouldNotRewindStreamException(
+                    'Unable to rewind the non-seekable entity body of the request after redirecting. cURL probably '
+                    . 'sent part of body before the redirect occurred. Try adding acustom rewind function using on the '
+                    . 'entity body of the request using setRewindFunction().'
+                );
+            }
+        }
+
+        return $redirectRequest;
+    }
+
+    /**
+     * Prepare the request for redirection and enforce the maximum number of allowed redirects per client
+     *
+     * @param RequestInterface $original  Origina request
+     * @param RequestInterface $request   Request to prepare and validate
+     * @param Response         $response  The current response
+     *
+     * @return RequestInterface
+     */
+    protected function prepareRedirection(RequestInterface $original, RequestInterface $request, Response $response)
+    {
+        $params = $original->getParams();
+        // This is a new redirect, so increment the redirect counter
+        $current = $params[self::REDIRECT_COUNT] + 1;
+        $params[self::REDIRECT_COUNT] = $current;
+        // Use a provided maximum value or default to a max redirect count of 5
+        $max = isset($params[self::MAX_REDIRECTS]) ? $params[self::MAX_REDIRECTS] : $this->defaultMaxRedirects;
+
+        // Throw an exception if the redirect count is exceeded
+        if ($current > $max) {
+            $this->throwTooManyRedirectsException($original, $max);
+            return false;
+        } else {
+            // Create a redirect request based on the redirect rules set on the request
+            return $this->createRedirectRequest(
+                $request,
+                $response->getStatusCode(),
+                trim($response->getLocation()),
+                $original
+            );
+        }
+    }
+
+    /**
+     * Send a redirect request and handle any errors
+     *
+     * @param RequestInterface $original The originating request
+     * @param RequestInterface $request  The current request being redirected
+     * @param Response         $response The response of the current request
+     *
+     * @throws BadResponseException|\Exception
+     */
+    protected function sendRedirectRequest(RequestInterface $original, RequestInterface $request, Response $response)
+    {
+        // Validate and create a redirect request based on the original request and current response
+        if ($redirectRequest = $this->prepareRedirection($original, $request, $response)) {
+            try {
+                $redirectRequest->send();
+            } catch (BadResponseException $e) {
+                $e->getResponse();
+                if (!$e->getResponse()) {
+                    throw $e;
+                }
+            }
+        }
+    }
+
+    /**
+     * Throw a too many redirects exception for a request
+     *
+     * @param RequestInterface $original Request
+     * @param int              $max      Max allowed redirects
+     *
+     * @throws TooManyRedirectsException when too many redirects have been issued
+     */
+    protected function throwTooManyRedirectsException(RequestInterface $original, $max)
+    {
+        $original->getEventDispatcher()->addListener(
+            'request.complete',
+            $func = function ($e) use (&$func, $original, $max) {
+                $original->getEventDispatcher()->removeListener('request.complete', $func);
+                $str = "{$max} redirects were issued for this request:\n" . $e['request']->getRawHeaders();
+                throw new TooManyRedirectsException($str);
+            }
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Resources/cacert.pem b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Resources/cacert.pem
new file mode 100644
index 0000000000000000000000000000000000000000..99b310bce9129a7d5ec72ef8e8aa22626a1a6d9c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Resources/cacert.pem
@@ -0,0 +1,3895 @@
+##
+## ca-bundle.crt -- Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Sat Dec 29 20:03:40 2012
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+
+# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.87 $ $Date: 2012/12/29 16:32:45 $
+
+GTE CyberTrust Global Root
+==========================
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
+Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG
+A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz
+MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL
+Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0
+IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u
+sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql
+HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID
+AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW
+M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
+NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+Thawte Server CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
+dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE
+AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j
+b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV
+BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u
+c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG
+A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl
+/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7
+1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J
+GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ
+GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+Thawte Premium Server CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
+dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE
+AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl
+ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT
+AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
+VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
+aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ
+cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh
+Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/
+qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm
+SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf
+8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t
+UCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+Equifax Secure CA
+=================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
+ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
+MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
+B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
+fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
+8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
+A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
+CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
+A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
+spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
+Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
+zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
+BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
+70+sB3c4
+-----END CERTIFICATE-----
+
+Digital Signature Trust Co. Global CA 1
+=======================================
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
+ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy
+MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
+IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE
+NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i
+o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
+BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
+dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
+IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY
+MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM
+BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
+ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq
+kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4
+RbyhkwS7hp86W0N6w4pl
+-----END CERTIFICATE-----
+
+Digital Signature Trust Co. Global CA 3
+=======================================
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
+ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy
+MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
+IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD
+VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS
+xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
+BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
+dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
+IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
+MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM
+BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
+AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi
+up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
+mPnHfxsb1gYgAlihw6ID
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
+TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
+WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
+Tqj/ZA1k
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority - G2
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgd
+k4xWArzZbxpvUjZudVYKVdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIq
+WpDBucSmFc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0Jh9ZrbWB85a7FkCMM
+XErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2uluIncrKTdcu1OofdPvAbT6shkdHvC
+lUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68DzFc6PLZ
+-----END CERTIFICATE-----
+
+Verisign Class 2 Public Primary Certification Authority - G2
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGljIFByaW1h
+cnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNp
+Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
+c3QgTmV0d29yazAeFw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGljIFByaW1h
+cnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNp
+Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
+c3QgTmV0d29yazCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjx
+nNuX6Zr8wgQGE75fUsjMHiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRC
+wiNPStjwDqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cCAwEA
+ATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9jinb3/7aHmZuovCfTK
+1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAXrXfMSTWqz9iP0b63GJZHc2pUIjRk
+LbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnInjBJ7xUS0rg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G2
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
+FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
+lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
+1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
+Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
+-----END CERTIFICATE-----
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+ValiCert Class 1 VA
+===================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy
+MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi
+GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm
+DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG
+lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX
+icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP
+Orf1LXLI
+-----END CERTIFICATE-----
+
+ValiCert Class 2 VA
+===================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
+MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC
+CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf
+ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ
+SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV
+UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8
+W9ViH0Pd
+-----END CERTIFICATE-----
+
+RSA Root Certificate 1
+======================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
+MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td
+3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H
+BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs
+3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF
+V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
+on+jjBXu
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAN2E1Lm0+afY8wR4nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/E
+bRrsC+MO8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjVojYJ
+rKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjbPG7PoBMAGrgnoeS+
+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP26KbqxzcSXKMpHgLZ2x87tNcPVkeB
+FQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vrn5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+q2aN17O6x5q25lXQBfGfMY1aqtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/N
+y9Sn2WCVhDr4wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
+ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrspSCAaWihT37h
+a88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4E1Z5T21Q6huwtVexN2ZYI/Pc
+D98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
+-----END CERTIFICATE-----
+
+Verisign Class 2 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29y
+azE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
+c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArwoNwtUs22e5LeWUJ92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6
+tW8UvxDOJxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUYwZF7
+C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9okoqQHgiBVrKtaaNS
+0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjNqWm6o+sdDZykIKbBoMXRRkwXbdKs
+Zj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/ESrg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0
+JhU8wI1NQ0kdvekhktdmnLfexbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf
+0xwLRtxyID+u7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
+sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RIsH/7NiXaldDx
+JBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTPcjnhsUPgKM+351psE2tJs//j
+GHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Verisign Class 4 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
+tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
+8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
+Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
+Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
+mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
+RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
+UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+Entrust.net Secure Server CA
+============================
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV
+BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg
+cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl
+ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG
+A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi
+eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p
+dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ
+aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5
+gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw
+ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw
+CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l
+dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw
+NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow
+HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
+BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN
+Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
+n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC
+AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER
+gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B
+AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
+oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS
+o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z
+2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX
+OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ==
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+Equifax Secure Global eBusiness CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
+bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
+HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
+b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
+PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
+qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
+hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
+BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
+MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
+I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
+NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 1
+=============================
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB
+LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE
+ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz
+IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ
+1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a
+IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk
+MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW
+Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF
+AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5
+lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 2
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE
+ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y
+MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT
+DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn
+2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5
+BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG
+A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx
+JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG
+A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e
+uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB
+Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1
+jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
+78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm
+V+GRMOrN
+-----END CERTIFICATE-----
+
+AddTrust Low-Value Services Root
+================================
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
+cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
+CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
+ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
+54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
+oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
+Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
+GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
+HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
+RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
+HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
+ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
+iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
+mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
+ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+AddTrust Public Services Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
+cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
+BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
+dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
+nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
+d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
+Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
+HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
+A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
+A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
+JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
+Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
+EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+AddTrust Qualified Certificates Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
+cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
+CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
+IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
+64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
+KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
+L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
+wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
+MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
+BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
+azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
+GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
+RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
+iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+RSA Security 2048 v3
+====================
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
+ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
+MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
+BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
+Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
+WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
+KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
++Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
+MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
+FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
+v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
+0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
+VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
+nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
+pKnXwiJPZ9d37CAFYd4=
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Global CA 2
+====================
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
+MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
+NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
+LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
+Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
+HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
+K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
+srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
+ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
+OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
+x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
+H4z1Ir+rzoPz4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+UTN-USER First-Network Applications
+===================================
+-----BEGIN CERTIFICATE-----
+MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzAp
+BgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5
+WhcNMTkwNzA5MTg1NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5T
+YWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBB
+cHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz+5Gh5DZVhawGNFug
+mliy+LUPBXeDrjKxdpJo7CNKyXY/45y2N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4Cj
+DUeJT1FxL+78P/m4FoCHiZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXu
+Ozr0hAReYFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1axwi
+P8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6gyN7igEL66S/ozjIE
+j3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8w
+HQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPhahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9j
+cmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0G
+CSqGSIb3DQEBBQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y
+IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6LzsQCv4AdRWOOTK
+RIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4ZSfP1FMa8Kxun08FDAOBp4Qp
+xFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qMYEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAq
+DbUMo2s/rn9X9R+WfN9v3YIwLGUbQErNaLly7HF27FSOH4UMAWr6pjisH8SE
+-----END CERTIFICATE-----
+
+America Online Root Certification Authority 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG
+A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
+T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG
+v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z
+DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh
+sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP
+8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z
+o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf
+GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF
+VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft
+3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g
+Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
+sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
+-----END CERTIFICATE-----
+
+America Online Root Certification Authority 2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG
+A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
+T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en
+fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8
+f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO
+qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN
+RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0
+gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn
+6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid
+FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6
+Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj
+B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op
+aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY
+T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p
++DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg
+JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy
+zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO
+ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh
+1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf
+GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff
+Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP
+cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk=
+-----END CERTIFICATE-----
+
+Visa eCommerce Root
+===================
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
+EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
+QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
+WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
+VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
+F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
+RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
+TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
+/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
+GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
+MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
+CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
+YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
+zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
+YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+Certum Root CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
+ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
+Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
+by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
+wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
+kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
+89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
+Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
+NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
+GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
+0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
+qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+Comodo Secure Services root
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
+MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
+Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
+BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
+9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
+rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
+oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
+p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
+FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
+YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
+aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
+4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
+DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
+pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
+RR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+Comodo Trusted Services root
+============================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
+MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
+bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
+IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
+3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
+/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
+juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
+ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
+DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
+ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
+cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
+uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
+BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
+R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
+9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 1 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAxMDQwNjEwNDkxM1oXDTIxMDQw
+NjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H88
+7dF+2rDNbS82rDTG29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9
+EJUkoVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk3w0LBUXl
+0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBLqdReLjVQCfOAl/QMF645
+2F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIINnvmLVz5MxxftLItyM19yejhW1ebZrgUa
+HXVFsculJRwSVzb9IjcCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZT
+iFIwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE9
+28Jj2VuXZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0HDjxV
+yhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VOTzF2nBBhjrZTOqMR
+vq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2UvkVrCqIexVmiUefkl98HVrhq4uz2P
+qYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4wzMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9Z
+IRlXvVWa
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
+ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
+HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
+bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
+vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
+jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
+C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
+vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
+22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
+HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
+dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
+BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
+EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
+MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
+nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+TDC Internet Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE
+ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx
+NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu
+ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j
+xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL
+znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc
+5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6
+otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI
+AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM
+VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM
+MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC
+AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe
+UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G
+CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m
+gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb
+O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU
+Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l
+-----END CERTIFICATE-----
+
+TDC OCES Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UE
+ChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5
+MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuH
+nEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0
+zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvV
+iGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBde
+dObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO
+3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB
+5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5k
+ay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBm
+cmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZp
+Y2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4x
+LjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEM
+MAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYm
+aHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
+MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647
++RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6
+NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4
+A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYsc
+A+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9
+AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1
+AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw==
+-----END CERTIFICATE-----
+
+UTN DATACorp SGC Root CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
+BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
+MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
+HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
+dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
+raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
+wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
+9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
+33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
+DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
+BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
+LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
+DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
+I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
+EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
+DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+UTN USERFirst Email Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0
+BgNVBAMTLVVUTi1VU0VSRmlyc3QtQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05
+OTA3MDkxNzI4NTBaFw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQx
+FzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsx
+ITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJz
+dC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWlsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3BYHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIx
+B8dOtINknS4p1aJkxIW9hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8
+om+rWV6lL8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLmSGHG
+TPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM1tZUOt4KpLoDd7Nl
+yP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws6wIDAQABo4G5MIG2MAsGA1UdDwQE
+AwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNV
+HR8EUTBPME2gS6BJhkdodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGll
+bnRBdXRoZW50aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u7mFVbwQ+zzne
+xRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0xtcgBEXkzYABurorbs6q15L+
+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQrfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarV
+NZ1yQAOJujEdxRBoUp7fooXFXAimeOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZ
+w7JHpsIyYdfHb0gkUSeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
+-----END CERTIFICATE-----
+
+UTN USERFirst Hardware Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
+BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
+OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
+eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
+ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
+wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
+tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
+i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
+Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
+gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
+lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
+UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
+BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
+XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
+lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
+iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
+nfhmqA==
+-----END CERTIFICATE-----
+
+UTN USERFirst Object Root CA
+============================
+-----BEGIN CERTIFICATE-----
+MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAb
+BgNVBAMTFFVUTi1VU0VSRmlyc3QtT2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAz
+NlowgZUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
+HjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3dy51c2Vy
+dHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicPHxzfOpuCaDDASmEd8S8O+r5596Uj71VR
+loTN2+O5bj4x2AogZ8f02b+U60cEPgLOKqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQ
+w5ujm9M89RKZd7G3CeBo5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vu
+lBe3/IW+pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehbkkj7
+RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUCAwEAAaOBrzCBrDAL
+BgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU2u1kdBScFDyr3ZmpvVsoTYs8
+ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmly
+c3QtT2JqZWN0LmNybDApBgNVHSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQw
+DQYJKoZIhvcNAQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
+NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXBmMiKVl0+7kNO
+PmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU4U3GDZlDAQ0Slox4nb9QorFE
+qmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK581OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCG
+hU3IfdeLA/5u1fedFqySLKAj5ZyRUh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
+-----END CERTIFICATE-----
+
+Camerfirma Chambers of Commerce Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
+NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
+cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
+MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
+AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
+xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
+NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
+DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
+d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
+EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
+cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
+AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
+bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
+VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
+fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
+L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
+UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
+ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
+erfutGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+Camerfirma Global Chambersign Root
+==================================
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
+NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
+YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
+MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
+ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
+1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
+by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
+6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
+8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
+BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
+aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
+Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
+aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
+ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
+PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
+gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
+PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
+IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
+t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+NetLock Qualified (Class QA) Root
+=================================
+-----BEGIN CERTIFICATE-----
+MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
+CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
+BAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQDEzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVn
+eXpvaSAoQ2xhc3MgUUEpIFRhbnVzaXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0
+bG9jay5odTAeFw0wMzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTER
+MA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNhZ2kgS2Z0
+LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5ldExvY2sgTWlub3NpdGV0
+dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZhbnlraWFkbzEeMBwGCSqGSIb3DQEJARYP
+aW5mb0BuZXRsb2NrLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRV
+CacbvWy5FPSKAtt2/GoqeKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e
+8ia6AFQer7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO53Lhb
+m+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWdvLrqOU+L73Sa58XQ
+0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0lmT+1fMptsK6ZmfoIYOcZwvK9UdPM
+0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4ICwDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
+HQ8BAf8EBAMCAQYwggJ1BglghkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2
+YW55IGEgTmV0TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh
+biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQgZWxla3Ryb25p
+a3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywgdmFsYW1pbnQgZWxmb2dhZGFz
+YW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwg
+YXogQWx0YWxhbm9zIFN6ZXJ6b2Rlc2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kg
+ZWxqYXJhcyBtZWd0ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczov
+L3d3dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0BuZXRsb2Nr
+Lm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0
+aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMg
+YXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0
+IGluZm9AbmV0bG9jay5uZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3
+DQEBBQUAA4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQMznN
+wNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+NFAwLvt/MpqNPfMg
+W/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCRVCHnpgu0mfVRQdzNo0ci2ccBgcTc
+R08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR
+5qq5aKrN9p2QdRLqOBrKROi3macqaJVmlaut74nLYKkGEsaUR+ko
+-----END CERTIFICATE-----
+
+NetLock Notary (Class A) Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
+EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
+ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
+DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
+EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
+VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
+cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
+D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
+z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
+/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
+tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
+4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
+A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
+Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
+bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
+LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
+ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
+IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
+IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
+b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
+Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
+bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
+ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
+ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
+CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
+KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
+8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+NetLock Business (Class B) Root
+===============================
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
+CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
+BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg
+VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD
+VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv
+bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg
+VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S
+o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr
+1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
+HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ
+RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh
+dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0
+ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv
+c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg
+YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz
+Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA
+bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl
+IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2
+YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj
+cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM
+43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR
+stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+NetLock Express (Class C) Root
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT
+CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
+BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ
+BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j
+ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z
+W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63
+euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw
+DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN
+RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn
+YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB
+IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i
+aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0
+ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y
+emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k
+IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ
+UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg
+YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2
+xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW
+gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
+YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
+AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
+Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
+U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
+LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
+cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
+dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
+AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
+3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
+vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
+fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
+fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
+EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
+1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
+lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
+g14=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+Firmaprofesional Root CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT
+GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp
+Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA
+ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL
+MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT
+OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2
+ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V
+j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH
+lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf
+3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8
+NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww
+KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG
+AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD
+ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf
+wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm
+7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG
+VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA=
+-----END CERTIFICATE-----
+
+Wells Fargo Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV
+BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl
+bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv
+MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX
+x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3
+E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5
+OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j
+sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj
+YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF
+BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD
+ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv
+m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R
+OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
+x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023
+tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
+-----END CERTIFICATE-----
+
+Swisscom Root CA 1
+==================
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
+EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
+dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
+MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
+aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
+MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
+NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
+AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
+b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
+7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
+cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
+WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
+haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
+MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
+MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
+jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
+MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
+VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
+vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
+OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
+1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
+nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
+x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
+NY6E0F/6MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+DST ACES CA X6
+==============
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
+MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
+MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
+CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
+DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
+pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
+GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
+MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
+Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
+dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
+CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
+5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
+Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
+vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
+oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 1
+==============================================
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
+MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
+MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
+TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
+aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
+yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
+Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
+8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
+W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
+BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
+sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
+q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
+nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
+QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
+MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
+dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
+LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
+x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
+QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
+5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
+AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
+Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
+9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
+UrbnBEI=
+-----END CERTIFICATE-----
+
+SwissSign Platinum CA - G2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWduIFBsYXRpbnVtIENBIC0gRzIw
+HhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAwWjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMM
+U3dpc3NTaWduIEFHMSMwIQYDVQQDExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu
+669yIIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2HtnIuJpX+UF
+eNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+6ixuEFGSzH7VozPY1kne
+WCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5objM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIo
+j5+saCB9bzuohTEJfwvH6GXp43gOCWcwizSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/6
+8++QHkwFix7qepF6w9fl+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34T
+aNhxKFrYzt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaPpZjy
+domyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtFKwH3HBqi7Ri6Cr2D
++m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuWae5ogObnmLo2t/5u7Su9IPhlGdpV
+CX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCv
+zAeHFUdvOMW0ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
+IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUAA4ICAQAIhab1
+Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0uMoI3LQwnkAHFmtllXcBrqS3
+NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4
+U99REJNi54Av4tHgvI42Rncz7Lj7jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8
+KV2LwUvJ4ooTHbG/u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl
+9x8DYSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1puEa+S1B
+aYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXaicYwu+uPyyIIoK6q8QNs
+OktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbGDI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSY
+Mdp08YSTcU1f+2BY0fvEwW2JorsgH51xkcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAci
+IfNAChs0B0QTwoRqjt8ZWr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+WellsSecure Public Root Certificate Authority
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
+F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
+NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
+bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
+VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
+iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
+i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
+bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
+K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
+AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
+cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
+lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
+i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
+GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
+K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
+bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
+qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
+E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
+tylv2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+IGC/A
+=====
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
+VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
+Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
+MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
+EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
+STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
+TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
+So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
+HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
+frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
+tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
+egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
+iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
+q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
+MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
+lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
+0mBWWg==
+-----END CERTIFICATE-----
+
+Security Communication EV RootCA1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
+BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
+Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
+/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
+WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
+ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
+bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
+9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
+iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
+Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
+mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
+T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+S-TRUST Authentication and Encryption Root CA 2005 PN
+=====================================================
+-----BEGIN CERTIFICATE-----
+MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcpMRIwEAYDVQQHEwlTdHV0dGdh
+cnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVT
+LVRSVVNUIEF1dGhlbnRpY2F0aW9uIGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0w
+NTA2MjIwMDAwMDBaFw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFk
+ZW4tV3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMgRGV1dHNj
+aGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJVU1QgQXV0aGVudGljYXRp
+b24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBOMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob
+4QSwI7+Vio5bG0F/WsPoTUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXL
+g3KSwlOyggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1Xgqf
+eN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteFhy+S8dF2g08LOlk3
+KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm7QIDAQABo4GSMIGPMBIGA1UdEwEB
+/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJv
+bmxpbmUxLTIwNDgtNTAdBgNVHQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAU
+D8oeXHngovMpttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD
+pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFoLtU96G7m1R08
+P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersFiXOMy6ZNwPv2AtawB6MDwidA
+nwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0yh9WUUpY6RsZxlj33mA6ykaqP2vROJAA5Veit
+F7nTNCtKqUDMFypVZUF0Qn71wK/Ik63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8b
+Hz2eBIPdltkdOpQ=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
+BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
+EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
+MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
+dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
+GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
+d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
+oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
+QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
+PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
+MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
+IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
+VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
+LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
+dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
+4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
+AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
+egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
+Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
+PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
+c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
+cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
+IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
+WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
+MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
+MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
+Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
+HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
+nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
+aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
+yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
+S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
+======================================
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
+AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
+LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
+HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
+U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
+IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
+yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
+2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
+4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
+2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
+8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
+HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
+Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
+5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
+czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
+ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
+BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
+cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
+AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
+EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
+/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
+MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
+3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
+eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
+/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
+RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
+Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+TC TrustCenter Class 2 CA II
+============================
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
+IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
+MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
+c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
+AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
+IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
+xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
+Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
+SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
+7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
+Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
+cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
+SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
+dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
+KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
+TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
+JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
+vQ==
+-----END CERTIFICATE-----
+
+TC TrustCenter Class 3 CA II
+============================
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
+IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
+MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
+c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
+AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
+yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
+6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
+uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
+2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
+7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
+Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
+cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
+SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
+O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
+yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
+IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
+092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
+5A==
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA I
+=============================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
+MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
+VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
+JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
+qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
+xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
+ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
+gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
+BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
+1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
+vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
+ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
+7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+ComSign CA
+==========
+-----BEGIN CERTIFICATE-----
+MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0MRMwEQYDVQQD
+EwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTMy
+MThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMTCkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNp
+Z24xCzAJBgNVBAYTAklMMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49q
+ROR+WCf4C9DklBKK8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTy
+P2Q298CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb2CEJKHxN
+GGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxCejVb7Us6eva1jsz/D3zk
+YDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7KpiXd3DTKaCQeQzC6zJMw9kglcq/QytNuEM
+rkvF7zuZ2SOzW120V+x0cAwqTwIDAQABo4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAy
+oDCgLoYsaHR0cDovL2ZlZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0P
+AQH/BAQDAgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRLAZs+
+VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWdfoPPbrxHbvUanlR2
+QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0McXS6hMTXcpuEfDhOZAYnKuGntewI
+mbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb
+/627HOkthIDYIb6FUtnUdLlphbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VG
+zT2ouvDzuFYkRes3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
+AGegcQCCSA==
+-----END CERTIFICATE-----
+
+ComSign Secured CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
+AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
+NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
+QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
+49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
+7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
+kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
+9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
+AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
+U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
+j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
+AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
+BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
+FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
+51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+Buypass Class 2 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
+MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
+cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
+0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
+0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
+uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
+1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
+7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
+fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
+wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+Buypass Class 3 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
+MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
+ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
+n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
+AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
+1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
+pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
+EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
+htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
+el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
+==========================================================================
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
+QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
+Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
+IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
+X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
+gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
+eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
+TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
+Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
+uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
+qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
+ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
+Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
+Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
+FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
+zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
+XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
+bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
+RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
+1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
+2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
+Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
+AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) FÅ‘tanÃºsÃtvÃ¡ny
+============================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+CA Disig
+========
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
+QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
+MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
+bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
+GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
+Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
+hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
+ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
+gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
+AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
+aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
+ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
+BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
+WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
+mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
+ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
+4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+Juur-SK
+=======
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
+c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
+DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
+SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
+aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
+TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
+UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
+Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
+MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
+HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
+AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
+cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
+AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
+cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
+A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
+ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
+abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
+IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
+Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
+yyqcjg==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
+T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
+MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
+A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
+WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
+YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
+MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
+m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
+HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
+xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
+3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
+2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
+TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
+4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
+9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
+aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
+eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
+zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
+ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
+KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
+nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
+I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
+MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
+tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAx
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0fzGVuDLDQ
+VoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHiTkVWaR94AoDa3EeRKbs2
+yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFgVKTk8d6Pa
+XCUDfGD67gmZPCcQcMgMCeazh88K4hiWNWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n
+0a3hUKw8fGJLj7qE1xIVGx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZ
+RjXZ+Hxb
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
+CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
+bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
+D/xwzoiQ
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
+===================================================
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
+ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
+MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
+cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
+aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
+8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
+jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
+JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
+9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
+SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
+F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
+D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
+Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA III
+===============================
+-----BEGIN CERTIFICATE-----
+MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
+Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
+QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
+KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
+QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
+juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
+CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
+M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
+A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
+g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
+KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
+BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
+CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
+woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+Certinomis - AutoritÃ© Racine
+=============================
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
+LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
+A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
+JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
+wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
+Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
+2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
+jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
+c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
+lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
+xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
+530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
+4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
+WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
+R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
+nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
+CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
+JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
+qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
+WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
+wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
+vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+Root CA Generalitat Valenciana
+==============================
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
+ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
+IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
+WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
+CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
+F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
+ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
+D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
+JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
+AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
+dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
+ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
+AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
+YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
+AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
+AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
+YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
+AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
+OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
+dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
+BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
+b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
+TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
+Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
+NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
+iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
++GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+A-Trust-nQual-03
+================
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
+Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
+a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
+dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
+RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
+ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
+c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
+zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
+yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
+SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
+iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
+cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
+eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
+ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
+sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
+JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
+ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
+Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
+dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
+c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
+bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
+aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
+L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
+cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
+fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
+N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
+Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
+tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
+e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
+2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
+HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
+D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority G2
+===================================
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
+ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
+o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
+4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
+Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
+Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
+O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
+vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
+nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
+FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
+z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
+KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
+J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
+/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
+nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
+blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
+l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
+7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
+obp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Resources/cacert.pem.md5 b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Resources/cacert.pem.md5
new file mode 100644
index 0000000000000000000000000000000000000000..56f626a934867c022a7fe103a6d37313989aea42
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Resources/cacert.pem.md5
@@ -0,0 +1 @@
+47961e7ef15667c93cd99be01b51f00a
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/StaticClient.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/StaticClient.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbd4c18413a5870a67ff6de38afa27029b2e1612
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/StaticClient.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Http\Client;
+use Guzzle\Http\ClientInterface;
+use Guzzle\Stream\StreamRequestFactoryInterface;
+use Guzzle\Stream\PhpStreamRequestFactory;
+
+/**
+ * Simplified interface to Guzzle that does not require a class to be instantiated
+ */
+final class StaticClient
+{
+    /** @var Client Guzzle client */
+    private static $client;
+
+    /**
+     * Mount the client to a simpler class name for a specific client
+     *
+     * @param string          $className Class name to use to mount
+     * @param ClientInterface $client    Client used to send requests
+     */
+    public static function mount($className = 'Guzzle', ClientInterface $client = null)
+    {
+        class_alias(__CLASS__, $className);
+        if ($client) {
+            self::$client = $client;
+        }
+    }
+
+    /**
+     * @param  string $method  HTTP request method (GET, POST, HEAD, DELETE, PUT, etc)
+     * @param  string $url     URL of the request
+     * @param  array  $options Options to use with the request. See: Guzzle\Http\Message\RequestFactory::applyOptions()
+     * @return \Guzzle\Http\Message\Response|\Guzzle\Stream\Stream
+     */
+    public static function request($method, $url, $options = array())
+    {
+        // @codeCoverageIgnoreStart
+        if (!self::$client) {
+            self::$client = new Client();
+        }
+        // @codeCoverageIgnoreEnd
+
+        $request = self::$client->createRequest($method, $url, null, null, $options);
+
+        if (isset($options['stream'])) {
+            if ($options['stream'] instanceof StreamRequestFactoryInterface) {
+                return $options['stream']->fromRequest($request);
+            } elseif ($options['stream'] == true) {
+                $streamFactory = new PhpStreamRequestFactory();
+                return $streamFactory->fromRequest($request);
+            }
+        }
+
+        return $request->send();
+    }
+
+    /**
+     * Send a GET request
+     *
+     * @param string $url     URL of the request
+     * @param array  $options Array of request options
+     *
+     * @return \Guzzle\Http\Message\Response
+     * @see Guzzle::request for a list of available options
+     */
+    public static function get($url, $options = array())
+    {
+        return self::request('GET', $url, $options);
+    }
+
+    /**
+     * Send a HEAD request
+     *
+     * @param string $url     URL of the request
+     * @param array  $options Array of request options
+     *
+     * @return \Guzzle\Http\Message\Response
+     * @see Guzzle::request for a list of available options
+     */
+    public static function head($url, $options = array())
+    {
+        return self::request('HEAD', $url, $options);
+    }
+
+    /**
+     * Send a DELETE request
+     *
+     * @param string $url     URL of the request
+     * @param array  $options Array of request options
+     *
+     * @return \Guzzle\Http\Message\Response
+     * @see Guzzle::request for a list of available options
+     */
+    public static function delete($url, $options = array())
+    {
+        return self::request('DELETE', $url, $options);
+    }
+
+    /**
+     * Send a POST request
+     *
+     * @param string $url     URL of the request
+     * @param array  $options Array of request options
+     *
+     * @return \Guzzle\Http\Message\Response
+     * @see Guzzle::request for a list of available options
+     */
+    public static function post($url, $options = array())
+    {
+        return self::request('POST', $url, $options);
+    }
+
+    /**
+     * Send a PUT request
+     *
+     * @param string $url     URL of the request
+     * @param array  $options Array of request options
+     *
+     * @return \Guzzle\Http\Message\Response
+     * @see Guzzle::request for a list of available options
+     */
+    public static function put($url, $options = array())
+    {
+        return self::request('PUT', $url, $options);
+    }
+
+    /**
+     * Send a PATCH request
+     *
+     * @param string $url     URL of the request
+     * @param array  $options Array of request options
+     *
+     * @return \Guzzle\Http\Message\Response
+     * @see Guzzle::request for a list of available options
+     */
+    public static function patch($url, $options = array())
+    {
+        return self::request('PATCH', $url, $options);
+    }
+
+    /**
+     * Send an OPTIONS request
+     *
+     * @param string $url     URL of the request
+     * @param array  $options Array of request options
+     *
+     * @return \Guzzle\Http\Message\Response
+     * @see Guzzle::request for a list of available options
+     */
+    public static function options($url, $options = array())
+    {
+        return self::request('OPTIONS', $url, $options);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Url.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Url.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7fe62844603ccc1668cfa3c68b553b84cc6f9c2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Http/Url.php
@@ -0,0 +1,538 @@
+<?php
+
+namespace Guzzle\Http;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Parser\ParserRegistry;
+
+/**
+ * Parses and generates URLs based on URL parts. In favor of performance, URL parts are not validated.
+ */
+class Url
+{
+    protected $scheme;
+    protected $host;
+    protected $port;
+    protected $username;
+    protected $password;
+    protected $path = '';
+    protected $fragment;
+
+    /** @var QueryString Query part of the URL */
+    protected $query;
+
+    /**
+     * Factory method to create a new URL from a URL string
+     *
+     * @param string $url Full URL used to create a Url object
+     *
+     * @return Url
+     */
+    public static function factory($url)
+    {
+        static $defaults = array('scheme' => null, 'host' => null, 'path' => null, 'port' => null, 'query' => null,
+            'user' => null, 'pass' => null, 'fragment' => null);
+
+        $parts = parse_url($url) + $defaults;
+
+        // Convert the query string into a QueryString object
+        if ($parts['query'] || 0 !== strlen($parts['query'])) {
+            $parts['query'] = QueryString::fromString($parts['query']);
+        }
+
+        return new self($parts['scheme'], $parts['host'], $parts['user'],
+            $parts['pass'], $parts['port'], $parts['path'], $parts['query'],
+            $parts['fragment']);
+    }
+
+    /**
+     * Build a URL from parse_url parts. The generated URL will be a relative URL if a scheme or host are not provided.
+     *
+     * @param array $parts Array of parse_url parts
+     *
+     * @return string
+     */
+    public static function buildUrl(array $parts)
+    {
+        $url = $scheme = '';
+
+        if (isset($parts['scheme'])) {
+            $scheme = $parts['scheme'];
+            $url .= $scheme . ':';
+        }
+
+        if (isset($parts['host'])) {
+            $url .= '//';
+            if (isset($parts['user'])) {
+                $url .= $parts['user'];
+                if (isset($parts['pass'])) {
+                    $url .= ':' . $parts['pass'];
+                }
+                $url .=  '@';
+            }
+
+            $url .= $parts['host'];
+
+            // Only include the port if it is not the default port of the scheme
+            if (isset($parts['port'])
+                && !(($scheme == 'http' && $parts['port'] == 80) || ($scheme == 'https' && $parts['port'] == 443))
+            ) {
+                $url .= ':' . $parts['port'];
+            }
+        }
+
+        // Add the path component if present
+        if (isset($parts['path']) && 0 !== strlen($parts['path'])) {
+            // Always ensure that the path begins with '/' if set and something is before the path
+            if ($url && $parts['path'][0] != '/' && substr($url, -1)  != '/') {
+                $url .= '/';
+            }
+            $url .= $parts['path'];
+        }
+
+        // Add the query string if present
+        if (isset($parts['query'])) {
+            $url .= '?' . $parts['query'];
+        }
+
+        // Ensure that # is only added to the url if fragment contains anything.
+        if (isset($parts['fragment'])) {
+            $url .= '#' . $parts['fragment'];
+        }
+
+        return $url;
+    }
+
+    /**
+     * Create a new URL from URL parts
+     *
+     * @param string                   $scheme   Scheme of the URL
+     * @param string                   $host     Host of the URL
+     * @param string                   $username Username of the URL
+     * @param string                   $password Password of the URL
+     * @param int                      $port     Port of the URL
+     * @param string                   $path     Path of the URL
+     * @param QueryString|array|string $query    Query string of the URL
+     * @param string                   $fragment Fragment of the URL
+     */
+    public function __construct($scheme, $host, $username = null, $password = null, $port = null, $path = null, QueryString $query = null, $fragment = null)
+    {
+        $this->scheme = $scheme;
+        $this->host = $host;
+        $this->port = $port;
+        $this->username = $username;
+        $this->password = $password;
+        $this->fragment = $fragment;
+        if (!$query) {
+            $this->query = new QueryString();
+        } else {
+            $this->setQuery($query);
+        }
+        $this->setPath($path);
+    }
+
+    /**
+     * Clone the URL
+     */
+    public function __clone()
+    {
+        $this->query = clone $this->query;
+    }
+
+    /**
+     * Returns the URL as a URL string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return self::buildUrl($this->getParts());
+    }
+
+    /**
+     * Get the parts of the URL as an array
+     *
+     * @return array
+     */
+    public function getParts()
+    {
+        return array(
+            'scheme' => $this->scheme,
+            'user' => $this->username,
+            'pass' => $this->password,
+            'host' => $this->host,
+            'port' => $this->port,
+            'path' => $this->getPath(),
+            'query' => (string) $this->query ?: null,
+            'fragment' => $this->fragment,
+        );
+    }
+
+    /**
+     * Set the host of the request.
+     *
+     * @param string $host Host to set (e.g. www.yahoo.com, yahoo.com)
+     *
+     * @return Url
+     */
+    public function setHost($host)
+    {
+        if (strpos($host, ':') === false) {
+            $this->host = $host;
+        } else {
+            list($host, $port) = explode(':', $host);
+            $this->host = $host;
+            $this->setPort($port);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the host part of the URL
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * Set the scheme part of the URL (http, https, ftp, etc)
+     *
+     * @param string $scheme Scheme to set
+     *
+     * @return Url
+     */
+    public function setScheme($scheme)
+    {
+        $this->scheme = $scheme;
+
+        return $this;
+    }
+
+    /**
+     * Get the scheme part of the URL
+     *
+     * @return string
+     */
+    public function getScheme()
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Set the port part of the URL
+     *
+     * @param int $port Port to set
+     *
+     * @return Url
+     */
+    public function setPort($port)
+    {
+        $this->port = $port;
+
+        return $this;
+    }
+
+    /**
+     * Get the port part of the URl. Will return the default port for a given scheme if no port has been set.
+     *
+     * @return int|null
+     */
+    public function getPort()
+    {
+        if ($this->port) {
+            return $this->port;
+        } elseif ($this->scheme == 'http') {
+            return 80;
+        } elseif ($this->scheme == 'https') {
+            return 443;
+        }
+
+        return null;
+    }
+
+    /**
+     * Set the path part of the URL
+     *
+     * @param array|string $path Path string or array of path segments
+     *
+     * @return Url
+     */
+    public function setPath($path)
+    {
+        if (is_array($path)) {
+            $this->path = '/' . implode('/', $path);
+        } else {
+            $this->path = (string) $path;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Normalize the URL so that double slashes and relative paths are removed
+     *
+     * @return Url
+     */
+    public function normalizePath()
+    {
+        if (!$this->path || $this->path == '/' || $this->path == '*') {
+            return $this;
+        }
+
+        // Replace // and /./ with /
+        $this->path = str_replace(array('/./', '//'), '/', $this->path);
+
+        // Remove dot segments
+        if (strpos($this->path, '..') !== false) {
+
+            // Remove trailing relative paths if possible
+            $segments = $this->getPathSegments();
+            $last = end($segments);
+            $trailingSlash = false;
+            if ($last === '') {
+                array_pop($segments);
+                $trailingSlash = true;
+            }
+
+            while ($last == '..' || $last == '.') {
+                if ($last == '..') {
+                    array_pop($segments);
+                    $last = array_pop($segments);
+                }
+                if ($last == '.' || $last == '') {
+                    $last = array_pop($segments);
+                }
+            }
+
+            $this->path = implode('/', $segments);
+            if ($trailingSlash) {
+                $this->path .= '/';
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a relative path to the currently set path
+     *
+     * @param string $relativePath Relative path to add
+     *
+     * @return Url
+     */
+    public function addPath($relativePath)
+    {
+        if (!$relativePath || $relativePath == '/') {
+            return $this;
+        }
+
+        // Add a leading slash if needed
+        if ($relativePath[0] != '/') {
+            $relativePath = '/' . $relativePath;
+        }
+
+        return $this->setPath(str_replace('//', '/', $this->getPath() . $relativePath));
+    }
+
+    /**
+     * Get the path part of the URL
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * Get the path segments of the URL as an array
+     *
+     * @return array
+     */
+    public function getPathSegments()
+    {
+        return array_slice(explode('/', $this->getPath()), 1);
+    }
+
+    /**
+     * Set the password part of the URL
+     *
+     * @param string $password Password to set
+     *
+     * @return Url
+     */
+    public function setPassword($password)
+    {
+        $this->password = $password;
+
+        return $this;
+    }
+
+    /**
+     * Get the password part of the URL
+     *
+     * @return null|string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * Set the username part of the URL
+     *
+     * @param string $username Username to set
+     *
+     * @return Url
+     */
+    public function setUsername($username)
+    {
+        $this->username = $username;
+
+        return $this;
+    }
+
+    /**
+     * Get the username part of the URl
+     *
+     * @return null|string
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    /**
+     * Get the query part of the URL as a QueryString object
+     *
+     * @return QueryString
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
+    /**
+     * Set the query part of the URL
+     *
+     * @param QueryString|string|array $query Query to set
+     *
+     * @return Url
+     */
+    public function setQuery($query)
+    {
+        if (is_string($query)) {
+            $output = null;
+            parse_str($query, $output);
+            $this->query = new QueryString($output);
+        } elseif (is_array($query)) {
+            $this->query = new QueryString($query);
+        } elseif ($query instanceof QueryString) {
+            $this->query = $query;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the fragment part of the URL
+     *
+     * @return null|string
+     */
+    public function getFragment()
+    {
+        return $this->fragment;
+    }
+
+    /**
+     * Set the fragment part of the URL
+     *
+     * @param string $fragment Fragment to set
+     *
+     * @return Url
+     */
+    public function setFragment($fragment)
+    {
+        $this->fragment = $fragment;
+
+        return $this;
+    }
+
+    /**
+     * Check if this is an absolute URL
+     *
+     * @return bool
+     */
+    public function isAbsolute()
+    {
+        return $this->scheme && $this->host;
+    }
+
+    /**
+     * Combine the URL with another URL. Follows the rules specific in RFC 3986 section 5.4.
+     *
+     * @param string $url Relative URL to combine with
+     *
+     * @return Url
+     * @throws InvalidArgumentException
+     * @link http://tools.ietf.org/html/rfc3986#section-5.4
+     */
+    public function combine($url)
+    {
+        $url = self::factory($url);
+
+        // Use the more absolute URL as the base URL
+        if (!$this->isAbsolute() && $url->isAbsolute()) {
+            $url = $url->combine($this);
+        }
+
+        // Passing a URL with a scheme overrides everything
+        if ($buffer = $url->getScheme()) {
+            $this->scheme = $buffer;
+            $this->host = $url->getHost();
+            $this->port = $url->getPort();
+            $this->username = $url->getUsername();
+            $this->password = $url->getPassword();
+            $this->path = $url->getPath();
+            $this->query = $url->getQuery();
+            $this->fragment = $url->getFragment();
+            return $this;
+        }
+
+        // Setting a host overrides the entire rest of the URL
+        if ($buffer = $url->getHost()) {
+            $this->host = $buffer;
+            $this->port = $url->getPort();
+            $this->username = $url->getUsername();
+            $this->password = $url->getPassword();
+            $this->path = $url->getPath();
+            $this->fragment = $url->getFragment();
+            return $this;
+        }
+
+        $path = $url->getPath();
+        $query = $url->getQuery();
+
+        if (!$path) {
+            if (count($query)) {
+                $this->query = $query;
+            }
+        } else {
+            if ($path[0] == '/') {
+                $this->path = $path;
+            } else {
+                $this->path .= '/' . $path;
+            }
+            $this->normalizePath();
+            $this->query = $query;
+        }
+
+        $this->fragment = $url->getFragment();
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/Inflector.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/Inflector.php
new file mode 100644
index 0000000000000000000000000000000000000000..c6997734ce411ca0ffce70cc80f25763482ae76f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/Inflector.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Guzzle\Inflection;
+
+/**
+ * Default inflection implementation
+ */
+class Inflector implements InflectorInterface
+{
+    /** @var InflectorInterface */
+    protected static $default;
+
+    /**
+     * Get the default inflector object that has support for caching
+     *
+     * @return MemoizingInflector
+     */
+    public static function getDefault()
+    {
+        // @codeCoverageIgnoreStart
+        if (!self::$default) {
+            self::$default = new MemoizingInflector(new self());
+        }
+        // @codeCoverageIgnoreEnd
+
+        return self::$default;
+    }
+
+    public function snake($word)
+    {
+        return ctype_lower($word) ? $word : strtolower(preg_replace('/(.)([A-Z])/', "$1_$2", $word));
+    }
+
+    public function camel($word)
+    {
+        return str_replace(' ', '', ucwords(strtr($word, '_-', '  ')));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/InflectorInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/InflectorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..321d71810eba5b05b59323c5d59c99cf568da165
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/InflectorInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Guzzle\Inflection;
+
+/**
+ * Inflector interface used to convert the casing of words
+ */
+interface InflectorInterface
+{
+    /**
+     * Converts strings from camel case to snake case (e.g. CamelCase camel_case).
+     *
+     * @param string $word Word to convert to snake case
+     *
+     * @return string
+     */
+    public function snake($word);
+
+    /**
+     * Converts strings from snake_case to upper CamelCase
+     *
+     * @param string $word Value to convert into upper CamelCase
+     *
+     * @return string
+     */
+    public function camel($word);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/MemoizingInflector.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/MemoizingInflector.php
new file mode 100644
index 0000000000000000000000000000000000000000..32968d667bdd2595c993a07d30e13e0ce790fd97
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/MemoizingInflector.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Guzzle\Inflection;
+
+/**
+ * Decorator used to add memoization to previously inflected words
+ */
+class MemoizingInflector implements InflectorInterface
+{
+    /** @var array Array of cached inflections */
+    protected $cache = array(
+        'snake' => array(),
+        'camel' => array()
+    );
+
+    /** @var int Max entries per cache */
+    protected $maxCacheSize;
+
+    /** @var InflectorInterface Decorated inflector */
+    protected $decoratedInflector;
+
+    /**
+     * @param InflectorInterface $inflector    Inflector being decorated
+     * @param int                $maxCacheSize Maximum number of cached items to hold per cache
+     */
+    public function __construct(InflectorInterface $inflector, $maxCacheSize = 500)
+    {
+        $this->decoratedInflector = $inflector;
+        $this->maxCacheSize = $maxCacheSize;
+    }
+
+    public function snake($word)
+    {
+        if (!isset($this->cache['snake'][$word])) {
+            $this->pruneCache('snake');
+            $this->cache['snake'][$word] = $this->decoratedInflector->snake($word);
+        }
+
+        return $this->cache['snake'][$word];
+    }
+
+    /**
+     * Converts strings from snake_case to upper CamelCase
+     *
+     * @param string $word Value to convert into upper CamelCase
+     *
+     * @return string
+     */
+    public function camel($word)
+    {
+        if (!isset($this->cache['camel'][$word])) {
+            $this->pruneCache('camel');
+            $this->cache['camel'][$word] = $this->decoratedInflector->camel($word);
+        }
+
+        return $this->cache['camel'][$word];
+    }
+
+    /**
+     * Prune one of the named caches by removing 20% of the cache if it is full
+     *
+     * @param string $cache Type of cache to prune
+     */
+    protected function pruneCache($cache)
+    {
+        if (count($this->cache[$cache]) == $this->maxCacheSize) {
+            $this->cache[$cache] = array_slice($this->cache[$cache], $this->maxCacheSize * 0.2);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/PreComputedInflector.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/PreComputedInflector.php
new file mode 100644
index 0000000000000000000000000000000000000000..db37e4fe4a56df25d5d3363368b751140706958d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Inflection/PreComputedInflector.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Guzzle\Inflection;
+
+/**
+ * Decorator used to add pre-computed inflection mappings to an inflector
+ */
+class PreComputedInflector implements InflectorInterface
+{
+    /** @var array Array of pre-computed inflections */
+    protected $mapping = array(
+        'snake' => array(),
+        'camel' => array()
+    );
+
+    /** @var InflectorInterface Decorated inflector */
+    protected $decoratedInflector;
+
+    /**
+     * @param InflectorInterface $inflector Inflector being decorated
+     * @param array              $snake     Hash of pre-computed camel to snake
+     * @param array              $camel     Hash of pre-computed snake to camel
+     * @param bool               $mirror    Mirror snake and camel reflections
+     */
+    public function __construct(InflectorInterface $inflector, array $snake = array(), array $camel = array(), $mirror = false)
+    {
+        if ($mirror) {
+            $camel = array_merge(array_flip($snake), $camel);
+            $snake = array_merge(array_flip($camel), $snake);
+        }
+
+        $this->decoratedInflector = $inflector;
+        $this->mapping = array(
+            'snake' => $snake,
+            'camel' => $camel
+        );
+    }
+
+    public function snake($word)
+    {
+        return isset($this->mapping['snake'][$word])
+            ? $this->mapping['snake'][$word]
+            : $this->decoratedInflector->snake($word);
+    }
+
+    /**
+     * Converts strings from snake_case to upper CamelCase
+     *
+     * @param string $word Value to convert into upper CamelCase
+     *
+     * @return string
+     */
+    public function camel($word)
+    {
+        return isset($this->mapping['camel'][$word])
+            ? $this->mapping['camel'][$word]
+            : $this->decoratedInflector->camel($word);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/AppendIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/AppendIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b6bd7e5374e96c4a425e0750aee36767cedbd31
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/AppendIterator.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Guzzle\Iterator;
+
+/**
+ * AppendIterator that is not affected by https://bugs.php.net/bug.php?id=49104
+ */
+class AppendIterator extends \AppendIterator
+{
+    /**
+     * Works around the bug in which PHP calls rewind() and next() when appending
+     *
+     * @param \Iterator $iterator Iterator to append
+     */
+    public function append(\Iterator $iterator)
+    {
+        $this->getArrayIterator()->append($iterator);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/ChunkedIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/ChunkedIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..1807b23e97a44b3e5b278948c3d34cde53ff73cb
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/ChunkedIterator.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Guzzle\Iterator;
+
+/**
+ * Pulls out chunks from an inner iterator and yields the chunks as arrays
+ */
+class ChunkedIterator extends \IteratorIterator
+{
+    /** @var int Size of each chunk */
+    protected $chunkSize;
+
+    /** @var array Current chunk */
+    protected $chunk;
+
+    /**
+     * @param \Traversable $iterator  Traversable iterator
+     * @param int          $chunkSize Size to make each chunk
+     */
+    public function __construct(\Traversable $iterator, $chunkSize)
+    {
+        parent::__construct($iterator);
+        $this->chunkSize = $chunkSize;
+    }
+
+    public function rewind()
+    {
+        $this->next();
+    }
+
+    public function next()
+    {
+        $this->chunk = array();
+        $inner = $this->getInnerIterator();
+        for ($i = 0; $i < $this->chunkSize && $inner->valid(); $i++) {
+            $this->chunk[] = $inner->current();
+            $inner->next();
+        }
+    }
+
+    public function current()
+    {
+        return $this->chunk;
+    }
+
+    public function valid()
+    {
+        return !empty($this->chunk);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/FilterIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/FilterIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..82b978284be0be2c7268a4195f9f97eef48ae003
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/FilterIterator.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Guzzle\Iterator;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * Filters values using a callback
+ *
+ * Used when PHP 5.4's {@see \CallbackFilterIterator} is not available
+ */
+class FilterIterator extends \FilterIterator
+{
+    /** @var mixed Callback used for filtering */
+    protected $callback;
+
+    /**
+     * @param \Traversable   $iterator Traversable iterator
+     * @param array|\Closure $callback Callback used for filtering. Return true to keep or false to filter.
+     *
+     * @throws InvalidArgumentException if the callback if not callable
+     */
+    public function __construct(\Traversable $iterator, $callback)
+    {
+        parent::__construct($iterator);
+        if (!is_callable($callback)) {
+            throw new InvalidArgumentException('The callback must be callable');
+        }
+        $this->callback = $callback;
+    }
+
+    public function accept()
+    {
+        return call_user_func($this->callback, $this->current());
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MapIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MapIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e586bda6a7fa7ec27a08a7dce0382d9610f245f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MapIterator.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Guzzle\Iterator;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * Maps values before yielding
+ */
+class MapIterator extends \IteratorIterator
+{
+    /** @var mixed Callback */
+    protected $callback;
+
+    /**
+     * @param \Traversable   $iterator Traversable iterator
+     * @param array|\Closure $callback Callback used for iterating
+     *
+     * @throws InvalidArgumentException if the callback if not callable
+     */
+    public function __construct(\Traversable $iterator, $callback)
+    {
+        parent::__construct($iterator);
+        if (!is_callable($callback)) {
+            throw new InvalidArgumentException('The callback must be callable');
+        }
+        $this->callback = $callback;
+    }
+
+    public function current()
+    {
+        return call_user_func($this->callback, parent::current());
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MethodProxyIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MethodProxyIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..de4ab036044620409722d10763e70a3ab74692c9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MethodProxyIterator.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Guzzle\Iterator;
+
+/**
+ * Proxies missing method calls to the innermost iterator
+ */
+class MethodProxyIterator extends \IteratorIterator
+{
+    /**
+     * Proxy method calls to the wrapped iterator
+     *
+     * @param string $name Name of the method
+     * @param array  $args Arguments to proxy
+     *
+     * @return mixed
+     */
+    public function __call($name, array $args)
+    {
+        $i = $this->getInnerIterator();
+        while ($i instanceof \OuterIterator) {
+            $i = $i->getInnerIterator();
+        }
+
+        return call_user_func_array(array($i, $name), $args);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/AbstractLogAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/AbstractLogAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f6271bcb5f9fcb8e65c1a35cbf3370ee07696a8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/AbstractLogAdapter.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Guzzle\Log;
+
+/**
+ * Adapter class that allows Guzzle to log data using various logging implementations
+ */
+abstract class AbstractLogAdapter implements LogAdapterInterface
+{
+    protected $log;
+
+    public function getLogObject()
+    {
+        return $this->log;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/ArrayLogAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/ArrayLogAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..a70fc8d4230b822a01013b02e942acfefab748d5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/ArrayLogAdapter.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Guzzle\Log;
+
+/**
+ * Stores all log messages in an array
+ */
+class ArrayLogAdapter implements LogAdapterInterface
+{
+    protected $logs = array();
+
+    public function log($message, $priority = LOG_INFO, $extras = array())
+    {
+        $this->logs[] = array('message' => $message, 'priority' => $priority, 'extras' => $extras);
+    }
+
+    /**
+     * Get logged entries
+     *
+     * @return array
+     */
+    public function getLogs()
+    {
+        return $this->logs;
+    }
+
+    /**
+     * Clears logged entries
+     */
+    public function clearLogs()
+    {
+        $this->logs = array();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/ClosureLogAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/ClosureLogAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4bb73f2198ed8a7688b58dcce7c7d4822ab0472
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/ClosureLogAdapter.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Guzzle\Log;
+
+/**
+ * Logs messages using Closures. Closures combined with filtering can trigger application events based on log messages.
+ */
+class ClosureLogAdapter extends AbstractLogAdapter
+{
+    public function __construct($logObject)
+    {
+        if (!is_callable($logObject)) {
+            throw new \InvalidArgumentException('Object must be callable');
+        }
+
+        $this->log = $logObject;
+    }
+
+    public function log($message, $priority = LOG_INFO, $extras = array())
+    {
+        call_user_func($this->log, $message, $priority, $extras);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/LogAdapterInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/LogAdapterInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d7ac4ea7c72ce16680bd9d915d8992df2827fd85
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/LogAdapterInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Log;
+
+/**
+ * Adapter class that allows Guzzle to log data to various logging implementations.
+ */
+interface LogAdapterInterface
+{
+    /**
+     * Log a message at a priority
+     *
+     * @param string  $message  Message to log
+     * @param integer $priority Priority of message (use the \LOG_* constants of 0 - 7)
+     * @param array   $extras   Extra information to log in event
+     */
+    public function log($message, $priority = LOG_INFO, $extras = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/MessageFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/MessageFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..b5cfe9d1f337cfed4466eae1351dd4f286ed01c2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/MessageFormatter.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace Guzzle\Log;
+
+use Guzzle\Http\Curl\CurlHandle;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Message formatter used in various places in the framework
+ *
+ * Format messages using a template that can contain the the following variables:
+ *
+ * - {request}:       Full HTTP request message
+ * - {response}:      Full HTTP response message
+ * - {ts}:            Timestamp
+ * - {host}:          Host of the request
+ * - {method}:        Method of the request
+ * - {url}:           URL of the request
+ * - {host}:          Host of the request
+ * - {protocol}:      Request protocol
+ * - {version}:       Protocol version
+ * - {resource}:      Resource of the request (path + query + fragment)
+ * - {port}:          Port of the request
+ * - {hostname}:      Hostname of the machine that sent the request
+ * - {code}:          Status code of the response (if available)
+ * - {phrase}:        Reason phrase of the response  (if available)
+ * - {curl_error}:    Curl error message (if available)
+ * - {curl_code}:     Curl error code (if available)
+ * - {curl_stderr}:   Curl standard error (if available)
+ * - {connect_time}:  Time in seconds it took to establish the connection (if available)
+ * - {total_time}:    Total transaction time in seconds for last transfer (if available)
+ * - {req_header_*}:  Replace `*` with the lowercased name of a request header to add to the message
+ * - {res_header_*}:  Replace `*` with the lowercased name of a response header to add to the message
+ * - {req_body}:      Request body
+ * - {res_body}:      Response body
+ */
+class MessageFormatter
+{
+    const DEFAULT_FORMAT = "{hostname} {req_header_User-Agent} - [{ts}] \"{method} {resource} {protocol}/{version}\" {code} {res_header_Content-Length}";
+    const DEBUG_FORMAT = ">>>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{curl_stderr}";
+    const SHORT_FORMAT = '[{ts}] "{method} {resource} {protocol}/{version}" {code}';
+
+    /**
+     * @var string Template used to format log messages
+     */
+    protected $template;
+
+    /**
+     * @param string $template Log message template
+     */
+    public function __construct($template = self::DEFAULT_FORMAT)
+    {
+        $this->template = $template ?: self::DEFAULT_FORMAT;
+    }
+
+    /**
+     * Set the template to use for logging
+     *
+     * @param string $template Log message template
+     *
+     * @return self
+     */
+    public function setTemplate($template)
+    {
+        $this->template = $template;
+
+        return $this;
+    }
+
+    /**
+     * Returns a formatted message
+     *
+     * @param RequestInterface $request    Request that was sent
+     * @param Response         $response   Response that was received
+     * @param CurlHandle       $handle     Curl handle associated with the message
+     * @param array            $customData Associative array of custom template data
+     *
+     * @return string
+     */
+    public function format(
+        RequestInterface $request,
+        Response $response = null,
+        CurlHandle $handle = null,
+        array $customData = array()
+    ) {
+        $cache = $customData;
+
+        return preg_replace_callback(
+            '/{\s*([A-Za-z_\-\.0-9]+)\s*}/',
+            function (array $matches) use ($request, $response, $handle, &$cache) {
+
+                if (array_key_exists($matches[1], $cache)) {
+                    return $cache[$matches[1]];
+                }
+
+                $result = '';
+                switch ($matches[1]) {
+                    case 'request':
+                        $result = (string) $request;
+                        break;
+                    case 'response':
+                        $result = (string) $response;
+                        break;
+                    case 'req_body':
+                        $result = $request instanceof EntityEnclosingRequestInterface
+                            ? (string) $request->getBody() : '';
+                        break;
+                    case 'res_body':
+                        $result = $response ? $response->getBody(true) : '';
+                        break;
+                    case 'ts':
+                        $result = gmdate('c');
+                        break;
+                    case 'method':
+                        $result = $request->getMethod();
+                        break;
+                    case 'url':
+                        $result = (string) $request->getUrl();
+                        break;
+                    case 'resource':
+                        $result = $request->getResource();
+                        break;
+                    case 'protocol':
+                        $result = 'HTTP';
+                        break;
+                    case 'version':
+                        $result = $request->getProtocolVersion();
+                        break;
+                    case 'host':
+                        $result = $request->getHost();
+                        break;
+                    case 'hostname':
+                        $result = gethostname();
+                        break;
+                    case 'port':
+                        $result = $request->getPort();
+                        break;
+                    case 'code':
+                        $result = $response ? $response->getStatusCode() : '';
+                        break;
+                    case 'phrase':
+                        $result = $response ? $response->getReasonPhrase() : '';
+                        break;
+                    case 'connect_time':
+                        $result = $handle && $handle->getInfo(CURLINFO_CONNECT_TIME)
+                            ? $handle->getInfo(CURLINFO_CONNECT_TIME)
+                            : ($response ? $response->getInfo('connect_time') : '');
+                        break;
+                    case 'total_time':
+                        $result = $handle && $handle->getInfo(CURLINFO_TOTAL_TIME)
+                            ? $handle->getInfo(CURLINFO_TOTAL_TIME)
+                            : ($response ? $response->getInfo('total_time') : '');
+                        break;
+                    case 'curl_error':
+                        $result = $handle ? $handle->getError() : '';
+                        break;
+                    case 'curl_code':
+                        $result = $handle ? $handle->getErrorNo() : '';
+                        break;
+                    case 'curl_stderr':
+                        $result =  $handle ? $handle->getStderr() : '';
+                        break;
+                    default:
+                        if (strpos($matches[1], 'req_header_') === 0) {
+                            $result = $request->getHeader(substr($matches[1], 11));
+                        } elseif ($response && strpos($matches[1], 'res_header_') === 0) {
+                            $result = $response->getHeader(substr($matches[1], 11));
+                        }
+                }
+
+                $cache[$matches[1]] = $result;
+                return $result;
+            },
+            $this->template
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/MonologLogAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/MonologLogAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..8c74a45dce8e7c60b4fe194dfa41adb9cad15fb4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/MonologLogAdapter.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Guzzle\Log;
+
+use Monolog\Logger;
+
+/**
+ * @deprecated
+ * @codeCoverageIgnore
+ */
+class MonologLogAdapter extends AbstractLogAdapter
+{
+    /**
+     * syslog to Monolog mappings
+     */
+    private static $mapping = array(
+        LOG_DEBUG   => Logger::DEBUG,
+        LOG_INFO    => Logger::INFO,
+        LOG_WARNING => Logger::WARNING,
+        LOG_ERR     => Logger::ERROR,
+        LOG_CRIT    => Logger::CRITICAL,
+        LOG_ALERT   => Logger::ALERT
+    );
+
+    public function __construct(Logger $logObject)
+    {
+        $this->log = $logObject;
+    }
+
+    public function log($message, $priority = LOG_INFO, $extras = array())
+    {
+        $this->log->addRecord(self::$mapping[$priority], $message);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/PsrLogAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/PsrLogAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..38a2b600d632746cabf69c08337ec89a69a2eba0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/PsrLogAdapter.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Guzzle\Log;
+
+use Psr\Log\LogLevel;
+use Psr\Log\LoggerInterface;
+
+/**
+ * PSR-3 log adapter
+ *
+ * @link https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ */
+class PsrLogAdapter extends AbstractLogAdapter
+{
+    /**
+     * syslog to PSR-3 mappings
+     */
+    private static $mapping = array(
+        LOG_DEBUG   => LogLevel::DEBUG,
+        LOG_INFO    => LogLevel::INFO,
+        LOG_WARNING => LogLevel::WARNING,
+        LOG_ERR     => LogLevel::ERROR,
+        LOG_CRIT    => LogLevel::CRITICAL,
+        LOG_ALERT   => LogLevel::ALERT
+    );
+
+    public function __construct(LoggerInterface $logObject)
+    {
+        $this->log = $logObject;
+    }
+
+    public function log($message, $priority = LOG_INFO, $extras = array())
+    {
+        $this->log->log(self::$mapping[$priority], $message, $extras);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/Zf1LogAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/Zf1LogAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ea8e3b1d0217c41a5501aa925cc16c95735a30c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/Zf1LogAdapter.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Guzzle\Log;
+
+use Guzzle\Common\Version;
+
+/**
+ * Adapts a Zend Framework 1 logger object
+ * @deprecated
+ * @codeCoverageIgnore
+ */
+class Zf1LogAdapter extends AbstractLogAdapter
+{
+    public function __construct(\Zend_Log $logObject)
+    {
+        $this->log = $logObject;
+        Version::warn(__CLASS__ . ' is deprecated');
+    }
+
+    public function log($message, $priority = LOG_INFO, $extras = array())
+    {
+        $this->log->log($message, $priority, $extras);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/Zf2LogAdapter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/Zf2LogAdapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..863f6a1c415f7b82c7861bb61ca15803aef8db29
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/Zf2LogAdapter.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Guzzle\Log;
+
+use Zend\Log\Logger;
+
+/**
+ * Adapts a Zend Framework 2 logger object
+ */
+class Zf2LogAdapter extends AbstractLogAdapter
+{
+    public function __construct(Logger $logObject)
+    {
+        $this->log = $logObject;
+    }
+
+    public function log($message, $priority = LOG_INFO, $extras = array())
+    {
+        $this->log->log($priority, $message, $extras);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Cookie/CookieParser.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Cookie/CookieParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e825f9bdeab5a7554c715af9182642cf93945db
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Cookie/CookieParser.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Guzzle\Parser\Cookie;
+
+/**
+ * Default Guzzle implementation of a Cookie parser
+ */
+class CookieParser implements CookieParserInterface
+{
+    /** @var array Cookie part names to snake_case array values */
+    protected static $cookieParts = array(
+        'domain'      => 'Domain',
+        'path'        => 'Path',
+        'max_age'     => 'Max-Age',
+        'expires'     => 'Expires',
+        'version'     => 'Version',
+        'secure'      => 'Secure',
+        'port'        => 'Port',
+        'discard'     => 'Discard',
+        'comment'     => 'Comment',
+        'comment_url' => 'Comment-Url',
+        'http_only'   => 'HttpOnly'
+    );
+
+    public function parseCookie($cookie, $host = null, $path = null, $decode = false)
+    {
+        // Explode the cookie string using a series of semicolons
+        $pieces = array_filter(array_map('trim', explode(';', $cookie)));
+
+        // The name of the cookie (first kvp) must include an equal sign.
+        if (empty($pieces) || !strpos($pieces[0], '=')) {
+            return false;
+        }
+
+        // Create the default return array
+        $data = array_merge(array_fill_keys(array_keys(self::$cookieParts), null), array(
+            'cookies'   => array(),
+            'data'      => array(),
+            'path'      => $path ?: '/',
+            'http_only' => false,
+            'discard'   => false,
+            'domain'    => $host
+        ));
+        $foundNonCookies = 0;
+
+        // Add the cookie pieces into the parsed data array
+        foreach ($pieces as $part) {
+
+            $cookieParts = explode('=', $part, 2);
+            $key = trim($cookieParts[0]);
+
+            if (count($cookieParts) == 1) {
+                // Can be a single value (e.g. secure, httpOnly)
+                $value = true;
+            } else {
+                // Be sure to strip wrapping quotes
+                $value = trim($cookieParts[1], " \n\r\t\0\x0B\"");
+                if ($decode) {
+                    $value = urldecode($value);
+                }
+            }
+
+            // Only check for non-cookies when cookies have been found
+            if (!empty($data['cookies'])) {
+                foreach (self::$cookieParts as $mapValue => $search) {
+                    if (!strcasecmp($search, $key)) {
+                        $data[$mapValue] = $mapValue == 'port' ? array_map('trim', explode(',', $value)) : $value;
+                        $foundNonCookies++;
+                        continue 2;
+                    }
+                }
+            }
+
+            // If cookies have not yet been retrieved, or this value was not found in the pieces array, treat it as a
+            // cookie. IF non-cookies have been parsed, then this isn't a cookie, it's cookie data. Cookies then data.
+            $data[$foundNonCookies ? 'data' : 'cookies'][$key] = $value;
+        }
+
+        // Calculate the expires date
+        if (!$data['expires'] && $data['max_age']) {
+            $data['expires'] = time() + (int) $data['max_age'];
+        }
+
+        return $data;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Cookie/CookieParserInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Cookie/CookieParserInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d21ffe21c1cc6095cf546df0806dc4d8fd78a30c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Cookie/CookieParserInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Guzzle\Parser\Cookie;
+
+/**
+ * Cookie parser interface
+ */
+interface CookieParserInterface
+{
+    /**
+     * Parse a cookie string as set in a Set-Cookie HTTP header and return an associative array of data.
+     *
+     * @param string $cookie Cookie header value to parse
+     * @param string $host   Host of an associated request
+     * @param string $path   Path of an associated request
+     * @param bool   $decode Set to TRUE to urldecode cookie values
+     *
+     * @return array|bool Returns FALSE on failure or returns an array of arrays, with each of the sub arrays including:
+     *     - domain  (string) - Domain of the cookie
+     *     - path    (string) - Path of the cookie
+     *     - cookies (array)  - Associative array of cookie names and values
+     *     - max_age (int)    - Lifetime of the cookie in seconds
+     *     - version (int)    - Version of the cookie specification. RFC 2965 is 1
+     *     - secure  (bool)   - Whether or not this is a secure cookie
+     *     - discard (bool)   - Whether or not this is a discardable cookie
+     *     - custom (string)  - Custom cookie data array
+     *     - comment (string) - How the cookie is intended to be used
+     *     - comment_url (str)- URL that contains info on how it will be used
+     *     - port (array|str) - Array of ports or null
+     *     - http_only (bool) - HTTP only cookie
+     */
+    public function parseCookie($cookie, $host = null, $path = null, $decode = false);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/AbstractMessageParser.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/AbstractMessageParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..d25f9cceee045c55c3076000b263e40d90f20adf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/AbstractMessageParser.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Guzzle\Parser\Message;
+
+/**
+ * Implements shared message parsing functionality
+ */
+abstract class AbstractMessageParser implements MessageParserInterface
+{
+    /**
+     * Create URL parts from HTTP message parts
+     *
+     * @param string $requestUrl Associated URL
+     * @param array  $parts      HTTP message parts
+     *
+     * @return array
+     */
+    protected function getUrlPartsFromMessage($requestUrl, array $parts)
+    {
+        // Parse the URL information from the message
+        $urlParts = array(
+            'path'   => $requestUrl,
+            'scheme' => 'http'
+        );
+
+        // Check for the Host header
+        if (isset($parts['headers']['Host'])) {
+            $urlParts['host'] = $parts['headers']['Host'];
+        } elseif (isset($parts['headers']['host'])) {
+            $urlParts['host'] = $parts['headers']['host'];
+        } else {
+            $urlParts['host'] = null;
+        }
+
+        if (false === strpos($urlParts['host'], ':')) {
+            $urlParts['port'] = '';
+        } else {
+            $hostParts = explode(':', $urlParts['host']);
+            $urlParts['host'] = trim($hostParts[0]);
+            $urlParts['port'] = (int) trim($hostParts[1]);
+            if ($urlParts['port'] == 443) {
+                $urlParts['scheme'] = 'https';
+            }
+        }
+
+        // Check if a query is present
+        $path = $urlParts['path'];
+        $qpos = strpos($path, '?');
+        if ($qpos) {
+            $urlParts['query'] = substr($path, $qpos + 1);
+            $urlParts['path'] = substr($path, 0, $qpos);
+        } else {
+            $urlParts['query'] = '';
+        }
+
+        return $urlParts;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/MessageParser.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/MessageParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..104740068e8d31cb0addfdff26a2fcf30cb47813
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/MessageParser.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Guzzle\Parser\Message;
+
+/**
+ * Default request and response parser used by Guzzle. Optimized for speed.
+ */
+class MessageParser extends AbstractMessageParser
+{
+    public function parseRequest($message)
+    {
+        if (!$message) {
+            return false;
+        }
+
+        $parts = $this->parseMessage($message);
+
+        // Parse the protocol and protocol version
+        if (isset($parts['start_line'][2])) {
+            $startParts = explode('/', $parts['start_line'][2]);
+            $protocol = strtoupper($startParts[0]);
+            $version = isset($startParts[1]) ? $startParts[1] : '1.1';
+        } else {
+            $protocol = 'HTTP';
+            $version = '1.1';
+        }
+
+        $parsed = array(
+            'method'   => strtoupper($parts['start_line'][0]),
+            'protocol' => $protocol,
+            'version'  => $version,
+            'headers'  => $parts['headers'],
+            'body'     => $parts['body']
+        );
+
+        $parsed['request_url'] = $this->getUrlPartsFromMessage($parts['start_line'][1], $parsed);
+
+        return $parsed;
+    }
+
+    public function parseResponse($message)
+    {
+        if (!$message) {
+            return false;
+        }
+
+        $parts = $this->parseMessage($message);
+        list($protocol, $version) = explode('/', trim($parts['start_line'][0]));
+
+        return array(
+            'protocol'      => $protocol,
+            'version'       => $version,
+            'code'          => $parts['start_line'][1],
+            'reason_phrase' => isset($parts['start_line'][2]) ? $parts['start_line'][2] : '',
+            'headers'       => $parts['headers'],
+            'body'          => $parts['body']
+        );
+    }
+
+    /**
+     * Parse a message into parts
+     *
+     * @param string $message Message to parse
+     *
+     * @return array
+     */
+    protected function parseMessage($message)
+    {
+        $startLine = null;
+        $headers = array();
+        $body = '';
+
+        // Iterate over each line in the message, accounting for line endings
+        $lines = preg_split('/(\\r?\\n)/', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
+        for ($i = 0, $totalLines = count($lines); $i < $totalLines; $i += 2) {
+
+            $line = $lines[$i];
+
+            // If two line breaks were encountered, then this is the end of body
+            if (empty($line)) {
+                if ($i < $totalLines - 1) {
+                    $body = implode('', array_slice($lines, $i + 2));
+                }
+                break;
+            }
+
+            // Parse message headers
+            if (!$startLine) {
+                $startLine = explode(' ', $line, 3);
+            } elseif (strpos($line, ':')) {
+                $parts = explode(':', $line, 2);
+                $key = trim($parts[0]);
+                $value = isset($parts[1]) ? trim($parts[1]) : '';
+                if (!isset($headers[$key])) {
+                    $headers[$key] = $value;
+                } elseif (!is_array($headers[$key])) {
+                    $headers[$key] = array($headers[$key], $value);
+                } else {
+                    $headers[$key][] = $value;
+                }
+            }
+        }
+
+        return array(
+            'start_line' => $startLine,
+            'headers'    => $headers,
+            'body'       => $body
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/MessageParserInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/MessageParserInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..cc448088dbd116f0485f48931e29837b3635c9f3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/MessageParserInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Guzzle\Parser\Message;
+
+/**
+ * HTTP message parser interface used to parse HTTP messages into an array
+ */
+interface MessageParserInterface
+{
+    /**
+     * Parse an HTTP request message into an associative array of parts.
+     *
+     * @param string $message HTTP request to parse
+     *
+     * @return array|bool Returns false if the message is invalid
+     */
+    public function parseRequest($message);
+
+    /**
+     * Parse an HTTP response message into an associative array of parts.
+     *
+     * @param string $message HTTP response to parse
+     *
+     * @return array|bool Returns false if the message is invalid
+     */
+    public function parseResponse($message);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/PeclHttpMessageParser.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/PeclHttpMessageParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..944aaa25828006ad2b627040c36817b1f4b147e3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Message/PeclHttpMessageParser.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Guzzle\Parser\Message;
+
+/**
+ * Pecl HTTP message parser
+ */
+class PeclHttpMessageParser extends AbstractMessageParser
+{
+    public function parseRequest($message)
+    {
+        if (!$message) {
+            return false;
+        }
+
+        $parts = http_parse_message($message);
+
+        $parsed = array(
+            'method'   => $parts->requestMethod,
+            'protocol' => 'HTTP',
+            'version'  => number_format($parts->httpVersion, 1),
+            'headers'  => $parts->headers,
+            'body'     => $parts->body
+        );
+
+        $parsed['request_url'] = $this->getUrlPartsFromMessage($parts->requestUrl, $parsed);
+
+        return $parsed;
+    }
+
+    public function parseResponse($message)
+    {
+        if (!$message) {
+            return false;
+        }
+
+        $parts = http_parse_message($message);
+
+        return array(
+            'protocol'      => 'HTTP',
+            'version'       => number_format($parts->httpVersion, 1),
+            'code'          => $parts->responseCode,
+            'reason_phrase' => $parts->responseStatus,
+            'headers'       => $parts->headers,
+            'body'          => $parts->body
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/ParserRegistry.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/ParserRegistry.php
new file mode 100644
index 0000000000000000000000000000000000000000..f8386831c22c8448bfb7d023b00d210fe06e2029
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/ParserRegistry.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Guzzle\Parser;
+
+/**
+ * Registry of parsers used by the application
+ */
+class ParserRegistry
+{
+    /** @var ParserRegistry Singleton instance */
+    protected static $instance;
+
+    /** @var array Array of parser instances */
+    protected $instances = array();
+
+    /** @var array Mapping of parser name to default class */
+    protected $mapping = array(
+        'message'      => 'Guzzle\\Parser\\Message\\MessageParser',
+        'cookie'       => 'Guzzle\\Parser\\Cookie\\CookieParser',
+        'url'          => 'Guzzle\\Parser\\Url\\UrlParser',
+        'uri_template' => 'Guzzle\\Parser\\UriTemplate\\UriTemplate',
+    );
+
+    /**
+     * @return self
+     * @codeCoverageIgnore
+     */
+    public static function getInstance()
+    {
+        if (!self::$instance) {
+            self::$instance = new static;
+        }
+
+        return self::$instance;
+    }
+
+    public function __construct()
+    {
+        // Use the PECL URI template parser if available
+        if (extension_loaded('uri_template')) {
+            $this->mapping['uri_template'] = 'Guzzle\\Parser\\UriTemplate\\PeclUriTemplate';
+        }
+    }
+
+    /**
+     * Get a parser by name from an instance
+     *
+     * @param string $name Name of the parser to retrieve
+     *
+     * @return mixed|null
+     */
+    public function getParser($name)
+    {
+        if (!isset($this->instances[$name])) {
+            if (!isset($this->mapping[$name])) {
+                return null;
+            }
+            $class = $this->mapping[$name];
+            $this->instances[$name] = new $class();
+        }
+
+        return $this->instances[$name];
+    }
+
+    /**
+     * Register a custom parser by name with the register
+     *
+     * @param string $name   Name or handle of the parser to register
+     * @param mixed  $parser Instantiated parser to register
+     */
+    public function registerParser($name, $parser)
+    {
+        $this->instances[$name] = $parser;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/PeclUriTemplate.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/PeclUriTemplate.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0764e8377c4f1a9348fc925a8260a7963f41489
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/PeclUriTemplate.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Guzzle\Parser\UriTemplate;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+/**
+ * Expands URI templates using the uri_template pecl extension (pecl install uri_template-beta)
+ *
+ * @link http://pecl.php.net/package/uri_template
+ * @link https://github.com/ioseb/uri-template
+ */
+class PeclUriTemplate implements UriTemplateInterface
+{
+    public function __construct()
+    {
+        if (!extension_loaded('uri_template')) {
+            throw new RuntimeException('uri_template PECL extension must be installed to use PeclUriTemplate');
+        }
+    }
+
+    public function expand($template, array $variables)
+    {
+        return uri_template($template, $variables);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/UriTemplate.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/UriTemplate.php
new file mode 100644
index 0000000000000000000000000000000000000000..2044810b5d46005f2dd6e920176c99cf8ce907f6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/UriTemplate.php
@@ -0,0 +1,243 @@
+<?php
+
+namespace Guzzle\Parser\UriTemplate;
+
+/**
+ * Expands URI templates using an array of variables
+ *
+ * @link http://tools.ietf.org/html/draft-gregorio-uritemplate-08
+ */
+class UriTemplate implements UriTemplateInterface
+{
+    /** @var string URI template */
+    private $template;
+
+    /** @var array Variables to use in the template expansion */
+    private $variables;
+
+    /** @var string Regex used to parse expressions */
+    private static $regex = '/\{([^\}]+)\}/';
+
+    /** @var array Hash for quick operator lookups */
+    private static $operatorHash = array(
+        '+' => true, '#' => true, '.' => true, '/' => true, ';' => true, '?' => true, '&' => true
+    );
+
+    /** @var array Delimiters */
+    private static $delims = array(
+        ':', '/', '?', '#', '[', ']', '@', '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '='
+    );
+
+    /** @var array Percent encoded delimiters */
+    private static $delimsPct = array(
+        '%3A', '%2F', '%3F', '%23', '%5B', '%5D', '%40', '%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C',
+        '%3B', '%3D'
+    );
+
+    public function expand($template, array $variables)
+    {
+        $this->template = $template;
+        $this->variables = $variables;
+
+        // Check to ensure that the preg_* function is needed
+        if (false === strpos($this->template, '{')) {
+            return $this->template;
+        }
+
+        return preg_replace_callback(self::$regex, array($this, 'expandMatch'), $this->template);
+    }
+
+    /**
+     * Parse an expression into parts
+     *
+     * @param string $expression Expression to parse
+     *
+     * @return array Returns an associative array of parts
+     */
+    private function parseExpression($expression)
+    {
+        // Check for URI operators
+        $operator = '';
+
+        if (isset(self::$operatorHash[$expression[0]])) {
+            $operator = $expression[0];
+            $expression = substr($expression, 1);
+        }
+
+        $values = explode(',', $expression);
+        foreach ($values as &$value) {
+            $value = trim($value);
+            $varspec = array();
+            $substrPos = strpos($value, ':');
+            if ($substrPos) {
+                $varspec['value'] = substr($value, 0, $substrPos);
+                $varspec['modifier'] = ':';
+                $varspec['position'] = (int) substr($value, $substrPos + 1);
+            } elseif (substr($value, -1) == '*') {
+                $varspec['modifier'] = '*';
+                $varspec['value'] = substr($value, 0, -1);
+            } else {
+                $varspec['value'] = (string) $value;
+                $varspec['modifier'] = '';
+            }
+            $value = $varspec;
+        }
+
+        return array(
+            'operator' => $operator,
+            'values'   => $values
+        );
+    }
+
+    /**
+     * Process an expansion
+     *
+     * @param array $matches Matches met in the preg_replace_callback
+     *
+     * @return string Returns the replacement string
+     */
+    private function expandMatch(array $matches)
+    {
+        static $rfc1738to3986 = array(
+            '+'   => '%20',
+            '%7e' => '~'
+        );
+
+        $parsed = self::parseExpression($matches[1]);
+        $replacements = array();
+
+        $prefix = $parsed['operator'];
+        $joiner = $parsed['operator'];
+        $useQueryString = false;
+        if ($parsed['operator'] == '?') {
+            $joiner = '&';
+            $useQueryString = true;
+        } elseif ($parsed['operator'] == '&') {
+            $useQueryString = true;
+        } elseif ($parsed['operator'] == '#') {
+            $joiner = ',';
+        } elseif ($parsed['operator'] == ';') {
+            $useQueryString = true;
+        } elseif ($parsed['operator'] == '' || $parsed['operator'] == '+') {
+            $joiner = ',';
+            $prefix = '';
+        }
+
+        foreach ($parsed['values'] as $value) {
+
+            if (!array_key_exists($value['value'], $this->variables) || $this->variables[$value['value']] === null) {
+                continue;
+            }
+
+            $variable = $this->variables[$value['value']];
+            $actuallyUseQueryString = $useQueryString;
+            $expanded = '';
+
+            if (is_array($variable)) {
+
+                $isAssoc = $this->isAssoc($variable);
+                $kvp = array();
+                foreach ($variable as $key => $var) {
+
+                    if ($isAssoc) {
+                        $key = rawurlencode($key);
+                        $isNestedArray = is_array($var);
+                    } else {
+                        $isNestedArray = false;
+                    }
+
+                    if (!$isNestedArray) {
+                        $var = rawurlencode($var);
+                        if ($parsed['operator'] == '+' || $parsed['operator'] == '#') {
+                            $var = $this->decodeReserved($var);
+                        }
+                    }
+
+                    if ($value['modifier'] == '*') {
+                        if ($isAssoc) {
+                            if ($isNestedArray) {
+                                // Nested arrays must allow for deeply nested structures
+                                $var = strtr(http_build_query(array($key => $var)), $rfc1738to3986);
+                            } else {
+                                $var = $key . '=' . $var;
+                            }
+                        } elseif ($key > 0 && $actuallyUseQueryString) {
+                            $var = $value['value'] . '=' . $var;
+                        }
+                    }
+
+                    $kvp[$key] = $var;
+                }
+
+                if (empty($variable)) {
+                    $actuallyUseQueryString = false;
+                } elseif ($value['modifier'] == '*') {
+                    $expanded = implode($joiner, $kvp);
+                    if ($isAssoc) {
+                        // Don't prepend the value name when using the explode modifier with an associative array
+                        $actuallyUseQueryString = false;
+                    }
+                } else {
+                    if ($isAssoc) {
+                        // When an associative array is encountered and the explode modifier is not set, then the
+                        // result must be a comma separated list of keys followed by their respective values.
+                        foreach ($kvp as $k => &$v) {
+                            $v = $k . ',' . $v;
+                        }
+                    }
+                    $expanded = implode(',', $kvp);
+                }
+
+            } else {
+                if ($value['modifier'] == ':') {
+                    $variable = substr($variable, 0, $value['position']);
+                }
+                $expanded = rawurlencode($variable);
+                if ($parsed['operator'] == '+' || $parsed['operator'] == '#') {
+                    $expanded = $this->decodeReserved($expanded);
+                }
+            }
+
+            if ($actuallyUseQueryString) {
+                if (!$expanded && $joiner != '&') {
+                    $expanded = $value['value'];
+                } else {
+                    $expanded = $value['value'] . '=' . $expanded;
+                }
+            }
+
+            $replacements[] = $expanded;
+        }
+
+        $ret = implode($joiner, $replacements);
+        if ($ret && $prefix) {
+            return $prefix . $ret;
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Determines if an array is associative
+     *
+     * @param array $array Array to check
+     *
+     * @return bool
+     */
+    private function isAssoc(array $array)
+    {
+        return (bool) count(array_filter(array_keys($array), 'is_string'));
+    }
+
+    /**
+     * Removes percent encoding on reserved characters (used with + and # modifiers)
+     *
+     * @param string $string String to fix
+     *
+     * @return string
+     */
+    private function decodeReserved($string)
+    {
+        return str_replace(self::$delimsPct, self::$delims, $string);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/UriTemplateInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/UriTemplateInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..c81d51548e8e1035e2cd8bb52606a7cec19eab2c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/UriTemplate/UriTemplateInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Guzzle\Parser\UriTemplate;
+
+/**
+ * Expands URI templates using an array of variables
+ *
+ * @link http://tools.ietf.org/html/rfc6570
+ */
+interface UriTemplateInterface
+{
+    /**
+     * Expand the URI template using the supplied variables
+     *
+     * @param string $template  URI Template to expand
+     * @param array  $variables Variables to use with the expansion
+     *
+     * @return string Returns the expanded template
+     */
+    public function expand($template, array $variables);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Url/UrlParser.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Url/UrlParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4cc896088e0beafad9584581385bc2e7f0fbca7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Url/UrlParser.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Guzzle\Parser\Url;
+
+use Guzzle\Common\Version;
+
+/**
+ * Parses URLs into parts using PHP's built-in parse_url() function
+ * @deprecated Just use parse_url. UTF-8 characters should be percent encoded anyways.
+ * @codeCoverageIgnore
+ */
+class UrlParser implements UrlParserInterface
+{
+    /** @var bool Whether or not to work with UTF-8 strings */
+    protected $utf8 = false;
+
+    /**
+     * Set whether or not to attempt to handle UTF-8 strings (still WIP)
+     *
+     * @param bool $utf8 Set to TRUE to handle UTF string
+     */
+    public function setUtf8Support($utf8)
+    {
+        $this->utf8 = $utf8;
+    }
+
+    public function parseUrl($url)
+    {
+        Version::warn(__CLASS__ . ' is deprecated. Just use parse_url()');
+
+        static $defaults = array('scheme' => null, 'host' => null, 'path' => null, 'port' => null, 'query' => null,
+            'user' => null, 'pass' => null, 'fragment' => null);
+
+        $parts = parse_url($url);
+
+        // Need to handle query parsing specially for UTF-8 requirements
+        if ($this->utf8 && isset($parts['query'])) {
+            $queryPos = strpos($url, '?');
+            if (isset($parts['fragment'])) {
+                $parts['query'] = substr($url, $queryPos + 1, strpos($url, '#') - $queryPos - 1);
+            } else {
+                $parts['query'] = substr($url, $queryPos + 1);
+            }
+        }
+
+        return $parts + $defaults;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Url/UrlParserInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Url/UrlParserInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..89ac4b30771a4689e70647dfa8ccb09898035caf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Parser/Url/UrlParserInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Guzzle\Parser\Url;
+
+/**
+ * URL parser interface
+ */
+interface UrlParserInterface
+{
+    /**
+     * Parse a URL using special handling for a subset of UTF-8 characters in the query string if needed.
+     *
+     * @param string $url URL to parse
+     *
+     * @return array Returns an array identical to what is returned from parse_url().  When an array key is missing from
+     *               this array, you must fill it in with NULL to avoid warnings in calling code.
+     */
+    public function parseUrl($url);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Async/AsyncPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Async/AsyncPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..534901baa420831db8f9cef5024fe1d6759c7f3b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Async/AsyncPlugin.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Guzzle\Plugin\Async;
+
+use Guzzle\Common\Event;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\CurlException;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Sends requests but does not wait for the response
+ */
+class AsyncPlugin implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'request.before_send'    => 'onBeforeSend',
+            'request.exception'      => 'onRequestTimeout',
+            'request.sent'           => 'onRequestSent',
+            'curl.callback.progress' => 'onCurlProgress'
+        );
+    }
+
+    /**
+     * Event used to ensure that progress callback are emitted from the curl handle's request mediator.
+     *
+     * @param Event $event
+     */
+    public function onBeforeSend(Event $event)
+    {
+        // Ensure that progress callbacks are dispatched
+        $event['request']->getCurlOptions()->set('progress', true);
+    }
+
+    /**
+     * Event emitted when a curl progress function is called. When the amount of data uploaded == the amount of data to
+     * upload OR any bytes have been downloaded, then time the request out after 1ms because we're done with
+     * transmitting the request, and tell curl not download a body.
+     *
+     * @param Event $event
+     */
+    public function onCurlProgress(Event $event)
+    {
+        if ($event['handle'] &&
+            ($event['downloaded'] || ($event['uploaded'] && $event['upload_size'] === $event['uploaded']))
+        ) {
+            // Timeout after 1ms
+            curl_setopt($event['handle'], CURLOPT_TIMEOUT_MS, 1);
+            // Even if the response is quick, tell curl not to download the body
+            curl_setopt($event['handle'], CURLOPT_NOBODY, true);
+        }
+    }
+
+    /**
+     * Event emitted when a curl exception occurs. Ignore the exception and set a mock response.
+     *
+     * @param Event $event
+     */
+    public function onRequestTimeout(Event $event)
+    {
+        if ($event['exception'] instanceof CurlException) {
+            $event['request']->setResponse(new Response(200, array(
+                'X-Guzzle-Async' => 'Did not wait for the response'
+            )));
+        }
+    }
+
+    /**
+     * Event emitted when a request completes because it took less than 1ms. Add an X-Guzzle-Async header to notify the
+     * caller that there is no body in the message.
+     *
+     * @param Event $event
+     */
+    public function onRequestSent(Event $event)
+    {
+        // Let the caller know this was meant to be async
+        $event['request']->getResponse()->setHeader('X-Guzzle-Async', 'Did not wait for the response');
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/AbstractBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/AbstractBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a85983452bfd563385cb0834467d3a426401575
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/AbstractBackoffStrategy.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Abstract backoff strategy that allows for a chain of responsibility
+ */
+abstract class AbstractBackoffStrategy implements BackoffStrategyInterface
+{
+    /** @var AbstractBackoffStrategy Next strategy in the chain */
+    protected $next;
+
+    /** @param AbstractBackoffStrategy $next Next strategy in the chain */
+    public function setNext(AbstractBackoffStrategy $next)
+    {
+        $this->next = $next;
+    }
+
+    /**
+     * Get the next backoff strategy in the chain
+     *
+     * @return AbstractBackoffStrategy|null
+     */
+    public function getNext()
+    {
+        return $this->next;
+    }
+
+    public function getBackoffPeriod(
+        $retries,
+        RequestInterface $request,
+        Response $response = null,
+        HttpException $e = null
+    ) {
+        $delay = $this->getDelay($retries, $request, $response, $e);
+        if ($delay === false) {
+            // The strategy knows that this must not be retried
+            return false;
+        } elseif ($delay === null) {
+            // If the strategy is deferring a decision and the next strategy will not make a decision then return false
+            return !$this->next || !$this->next->makesDecision()
+                ? false
+                : $this->next->getBackoffPeriod($retries, $request, $response, $e);
+        } elseif ($delay === true) {
+            // if the strategy knows that it must retry but is deferring to the next to determine the delay
+            if (!$this->next) {
+                return 0;
+            } else {
+                $next = $this->next;
+                while ($next->makesDecision() && $next->getNext()) {
+                    $next = $next->getNext();
+                }
+                return !$next->makesDecision() ? $next->getBackoffPeriod($retries, $request, $response, $e) : 0;
+            }
+        } else {
+            return $delay;
+        }
+    }
+
+    /**
+     * Check if the strategy does filtering and makes decisions on whether or not to retry.
+     *
+     * Strategies that return false will never retry if all of the previous strategies in a chain defer on a backoff
+     * decision.
+     *
+     * @return bool
+     */
+    abstract public function makesDecision();
+
+    /**
+     * Implement the concrete strategy
+     *
+     * @param int              $retries  Number of retries of the request
+     * @param RequestInterface $request  Request that was sent
+     * @param Response         $response Response that was received. Note that there may not be a response
+     * @param HttpException    $e        Exception that was encountered if any
+     *
+     * @return bool|int|null Returns false to not retry or the number of seconds to delay between retries. Return true
+     *                       or null to defer to the next strategy if available, and if not, return 0.
+     */
+    abstract protected function getDelay(
+        $retries,
+        RequestInterface $request,
+        Response $response = null,
+        HttpException $e = null
+    );
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/AbstractErrorCodeBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/AbstractErrorCodeBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ebee6c1a37f04feb7ff85225e9890e176a400d2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/AbstractErrorCodeBackoffStrategy.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+/**
+ * Strategy used to retry when certain error codes are encountered
+ */
+abstract class AbstractErrorCodeBackoffStrategy extends AbstractBackoffStrategy
+{
+    /** @var array Default cURL errors to retry */
+    protected static $defaultErrorCodes = array();
+
+    /** @var array Error codes that can be retried */
+    protected $errorCodes;
+
+    /**
+     * @param array                    $codes Array of codes that should be retried
+     * @param BackoffStrategyInterface $next  The optional next strategy
+     */
+    public function __construct(array $codes = null, BackoffStrategyInterface $next = null)
+    {
+        $this->errorCodes = array_fill_keys($codes ?: static::$defaultErrorCodes, 1);
+        $this->next = $next;
+    }
+
+    /**
+     * Get the default failure codes to retry
+     *
+     * @return array
+     */
+    public static function getDefaultFailureCodes()
+    {
+        return static::$defaultErrorCodes;
+    }
+
+    public function makesDecision()
+    {
+        return true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffLogger.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffLogger.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec54c289eb29ac03a51c5e170766c4699c372bee
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffLogger.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Common\Event;
+use Guzzle\Log\LogAdapterInterface;
+use Guzzle\Log\MessageFormatter;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Logs backoff retries triggered from the BackoffPlugin
+ *
+ * Format your log messages using a template that can contain template substitutions found in {@see MessageFormatter}.
+ * In addition to the default template substitutions, there is also:
+ *
+ * - retries: The number of times the request has been retried
+ * - delay:   The amount of time the request is being delayed
+ */
+class BackoffLogger implements EventSubscriberInterface
+{
+    /** @var string Default log message template */
+    const DEFAULT_FORMAT = '[{ts}] {method} {url} - {code} {phrase} - Retries: {retries}, Delay: {delay}, Time: {connect_time}, {total_time}, cURL: {curl_code} {curl_error}';
+
+    /** @var LogAdapterInterface Logger used to log retries */
+    protected $logger;
+
+    /** @var MessageFormatter Formatter used to format log messages */
+    protected $formatter;
+
+    /**
+     * @param LogAdapterInterface $logger    Logger used to log the retries
+     * @param MessageFormatter    $formatter Formatter used to format log messages
+     */
+    public function __construct(LogAdapterInterface $logger, MessageFormatter $formatter = null)
+    {
+        $this->logger = $logger;
+        $this->formatter = $formatter ?: new MessageFormatter(self::DEFAULT_FORMAT);
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(BackoffPlugin::RETRY_EVENT => 'onRequestRetry');
+    }
+
+    /**
+     * Set the template to use for logging
+     *
+     * @param string $template Log message template
+     *
+     * @return self
+     */
+    public function setTemplate($template)
+    {
+        $this->formatter->setTemplate($template);
+
+        return $this;
+    }
+
+    /**
+     * Called when a request is being retried
+     *
+     * @param Event $event Event emitted
+     */
+    public function onRequestRetry(Event $event)
+    {
+        $this->logger->log($this->formatter->format(
+            $event['request'],
+            $event['response'],
+            $event['handle'],
+            array(
+                'retries' => $event['retries'],
+                'delay'   => $event['delay']
+            )
+        ));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..b2b84c266dfdb975b515642de99ef71d6427fa84
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffPlugin.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Common\Event;
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Curl\CurlMultiInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Plugin to automatically retry failed HTTP requests using a backoff strategy
+ */
+class BackoffPlugin extends AbstractHasDispatcher implements EventSubscriberInterface
+{
+    const DELAY_PARAM = CurlMultiInterface::BLOCKING;
+    const RETRY_PARAM = 'plugins.backoff.retry_count';
+    const RETRY_EVENT = 'plugins.backoff.retry';
+
+    /** @var BackoffStrategyInterface Backoff strategy */
+    protected $strategy;
+
+    /**
+     * @param BackoffStrategyInterface $strategy The backoff strategy used to determine whether or not to retry and
+     *                                           the amount of delay between retries.
+     */
+    public function __construct(BackoffStrategyInterface $strategy = null)
+    {
+        $this->strategy = $strategy;
+    }
+
+    /**
+     * Retrieve a basic truncated exponential backoff plugin that will retry HTTP errors and cURL errors
+     *
+     * @param int   $maxRetries Maximum number of retries
+     * @param array $httpCodes  HTTP response codes to retry
+     * @param array $curlCodes  cURL error codes to retry
+     *
+     * @return self
+     */
+    public static function getExponentialBackoff(
+        $maxRetries = 3,
+        array $httpCodes = null,
+        array $curlCodes = null
+    ) {
+        return new self(new TruncatedBackoffStrategy($maxRetries,
+            new HttpBackoffStrategy($httpCodes,
+                new CurlBackoffStrategy($curlCodes,
+                    new ExponentialBackoffStrategy()
+                )
+            )
+        ));
+    }
+
+    public static function getAllEvents()
+    {
+        return array(self::RETRY_EVENT);
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'request.sent'      => 'onRequestSent',
+            'request.exception' => 'onRequestSent',
+            CurlMultiInterface::POLLING_REQUEST => 'onRequestPoll'
+        );
+    }
+
+    /**
+     * Called when a request has been sent  and isn't finished processing
+     *
+     * @param Event $event
+     */
+    public function onRequestSent(Event $event)
+    {
+        $request = $event['request'];
+        $response = $event['response'];
+        $exception = $event['exception'];
+
+        $params = $request->getParams();
+        $retries = (int) $params->get(self::RETRY_PARAM);
+        $delay = $this->strategy->getBackoffPeriod($retries, $request, $response, $exception);
+
+        if ($delay !== false) {
+            // Calculate how long to wait until the request should be retried
+            $params->set(self::RETRY_PARAM, ++$retries)
+                ->set(self::DELAY_PARAM, microtime(true) + $delay);
+            // Send the request again
+            $request->setState(RequestInterface::STATE_TRANSFER);
+            $this->dispatch(self::RETRY_EVENT, array(
+                'request'  => $request,
+                'response' => $response,
+                'handle'   => $exception ? $exception->getCurlHandle() : null,
+                'retries'  => $retries,
+                'delay'    => $delay
+            ));
+        }
+    }
+
+    /**
+     * Called when a request is polling in the curl multi object
+     *
+     * @param Event $event
+     */
+    public function onRequestPoll(Event $event)
+    {
+        $request = $event['request'];
+        $delay = $request->getParams()->get(self::DELAY_PARAM);
+
+        // If the duration of the delay has passed, retry the request using the pool
+        if (null !== $delay && microtime(true) >= $delay) {
+            // Remove the request from the pool and then add it back again. This is required for cURL to know that we
+            // want to retry sending the easy handle.
+            $request->getParams()->remove(self::DELAY_PARAM);
+            // Rewind the request body if possible
+            if ($request instanceof EntityEnclosingRequestInterface && $request->getBody()) {
+                $request->getBody()->seek(0);
+            }
+            $multi = $event['curl_multi'];
+            $multi->remove($request);
+            $multi->add($request);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffStrategyInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffStrategyInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..4e590dbe0f1f3926edd09baf2bbf7e775feabdda
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/BackoffStrategyInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Strategy to determine if a request should be retried and how long to delay between retries
+ */
+interface BackoffStrategyInterface
+{
+    /**
+     * Get the amount of time to delay in seconds before retrying a request
+     *
+     * @param int              $retries  Number of retries of the request
+     * @param RequestInterface $request  Request that was sent
+     * @param Response         $response Response that was received. Note that there may not be a response
+     * @param HttpException    $e        Exception that was encountered if any
+     *
+     * @return bool|int Returns false to not retry or the number of seconds to delay between retries
+     */
+    public function getBackoffPeriod(
+        $retries,
+        RequestInterface $request,
+        Response $response = null,
+        HttpException $e = null
+    );
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/CallbackBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/CallbackBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..b4f77c3df9d4b242eee5629a322386e76ca1a34c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/CallbackBackoffStrategy.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Strategy that will invoke a closure to determine whether or not to retry with a delay
+ */
+class CallbackBackoffStrategy extends AbstractBackoffStrategy
+{
+    /** @var \Closure|array|mixed Callable method to invoke */
+    protected $callback;
+
+    /** @var bool Whether or not this strategy makes a retry decision */
+    protected $decision;
+
+    /**
+     * @param \Closure|array|mixed     $callback Callable method to invoke
+     * @param bool                     $decision Set to true if this strategy makes a backoff decision
+     * @param BackoffStrategyInterface $next     The optional next strategy
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct($callback, $decision, BackoffStrategyInterface $next = null)
+    {
+        if (!is_callable($callback)) {
+            throw new InvalidArgumentException('The callback must be callable');
+        }
+        $this->callback = $callback;
+        $this->decision = (bool) $decision;
+        $this->next = $next;
+    }
+
+    public function makesDecision()
+    {
+        return $this->decision;
+    }
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        return call_user_func($this->callback, $retries, $request, $response, $e);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ConstantBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ConstantBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..061d2a407f070ec82478481e18807487f1217dff
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ConstantBackoffStrategy.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Will retry the request using the same amount of delay for each retry.
+ *
+ * Warning: If no decision making strategies precede this strategy in the the chain, then all requests will be retried
+ */
+class ConstantBackoffStrategy extends AbstractBackoffStrategy
+{
+    /** @var int Amount of time for each delay */
+    protected $delay;
+
+    /** @param int $delay Amount of time to delay between each additional backoff */
+    public function __construct($delay)
+    {
+        $this->delay = $delay;
+    }
+
+    public function makesDecision()
+    {
+        return false;
+    }
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        return $this->delay;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/CurlBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/CurlBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1d70f65c53bb736abcf9dbf743748eae1f66aca
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/CurlBackoffStrategy.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+use Guzzle\Http\Exception\CurlException;
+
+/**
+ * Strategy used to retry when certain cURL error codes are encountered.
+ */
+class CurlBackoffStrategy extends AbstractErrorCodeBackoffStrategy
+{
+    /** @var array Default cURL errors to retry */
+    protected static $defaultErrorCodes = array(
+        CURLE_COULDNT_RESOLVE_HOST, CURLE_COULDNT_CONNECT, CURLE_WRITE_ERROR, CURLE_READ_ERROR,
+        CURLE_OPERATION_TIMEOUTED, CURLE_SSL_CONNECT_ERROR, CURLE_HTTP_PORT_FAILED, CURLE_GOT_NOTHING,
+        CURLE_SEND_ERROR, CURLE_RECV_ERROR
+    );
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        if ($e && $e instanceof CurlException) {
+            return isset($this->errorCodes[$e->getErrorNo()]) ? true : null;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ExponentialBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ExponentialBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..fb2912d50e88c1e79075fca6fd171dbe286e21d9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ExponentialBackoffStrategy.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Implements an exponential backoff retry strategy.
+ *
+ * Warning: If no decision making strategies precede this strategy in the the chain, then all requests will be retried
+ */
+class ExponentialBackoffStrategy extends AbstractBackoffStrategy
+{
+    public function makesDecision()
+    {
+        return false;
+    }
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        return (int) pow(2, $retries);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/HttpBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/HttpBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c63a14e2a696b685052cf5fbe7229f6d72d4a29
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/HttpBackoffStrategy.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Strategy used to retry HTTP requests based on the response code.
+ *
+ * Retries 500 and 503 error by default.
+ */
+class HttpBackoffStrategy extends AbstractErrorCodeBackoffStrategy
+{
+    /** @var array Default cURL errors to retry */
+    protected static $defaultErrorCodes = array(500, 503);
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        if ($response) {
+            //Short circuit the rest of the checks if it was successful
+            if ($response->isSuccessful()) {
+                return false;
+            } else {
+                return isset($this->errorCodes[$response->getStatusCode()]) ? true : null;
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/LinearBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/LinearBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..b35e8a490d6685b3d232f5ce2d8f1149f276047b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/LinearBackoffStrategy.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Implements a linear backoff retry strategy.
+ *
+ * Warning: If no decision making strategies precede this strategy in the the chain, then all requests will be retried
+ */
+class LinearBackoffStrategy extends AbstractBackoffStrategy
+{
+    /** @var int Amount of time to progress each delay */
+    protected $step;
+
+    /**
+     * @param int $step Amount of time to increase the delay each additional backoff
+     */
+    public function __construct($step = 1)
+    {
+        $this->step = $step;
+    }
+
+    public function makesDecision()
+    {
+        return false;
+    }
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        return $retries * $this->step;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ReasonPhraseBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ReasonPhraseBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..4fd73fedfb9ed7fa4016605b3b5293163f748f26
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/ReasonPhraseBackoffStrategy.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Strategy used to retry HTTP requests when the response's reason phrase matches one of the registered phrases.
+ */
+class ReasonPhraseBackoffStrategy extends AbstractErrorCodeBackoffStrategy
+{
+    public function makesDecision()
+    {
+        return true;
+    }
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        if ($response) {
+            return isset($this->errorCodes[$response->getReasonPhrase()]) ? true : null;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/TruncatedBackoffStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/TruncatedBackoffStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..3608f358428e05adb69453f19336ed632dfab2a2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Backoff/TruncatedBackoffStrategy.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Guzzle\Plugin\Backoff;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\HttpException;
+
+/**
+ * Strategy that will not retry more than a certain number of times.
+ */
+class TruncatedBackoffStrategy extends AbstractBackoffStrategy
+{
+    /** @var int Maximum number of retries per request */
+    protected $max;
+
+    /**
+     * @param int                      $maxRetries Maximum number of retries per request
+     * @param BackoffStrategyInterface $next The optional next strategy
+     */
+    public function __construct($maxRetries, BackoffStrategyInterface $next = null)
+    {
+        $this->max = $maxRetries;
+        $this->next = $next;
+    }
+
+    public function makesDecision()
+    {
+        return true;
+    }
+
+    protected function getDelay($retries, RequestInterface $request, Response $response = null, HttpException $e = null)
+    {
+        return $retries < $this->max ? null : false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CacheKeyProviderInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CacheKeyProviderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..7790f884429efad5d24ac442fe5b9bb693483eb3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CacheKeyProviderInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+\Guzzle\Common\Version::warn('Guzzle\Plugin\Cache\CacheKeyProviderInterface is no longer used');
+
+/**
+ * @deprecated This is no longer used
+ * @codeCoverageIgnore
+ */
+interface CacheKeyProviderInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CachePlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CachePlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..ce4b317420fed4feeba8ee2797ea4a12b906e4f9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CachePlugin.php
@@ -0,0 +1,353 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Cache\CacheAdapterFactory;
+use Guzzle\Cache\CacheAdapterInterface;
+use Guzzle\Common\Event;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Version;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Cache\DoctrineCacheAdapter;
+use Guzzle\Http\Exception\CurlException;
+use Doctrine\Common\Cache\ArrayCache;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Plugin to enable the caching of GET and HEAD requests.  Caching can be done on all requests passing through this
+ * plugin or only after retrieving resources with cacheable response headers.
+ *
+ * This is a simple implementation of RFC 2616 and should be considered a private transparent proxy cache, meaning
+ * authorization and private data can be cached.
+ *
+ * It also implements RFC 5861's `stale-if-error` Cache-Control extension, allowing stale cache responses to be used
+ * when an error is encountered (such as a `500 Internal Server Error` or DNS failure).
+ */
+class CachePlugin implements EventSubscriberInterface
+{
+    /** @var RevalidationInterface Cache revalidation strategy */
+    protected $revalidation;
+
+    /** @var CanCacheStrategyInterface Object used to determine if a request can be cached */
+    protected $canCache;
+
+    /** @var CacheStorageInterface $cache Object used to cache responses */
+    protected $storage;
+
+    /** @var bool */
+    protected $autoPurge;
+
+    /**
+     * @param array|CacheAdapterInterface|CacheStorageInterface $options Array of options for the cache plugin,
+     *     cache adapter, or cache storage object.
+     *     - CacheStorageInterface storage:      Adapter used to cache responses
+     *     - RevalidationInterface revalidation: Cache revalidation strategy
+     *     - CanCacheInterface     can_cache:    Object used to determine if a request can be cached
+     *     - bool                  auto_purge    Set to true to automatically PURGE resources when non-idempotent
+     *                                           requests are sent to a resource. Defaults to false.
+     * @throws InvalidArgumentException if no cache is provided and Doctrine cache is not installed
+     */
+    public function __construct($options = null)
+    {
+        if (!is_array($options)) {
+            if ($options instanceof CacheAdapterInterface) {
+                $options = array('storage' => new DefaultCacheStorage($options));
+            } elseif ($options instanceof CacheStorageInterface) {
+                $options = array('storage' => $options);
+            } elseif ($options) {
+                $options = array('storage' => new DefaultCacheStorage(CacheAdapterFactory::fromCache($options)));
+            } elseif (!class_exists('Doctrine\Common\Cache\ArrayCache')) {
+                // @codeCoverageIgnoreStart
+                throw new InvalidArgumentException('No cache was provided and Doctrine is not installed');
+                // @codeCoverageIgnoreEnd
+            }
+        }
+
+        $this->autoPurge = isset($options['auto_purge']) ? $options['auto_purge'] : false;
+
+        // Add a cache storage if a cache adapter was provided
+        $this->storage = isset($options['storage'])
+            ? $options['storage']
+            : new DefaultCacheStorage(new DoctrineCacheAdapter(new ArrayCache()));
+
+        if (!isset($options['can_cache'])) {
+            $this->canCache = new DefaultCanCacheStrategy();
+        } else {
+            $this->canCache = is_callable($options['can_cache'])
+                ? new CallbackCanCacheStrategy($options['can_cache'])
+                : $options['can_cache'];
+        }
+
+        // Use the provided revalidation strategy or the default
+        $this->revalidation = isset($options['revalidation'])
+            ? $options['revalidation']
+            : new DefaultRevalidation($this->storage, $this->canCache);
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'request.before_send' => array('onRequestBeforeSend', -255),
+            'request.sent'        => array('onRequestSent', 255),
+            'request.error'       => array('onRequestError', 0),
+            'request.exception'   => array('onRequestException', 0),
+        );
+    }
+
+    /**
+     * Check if a response in cache will satisfy the request before sending
+     *
+     * @param Event $event
+     */
+    public function onRequestBeforeSend(Event $event)
+    {
+        $request = $event['request'];
+        $request->addHeader('Via', sprintf('%s GuzzleCache/%s', $request->getProtocolVersion(), Version::VERSION));
+
+        if (!$this->canCache->canCacheRequest($request)) {
+            switch ($request->getMethod()) {
+                case 'PURGE':
+                    $this->purge($request);
+                    $request->setResponse(new Response(200, array(), 'purged'));
+                    break;
+                case 'PUT':
+                case 'POST':
+                case 'DELETE':
+                case 'PATCH':
+                    if ($this->autoPurge) {
+                        $this->purge($request);
+                    }
+            }
+            return;
+        }
+
+        if ($response = $this->storage->fetch($request)) {
+            $params = $request->getParams();
+            $params['cache.lookup'] = true;
+            $response->setHeader(
+                'Age',
+                time() - strtotime($response->getDate() ? : $response->getLastModified() ?: 'now')
+            );
+            // Validate that the response satisfies the request
+            if ($this->canResponseSatisfyRequest($request, $response)) {
+                if (!isset($params['cache.hit'])) {
+                    $params['cache.hit'] = true;
+                }
+                $request->setResponse($response);
+            }
+        }
+    }
+
+    /**
+     * If possible, store a response in cache after sending
+     *
+     * @param Event $event
+     */
+    public function onRequestSent(Event $event)
+    {
+        $request = $event['request'];
+        $response = $event['response'];
+
+        if ($request->getParams()->get('cache.hit') === null &&
+            $this->canCache->canCacheRequest($request) &&
+            $this->canCache->canCacheResponse($response)
+        ) {
+            $this->storage->cache($request, $response);
+        }
+
+        $this->addResponseHeaders($request, $response);
+    }
+
+    /**
+     * If possible, return a cache response on an error
+     *
+     * @param Event $event
+     */
+    public function onRequestError(Event $event)
+    {
+        $request = $event['request'];
+
+        if (!$this->canCache->canCacheRequest($request)) {
+            return;
+        }
+
+        if ($response = $this->storage->fetch($request)) {
+            $response->setHeader(
+                'Age',
+                time() - strtotime($response->getLastModified() ? : $response->getDate() ?: 'now')
+            );
+
+            if ($this->canResponseSatisfyFailedRequest($request, $response)) {
+                $request->getParams()->set('cache.hit', 'error');
+                $this->addResponseHeaders($request, $response);
+                $event['response'] = $response;
+                $event->stopPropagation();
+            }
+        }
+    }
+
+    /**
+     * If possible, set a cache response on a cURL exception
+     *
+     * @param Event $event
+     *
+     * @return null
+     */
+    public function onRequestException(Event $event)
+    {
+        if (!$event['exception'] instanceof CurlException) {
+            return;
+        }
+
+        $request = $event['request'];
+        if (!$this->canCache->canCacheRequest($request)) {
+            return;
+        }
+
+        if ($response = $this->storage->fetch($request)) {
+            $response->setHeader('Age', time() - strtotime($response->getDate() ? : 'now'));
+            if (!$this->canResponseSatisfyFailedRequest($request, $response)) {
+                return;
+            }
+            $request->getParams()->set('cache.hit', 'error');
+            $request->setResponse($response);
+            $this->addResponseHeaders($request, $response);
+            $event->stopPropagation();
+        }
+    }
+
+    /**
+     * Check if a cache response satisfies a request's caching constraints
+     *
+     * @param RequestInterface $request  Request to validate
+     * @param Response         $response Response to validate
+     *
+     * @return bool
+     */
+    public function canResponseSatisfyRequest(RequestInterface $request, Response $response)
+    {
+        $responseAge = $response->calculateAge();
+        $reqc = $request->getHeader('Cache-Control');
+        $resc = $response->getHeader('Cache-Control');
+
+        // Check the request's max-age header against the age of the response
+        if ($reqc && $reqc->hasDirective('max-age') &&
+            $responseAge > $reqc->getDirective('max-age')) {
+            return false;
+        }
+
+        // Check the response's max-age header
+        if ($response->isFresh() === false) {
+            $maxStale = $reqc ? $reqc->getDirective('max-stale') : null;
+            if (null !== $maxStale) {
+                if ($maxStale !== true && $response->getFreshness() < (-1 * $maxStale)) {
+                    return false;
+                }
+            } elseif ($resc && $resc->hasDirective('max-age')
+                && $responseAge > $resc->getDirective('max-age')
+            ) {
+                return false;
+            }
+        }
+
+        if ($this->revalidation->shouldRevalidate($request, $response)) {
+            try {
+                return $this->revalidation->revalidate($request, $response);
+            } catch (CurlException $e) {
+                $request->getParams()->set('cache.hit', 'error');
+                return $this->canResponseSatisfyFailedRequest($request, $response);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if a cache response satisfies a failed request's caching constraints
+     *
+     * @param RequestInterface $request  Request to validate
+     * @param Response         $response Response to validate
+     *
+     * @return bool
+     */
+    public function canResponseSatisfyFailedRequest(RequestInterface $request, Response $response)
+    {
+        $reqc = $request->getHeader('Cache-Control');
+        $resc = $response->getHeader('Cache-Control');
+        $requestStaleIfError = $reqc ? $reqc->getDirective('stale-if-error') : null;
+        $responseStaleIfError = $resc ? $resc->getDirective('stale-if-error') : null;
+
+        if (!$requestStaleIfError && !$responseStaleIfError) {
+            return false;
+        }
+
+        if (is_numeric($requestStaleIfError) && $response->getAge() - $response->getMaxAge() > $requestStaleIfError) {
+            return false;
+        }
+
+        if (is_numeric($responseStaleIfError) && $response->getAge() - $response->getMaxAge() > $responseStaleIfError) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Purge all cache entries for a given URL
+     *
+     * @param string $url URL to purge
+     */
+    public function purge($url)
+    {
+        // BC compatibility with previous version that accepted a Request object
+        $url = $url instanceof RequestInterface ? $url->getUrl() : $url;
+        $this->storage->purge($url);
+    }
+
+    /**
+     * Add the plugin's headers to a response
+     *
+     * @param RequestInterface $request  Request
+     * @param Response         $response Response to add headers to
+     */
+    protected function addResponseHeaders(RequestInterface $request, Response $response)
+    {
+        $params = $request->getParams();
+        $response->setHeader('Via', sprintf('%s GuzzleCache/%s', $request->getProtocolVersion(), Version::VERSION));
+
+        $lookup = ($params['cache.lookup'] === true ? 'HIT' : 'MISS') . ' from GuzzleCache';
+        if ($header = $response->getHeader('X-Cache-Lookup')) {
+            // Don't add duplicates
+            $values = $header->toArray();
+            $values[] = $lookup;
+            $response->setHeader('X-Cache-Lookup', array_unique($values));
+        } else {
+            $response->setHeader('X-Cache-Lookup', $lookup);
+        }
+
+        if ($params['cache.hit'] === true) {
+            $xcache = 'HIT from GuzzleCache';
+        } elseif ($params['cache.hit'] == 'error') {
+            $xcache = 'HIT_ERROR from GuzzleCache';
+        } else {
+            $xcache = 'MISS from GuzzleCache';
+        }
+
+        if ($header = $response->getHeader('X-Cache')) {
+            // Don't add duplicates
+            $values = $header->toArray();
+            $values[] = $xcache;
+            $response->setHeader('X-Cache', array_unique($values));
+        } else {
+            $response->setHeader('X-Cache', $xcache);
+        }
+
+        if ($response->isFresh() === false) {
+            $response->addHeader('Warning', sprintf('110 GuzzleCache/%s "Response is stale"', Version::VERSION));
+            if ($params['cache.hit'] === 'error') {
+                $response->addHeader('Warning', sprintf('111 GuzzleCache/%s "Revalidation failed"', Version::VERSION));
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CacheStorageInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CacheStorageInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..f3d9154584c62e57ef63e13f5f66381031446092
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CacheStorageInterface.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Interface used to cache HTTP requests
+ */
+interface CacheStorageInterface
+{
+    /**
+     * Get a Response from the cache for a request
+     *
+     * @param RequestInterface $request
+     *
+     * @return null|Response
+     */
+    public function fetch(RequestInterface $request);
+
+    /**
+     * Cache an HTTP request
+     *
+     * @param RequestInterface $request  Request being cached
+     * @param Response         $response Response to cache
+     */
+    public function cache(RequestInterface $request, Response $response);
+
+    /**
+     * Deletes cache entries that match a request
+     *
+     * @param RequestInterface $request Request to delete from cache
+     */
+    public function delete(RequestInterface $request);
+
+    /**
+     * Purge all cache entries for a given URL
+     *
+     * @param string $url
+     */
+    public function purge($url);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CallbackCanCacheStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CallbackCanCacheStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..7109fa429b0ce4beffa408ab09251f6227ebab68
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CallbackCanCacheStrategy.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Determines if a request can be cached using a callback
+ */
+class CallbackCanCacheStrategy extends DefaultCanCacheStrategy
+{
+    /** @var callable Callback for request */
+    protected $requestCallback;
+
+    /** @var callable Callback for response */
+    protected $responseCallback;
+
+    /**
+     * @param \Closure|array|mixed $requestCallback  Callable method to invoke for requests
+     * @param \Closure|array|mixed $responseCallback Callable method to invoke for responses
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct($requestCallback = null, $responseCallback = null)
+    {
+        if ($requestCallback && !is_callable($requestCallback)) {
+            throw new InvalidArgumentException('Method must be callable');
+        }
+
+        if ($responseCallback && !is_callable($responseCallback)) {
+            throw new InvalidArgumentException('Method must be callable');
+        }
+
+        $this->requestCallback = $requestCallback;
+        $this->responseCallback = $responseCallback;
+    }
+
+    public function canCacheRequest(RequestInterface $request)
+    {
+        return $this->requestCallback
+            ? call_user_func($this->requestCallback, $request)
+            : parent::canCache($request);
+    }
+
+    public function canCacheResponse(Response $response)
+    {
+        return $this->responseCallback
+            ? call_user_func($this->responseCallback, $response)
+            : parent::canCacheResponse($response);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CanCacheStrategyInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CanCacheStrategyInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..6e01a8e74a794ed9ea1a15722323643fac2ec9fe
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/CanCacheStrategyInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Strategy used to determine if a request can be cached
+ */
+interface CanCacheStrategyInterface
+{
+    /**
+     * Determine if a request can be cached
+     *
+     * @param RequestInterface $request Request to determine
+     *
+     * @return bool
+     */
+    public function canCacheRequest(RequestInterface $request);
+
+    /**
+     * Determine if a response can be cached
+     *
+     * @param Response $response Response to determine
+     *
+     * @return bool
+     */
+    public function canCacheResponse(Response $response);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCacheKeyProvider.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCacheKeyProvider.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec0dc4ed1410e45a8c0327188fe38ae4c6d6450f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCacheKeyProvider.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+
+\Guzzle\Common\Version::warn('Guzzle\Plugin\Cache\DefaultCacheKeyProvider is no longer used');
+
+/**
+ * @deprecated This class is no longer used
+ * @codeCoverageIgnore
+ */
+class DefaultCacheKeyProvider implements CacheKeyProviderInterface
+{
+    public function getCacheKey(RequestInterface $request)
+    {
+        // See if the key has already been calculated
+        $key = $request->getParams()->get(self::CACHE_KEY);
+
+        if (!$key) {
+
+            $cloned = clone $request;
+            $cloned->removeHeader('Cache-Control');
+
+            // Check to see how and if the key should be filtered
+            foreach (explode(';', $request->getParams()->get(self::CACHE_KEY_FILTER)) as $part) {
+                $pieces = array_map('trim', explode('=', $part));
+                if (isset($pieces[1])) {
+                    foreach (array_map('trim', explode(',', $pieces[1])) as $remove) {
+                        if ($pieces[0] == 'header') {
+                            $cloned->removeHeader($remove);
+                        } elseif ($pieces[0] == 'query') {
+                            $cloned->getQuery()->remove($remove);
+                        }
+                    }
+                }
+            }
+
+            $raw = (string) $cloned;
+            $key = 'GZ' . md5($raw);
+            $request->getParams()->set(self::CACHE_KEY, $key)->set(self::CACHE_KEY_RAW, $raw);
+        }
+
+        return $key;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCacheStorage.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCacheStorage.php
new file mode 100644
index 0000000000000000000000000000000000000000..555c9b79c7cb93ee9fcadfe7dac93360e1790d3b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCacheStorage.php
@@ -0,0 +1,251 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Cache\CacheAdapterFactory;
+use Guzzle\Cache\CacheAdapterInterface;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Http\Message\MessageInterface;
+use Guzzle\Http\Message\Request;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Default cache storage implementation
+ */
+class DefaultCacheStorage implements CacheStorageInterface
+{
+    /** @var string */
+    protected $keyPrefix;
+
+    /** @var CacheAdapterInterface Cache used to store cache data */
+    protected $cache;
+
+    /** @var int Default cache TTL */
+    protected $defaultTtl;
+
+    /**
+     * @param mixed  $cache      Cache used to store cache data
+     * @param string $keyPrefix  Provide an optional key prefix to prefix on all cache keys
+     * @param int    $defaultTtl Default cache TTL
+     */
+    public function __construct($cache, $keyPrefix = '', $defaultTtl = 3600)
+    {
+        $this->cache = CacheAdapterFactory::fromCache($cache);
+        $this->defaultTtl = $defaultTtl;
+        $this->keyPrefix = $keyPrefix;
+    }
+
+    public function cache(RequestInterface $request, Response $response)
+    {
+        $currentTime = time();
+        $ttl = $request->getParams()->get('cache.override_ttl') ?: $response->getMaxAge() ?: $this->defaultTtl;
+
+        if ($cacheControl = $response->getHeader('Cache-Control')) {
+            $stale = $cacheControl->getDirective('stale-if-error');
+            $ttl += $stale == true ? $ttl : $stale;
+        }
+
+        // Determine which manifest key should be used
+        $key = $this->getCacheKey($request);
+        $persistedRequest = $this->persistHeaders($request);
+        $entries = array();
+
+        if ($manifest = $this->cache->fetch($key)) {
+            // Determine which cache entries should still be in the cache
+            $vary = $response->getVary();
+            foreach (unserialize($manifest) as $entry) {
+                // Check if the entry is expired
+                if ($entry[4] < $currentTime) {
+                    continue;
+                }
+                $entry[1]['vary'] = isset($entry[1]['vary']) ? $entry[1]['vary'] : '';
+                if ($vary != $entry[1]['vary'] || !$this->requestsMatch($vary, $entry[0], $persistedRequest)) {
+                    $entries[] = $entry;
+                }
+            }
+        }
+
+        // Persist the response body if needed
+        $bodyDigest = null;
+        if ($response->getBody() && $response->getBody()->getContentLength() > 0) {
+            $bodyDigest = $this->getBodyKey($request->getUrl(), $response->getBody());
+            $this->cache->save($bodyDigest, (string) $response->getBody(), $ttl);
+        }
+
+        array_unshift($entries, array(
+            $persistedRequest,
+            $this->persistHeaders($response),
+            $response->getStatusCode(),
+            $bodyDigest,
+            $currentTime + $ttl
+        ));
+
+        $this->cache->save($key, serialize($entries));
+    }
+
+    public function delete(RequestInterface $request)
+    {
+        $key = $this->getCacheKey($request);
+        if ($entries = $this->cache->fetch($key)) {
+            // Delete each cached body
+            foreach (unserialize($entries) as $entry) {
+                if ($entry[3]) {
+                    $this->cache->delete($entry[3]);
+                }
+            }
+            $this->cache->delete($key);
+        }
+    }
+
+    public function purge($url)
+    {
+        foreach (array('GET', 'HEAD', 'POST', 'PUT', 'DELETE') as $method) {
+            $this->delete(new Request($method, $url));
+        }
+    }
+
+    public function fetch(RequestInterface $request)
+    {
+        $key = $this->getCacheKey($request);
+        if (!($entries = $this->cache->fetch($key))) {
+            return null;
+        }
+
+        $match = null;
+        $headers = $this->persistHeaders($request);
+        $entries = unserialize($entries);
+        foreach ($entries as $index => $entry) {
+            if ($this->requestsMatch(isset($entry[1]['vary']) ? $entry[1]['vary'] : '', $headers, $entry[0])) {
+                $match = $entry;
+                break;
+            }
+        }
+
+        if (!$match) {
+            return null;
+        }
+
+        // Ensure that the response is not expired
+        $response = null;
+        if ($match[4] < time()) {
+            $response = -1;
+        } else {
+            $response = new Response($match[2], $match[1]);
+            if ($match[3]) {
+                if ($body = $this->cache->fetch($match[3])) {
+                    $response->setBody($body);
+                } else {
+                    // The response is not valid because the body was somehow deleted
+                    $response = -1;
+                }
+            }
+        }
+
+        if ($response === -1) {
+            // Remove the entry from the metadata and update the cache
+            unset($entries[$index]);
+            if ($entries) {
+                $this->cache->save($key, serialize($entries));
+            } else {
+                $this->cache->delete($key);
+            }
+            return null;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Hash a request URL into a string that returns cache metadata
+     *
+     * @param RequestInterface $request
+     *
+     * @return string
+     */
+    protected function getCacheKey(RequestInterface $request)
+    {
+        // Allow cache.key_filter to trim down the URL cache key by removing generate query string values (e.g. auth)
+        if ($filter = $request->getParams()->get('cache.key_filter')) {
+            $url = $request->getUrl(true);
+            foreach (explode(',', $filter) as $remove) {
+                $url->getQuery()->remove(trim($remove));
+            }
+        } else {
+            $url = $request->getUrl();
+        }
+
+        return $this->keyPrefix . md5($request->getMethod() . ' ' . $url);
+    }
+
+    /**
+     * Create a cache key for a response's body
+     *
+     * @param string              $url  URL of the entry
+     * @param EntityBodyInterface $body Response body
+     *
+     * @return string
+     */
+    protected function getBodyKey($url, EntityBodyInterface $body)
+    {
+        return $this->keyPrefix . md5($url) . $body->getContentMd5();
+    }
+
+    /**
+     * Determines whether two Request HTTP header sets are non-varying
+     *
+     * @param string $vary Response vary header
+     * @param array  $r1   HTTP header array
+     * @param array  $r2   HTTP header array
+     *
+     * @return bool
+     */
+    private function requestsMatch($vary, $r1, $r2)
+    {
+        if ($vary) {
+            foreach (explode(',', $vary) as $header) {
+                $key = trim(strtolower($header));
+                $v1 = isset($r1[$key]) ? $r1[$key] : null;
+                $v2 = isset($r2[$key]) ? $r2[$key] : null;
+                if ($v1 !== $v2) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Creates an array of cacheable and normalized message headers
+     *
+     * @param MessageInterface $message
+     *
+     * @return array
+     */
+    private function persistHeaders(MessageInterface $message)
+    {
+        // Headers are excluded from the caching (see RFC 2616:13.5.1)
+        static $noCache = array(
+            'age' => true,
+            'connection' => true,
+            'keep-alive' => true,
+            'proxy-authenticate' => true,
+            'proxy-authorization' => true,
+            'te' => true,
+            'trailers' => true,
+            'transfer-encoding' => true,
+            'upgrade' => true,
+            'set-cookie' => true,
+            'set-cookie2' => true
+        );
+
+        // Clone the response to not destroy any necessary headers when caching
+        $headers = $message->getHeaders()->getAll();
+        $headers = array_diff_key($headers, $noCache);
+        // Cast the headers to a string
+        $headers = array_map(function ($h) { return (string) $h; }, $headers);
+
+        return $headers;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCanCacheStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCanCacheStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ca1fbf19d64798f383b5ab434ef6709c03498de
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultCanCacheStrategy.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Default strategy used to determine of an HTTP request can be cached
+ */
+class DefaultCanCacheStrategy implements CanCacheStrategyInterface
+{
+    public function canCacheRequest(RequestInterface $request)
+    {
+        // Only GET and HEAD requests can be cached
+        if ($request->getMethod() != RequestInterface::GET && $request->getMethod() != RequestInterface::HEAD) {
+            return false;
+        }
+
+        // Never cache requests when using no-store
+        if ($request->hasHeader('Cache-Control') && $request->getHeader('Cache-Control')->hasDirective('no-store')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function canCacheResponse(Response $response)
+    {
+        return $response->isSuccessful() && $response->canCache();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultRevalidation.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultRevalidation.php
new file mode 100644
index 0000000000000000000000000000000000000000..1bbaa1ad0fc6ca1582bfa3b283999ab03ce9801d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DefaultRevalidation.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Exception\BadResponseException;
+
+/**
+ * Default revalidation strategy
+ */
+class DefaultRevalidation implements RevalidationInterface
+{
+    /** @var CacheStorageInterface Cache object storing cache data */
+    protected $storage;
+
+    /** @var CanCacheStrategyInterface */
+    protected $canCache;
+
+    /**
+     * @param CacheStorageInterface     $cache    Cache storage
+     * @param CanCacheStrategyInterface $canCache Determines if a message can be cached
+     */
+    public function __construct(CacheStorageInterface $cache, CanCacheStrategyInterface $canCache = null)
+    {
+        $this->storage = $cache;
+        $this->canCache = $canCache ?: new DefaultCanCacheStrategy();
+    }
+
+    public function revalidate(RequestInterface $request, Response $response)
+    {
+        try {
+            $revalidate = $this->createRevalidationRequest($request, $response);
+            $validateResponse = $revalidate->send();
+            if ($validateResponse->getStatusCode() == 200) {
+                return $this->handle200Response($request, $validateResponse);
+            } elseif ($validateResponse->getStatusCode() == 304) {
+                return $this->handle304Response($request, $validateResponse, $response);
+            }
+        } catch (BadResponseException $e) {
+            $this->handleBadResponse($e);
+        }
+
+        // Other exceptions encountered in the revalidation request are ignored
+        // in hopes that sending a request to the origin server will fix it
+        return false;
+    }
+
+    public function shouldRevalidate(RequestInterface $request, Response $response)
+    {
+        if ($request->getMethod() != RequestInterface::GET) {
+            return false;
+        }
+
+        $reqCache = $request->getHeader('Cache-Control');
+        $resCache = $response->getHeader('Cache-Control');
+
+        $revalidate = $request->getHeader('Pragma') == 'no-cache' ||
+            ($reqCache && ($reqCache->hasDirective('no-cache') || $reqCache->hasDirective('must-revalidate'))) ||
+            ($resCache && ($resCache->hasDirective('no-cache') || $resCache->hasDirective('must-revalidate')));
+
+        // Use the strong ETag validator if available and the response contains no Cache-Control directive
+        if (!$revalidate && !$reqCache && $response->hasHeader('ETag')) {
+            $revalidate = true;
+        }
+
+        return $revalidate;
+    }
+
+    /**
+     * Handles a bad response when attempting to revalidate
+     *
+     * @param BadResponseException $e Exception encountered
+     *
+     * @throws BadResponseException
+     */
+    protected function handleBadResponse(BadResponseException $e)
+    {
+        // 404 errors mean the resource no longer exists, so remove from
+        // cache, and prevent an additional request by throwing the exception
+        if ($e->getResponse()->getStatusCode() == 404) {
+            $this->storage->delete($e->getRequest());
+            throw $e;
+        }
+    }
+
+    /**
+     * Creates a request to use for revalidation
+     *
+     * @param RequestInterface $request  Request
+     * @param Response         $response Response to revalidate
+     *
+     * @return RequestInterface returns a revalidation request
+     */
+    protected function createRevalidationRequest(RequestInterface $request, Response $response)
+    {
+        $revalidate = clone $request;
+        $revalidate->removeHeader('Pragma')
+            ->removeHeader('Cache-Control')
+            ->setHeader('If-Modified-Since', $response->getLastModified() ?: $response->getDate());
+
+        if ($response->getEtag()) {
+            $revalidate->setHeader('If-None-Match', '"' . $response->getEtag() . '"');
+        }
+
+        // Remove any cache plugins that might be on the request to prevent infinite recursive revalidations
+        $dispatcher = $revalidate->getEventDispatcher();
+        foreach ($dispatcher->getListeners() as $eventName => $listeners) {
+            foreach ($listeners as $listener) {
+                if ($listener[0] instanceof CachePlugin) {
+                    $dispatcher->removeListener($eventName, $listener);
+                }
+            }
+        }
+
+        return $revalidate;
+    }
+
+    /**
+     * Handles a 200 response response from revalidating. The server does not support validation, so use this response.
+     *
+     * @param RequestInterface $request          Request that was sent
+     * @param Response         $validateResponse Response received
+     *
+     * @return bool Returns true if valid, false if invalid
+     */
+    protected function handle200Response(RequestInterface $request, Response $validateResponse)
+    {
+        $request->setResponse($validateResponse);
+        if ($this->canCache->canCacheResponse($validateResponse)) {
+            $this->storage->cache($request, $validateResponse);
+        }
+
+        return false;
+    }
+
+    /**
+     * Handle a 304 response and ensure that it is still valid
+     *
+     * @param RequestInterface $request          Request that was sent
+     * @param Response         $validateResponse Response received
+     * @param Response         $response         Original cached response
+     *
+     * @return bool Returns true if valid, false if invalid
+     */
+    protected function handle304Response(RequestInterface $request, Response $validateResponse, Response $response)
+    {
+        static $replaceHeaders = array('Date', 'Expires', 'Cache-Control', 'ETag', 'Last-Modified');
+
+        // Make sure that this response has the same ETag
+        if ($validateResponse->getEtag() != $response->getEtag()) {
+            return false;
+        }
+
+        // Replace cached headers with any of these headers from the
+        // origin server that might be more up to date
+        $modified = false;
+        foreach ($replaceHeaders as $name) {
+            if ($validateResponse->hasHeader($name)) {
+                $modified = true;
+                $response->setHeader($name, $validateResponse->getHeader($name));
+            }
+        }
+
+        // Store the updated response in cache
+        if ($modified && $this->canCache->canCacheResponse($response)) {
+            $this->storage->cache($request, $response);
+        }
+
+        return true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DenyRevalidation.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DenyRevalidation.php
new file mode 100644
index 0000000000000000000000000000000000000000..88b86f3ca1dde7629431a8d15fe6cd5566862780
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/DenyRevalidation.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Never performs cache revalidation and just assumes the request is invalid
+ */
+class DenyRevalidation extends DefaultRevalidation
+{
+    public function __construct() {}
+
+    public function revalidate(RequestInterface $request, Response $response)
+    {
+        return false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/RevalidationInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/RevalidationInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..52353d8899f448e42d7d86432f7c668e8f6802c2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/RevalidationInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Cache revalidation interface
+ */
+interface RevalidationInterface
+{
+    /**
+     * Performs a cache revalidation
+     *
+     * @param RequestInterface $request    Request to revalidate
+     * @param Response         $response   Response that was received
+     *
+     * @return bool Returns true if the request can be cached
+     */
+    public function revalidate(RequestInterface $request, Response $response);
+
+    /**
+     * Returns true if the response should be revalidated
+     *
+     * @param RequestInterface $request  Request to check
+     * @param Response         $response Response to check
+     *
+     * @return bool
+     */
+    public function shouldRevalidate(RequestInterface $request, Response $response);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/SkipRevalidation.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/SkipRevalidation.php
new file mode 100644
index 0000000000000000000000000000000000000000..10b5c115214dc9f73e7e6ddb52dc621e25a7ee26
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cache/SkipRevalidation.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Guzzle\Plugin\Cache;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Never performs cache revalidation and just assumes the request is still ok
+ */
+class SkipRevalidation extends DefaultRevalidation
+{
+    public function __construct() {}
+
+    public function revalidate(RequestInterface $request, Response $response)
+    {
+        return true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/Cookie.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/Cookie.php
new file mode 100644
index 0000000000000000000000000000000000000000..bf81125ff77605ca2ff033a9b1e162e5717ac53a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/Cookie.php
@@ -0,0 +1,523 @@
+<?php
+
+namespace Guzzle\Plugin\Cookie;
+
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * Set-Cookie object
+ */
+class Cookie implements ToArrayInterface
+{
+    /** @var array Cookie data */
+    protected $data;
+
+    /**
+     * @var string ASCII codes not valid for for use in a cookie name
+     *
+     * Cookie names are defined as 'token', according to RFC 2616, Section 2.2
+     * A valid token may contain any CHAR except CTLs (ASCII 0 - 31 or 127)
+     * or any of the following separators
+     */
+    protected static $invalidCharString;
+
+    /**
+     * Gets an array of invalid cookie characters
+     *
+     * @return array
+     */
+    protected static function getInvalidCharacters()
+    {
+        if (!self::$invalidCharString) {
+            self::$invalidCharString = implode('', array_map('chr', array_merge(
+                range(0, 32),
+                array(34, 40, 41, 44, 47),
+                array(58, 59, 60, 61, 62, 63, 64, 91, 92, 93, 123, 125, 127)
+            )));
+        }
+
+        return self::$invalidCharString;
+    }
+
+    /**
+     * @param array $data Array of cookie data provided by a Cookie parser
+     */
+    public function __construct(array $data = array())
+    {
+        static $defaults = array(
+            'name'        => '',
+            'value'       => '',
+            'domain'      => '',
+            'path'        => '/',
+            'expires'     => null,
+            'max_age'     => 0,
+            'comment'     => null,
+            'comment_url' => null,
+            'port'        => array(),
+            'version'     => null,
+            'secure'      => false,
+            'discard'     => false,
+            'http_only'   => false
+        );
+
+        $this->data = array_merge($defaults, $data);
+        // Extract the expires value and turn it into a UNIX timestamp if needed
+        if (!$this->getExpires() && $this->getMaxAge()) {
+            // Calculate the expires date
+            $this->setExpires(time() + (int) $this->getMaxAge());
+        } elseif ($this->getExpires() && !is_numeric($this->getExpires())) {
+            $this->setExpires(strtotime($this->getExpires()));
+        }
+    }
+
+    /**
+     * Get the cookie as an array
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Get the cookie name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->data['name'];
+    }
+
+    /**
+     * Set the cookie name
+     *
+     * @param string $name Cookie name
+     *
+     * @return Cookie
+     */
+    public function setName($name)
+    {
+        return $this->setData('name', $name);
+    }
+
+    /**
+     * Get the cookie value
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->data['value'];
+    }
+
+    /**
+     * Set the cookie value
+     *
+     * @param string $value Cookie value
+     *
+     * @return Cookie
+     */
+    public function setValue($value)
+    {
+        return $this->setData('value', $value);
+    }
+
+    /**
+     * Get the domain
+     *
+     * @return string|null
+     */
+    public function getDomain()
+    {
+        return $this->data['domain'];
+    }
+
+    /**
+     * Set the domain of the cookie
+     *
+     * @param string $domain
+     *
+     * @return Cookie
+     */
+    public function setDomain($domain)
+    {
+        return $this->setData('domain', $domain);
+    }
+
+    /**
+     * Get the path
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->data['path'];
+    }
+
+    /**
+     * Set the path of the cookie
+     *
+     * @param string $path Path of the cookie
+     *
+     * @return Cookie
+     */
+    public function setPath($path)
+    {
+        return $this->setData('path', $path);
+    }
+
+    /**
+     * Maximum lifetime of the cookie in seconds
+     *
+     * @return int|null
+     */
+    public function getMaxAge()
+    {
+        return $this->data['max_age'];
+    }
+
+    /**
+     * Set the max-age of the cookie
+     *
+     * @param int $maxAge Max age of the cookie in seconds
+     *
+     * @return Cookie
+     */
+    public function setMaxAge($maxAge)
+    {
+        return $this->setData('max_age', $maxAge);
+    }
+
+    /**
+     * The UNIX timestamp when the cookie expires
+     *
+     * @return mixed
+     */
+    public function getExpires()
+    {
+        return $this->data['expires'];
+    }
+
+    /**
+     * Set the unix timestamp for which the cookie will expire
+     *
+     * @param int $timestamp Unix timestamp
+     *
+     * @return Cookie
+     */
+    public function setExpires($timestamp)
+    {
+        return $this->setData('expires', $timestamp);
+    }
+
+    /**
+     * Version of the cookie specification. RFC 2965 is 1
+     *
+     * @return mixed
+     */
+    public function getVersion()
+    {
+        return $this->data['version'];
+    }
+
+    /**
+     * Set the cookie version
+     *
+     * @param string|int $version Version to set
+     *
+     * @return Cookie
+     */
+    public function setVersion($version)
+    {
+        return $this->setData('version', $version);
+    }
+
+    /**
+     * Get whether or not this is a secure cookie
+     *
+     * @return null|bool
+     */
+    public function getSecure()
+    {
+        return $this->data['secure'];
+    }
+
+    /**
+     * Set whether or not the cookie is secure
+     *
+     * @param bool $secure Set to true or false if secure
+     *
+     * @return Cookie
+     */
+    public function setSecure($secure)
+    {
+        return $this->setData('secure', (bool) $secure);
+    }
+
+    /**
+     * Get whether or not this is a session cookie
+     *
+     * @return null|bool
+     */
+    public function getDiscard()
+    {
+        return $this->data['discard'];
+    }
+
+    /**
+     * Set whether or not this is a session cookie
+     *
+     * @param bool $discard Set to true or false if this is a session cookie
+     *
+     * @return Cookie
+     */
+    public function setDiscard($discard)
+    {
+        return $this->setData('discard', $discard);
+    }
+
+    /**
+     * Get the comment
+     *
+     * @return string|null
+     */
+    public function getComment()
+    {
+        return $this->data['comment'];
+    }
+
+    /**
+     * Set the comment of the cookie
+     *
+     * @param string $comment Cookie comment
+     *
+     * @return Cookie
+     */
+    public function setComment($comment)
+    {
+        return $this->setData('comment', $comment);
+    }
+
+    /**
+     * Get the comment URL of the cookie
+     *
+     * @return string|null
+     */
+    public function getCommentUrl()
+    {
+        return $this->data['comment_url'];
+    }
+
+    /**
+     * Set the comment URL of the cookie
+     *
+     * @param string $commentUrl Cookie comment URL for more information
+     *
+     * @return Cookie
+     */
+    public function setCommentUrl($commentUrl)
+    {
+        return $this->setData('comment_url', $commentUrl);
+    }
+
+    /**
+     * Get an array of acceptable ports this cookie can be used with
+     *
+     * @return array
+     */
+    public function getPorts()
+    {
+        return $this->data['port'];
+    }
+
+    /**
+     * Set a list of acceptable ports this cookie can be used with
+     *
+     * @param array $ports Array of acceptable ports
+     *
+     * @return Cookie
+     */
+    public function setPorts(array $ports)
+    {
+        return $this->setData('port', $ports);
+    }
+
+    /**
+     * Get whether or not this is an HTTP only cookie
+     *
+     * @return bool
+     */
+    public function getHttpOnly()
+    {
+        return $this->data['http_only'];
+    }
+
+    /**
+     * Set whether or not this is an HTTP only cookie
+     *
+     * @param bool $httpOnly Set to true or false if this is HTTP only
+     *
+     * @return Cookie
+     */
+    public function setHttpOnly($httpOnly)
+    {
+        return $this->setData('http_only', $httpOnly);
+    }
+
+    /**
+     * Get an array of extra cookie data
+     *
+     * @return array
+     */
+    public function getAttributes()
+    {
+        return $this->data['data'];
+    }
+
+    /**
+     * Get a specific data point from the extra cookie data
+     *
+     * @param string $name Name of the data point to retrieve
+     *
+     * @return null|string
+     */
+    public function getAttribute($name)
+    {
+        return array_key_exists($name, $this->data['data']) ? $this->data['data'][$name] : null;
+    }
+
+    /**
+     * Set a cookie data attribute
+     *
+     * @param string $name  Name of the attribute to set
+     * @param string $value Value to set
+     *
+     * @return Cookie
+     */
+    public function setAttribute($name, $value)
+    {
+        $this->data['data'][$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Check if the cookie matches a path value
+     *
+     * @param string $path Path to check against
+     *
+     * @return bool
+     */
+    public function matchesPath($path)
+    {
+        return !$this->getPath() || 0 === stripos($path, $this->getPath());
+    }
+
+    /**
+     * Check if the cookie matches a domain value
+     *
+     * @param string $domain Domain to check against
+     *
+     * @return bool
+     */
+    public function matchesDomain($domain)
+    {
+        $cookieDomain = $this->getDomain();
+
+        // Domain not set or exact match.
+        if (!$cookieDomain || !strcasecmp($domain, $cookieDomain)) {
+            return true;
+        }
+
+        // . prefix match.
+        if (strpos($cookieDomain, '.') === 0) {
+            $realDomain = substr($cookieDomain, 1);
+
+            // Root domains don't match except for .local.
+            if (!substr_count($realDomain, '.') && strcasecmp($realDomain, 'local')) {
+                return false;
+            }
+
+            if (substr($domain, -strlen($realDomain)) === $realDomain) {
+                // Match exact or 1 deep subdomain.
+                return !strcasecmp($domain, $realDomain) ||
+                    substr_count(substr($domain, 0, -strlen($realDomain)), '.') === 1;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if the cookie is compatible with a specific port
+     *
+     * @param int $port Port to check
+     *
+     * @return bool
+     */
+    public function matchesPort($port)
+    {
+        return count($this->getPorts()) == 0 || in_array($port, $this->getPorts());
+    }
+
+    /**
+     * Check if the cookie is expired
+     *
+     * @return bool
+     */
+    public function isExpired()
+    {
+        return $this->getExpires() && time() > $this->getExpires();
+    }
+
+    /**
+     * Check if the cookie is valid according to RFC 6265
+     *
+     * @return bool|string Returns true if valid or an error message if invalid
+     */
+    public function validate()
+    {
+        // Names must not be empty, but can be 0
+        $name = $this->getName();
+        if (empty($name) && !is_numeric($name)) {
+            return 'The cookie name must not be empty';
+        }
+
+        // Check if any of the invalid characters are present in the cookie name
+        if (strpbrk($name, self::getInvalidCharacters()) !== false) {
+            return 'The cookie name must not contain invalid characters: ' . $name;
+        }
+
+        // Value must not be empty, but can be 0
+        $value = $this->getValue();
+        if (empty($value) && !is_numeric($value)) {
+            return 'The cookie value must not be empty';
+        }
+
+        // Domains must not be empty, but can be 0
+        // A "0" is not a valid internet domain, but may be used as server name in a private network
+        $domain = $this->getDomain();
+        if (empty($domain) && !is_numeric($domain)) {
+            return 'The cookie domain must not be empty';
+        }
+
+        return true;
+    }
+
+    /**
+     * Set a value and return the cookie object
+     *
+     * @param string $key   Key to set
+     * @param string $value Value to set
+     *
+     * @return Cookie
+     */
+    private function setData($key, $value)
+    {
+        $this->data[$key] = $value;
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php
new file mode 100644
index 0000000000000000000000000000000000000000..68d5be7e633d9b27afcb33d86c0a7a65d58f5aae
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php
@@ -0,0 +1,222 @@
+<?php
+
+namespace Guzzle\Plugin\Cookie\CookieJar;
+
+use Guzzle\Plugin\Cookie\Cookie;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Parser\ParserRegistry;
+use Guzzle\Plugin\Cookie\Exception\InvalidCookieException;
+
+/**
+ * Cookie cookieJar that stores cookies an an array
+ */
+class ArrayCookieJar implements CookieJarInterface, \Serializable
+{
+    /** @var array Loaded cookie data */
+    protected $cookies = array();
+
+    /** @var bool Whether or not strict mode is enabled. When enabled, exceptions will be thrown for invalid cookies */
+    protected $strictMode;
+
+    /**
+     * @param bool $strictMode Set to true to throw exceptions when invalid cookies are added to the cookie jar
+     */
+    public function __construct($strictMode = false)
+    {
+        $this->strictMode = $strictMode;
+    }
+
+    /**
+     * Enable or disable strict mode on the cookie jar
+     *
+     * @param bool $strictMode Set to true to throw exceptions when invalid cookies are added. False to ignore them.
+     *
+     * @return self
+     */
+    public function setStrictMode($strictMode)
+    {
+        $this->strictMode = $strictMode;
+    }
+
+    public function remove($domain = null, $path = null, $name = null)
+    {
+        $cookies = $this->all($domain, $path, $name, false, false);
+        $this->cookies = array_filter($this->cookies, function (Cookie $cookie) use ($cookies) {
+            return !in_array($cookie, $cookies, true);
+        });
+
+        return $this;
+    }
+
+    public function removeTemporary()
+    {
+        $this->cookies = array_filter($this->cookies, function (Cookie $cookie) {
+            return !$cookie->getDiscard() && $cookie->getExpires();
+        });
+
+        return $this;
+    }
+
+    public function removeExpired()
+    {
+        $currentTime = time();
+        $this->cookies = array_filter($this->cookies, function (Cookie $cookie) use ($currentTime) {
+            return !$cookie->getExpires() || $currentTime < $cookie->getExpires();
+        });
+
+        return $this;
+    }
+
+    public function all($domain = null, $path = null, $name = null, $skipDiscardable = false, $skipExpired = true)
+    {
+        return array_values(array_filter($this->cookies, function (Cookie $cookie) use (
+            $domain,
+            $path,
+            $name,
+            $skipDiscardable,
+            $skipExpired
+        ) {
+            return false === (($name && $cookie->getName() != $name) ||
+                ($skipExpired && $cookie->isExpired()) ||
+                ($skipDiscardable && ($cookie->getDiscard() || !$cookie->getExpires())) ||
+                ($path && !$cookie->matchesPath($path)) ||
+                ($domain && !$cookie->matchesDomain($domain)));
+        }));
+    }
+
+    public function add(Cookie $cookie)
+    {
+        // Only allow cookies with set and valid domain, name, value
+        $result = $cookie->validate();
+        if ($result !== true) {
+            if ($this->strictMode) {
+                throw new InvalidCookieException($result);
+            } else {
+                return false;
+            }
+        }
+
+        // Resolve conflicts with previously set cookies
+        foreach ($this->cookies as $i => $c) {
+
+            // Two cookies are identical, when their path, domain, port and name are identical
+            if ($c->getPath() != $cookie->getPath() ||
+                $c->getDomain() != $cookie->getDomain() ||
+                $c->getPorts() != $cookie->getPorts() ||
+                $c->getName() != $cookie->getName()
+            ) {
+                continue;
+            }
+
+            // The previously set cookie is a discard cookie and this one is not so allow the new cookie to be set
+            if (!$cookie->getDiscard() && $c->getDiscard()) {
+                unset($this->cookies[$i]);
+                continue;
+            }
+
+            // If the new cookie's expiration is further into the future, then replace the old cookie
+            if ($cookie->getExpires() > $c->getExpires()) {
+                unset($this->cookies[$i]);
+                continue;
+            }
+
+            // If the value has changed, we better change it
+            if ($cookie->getValue() !== $c->getValue()) {
+                unset($this->cookies[$i]);
+                continue;
+            }
+
+            // The cookie exists, so no need to continue
+            return false;
+        }
+
+        $this->cookies[] = $cookie;
+
+        return true;
+    }
+
+    /**
+     * Serializes the cookie cookieJar
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        // Only serialize long term cookies and unexpired cookies
+        return json_encode(array_map(function (Cookie $cookie) {
+            return $cookie->toArray();
+        }, $this->all(null, null, null, true, true)));
+    }
+
+    /**
+     * Unserializes the cookie cookieJar
+     */
+    public function unserialize($data)
+    {
+        $data = json_decode($data, true);
+        if (empty($data)) {
+            $this->cookies = array();
+        } else {
+            $this->cookies = array_map(function (array $cookie) {
+                return new Cookie($cookie);
+            }, $data);
+        }
+    }
+
+    /**
+     * Returns the total number of stored cookies
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->cookies);
+    }
+
+    /**
+     * Returns an iterator
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->cookies);
+    }
+
+    public function addCookiesFromResponse(Response $response, RequestInterface $request = null)
+    {
+        if ($cookieHeader = $response->getHeader('Set-Cookie')) {
+            $parser = ParserRegistry::getInstance()->getParser('cookie');
+            foreach ($cookieHeader as $cookie) {
+                if ($parsed = $request
+                    ? $parser->parseCookie($cookie, $request->getHost(), $request->getPath())
+                    : $parser->parseCookie($cookie)
+                ) {
+                    // Break up cookie v2 into multiple cookies
+                    foreach ($parsed['cookies'] as $key => $value) {
+                        $row = $parsed;
+                        $row['name'] = $key;
+                        $row['value'] = $value;
+                        unset($row['cookies']);
+                        $this->add(new Cookie($row));
+                    }
+                }
+            }
+        }
+    }
+
+    public function getMatchingCookies(RequestInterface $request)
+    {
+        // Find cookies that match this request
+        $cookies = $this->all($request->getHost(), $request->getPath());
+        // Remove ineligible cookies
+        foreach ($cookies as $index => $cookie) {
+            if (!$cookie->matchesPort($request->getPort()) || ($cookie->getSecure() && $request->getScheme() != 'https')) {
+                unset($cookies[$index]);
+            }
+        };
+
+        return $cookies;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/CookieJarInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/CookieJarInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..7faa7d21f5afe24393a3f9fca23c4ec8c708e151
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/CookieJarInterface.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Guzzle\Plugin\Cookie\CookieJar;
+
+use Guzzle\Plugin\Cookie\Cookie;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Interface for persisting cookies
+ */
+interface CookieJarInterface extends \Countable, \IteratorAggregate
+{
+    /**
+     * Remove cookies currently held in the Cookie cookieJar.
+     *
+     * Invoking this method without arguments will empty the whole Cookie cookieJar.  If given a $domain argument only
+     * cookies belonging to that domain will be removed. If given a $domain and $path argument, cookies belonging to
+     * the specified path within that domain are removed. If given all three arguments, then the cookie with the
+     * specified name, path and domain is removed.
+     *
+     * @param string $domain Set to clear only cookies matching a domain
+     * @param string $path   Set to clear only cookies matching a domain and path
+     * @param string $name   Set to clear only cookies matching a domain, path, and name
+     *
+     * @return CookieJarInterface
+     */
+    public function remove($domain = null, $path = null, $name = null);
+
+    /**
+     * Discard all temporary cookies.
+     *
+     * Scans for all cookies in the cookieJar with either no expire field or a true discard flag. To be called when the
+     * user agent shuts down according to RFC 2965.
+     *
+     * @return CookieJarInterface
+     */
+    public function removeTemporary();
+
+    /**
+     * Delete any expired cookies
+     *
+     * @return CookieJarInterface
+     */
+    public function removeExpired();
+
+    /**
+     * Add a cookie to the cookie cookieJar
+     *
+     * @param Cookie $cookie Cookie to add
+     *
+     * @return bool Returns true on success or false on failure
+     */
+    public function add(Cookie $cookie);
+
+    /**
+     * Add cookies from a {@see Guzzle\Http\Message\Response} object
+     *
+     * @param Response         $response Response object
+     * @param RequestInterface $request  Request that received the response
+     */
+    public function addCookiesFromResponse(Response $response, RequestInterface $request = null);
+
+    /**
+     * Get cookies matching a request object
+     *
+     * @param RequestInterface $request Request object to match
+     *
+     * @return array
+     */
+    public function getMatchingCookies(RequestInterface $request);
+
+    /**
+     * Get all of the matching cookies
+     *
+     * @param string $domain          Domain of the cookie
+     * @param string $path            Path of the cookie
+     * @param string $name            Name of the cookie
+     * @param bool   $skipDiscardable Set to TRUE to skip cookies with the Discard attribute.
+     * @param bool   $skipExpired     Set to FALSE to include expired
+     *
+     * @return array Returns an array of Cookie objects
+     */
+    public function all($domain = null, $path = null, $name = null, $skipDiscardable = false, $skipExpired = true);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/FileCookieJar.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/FileCookieJar.php
new file mode 100644
index 0000000000000000000000000000000000000000..99344cd873981489fae3238130139c755f5da8cd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookieJar/FileCookieJar.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Guzzle\Plugin\Cookie\CookieJar;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+/**
+ * Persists non-session cookies using a JSON formatted file
+ */
+class FileCookieJar extends ArrayCookieJar
+{
+    /** @var string filename */
+    protected $filename;
+
+    /**
+     * Create a new FileCookieJar object
+     *
+     * @param string $cookieFile File to store the cookie data
+     *
+     * @throws RuntimeException if the file cannot be found or created
+     */
+    public function __construct($cookieFile)
+    {
+        $this->filename = $cookieFile;
+        $this->load();
+    }
+
+    /**
+     * Saves the file when shutting down
+     */
+    public function __destruct()
+    {
+        $this->persist();
+    }
+
+    /**
+     * Save the contents of the data array to the file
+     *
+     * @throws RuntimeException if the file cannot be found or created
+     */
+    protected function persist()
+    {
+        if (false === file_put_contents($this->filename, $this->serialize())) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('Unable to open file ' . $this->filename);
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+    /**
+     * Load the contents of the json formatted file into the data array and discard any unsaved state
+     */
+    protected function load()
+    {
+        $json = file_get_contents($this->filename);
+        if (false === $json) {
+            // @codeCoverageIgnoreStart
+            throw new RuntimeException('Unable to open file ' . $this->filename);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $this->unserialize($json);
+        $this->cookies = $this->cookies ?: array();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookiePlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookiePlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..df3210ee1280abf15bcd871c147df2ffe969a0cf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/CookiePlugin.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Guzzle\Plugin\Cookie;
+
+use Guzzle\Common\Event;
+use Guzzle\Plugin\Cookie\CookieJar\ArrayCookieJar;
+use Guzzle\Plugin\Cookie\CookieJar\CookieJarInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Adds, extracts, and persists cookies between HTTP requests
+ */
+class CookiePlugin implements EventSubscriberInterface
+{
+    /** @var CookieJarInterface Cookie cookieJar used to hold cookies */
+    protected $cookieJar;
+
+    /**
+     * @param CookieJarInterface $cookieJar Cookie jar used to hold cookies. Creates an ArrayCookieJar by default.
+     */
+    public function __construct(CookieJarInterface $cookieJar = null)
+    {
+        $this->cookieJar = $cookieJar ?: new ArrayCookieJar();
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'request.before_send' => array('onRequestBeforeSend', 125),
+            'request.sent'        => array('onRequestSent', 125)
+        );
+    }
+
+    /**
+     * Get the cookie cookieJar
+     *
+     * @return CookieJarInterface
+     */
+    public function getCookieJar()
+    {
+        return $this->cookieJar;
+    }
+
+    /**
+     * Add cookies before a request is sent
+     *
+     * @param Event $event
+     */
+    public function onRequestBeforeSend(Event $event)
+    {
+        $request = $event['request'];
+        if (!$request->getParams()->get('cookies.disable')) {
+            $request->removeHeader('Cookie');
+            // Find cookies that match this request
+            foreach ($this->cookieJar->getMatchingCookies($request) as $cookie) {
+                $request->addCookie($cookie->getName(), $cookie->getValue());
+            }
+        }
+    }
+
+    /**
+     * Extract cookies from a sent request
+     *
+     * @param Event $event
+     */
+    public function onRequestSent(Event $event)
+    {
+        $this->cookieJar->addCookiesFromResponse($event['response'], $event['request']);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/Exception/InvalidCookieException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/Exception/InvalidCookieException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b1fa6fd896999ea6446f13a8527d398950e3dca6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Cookie/Exception/InvalidCookieException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Guzzle\Plugin\Cookie\Exception;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+class InvalidCookieException extends InvalidArgumentException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/CurlAuth/CurlAuthPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/CurlAuth/CurlAuthPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..610e60cad1818d9b00a2ce31a7df1bee35d25c8f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/CurlAuth/CurlAuthPlugin.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Guzzle\Plugin\CurlAuth;
+
+use Guzzle\Common\Event;
+use Guzzle\Common\Version;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Adds specified curl auth to all requests sent from a client. Defaults to CURLAUTH_BASIC if none supplied.
+ * @deprecated Use $client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');
+ */
+class CurlAuthPlugin implements EventSubscriberInterface
+{
+    private $username;
+    private $password;
+    private $scheme;
+
+    /**
+     * @param string $username HTTP basic auth username
+     * @param string $password Password
+     * @param int    $scheme   Curl auth scheme
+     */
+    public function __construct($username, $password, $scheme=CURLAUTH_BASIC)
+    {
+        Version::warn(__CLASS__ . " is deprecated. Use \$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');");
+        $this->username = $username;
+        $this->password = $password;
+        $this->scheme = $scheme;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array('client.create_request' => array('onRequestCreate', 255));
+    }
+
+    /**
+     * Add basic auth
+     *
+     * @param Event $event
+     */
+    public function onRequestCreate(Event $event)
+    {
+        $event['request']->setAuth($this->username, $this->password, $this->scheme);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/ErrorResponseExceptionInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/ErrorResponseExceptionInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dce8bd6ce15b829350542ac734a1855e0763fb1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/ErrorResponseExceptionInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Guzzle\Plugin\ErrorResponse;
+
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Http\Message\Response;
+
+/**
+ * Interface used to create an exception from an error response
+ */
+interface ErrorResponseExceptionInterface
+{
+    /**
+     * Create an exception for a command based on a command and an error response definition
+     *
+     * @param CommandInterface $command  Command that was sent
+     * @param Response         $response The error response
+     *
+     * @return self
+     */
+    public static function fromCommand(CommandInterface $command, Response $response);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..a687fd7f1208e66043997540cbbc610df70a0bb0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Guzzle\Plugin\ErrorResponse;
+
+use Guzzle\Common\Event;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Operation;
+use Guzzle\Plugin\ErrorResponse\Exception\ErrorResponseException;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Converts generic Guzzle response exceptions into errorResponse exceptions
+ */
+class ErrorResponsePlugin implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return array('command.before_send' => array('onCommandBeforeSend', -1));
+    }
+
+    /**
+     * Adds a listener to requests before they sent from a command
+     *
+     * @param Event $event Event emitted
+     */
+    public function onCommandBeforeSend(Event $event)
+    {
+        $command = $event['command'];
+        if ($operation = $command->getOperation()) {
+            if ($operation->getErrorResponses()) {
+                $request = $command->getRequest();
+                $request->getEventDispatcher()
+                    ->addListener('request.complete', $this->getErrorClosure($request, $command, $operation));
+            }
+        }
+    }
+
+    /**
+     * @param RequestInterface $request   Request that received an error
+     * @param CommandInterface $command   Command that created the request
+     * @param Operation        $operation Operation that defines the request and errors
+     *
+     * @return \Closure Returns a closure
+     * @throws ErrorResponseException
+     */
+    protected function getErrorClosure(RequestInterface $request, CommandInterface $command, Operation $operation)
+    {
+        return function (Event $event) use ($request, $command, $operation) {
+            $response = $event['response'];
+            foreach ($operation->getErrorResponses() as $error) {
+                if (!isset($error['class'])) {
+                    continue;
+                }
+                if (isset($error['code']) && $response->getStatusCode() != $error['code']) {
+                    continue;
+                }
+                if (isset($error['reason']) && $response->getReasonPhrase() != $error['reason']) {
+                    continue;
+                }
+                $className = $error['class'];
+                $errorClassInterface = __NAMESPACE__ . '\\ErrorResponseExceptionInterface';
+                if (!class_exists($className)) {
+                    throw new ErrorResponseException("{$className} does not exist");;
+                } elseif (!is_subclass_of($className, $errorClassInterface)) {
+                    throw new ErrorResponseException("{$className} must implement {$errorClassInterface}");
+                }
+                throw $className::fromCommand($command, $response);
+            }
+        };
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/Exception/ErrorResponseException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/Exception/ErrorResponseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d89e40e74139dada11796ff7ef8c44edd09f0a9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/ErrorResponse/Exception/ErrorResponseException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Guzzle\Plugin\ErrorResponse\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+class ErrorResponseException extends RuntimeException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/History/HistoryPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/History/HistoryPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..7375e892b81093a1491ac319fb4622ae28b1026c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/History/HistoryPlugin.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace Guzzle\Plugin\History;
+
+use Guzzle\Common\Event;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\Response;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Maintains a list of requests and responses sent using a request or client
+ */
+class HistoryPlugin implements EventSubscriberInterface, \IteratorAggregate, \Countable
+{
+    /** @var int The maximum number of requests to maintain in the history */
+    protected $limit = 10;
+
+    /** @var array Requests and responses that have passed through the plugin */
+    protected $transactions = array();
+
+    public static function getSubscribedEvents()
+    {
+        return array('request.sent' => array('onRequestSent', 9999));
+    }
+
+    /**
+     * Convert to a string that contains all request and response headers
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $lines = array();
+        foreach ($this->transactions as $entry) {
+            $response = isset($entry['response']) ? $entry['response'] : '';
+            $lines[] = '> ' . trim($entry['request']) . "\n\n< " . trim($response) . "\n";
+        }
+
+        return implode("\n", $lines);
+    }
+
+    /**
+     * Add a request to the history
+     *
+     * @param RequestInterface $request  Request to add
+     * @param Response         $response Response of the request
+     *
+     * @return HistoryPlugin
+     */
+    public function add(RequestInterface $request, Response $response = null)
+    {
+        if (!$response && $request->getResponse()) {
+            $response = $request->getResponse();
+        }
+
+        $this->transactions[] = array('request' => $request, 'response' => $response);
+        if (count($this->transactions) > $this->getlimit()) {
+            array_shift($this->transactions);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the max number of requests to store
+     *
+     * @param int $limit Limit
+     *
+     * @return HistoryPlugin
+     */
+    public function setLimit($limit)
+    {
+        $this->limit = (int) $limit;
+
+        return $this;
+    }
+
+    /**
+     * Get the request limit
+     *
+     * @return int
+     */
+    public function getLimit()
+    {
+        return $this->limit;
+    }
+
+    /**
+     * Get all of the raw transactions in the form of an array of associative arrays containing
+     * 'request' and 'response' keys.
+     *
+     * @return array
+     */
+    public function getAll()
+    {
+        return $this->transactions;
+    }
+
+    /**
+     * Get the requests in the history
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        // Return an iterator just like the old iteration of the HistoryPlugin for BC compatibility (use getAll())
+        return new \ArrayIterator(array_map(function ($entry) {
+            $entry['request']->getParams()->set('actual_response', $entry['response']);
+            return $entry['request'];
+        }, $this->transactions));
+    }
+
+    /**
+     * Get the number of requests in the history
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->transactions);
+    }
+
+    /**
+     * Get the last request sent
+     *
+     * @return RequestInterface
+     */
+    public function getLastRequest()
+    {
+        $last = end($this->transactions);
+
+        return $last['request'];
+    }
+
+    /**
+     * Get the last response in the history
+     *
+     * @return Response|null
+     */
+    public function getLastResponse()
+    {
+        $last = end($this->transactions);
+
+        return isset($last['response']) ? $last['response'] : null;
+    }
+
+    /**
+     * Clears the history
+     *
+     * @return HistoryPlugin
+     */
+    public function clear()
+    {
+        $this->transactions = array();
+
+        return $this;
+    }
+
+    public function onRequestSent(Event $event)
+    {
+        $this->add($event['request'], $event['response']);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Log/LogPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Log/LogPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..1a8e8a00b1c7c3d95e4e9b45f69c9d9bc746a837
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Log/LogPlugin.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace Guzzle\Plugin\Log;
+
+use Guzzle\Common\Event;
+use Guzzle\Log\LogAdapterInterface;
+use Guzzle\Log\MessageFormatter;
+use Guzzle\Log\ClosureLogAdapter;
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\Response;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Plugin class that will add request and response logging to an HTTP request.
+ *
+ * The log plugin uses a message formatter that allows custom messages via template variable substitution.
+ *
+ * @see MessageLogger for a list of available log template variable substitutions
+ */
+class LogPlugin implements EventSubscriberInterface
+{
+    /** @var LogAdapterInterface Adapter responsible for writing log data */
+    private $logAdapter;
+
+    /** @var MessageFormatter Formatter used to format messages before logging */
+    protected $formatter;
+
+    /** @var bool Whether or not to wire request and response bodies */
+    protected $wireBodies;
+
+    /**
+     * @param LogAdapterInterface     $logAdapter Adapter object used to log message
+     * @param string|MessageFormatter $formatter  Formatter used to format log messages or the formatter template
+     * @param bool                    $wireBodies Set to true to track request and response bodies using a temporary
+     *                                            buffer if the bodies are not repeatable.
+     */
+    public function __construct(
+        LogAdapterInterface $logAdapter,
+        $formatter = null,
+        $wireBodies = false
+    ) {
+        $this->logAdapter = $logAdapter;
+        $this->formatter = $formatter instanceof MessageFormatter ? $formatter : new MessageFormatter($formatter);
+        $this->wireBodies = $wireBodies;
+    }
+
+    /**
+     * Get a log plugin that outputs full request, response, and curl error information to stderr
+     *
+     * @param bool     $wireBodies Set to false to disable request/response body output when they use are not repeatable
+     * @param resource $stream     Stream to write to when logging. Defaults to STDERR when it is available
+     *
+     * @return self
+     */
+    public static function getDebugPlugin($wireBodies = true, $stream = null)
+    {
+        if ($stream === null) {
+            if (defined('STDERR')) {
+                $stream = STDERR;
+            } else {
+                $stream = fopen('php://output', 'w');
+            }
+        }
+
+        return new self(new ClosureLogAdapter(function ($m) use ($stream) {
+            fwrite($stream, $m . PHP_EOL);
+        }), "# Request:\n{request}\n\n# Response:\n{response}\n\n# Errors: {curl_code} {curl_error}", $wireBodies);
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'curl.callback.write' => array('onCurlWrite', 255),
+            'curl.callback.read'  => array('onCurlRead', 255),
+            'request.before_send' => array('onRequestBeforeSend', 255),
+            'request.sent'        => array('onRequestSent', 255)
+        );
+    }
+
+    /**
+     * Event triggered when curl data is read from a request
+     *
+     * @param Event $event
+     */
+    public function onCurlRead(Event $event)
+    {
+        // Stream the request body to the log if the body is not repeatable
+        if ($wire = $event['request']->getParams()->get('request_wire')) {
+            $wire->write($event['read']);
+        }
+    }
+
+    /**
+     * Event triggered when curl data is written to a response
+     *
+     * @param Event $event
+     */
+    public function onCurlWrite(Event $event)
+    {
+        // Stream the response body to the log if the body is not repeatable
+        if ($wire = $event['request']->getParams()->get('response_wire')) {
+            $wire->write($event['write']);
+        }
+    }
+
+    /**
+     * Called before a request is sent
+     *
+     * @param Event $event
+     */
+    public function onRequestBeforeSend(Event $event)
+    {
+        if ($this->wireBodies) {
+            $request = $event['request'];
+            // Ensure that curl IO events are emitted
+            $request->getCurlOptions()->set('emit_io', true);
+            // We need to make special handling for content wiring and non-repeatable streams.
+            if ($request instanceof EntityEnclosingRequestInterface && $request->getBody()
+                && (!$request->getBody()->isSeekable() || !$request->getBody()->isReadable())
+            ) {
+                // The body of the request cannot be recalled so logging the body will require us to buffer it
+                $request->getParams()->set('request_wire', EntityBody::factory());
+            }
+            if (!$request->getResponseBody()->isRepeatable()) {
+                // The body of the response cannot be recalled so logging the body will require us to buffer it
+                $request->getParams()->set('response_wire', EntityBody::factory());
+            }
+        }
+    }
+
+    /**
+     * Triggers the actual log write when a request completes
+     *
+     * @param Event $event
+     */
+    public function onRequestSent(Event $event)
+    {
+        $request = $event['request'];
+        $response = $event['response'];
+        $handle = $event['handle'];
+
+        if ($wire = $request->getParams()->get('request_wire')) {
+            $request = clone $request;
+            $request->setBody($wire);
+        }
+
+        if ($wire = $request->getParams()->get('response_wire')) {
+            $response = clone $response;
+            $response->setBody($wire);
+        }
+
+        // Send the log message to the adapter, adding a category and host
+        $priority = $response && $response->isError() ? LOG_ERR : LOG_DEBUG;
+        $message = $this->formatter->format($request, $response, $handle);
+        $this->logAdapter->log($message, $priority, array(
+            'request'  => $request,
+            'response' => $response,
+            'handle'   => $handle
+        ));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Md5/CommandContentMd5Plugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Md5/CommandContentMd5Plugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..08d635cf3fa7d6ce5c18791419c6c21e6d405d96
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Md5/CommandContentMd5Plugin.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Guzzle\Plugin\Md5;
+
+use Guzzle\Common\Event;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Listener used to add a ContentMD5 header to the body of a command and adds ContentMD5 validation if the
+ * ValidateMD5 option is not set to false on a command
+ */
+class CommandContentMd5Plugin  implements EventSubscriberInterface
+{
+    /** @var string Parameter used to check if the ContentMD5 value is being added */
+    protected $contentMd5Param;
+
+    /** @var string Parameter used to check if validation should occur on the response */
+    protected $validateMd5Param;
+
+    /**
+     * @param string $contentMd5Param  Parameter used to check if the ContentMD5 value is being added
+     * @param string $validateMd5Param Parameter used to check if validation should occur on the response
+     */
+    public function __construct($contentMd5Param = 'ContentMD5', $validateMd5Param = 'ValidateMD5')
+    {
+        $this->contentMd5Param = $contentMd5Param;
+        $this->validateMd5Param = $validateMd5Param;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array('command.before_send' => array('onCommandBeforeSend', -255));
+    }
+
+    public function onCommandBeforeSend(Event $event)
+    {
+        $command = $event['command'];
+        $request = $command->getRequest();
+
+        // Only add an MD5 is there is a MD5 option on the operation and it has a payload
+        if ($request instanceof EntityEnclosingRequestInterface && $request->getBody()
+            && $command->getOperation()->hasParam($this->contentMd5Param)) {
+            // Check if an MD5 checksum value should be passed along to the request
+            if ($command[$this->contentMd5Param] === true) {
+                $request->setHeader('Content-MD5', $request->getBody()->getContentMd5(true, true));
+            }
+        }
+
+        // Check if MD5 validation should be used with the response
+        if ($command[$this->validateMd5Param] === true) {
+            $request->addSubscriber(new Md5ValidatorPlugin(true, false));
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Md5/Md5ValidatorPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Md5/Md5ValidatorPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c70f4dcec8f2683dc3a21f606f8a1edfea4951c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Md5/Md5ValidatorPlugin.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Guzzle\Plugin\Md5;
+
+use Guzzle\Common\Event;
+use Guzzle\Common\Exception\UnexpectedValueException;
+use Guzzle\Http\Message\Response;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Ensures that an the MD5 hash of an entity body matches the Content-MD5
+ * header (if set) of an HTTP response.  An exception is thrown if the
+ * calculated MD5 does not match the expected MD5.
+ */
+class Md5ValidatorPlugin implements EventSubscriberInterface
+{
+    /** @var int Maximum Content-Length in bytes to validate */
+    protected $contentLengthCutoff;
+
+    /** @var bool Whether or not to compare when a Content-Encoding is present */
+    protected $contentEncoded;
+
+    /**
+     * @param bool     $contentEncoded      Calculating the MD5 hash of an entity body where a Content-Encoding was
+     *                                      applied is a more expensive comparison because the entity body will need to
+     *                                      be compressed in order to get the correct hash.  Set to FALSE to not
+     *                                      validate the MD5 hash of an entity body with an applied Content-Encoding.
+     * @param bool|int $contentLengthCutoff Maximum Content-Length (bytes) in which a MD5 hash will be validated. Any
+     *                                      response with a Content-Length greater than this value will not be validated
+     *                                      because it will be deemed too memory intensive.
+     */
+    public function __construct($contentEncoded = true, $contentLengthCutoff = false)
+    {
+        $this->contentLengthCutoff = $contentLengthCutoff;
+        $this->contentEncoded = $contentEncoded;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array('request.complete' => array('onRequestComplete', 255));
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws UnexpectedValueException
+     */
+    public function onRequestComplete(Event $event)
+    {
+        $response = $event['response'];
+
+        if (!$contentMd5 = $response->getContentMd5()) {
+            return;
+        }
+
+        $contentEncoding = $response->getContentEncoding();
+        if ($contentEncoding && !$this->contentEncoded) {
+            return false;
+        }
+
+        // Make sure that the size of the request is under the cutoff size
+        if ($this->contentLengthCutoff) {
+            $size = $response->getContentLength() ?: $response->getBody()->getSize();
+            if (!$size || $size > $this->contentLengthCutoff) {
+                return;
+            }
+        }
+
+        if (!$contentEncoding) {
+            $hash = $response->getBody()->getContentMd5();
+        } elseif ($contentEncoding == 'gzip') {
+            $response->getBody()->compress('zlib.deflate');
+            $hash = $response->getBody()->getContentMd5();
+            $response->getBody()->uncompress();
+        } elseif ($contentEncoding == 'compress') {
+            $response->getBody()->compress('bzip2.compress');
+            $hash = $response->getBody()->getContentMd5();
+            $response->getBody()->uncompress();
+        } else {
+            return;
+        }
+
+        if ($contentMd5 !== $hash) {
+            throw new UnexpectedValueException(
+                "The response entity body may have been modified over the wire.  The Content-MD5 "
+                . "received ({$contentMd5}) did not match the calculated MD5 hash ({$hash})."
+            );
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Mock/MockPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Mock/MockPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..ab7833cee2cb5ed049770637abbce7492103aa6c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Mock/MockPlugin.php
@@ -0,0 +1,242 @@
+<?php
+
+namespace Guzzle\Plugin\Mock;
+
+use Guzzle\Common\Event;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Http\Exception\CurlException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\Response;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Queues mock responses or exceptions and delivers mock responses or exceptions in a fifo order.
+ */
+class MockPlugin extends AbstractHasDispatcher implements EventSubscriberInterface, \Countable
+{
+    /** @var array Array of mock responses / exceptions */
+    protected $queue = array();
+
+    /** @var bool Whether or not to remove the plugin when the queue is empty */
+    protected $temporary = false;
+
+    /** @var array Array of requests that were mocked */
+    protected $received = array();
+
+    /** @var bool Whether or not to consume an entity body when a mock response is served */
+    protected $readBodies;
+
+    /**
+     * @param array $items      Array of responses or exceptions to queue
+     * @param bool  $temporary  Set to TRUE to remove the plugin when the queue is empty
+     * @param bool  $readBodies Set to TRUE to consume the entity body when a mock is served
+     */
+    public function __construct(array $items = null, $temporary = false, $readBodies = false)
+    {
+        $this->readBodies = $readBodies;
+        $this->temporary = $temporary;
+        if ($items) {
+            foreach ($items as $item) {
+                if ($item instanceof \Exception) {
+                    $this->addException($item);
+                } else {
+                    $this->addResponse($item);
+                }
+            }
+        }
+    }
+
+    public static function getSubscribedEvents()
+    {
+        // Use a number lower than the CachePlugin
+        return array('request.before_send' => array('onRequestBeforeSend', -999));
+    }
+
+    public static function getAllEvents()
+    {
+        return array('mock.request');
+    }
+
+    /**
+     * Get a mock response from a file
+     *
+     * @param string $path File to retrieve a mock response from
+     *
+     * @return Response
+     * @throws InvalidArgumentException if the file is not found
+     */
+    public static function getMockFile($path)
+    {
+        if (!file_exists($path)) {
+            throw new InvalidArgumentException('Unable to open mock file: ' . $path);
+        }
+
+        return Response::fromMessage(file_get_contents($path));
+    }
+
+    /**
+     * Set whether or not to consume the entity body of a request when a mock
+     * response is used
+     *
+     * @param bool $readBodies Set to true to read and consume entity bodies
+     *
+     * @return self
+     */
+    public function readBodies($readBodies)
+    {
+        $this->readBodies = $readBodies;
+
+        return $this;
+    }
+
+    /**
+     * Returns the number of remaining mock responses
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->queue);
+    }
+
+    /**
+     * Add a response to the end of the queue
+     *
+     * @param string|Response $response Response object or path to response file
+     *
+     * @return MockPlugin
+     * @throws InvalidArgumentException if a string or Response is not passed
+     */
+    public function addResponse($response)
+    {
+        if (!($response instanceof Response)) {
+            if (!is_string($response)) {
+                throw new InvalidArgumentException('Invalid response');
+            }
+            $response = self::getMockFile($response);
+        }
+
+        $this->queue[] = $response;
+
+        return $this;
+    }
+
+    /**
+     * Add an exception to the end of the queue
+     *
+     * @param CurlException $e Exception to throw when the request is executed
+     *
+     * @return MockPlugin
+     */
+    public function addException(CurlException $e)
+    {
+        $this->queue[] = $e;
+
+        return $this;
+    }
+
+    /**
+     * Clear the queue
+     *
+     * @return MockPlugin
+     */
+    public function clearQueue()
+    {
+        $this->queue = array();
+
+        return $this;
+    }
+
+    /**
+     * Returns an array of mock responses remaining in the queue
+     *
+     * @return array
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * Check if this is a temporary plugin
+     *
+     * @return bool
+     */
+    public function isTemporary()
+    {
+        return $this->temporary;
+    }
+
+    /**
+     * Get a response from the front of the list and add it to a request
+     *
+     * @param RequestInterface $request Request to mock
+     *
+     * @return self
+     * @throws CurlException When request.send is called and an exception is queued
+     */
+    public function dequeue(RequestInterface $request)
+    {
+        $this->dispatch('mock.request', array('plugin' => $this, 'request' => $request));
+
+        $item = array_shift($this->queue);
+        if ($item instanceof Response) {
+            if ($this->readBodies && $request instanceof EntityEnclosingRequestInterface) {
+                $request->getEventDispatcher()->addListener('request.sent', $f = function (Event $event) use (&$f) {
+                    while ($data = $event['request']->getBody()->read(8096));
+                    // Remove the listener after one-time use
+                    $event['request']->getEventDispatcher()->removeListener('request.sent', $f);
+                });
+            }
+            $request->setResponse($item);
+        } elseif ($item instanceof CurlException) {
+            // Emulates exceptions encountered while transferring requests
+            $item->setRequest($request);
+            $state = $request->setState(RequestInterface::STATE_ERROR, array('exception' => $item));
+            // Only throw if the exception wasn't handled
+            if ($state == RequestInterface::STATE_ERROR) {
+                throw $item;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clear the array of received requests
+     */
+    public function flush()
+    {
+        $this->received = array();
+    }
+
+    /**
+     * Get an array of requests that were mocked by this plugin
+     *
+     * @return array
+     */
+    public function getReceivedRequests()
+    {
+        return $this->received;
+    }
+
+    /**
+     * Called when a request is about to be sent
+     *
+     * @param Event $event
+     */
+    public function onRequestBeforeSend(Event $event)
+    {
+        if ($this->queue) {
+            $request = $event['request'];
+            $this->received[] = $request;
+            // Detach the filter from the client so it's a one-time use
+            if ($this->temporary && count($this->queue) == 1 && $request->getClient()) {
+                $request->getClient()->getEventDispatcher()->removeSubscriber($this);
+            }
+            $this->dequeue($request);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Oauth/OauthPlugin.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Oauth/OauthPlugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..14961a0bc89beab2de8da8dbd9c7f61059fbb555
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Plugin/Oauth/OauthPlugin.php
@@ -0,0 +1,264 @@
+<?php
+
+namespace Guzzle\Plugin\Oauth;
+
+use Guzzle\Common\Event;
+use Guzzle\Common\Collection;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\QueryString;
+use Guzzle\Http\Url;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * OAuth signing plugin
+ * @link http://oauth.net/core/1.0/#rfc.section.9.1.1
+ */
+class OauthPlugin implements EventSubscriberInterface
+{
+    /** @var Collection Configuration settings */
+    protected $config;
+
+    /**
+     * Create a new OAuth 1.0 plugin
+     *
+     * @param array $config Configuration array containing these parameters:
+     *     - string 'callback'             OAuth callback
+     *     - string 'consumer_key'         Consumer key
+     *     - string 'consumer_secret'      Consumer secret
+     *     - string 'token'                Token
+     *     - string 'token_secret'         Token secret
+     *     - string 'verifier'             OAuth verifier.
+     *     - string 'version'              OAuth version.  Defaults to 1.0
+     *     - string 'signature_method'     Custom signature method
+     *     - bool   'disable_post_params'  Set to true to prevent POST parameters from being signed
+     *     - array|Closure 'signature_callback' Custom signature callback that accepts a string to sign and a signing key
+     */
+    public function __construct($config)
+    {
+        $this->config = Collection::fromConfig($config, array(
+            'version' => '1.0',
+            'consumer_key' => 'anonymous',
+            'consumer_secret' => 'anonymous',
+            'signature_method' => 'HMAC-SHA1',
+            'signature_callback' => function($stringToSign, $key) {
+                return hash_hmac('sha1', $stringToSign, $key, true);
+            }
+        ), array(
+            'signature_method', 'signature_callback', 'version',
+            'consumer_key', 'consumer_secret'
+        ));
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'request.before_send' => array('onRequestBeforeSend', -1000)
+        );
+    }
+
+    /**
+     * Request before-send event handler
+     *
+     * @param Event $event Event received
+     * @return array
+     */
+    public function onRequestBeforeSend(Event $event)
+    {
+        $timestamp = $this->getTimestamp($event);
+        $request = $event['request'];
+        $nonce = $this->generateNonce($request);
+
+        $authorizationParams = array(
+            'oauth_callback'         => $this->config['callback'],
+            'oauth_consumer_key'     => $this->config['consumer_key'],
+            'oauth_nonce'            => $nonce,
+            'oauth_signature'        => $this->getSignature($request, $timestamp, $nonce),
+            'oauth_signature_method' => $this->config['signature_method'],
+            'oauth_timestamp'        => $timestamp,
+            'oauth_token'            => $this->config['token'],
+            'oauth_verifier'         => $this->config['verifier'],
+            'oauth_version'          => $this->config['version'],
+        );
+
+        $request->setHeader(
+            'Authorization',
+            $this->buildAuthorizationHeader($authorizationParams)
+        );
+
+        return $authorizationParams;
+    }
+
+    /**
+     * Builds the Authorization header for a request
+     *
+     * @param array $authorizationParams Associative array of authorization parameters
+     *
+     * @return string
+     */
+    private function buildAuthorizationHeader($authorizationParams)
+    {
+        $authorizationString = 'OAuth ';
+        foreach ($authorizationParams as $key => $val) {
+            if ($val) {
+                $authorizationString .= $key . '="' . urlencode($val) . '", ';
+            }
+        }
+
+        return substr($authorizationString, 0, -2);
+    }
+
+    /**
+     * Calculate signature for request
+     *
+     * @param RequestInterface $request   Request to generate a signature for
+     * @param integer          $timestamp Timestamp to use for nonce
+     * @param string           $nonce
+     *
+     * @return string
+     */
+    public function getSignature(RequestInterface $request, $timestamp, $nonce)
+    {
+        $string = $this->getStringToSign($request, $timestamp, $nonce);
+        $key = urlencode($this->config['consumer_secret']) . '&' . urlencode($this->config['token_secret']);
+
+        return base64_encode(call_user_func($this->config['signature_callback'], $string, $key));
+    }
+
+    /**
+     * Calculate string to sign
+     *
+     * @param RequestInterface $request   Request to generate a signature for
+     * @param int              $timestamp Timestamp to use for nonce
+     * @param string           $nonce
+     *
+     * @return string
+     */
+    public function getStringToSign(RequestInterface $request, $timestamp, $nonce)
+    {
+        $params = $this->getParamsToSign($request, $timestamp, $nonce);
+
+        // Convert booleans to strings.
+        $params = $this->prepareParameters($params);
+
+        // Build signing string from combined params
+        $parameterString = new QueryString($params);
+
+        $url = Url::factory($request->getUrl())->setQuery('')->setFragment(null);
+
+        return strtoupper($request->getMethod()) . '&'
+             . rawurlencode($url) . '&'
+             . rawurlencode((string) $parameterString);
+    }
+
+    /**
+     * Parameters sorted and filtered in order to properly sign a request
+     *
+     * @param RequestInterface $request   Request to generate a signature for
+     * @param integer          $timestamp Timestamp to use for nonce
+     * @param string           $nonce
+     *
+     * @return array
+     */
+    public function getParamsToSign(RequestInterface $request, $timestamp, $nonce)
+    {
+        $params = new Collection(array(
+            'oauth_callback'         => $this->config['callback'],
+            'oauth_consumer_key'     => $this->config['consumer_key'],
+            'oauth_nonce'            => $nonce,
+            'oauth_signature_method' => $this->config['signature_method'],
+            'oauth_timestamp'        => $timestamp,
+            'oauth_token'            => $this->config['token'],
+            'oauth_verifier'         => $this->config['verifier'],
+            'oauth_version'          => $this->config['version']
+        ));
+
+        // Add query string parameters
+        $params->merge($request->getQuery());
+
+        // Add POST fields to signing string if required
+        if ($this->shouldPostFieldsBeSigned($request))
+        {
+            $params->merge($request->getPostFields());
+        }
+
+        // Sort params
+        $params = $params->toArray();
+        ksort($params);
+
+        return $params;
+    }
+
+    /**
+     * Decide whether the post fields should be added to the base string that Oauth signs.
+     * This implementation is correct. Non-conformant APIs may require that this method be
+     * overwritten e.g. the Flickr API incorrectly adds the post fields when the Content-Type
+     * is 'application/x-www-form-urlencoded'
+     *
+     * @param $request
+     * @return bool Whether the post fields should be signed or not
+     */
+    public function shouldPostFieldsBeSigned($request)
+    {
+        if (!$this->config->get('disable_post_params') &&
+            $request instanceof EntityEnclosingRequestInterface &&
+            false !== strpos($request->getHeader('Content-Type'), 'application/x-www-form-urlencoded'))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a Nonce Based on the unique id and URL. This will allow for multiple requests in parallel with the same
+     * exact timestamp to use separate nonce's.
+     *
+     * @param RequestInterface $request Request to generate a nonce for
+     *
+     * @return string
+     */
+    public function generateNonce(RequestInterface $request)
+    {
+        return sha1(uniqid('', true) . $request->getUrl());
+    }
+
+    /**
+     * Gets timestamp from event or create new timestamp
+     *
+     * @param Event $event Event containing contextual information
+     *
+     * @return int
+     */
+    public function getTimestamp(Event $event)
+    {
+       return $event['timestamp'] ?: time();
+    }
+
+    /**
+     * Convert booleans to strings, removed unset parameters, and sorts the array
+     *
+     * @param array $data Data array
+     *
+     * @return array
+     */
+    protected function prepareParameters($data)
+    {
+        ksort($data);
+        foreach ($data as $key => &$value) {
+            switch (gettype($value)) {
+                case 'NULL':
+                    unset($data[$key]);
+                    break;
+                case 'array':
+                    $data[$key] = self::prepareParameters($value);
+                    break;
+                case 'boolean':
+                    $data[$key] = $value ? 'true' : 'false';
+                    break;
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/AbstractConfigLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/AbstractConfigLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..cd06f5722f5c5109bc93f72d08bc007c2bba1f54
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/AbstractConfigLoader.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Guzzle\Service;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\RuntimeException;
+
+/**
+ * Abstract config loader
+ */
+abstract class AbstractConfigLoader implements ConfigLoaderInterface
+{
+    /** @var array Array of aliases for actual filenames */
+    protected $aliases = array();
+
+    /** @var array Hash of previously loaded filenames */
+    protected $loadedFiles = array();
+
+    /** @var array JSON error code mappings */
+    protected static $jsonErrors = array(
+        JSON_ERROR_NONE => 'JSON_ERROR_NONE - No errors',
+        JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH - Maximum stack depth exceeded',
+        JSON_ERROR_STATE_MISMATCH => 'JSON_ERROR_STATE_MISMATCH - Underflow or the modes mismatch',
+        JSON_ERROR_CTRL_CHAR => 'JSON_ERROR_CTRL_CHAR - Unexpected control character found',
+        JSON_ERROR_SYNTAX => 'JSON_ERROR_SYNTAX - Syntax error, malformed JSON',
+        JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded'
+    );
+
+    public function load($config, array $options = array())
+    {
+        // Reset the array of loaded files because this is a new config
+        $this->loadedFiles = array();
+
+        if (is_string($config)) {
+            $config = $this->loadFile($config);
+        } elseif (!is_array($config)) {
+            throw new InvalidArgumentException('Unknown type passed to configuration loader: ' . gettype($config));
+        } else {
+            $this->mergeIncludes($config);
+        }
+
+        return $this->build($config, $options);
+    }
+
+    /**
+     * Add an include alias to the loader
+     *
+     * @param string $filename Filename to alias (e.g. _foo)
+     * @param string $alias    Actual file to use (e.g. /path/to/foo.json)
+     *
+     * @return self
+     */
+    public function addAlias($filename, $alias)
+    {
+        $this->aliases[$filename] = $alias;
+
+        return $this;
+    }
+
+    /**
+     * Remove an alias from the loader
+     *
+     * @param string $alias Alias to remove
+     *
+     * @return self
+     */
+    public function removeAlias($alias)
+    {
+        unset($this->aliases[$alias]);
+
+        return $this;
+    }
+
+    /**
+     * Perform the parsing of a config file and create the end result
+     *
+     * @param array $config  Configuration data
+     * @param array $options Options to use when building
+     *
+     * @return mixed
+     */
+    protected abstract function build($config, array $options);
+
+    /**
+     * Load a configuration file (can load JSON or PHP files that return an array when included)
+     *
+     * @param string $filename File to load
+     *
+     * @return array
+     * @throws InvalidArgumentException
+     * @throws RuntimeException when the JSON cannot be parsed
+     */
+    protected function loadFile($filename)
+    {
+        if (isset($this->aliases[$filename])) {
+            $filename = $this->aliases[$filename];
+        }
+
+        switch (pathinfo($filename, PATHINFO_EXTENSION)) {
+            case 'js':
+            case 'json':
+                $level = error_reporting(0);
+                $json = file_get_contents($filename);
+                error_reporting($level);
+
+                if ($json === false) {
+                    $err = error_get_last();
+                    throw new InvalidArgumentException("Unable to open {$filename}: " . $err['message']);
+                }
+
+                $config = json_decode($json, true);
+                // Throw an exception if there was an error loading the file
+                if ($error = json_last_error()) {
+                    $message = isset(self::$jsonErrors[$error]) ? self::$jsonErrors[$error] : 'Unknown error';
+                    throw new RuntimeException("Error loading JSON data from {$filename}: ({$error}) - {$message}");
+                }
+                break;
+            case 'php':
+                if (!is_readable($filename)) {
+                    throw new InvalidArgumentException("Unable to open {$filename} for reading");
+                }
+                $config = require $filename;
+                if (!is_array($config)) {
+                    throw new InvalidArgumentException('PHP files must return an array of configuration data');
+                }
+                break;
+            default:
+                throw new InvalidArgumentException('Unknown file extension: ' . $filename);
+        }
+
+        // Keep track of this file being loaded to prevent infinite recursion
+        $this->loadedFiles[$filename] = true;
+
+        // Merge include files into the configuration array
+        $this->mergeIncludes($config, dirname($filename));
+
+        return $config;
+    }
+
+    /**
+     * Merges in all include files
+     *
+     * @param array  $config   Config data that contains includes
+     * @param string $basePath Base path to use when a relative path is encountered
+     *
+     * @return array Returns the merged and included data
+     */
+    protected function mergeIncludes(&$config, $basePath = null)
+    {
+        if (!empty($config['includes'])) {
+            foreach ($config['includes'] as &$path) {
+                // Account for relative paths
+                if ($path[0] != DIRECTORY_SEPARATOR && !isset($this->aliases[$path]) && $basePath) {
+                    $path = "{$basePath}/{$path}";
+                }
+                // Don't load the same files more than once
+                if (!isset($this->loadedFiles[$path])) {
+                    $this->loadedFiles[$path] = true;
+                    $config = $this->mergeData($this->loadFile($path), $config);
+                }
+            }
+        }
+    }
+
+    /**
+     * Default implementation for merging two arrays of data (uses array_merge_recursive)
+     *
+     * @param array $a Original data
+     * @param array $b Data to merge into the original and overwrite existing values
+     *
+     * @return array
+     */
+    protected function mergeData(array $a, array $b)
+    {
+        return array_merge_recursive($a, $b);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilder.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilder.php
new file mode 100644
index 0000000000000000000000000000000000000000..38150db4b8b319f5c4e1b9b521a9a485ccc945e3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilder.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace Guzzle\Service\Builder;
+
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Service\ClientInterface;
+use Guzzle\Service\Exception\ServiceBuilderException;
+use Guzzle\Service\Exception\ServiceNotFoundException;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * {@inheritdoc}
+ *
+ * Clients and data can be set, retrieved, and removed by accessing the service builder like an associative array.
+ */
+class ServiceBuilder extends AbstractHasDispatcher implements ServiceBuilderInterface, \ArrayAccess, \Serializable
+{
+    /** @var array Service builder configuration data */
+    protected $builderConfig = array();
+
+    /** @var array Instantiated client objects */
+    protected $clients = array();
+
+    /** @var ServiceBuilderLoader Cached instance of the service builder loader */
+    protected static $cachedFactory;
+
+    /** @var array Plugins to attach to each client created by the service builder */
+    protected $plugins = array();
+
+    /**
+     * Create a new ServiceBuilder using configuration data sourced from an
+     * array, .js|.json or .php file.
+     *
+     * @param array|string $config           The full path to an .json|.js or .php file, or an associative array
+     * @param array        $globalParameters Array of global parameters to pass to every service as it is instantiated.
+     *
+     * @return ServiceBuilderInterface
+     * @throws ServiceBuilderException if a file cannot be opened
+     * @throws ServiceNotFoundException when trying to extend a missing client
+     */
+    public static function factory($config = null, array $globalParameters = array())
+    {
+        // @codeCoverageIgnoreStart
+        if (!static::$cachedFactory) {
+            static::$cachedFactory = new ServiceBuilderLoader();
+        }
+        // @codeCoverageIgnoreEnd
+
+        return self::$cachedFactory->load($config, $globalParameters);
+    }
+
+    /**
+     * @param array $serviceBuilderConfig Service configuration settings:
+     *     - name: Name of the service
+     *     - class: Client class to instantiate using a factory method
+     *     - params: array of key value pair configuration settings for the builder
+     */
+    public function __construct(array $serviceBuilderConfig = array())
+    {
+        $this->builderConfig = $serviceBuilderConfig;
+    }
+
+    public static function getAllEvents()
+    {
+        return array('service_builder.create_client');
+    }
+
+    public function unserialize($serialized)
+    {
+        $this->builderConfig = json_decode($serialized, true);
+    }
+
+    public function serialize()
+    {
+        return json_encode($this->builderConfig);
+    }
+
+    /**
+     * Attach a plugin to every client created by the builder
+     *
+     * @param EventSubscriberInterface $plugin Plugin to attach to each client
+     *
+     * @return self
+     */
+    public function addGlobalPlugin(EventSubscriberInterface $plugin)
+    {
+        $this->plugins[] = $plugin;
+
+        return $this;
+    }
+
+    /**
+     * Get data from the service builder without triggering the building of a service
+     *
+     * @param string $name Name of the service to retrieve
+     *
+     * @return array|null
+     */
+    public function getData($name)
+    {
+        return isset($this->builderConfig[$name]) ? $this->builderConfig[$name] : null;
+    }
+
+    public function get($name, $throwAway = false)
+    {
+        if (!isset($this->builderConfig[$name])) {
+
+            // Check to see if arbitrary data is being referenced
+            if (isset($this->clients[$name])) {
+                return $this->clients[$name];
+            }
+
+            // Check aliases and return a match if found
+            foreach ($this->builderConfig as $actualName => $config) {
+                if (isset($config['alias']) && $config['alias'] == $name) {
+                    return $this->get($actualName, $throwAway);
+                }
+            }
+            throw new ServiceNotFoundException('No service is registered as ' . $name);
+        }
+
+        if (!$throwAway && isset($this->clients[$name])) {
+            return $this->clients[$name];
+        }
+
+        $builder =& $this->builderConfig[$name];
+
+        // Convert references to the actual client
+        foreach ($builder['params'] as &$v) {
+            if (is_string($v) && substr($v, 0, 1) == '{' && substr($v, -1) == '}') {
+                $v = $this->get(trim($v, '{} '));
+            }
+        }
+
+        // Get the configured parameters and merge in any parameters provided for throw-away clients
+        $config = $builder['params'];
+        if (is_array($throwAway)) {
+            $config = $throwAway + $config;
+        }
+
+        $client = $builder['class']::factory($config);
+
+        if (!$throwAway) {
+            $this->clients[$name] = $client;
+        }
+
+        if ($client instanceof ClientInterface) {
+            foreach ($this->plugins as $plugin) {
+                $client->addSubscriber($plugin);
+            }
+            // Dispatch an event letting listeners know a client was created
+            $this->dispatch('service_builder.create_client', array('client' => $client));
+        }
+
+        return $client;
+    }
+
+    public function set($key, $service)
+    {
+        if (is_array($service) && isset($service['class']) && isset($service['params'])) {
+            $this->builderConfig[$key] = $service;
+        } else {
+            $this->clients[$key] = $service;
+        }
+
+        return $this;
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->builderConfig[$offset]);
+        unset($this->clients[$offset]);
+    }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->builderConfig[$offset]) || isset($this->clients[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->get($offset);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilderInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..4fc310a47278f8ade7a83d93c313abaf8f04f3ed
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilderInterface.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Guzzle\Service\Builder;
+
+use Guzzle\Service\Exception\ServiceNotFoundException;
+
+/**
+ * Service builder used to store and build clients or arbitrary data. Client configuration data can be supplied to tell
+ * the service builder how to create and cache {@see \Guzzle\Service\ClientInterface} objects. Arbitrary data can be
+ * supplied and accessed from a service builder. Arbitrary data and other clients can be referenced by name in client
+ * configuration arrays to make them input for building other clients (e.g. "{key}").
+ */
+interface ServiceBuilderInterface
+{
+    /**
+     * Get a ClientInterface object or arbitrary data from the service builder
+     *
+     * @param string     $name      Name of the registered service or data to retrieve
+     * @param bool|array $throwAway Only pertains to retrieving client objects built using a configuration array.
+     *                              Set to TRUE to not store the client for later retrieval from the ServiceBuilder.
+     *                              If an array is specified, that data will overwrite the configured params of the
+     *                              client if the client implements {@see \Guzzle\Common\FromConfigInterface} and will
+     *                              not store the client for later retrieval.
+     *
+     * @return \Guzzle\Service\ClientInterface|mixed
+     * @throws ServiceNotFoundException when a client or data cannot be found by the given name
+     */
+    public function get($name, $throwAway = false);
+
+    /**
+     * Register a service or arbitrary data by name with the service builder
+     *
+     * @param string $key     Name of the client or data to register
+     * @param mixed  $service Client configuration array or arbitrary data to register. The client configuration array
+     *                        must include a 'class' (string) and 'params' (array) key.
+     *
+     * @return ServiceBuilderInterface
+     */
+    public function set($key, $service);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilderLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilderLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..c561a3d56b97b03db225a8513ce23bfe5b0e0016
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Builder/ServiceBuilderLoader.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Guzzle\Service\Builder;
+
+use Guzzle\Service\AbstractConfigLoader;
+use Guzzle\Service\Exception\ServiceNotFoundException;
+
+/**
+ * Service builder config loader
+ */
+class ServiceBuilderLoader extends AbstractConfigLoader
+{
+    protected function build($config, array $options)
+    {
+        // A service builder class can be specified in the class field
+        $class = !empty($config['class']) ? $config['class'] : __NAMESPACE__ . '\\ServiceBuilder';
+
+        // Account for old style configs that do not have a services array
+        $services = isset($config['services']) ? $config['services'] : $config;
+
+        // Validate the configuration and handle extensions
+        foreach ($services as $name => &$service) {
+
+            $service['params'] = isset($service['params']) ? $service['params'] : array();
+
+            // Check if this client builder extends another client
+            if (!empty($service['extends'])) {
+
+                // Make sure that the service it's extending has been defined
+                if (!isset($services[$service['extends']])) {
+                    throw new ServiceNotFoundException(
+                        "{$name} is trying to extend a non-existent service: {$service['extends']}"
+                    );
+                }
+
+                $extended = &$services[$service['extends']];
+
+                // Use the correct class attribute
+                if (empty($service['class'])) {
+                    $service['class'] = isset($extended['class']) ? $extended['class'] : '';
+                }
+                if ($extendsParams = isset($extended['params']) ? $extended['params'] : false) {
+                    $service['params'] = $service['params'] + $extendsParams;
+                }
+            }
+
+            // Overwrite default values with global parameter values
+            if (!empty($options)) {
+                $service['params'] = $options + $service['params'];
+            }
+
+            $service['class'] = isset($service['class']) ? $service['class'] : '';
+        }
+
+        return new $class($services);
+    }
+
+    protected function mergeData(array $a, array $b)
+    {
+        $result = $b + $a;
+
+        // Merge services using a recursive union of arrays
+        if (isset($a['services']) && $b['services']) {
+
+            // Get a union of the services of the two arrays
+            $result['services'] = $b['services'] + $a['services'];
+
+            // Merge each service in using a union of the two arrays
+            foreach ($result['services'] as $name => &$service) {
+
+                // By default, services completely override a previously defined service unless it extends itself
+                if (isset($a['services'][$name]['extends'])
+                    && isset($b['services'][$name]['extends'])
+                    && $b['services'][$name]['extends'] == $name
+                ) {
+                    $service += $a['services'][$name];
+                    // Use the `extends` attribute of the parent
+                    $service['extends'] = $a['services'][$name]['extends'];
+                    // Merge parameters using a union if both have parameters
+                    if (isset($a['services'][$name]['params'])) {
+                        $service['params'] += $a['services'][$name]['params'];
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/CachingConfigLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/CachingConfigLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..26f8360cc66e5a4b919eff4d0980c7c8931de140
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/CachingConfigLoader.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Guzzle\Service;
+
+use Guzzle\Cache\CacheAdapterInterface;
+
+/**
+ * Decorator that adds caching to a service description loader
+ */
+class CachingConfigLoader implements ConfigLoaderInterface
+{
+    /** @var ConfigLoaderInterface */
+    protected $loader;
+
+    /** @var CacheAdapterInterface */
+    protected $cache;
+
+    /**
+     * @param ConfigLoaderInterface $loader Loader used to load the config when there is a cache miss
+     * @param CacheAdapterInterface $cache  Object used to cache the loaded result
+     */
+    public function __construct(ConfigLoaderInterface $loader, CacheAdapterInterface $cache)
+    {
+        $this->loader = $loader;
+        $this->cache = $cache;
+    }
+
+    public function load($config, array $options = array())
+    {
+        if (!is_string($config)) {
+            $key = false;
+        } else {
+            $key = 'loader_' . crc32($config);
+            if ($result = $this->cache->fetch($key)) {
+                return $result;
+            }
+        }
+
+        $result = $this->loader->load($config, $options);
+        if ($key) {
+            $this->cache->save($key, $result);
+        }
+
+        return $result;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Client.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Client.php
new file mode 100644
index 0000000000000000000000000000000000000000..944d994f77f82fc67a3325a5d9fd5956b2d32a44
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Client.php
@@ -0,0 +1,292 @@
+<?php
+
+namespace Guzzle\Service;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\BadMethodCallException;
+use Guzzle\Common\Version;
+use Guzzle\Inflection\InflectorInterface;
+use Guzzle\Inflection\Inflector;
+use Guzzle\Http\Client as HttpClient;
+use Guzzle\Http\Exception\MultiTransferException;
+use Guzzle\Service\Exception\CommandTransferException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Command\Factory\CompositeFactory;
+use Guzzle\Service\Command\Factory\FactoryInterface as CommandFactoryInterface;
+use Guzzle\Service\Resource\ResourceIteratorClassFactory;
+use Guzzle\Service\Resource\ResourceIteratorFactoryInterface;
+use Guzzle\Service\Description\ServiceDescriptionInterface;
+
+/**
+ * Client object for executing commands on a web service.
+ */
+class Client extends HttpClient implements ClientInterface
+{
+    const COMMAND_PARAMS = 'command.params';
+
+    /** @var ServiceDescriptionInterface Description of the service and possible commands */
+    protected $serviceDescription;
+
+    /** @var CommandFactoryInterface */
+    protected $commandFactory;
+
+    /** @var ResourceIteratorFactoryInterface */
+    protected $resourceIteratorFactory;
+
+    /** @var InflectorInterface Inflector associated with the service/client */
+    protected $inflector;
+
+    /**
+     * Basic factory method to create a new client. Extend this method in subclasses to build more complex clients.
+     *
+     * @param array|Collection $config Configuration data
+     *
+     * @return Client
+     */
+    public static function factory($config = array())
+    {
+        return new static(isset($config['base_url']) ? $config['base_url'] : null, $config);
+    }
+
+    public static function getAllEvents()
+    {
+        return array_merge(HttpClient::getAllEvents(), array(
+            'client.command.create',
+            'command.before_prepare',
+            'command.after_prepare',
+            'command.before_send',
+            'command.after_send'
+        ));
+    }
+
+    /**
+     * Magic method used to retrieve a command
+     *
+     * @param string $method Name of the command object to instantiate
+     * @param array  $args   Arguments to pass to the command
+     *
+     * @return mixed Returns the result of the command
+     * @throws BadMethodCallException when a command is not found
+     */
+    public function __call($method, $args)
+    {
+        return $this->getCommand($method, isset($args[0]) ? $args[0] : array())->getResult();
+    }
+
+    public function getCommand($name, array $args = array())
+    {
+        // Add global client options to the command
+        if ($options = $this->getConfig(self::COMMAND_PARAMS)) {
+            $args += $options;
+        }
+
+        if (!($command = $this->getCommandFactory()->factory($name, $args))) {
+            throw new InvalidArgumentException("Command was not found matching {$name}");
+        }
+
+        $command->setClient($this);
+        $this->dispatch('client.command.create', array('client' => $this, 'command' => $command));
+
+        return $command;
+    }
+
+    /**
+     * Set the command factory used to create commands by name
+     *
+     * @param CommandFactoryInterface $factory Command factory
+     *
+     * @return self
+     */
+    public function setCommandFactory(CommandFactoryInterface $factory)
+    {
+        $this->commandFactory = $factory;
+
+        return $this;
+    }
+
+    /**
+     * Set the resource iterator factory associated with the client
+     *
+     * @param ResourceIteratorFactoryInterface $factory Resource iterator factory
+     *
+     * @return self
+     */
+    public function setResourceIteratorFactory(ResourceIteratorFactoryInterface $factory)
+    {
+        $this->resourceIteratorFactory = $factory;
+
+        return $this;
+    }
+
+    public function getIterator($command, array $commandOptions = null, array $iteratorOptions = array())
+    {
+        if (!($command instanceof CommandInterface)) {
+            $command = $this->getCommand($command, $commandOptions ?: array());
+        }
+
+        return $this->getResourceIteratorFactory()->build($command, $iteratorOptions);
+    }
+
+    public function execute($command)
+    {
+        if ($command instanceof CommandInterface) {
+            $this->send($this->prepareCommand($command));
+            $this->dispatch('command.after_send', array('command' => $command));
+            return $command->getResult();
+        } elseif (is_array($command) || $command instanceof \Traversable) {
+            return $this->executeMultiple($command);
+        } else {
+            throw new InvalidArgumentException('Command must be a command or array of commands');
+        }
+    }
+
+    public function setDescription(ServiceDescriptionInterface $service)
+    {
+        $this->serviceDescription = $service;
+
+        // If a baseUrl was set on the description, then update the client
+        if ($baseUrl = $service->getBaseUrl()) {
+            $this->setBaseUrl($baseUrl);
+        }
+
+        return $this;
+    }
+
+    public function getDescription()
+    {
+        return $this->serviceDescription;
+    }
+
+    /**
+     * Set the inflector used with the client
+     *
+     * @param InflectorInterface $inflector Inflection object
+     *
+     * @return self
+     */
+    public function setInflector(InflectorInterface $inflector)
+    {
+        $this->inflector = $inflector;
+
+        return $this;
+    }
+
+    /**
+     * Get the inflector used with the client
+     *
+     * @return self
+     */
+    public function getInflector()
+    {
+        if (!$this->inflector) {
+            $this->inflector = Inflector::getDefault();
+        }
+
+        return $this->inflector;
+    }
+
+    /**
+     * Prepare a command for sending and get the RequestInterface object created by the command
+     *
+     * @param CommandInterface $command Command to prepare
+     *
+     * @return RequestInterface
+     */
+    protected function prepareCommand(CommandInterface $command)
+    {
+        // Set the client and prepare the command
+        $request = $command->setClient($this)->prepare();
+        // Set the state to new if the command was previously executed
+        $request->setState(RequestInterface::STATE_NEW);
+        $this->dispatch('command.before_send', array('command' => $command));
+
+        return $request;
+    }
+
+    /**
+     * Execute multiple commands in parallel
+     *
+     * @param array|Traversable $commands Array of CommandInterface objects to execute
+     *
+     * @return array Returns an array of the executed commands
+     * @throws Exception\CommandTransferException
+     */
+    protected function executeMultiple($commands)
+    {
+        $requests = array();
+        $commandRequests = new \SplObjectStorage();
+
+        foreach ($commands as $command) {
+            $request = $this->prepareCommand($command);
+            $commandRequests[$request] = $command;
+            $requests[] = $request;
+        }
+
+        try {
+            $this->send($requests);
+            foreach ($commands as $command) {
+                $this->dispatch('command.after_send', array('command' => $command));
+            }
+            return $commands;
+        } catch (MultiTransferException $failureException) {
+            // Throw a CommandTransferException using the successful and failed commands
+            $e = CommandTransferException::fromMultiTransferException($failureException);
+
+            // Remove failed requests from the successful requests array and add to the failures array
+            foreach ($failureException->getFailedRequests() as $request) {
+                if (isset($commandRequests[$request])) {
+                    $e->addFailedCommand($commandRequests[$request]);
+                    unset($commandRequests[$request]);
+                }
+            }
+
+            // Always emit the command after_send events for successful commands
+            foreach ($commandRequests as $success) {
+                $e->addSuccessfulCommand($commandRequests[$success]);
+                $this->dispatch('command.after_send', array('command' => $commandRequests[$success]));
+            }
+
+            throw $e;
+        }
+    }
+
+    protected function getResourceIteratorFactory()
+    {
+        if (!$this->resourceIteratorFactory) {
+            // Build the default resource iterator factory if one is not set
+            $clientClass = get_class($this);
+            $prefix = substr($clientClass, 0, strrpos($clientClass, '\\'));
+            $this->resourceIteratorFactory = new ResourceIteratorClassFactory(array(
+                "{$prefix}\\Iterator",
+                "{$prefix}\\Model"
+            ));
+        }
+
+        return $this->resourceIteratorFactory;
+    }
+
+    /**
+     * Get the command factory associated with the client
+     *
+     * @return CommandFactoryInterface
+     */
+    protected function getCommandFactory()
+    {
+        if (!$this->commandFactory) {
+            $this->commandFactory = CompositeFactory::getDefaultChain($this);
+        }
+
+        return $this->commandFactory;
+    }
+
+    /**
+     * @deprecated
+     * @codeCoverageIgnore
+     */
+    public function enableMagicMethods($isEnabled)
+    {
+        Version::warn(__METHOD__ . ' is deprecated');
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/ClientInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/ClientInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..814154f00bb22594e0bedee2eb7936f3fdcfe2f1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/ClientInterface.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Guzzle\Service;
+
+use Guzzle\Common\FromConfigInterface;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\ClientInterface as HttpClientInterface;
+use Guzzle\Service\Exception\CommandTransferException;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\ServiceDescriptionInterface;
+use Guzzle\Service\Resource\ResourceIteratorInterface;
+
+/**
+ * Client interface for executing commands on a web service.
+ */
+interface ClientInterface extends HttpClientInterface, FromConfigInterface
+{
+    /**
+     * Get a command by name. First, the client will see if it has a service description and if the service description
+     * defines a command by the supplied name. If no dynamic command is found, the client will look for a concrete
+     * command class exists matching the name supplied. If neither are found, an InvalidArgumentException is thrown.
+     *
+     * @param string $name Name of the command to retrieve
+     * @param array  $args Arguments to pass to the command
+     *
+     * @return CommandInterface
+     * @throws InvalidArgumentException if no command can be found by name
+     */
+    public function getCommand($name, array $args = array());
+
+    /**
+     * Execute one or more commands
+     *
+     * @param CommandInterface|array|Traversable $command Command, array of commands or Traversable object containing commands to execute
+     *
+     * @return mixed Returns the result of the executed command or an array of commands if executing multiple commands
+     * @throws InvalidArgumentException if an invalid command is passed
+     * @throws CommandTransferException if an exception is encountered when transferring multiple commands
+     */
+    public function execute($command);
+
+    /**
+     * Set the service description of the client
+     *
+     * @param ServiceDescriptionInterface $service Service description
+     *
+     * @return ClientInterface
+     */
+    public function setDescription(ServiceDescriptionInterface $service);
+
+    /**
+     * Get the service description of the client
+     *
+     * @return ServiceDescriptionInterface|null
+     */
+    public function getDescription();
+
+    /**
+     * Get a resource iterator from the client.
+     *
+     * @param string|CommandInterface $command         Command class or command name.
+     * @param array                   $commandOptions  Command options used when creating commands.
+     * @param array                   $iteratorOptions Iterator options passed to the iterator when it is instantiated.
+     *
+     * @return ResourceIteratorInterface
+     */
+    public function getIterator($command, array $commandOptions = null, array $iteratorOptions = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/AbstractCommand.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/AbstractCommand.php
new file mode 100644
index 0000000000000000000000000000000000000000..e54f51ace569d242678802e0f2535132b056266d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/AbstractCommand.php
@@ -0,0 +1,378 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Curl\CurlHandle;
+use Guzzle\Service\Client;
+use Guzzle\Service\ClientInterface;
+use Guzzle\Service\Description\Operation;
+use Guzzle\Service\Description\OperationInterface;
+use Guzzle\Service\Description\ValidatorInterface;
+use Guzzle\Service\Description\SchemaValidator;
+use Guzzle\Service\Exception\CommandException;
+use Guzzle\Service\Exception\ValidationException;
+
+/**
+ * Command object to handle preparing and processing client requests and responses of the requests
+ */
+abstract class AbstractCommand extends Collection implements CommandInterface
+{
+    // @deprecated: Option used to specify custom headers to add to the generated request
+    const HEADERS_OPTION = 'command.headers';
+    // @deprecated: Option used to add an onComplete method to a command
+    const ON_COMPLETE = 'command.on_complete';
+    // @deprecated: Option used to change the entity body used to store a response
+    const RESPONSE_BODY = 'command.response_body';
+
+    // Option used to add request options to the request created by a command
+    const REQUEST_OPTIONS = 'command.request_options';
+    // command values to not count as additionalParameters
+    const HIDDEN_PARAMS = 'command.hidden_params';
+    // Option used to disable any pre-sending command validation
+    const DISABLE_VALIDATION = 'command.disable_validation';
+    // Option used to override how a command result will be formatted
+    const RESPONSE_PROCESSING = 'command.response_processing';
+    // Different response types that commands can use
+    const TYPE_RAW = 'raw';
+    const TYPE_MODEL = 'model';
+    const TYPE_NO_TRANSLATION = 'no_translation';
+
+    /** @var ClientInterface Client object used to execute the command */
+    protected $client;
+
+    /** @var RequestInterface The request object associated with the command */
+    protected $request;
+
+    /** @var mixed The result of the command */
+    protected $result;
+
+    /** @var OperationInterface API information about the command */
+    protected $operation;
+
+    /** @var mixed callable */
+    protected $onComplete;
+
+    /** @var ValidatorInterface Validator used to prepare and validate properties against a JSON schema */
+    protected $validator;
+
+    /**
+     * @param array|Collection   $parameters Collection of parameters to set on the command
+     * @param OperationInterface $operation Command definition from description
+     */
+    public function __construct($parameters = array(), OperationInterface $operation = null)
+    {
+        parent::__construct($parameters);
+        $this->operation = $operation ?: $this->createOperation();
+        foreach ($this->operation->getParams() as $name => $arg) {
+            $currentValue = $this[$name];
+            $configValue = $arg->getValue($currentValue);
+            // If default or static values are set, then this should always be updated on the config object
+            if ($currentValue !== $configValue) {
+                $this[$name] = $configValue;
+            }
+        }
+
+        $headers = $this[self::HEADERS_OPTION];
+        if (!$headers instanceof Collection) {
+            $this[self::HEADERS_OPTION] = new Collection((array) $headers);
+        }
+
+        // You can set a command.on_complete option in your parameters to set an onComplete callback
+        if ($onComplete = $this['command.on_complete']) {
+            unset($this['command.on_complete']);
+            $this->setOnComplete($onComplete);
+        }
+
+        // Set the hidden additional parameters
+        if (!$this[self::HIDDEN_PARAMS]) {
+            $this[self::HIDDEN_PARAMS] = array(
+                self::HEADERS_OPTION,
+                self::RESPONSE_PROCESSING,
+                self::HIDDEN_PARAMS,
+                self::REQUEST_OPTIONS
+            );
+        }
+
+        $this->init();
+    }
+
+    /**
+     * Custom clone behavior
+     */
+    public function __clone()
+    {
+        $this->request = null;
+        $this->result = null;
+    }
+
+    /**
+     * Execute the command in the same manner as calling a function
+     *
+     * @return mixed Returns the result of {@see AbstractCommand::execute}
+     */
+    public function __invoke()
+    {
+        return $this->execute();
+    }
+
+    public function getName()
+    {
+        return $this->operation->getName();
+    }
+
+    /**
+     * Get the API command information about the command
+     *
+     * @return OperationInterface
+     */
+    public function getOperation()
+    {
+        return $this->operation;
+    }
+
+    public function setOnComplete($callable)
+    {
+        if (!is_callable($callable)) {
+            throw new InvalidArgumentException('The onComplete function must be callable');
+        }
+
+        $this->onComplete = $callable;
+
+        return $this;
+    }
+
+    public function execute()
+    {
+        if (!$this->client) {
+            throw new CommandException('A client must be associated with the command before it can be executed.');
+        }
+
+        return $this->client->execute($this);
+    }
+
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    public function setClient(ClientInterface $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    public function getRequest()
+    {
+        if (!$this->request) {
+            throw new CommandException('The command must be prepared before retrieving the request');
+        }
+
+        return $this->request;
+    }
+
+    public function getResponse()
+    {
+        if (!$this->isExecuted()) {
+            $this->execute();
+        }
+
+        return $this->request->getResponse();
+    }
+
+    public function getResult()
+    {
+        if (!$this->isExecuted()) {
+            $this->execute();
+        }
+
+        if (null === $this->result) {
+            $this->process();
+            // Call the onComplete method if one is set
+            if ($this->onComplete) {
+                call_user_func($this->onComplete, $this);
+            }
+        }
+
+        return $this->result;
+    }
+
+    public function setResult($result)
+    {
+        $this->result = $result;
+
+        return $this;
+    }
+
+    public function isPrepared()
+    {
+        return $this->request !== null;
+    }
+
+    public function isExecuted()
+    {
+        return $this->request !== null && $this->request->getState() == 'complete';
+    }
+
+    public function prepare()
+    {
+        if (!$this->isPrepared()) {
+            if (!$this->client) {
+                throw new CommandException('A client must be associated with the command before it can be prepared.');
+            }
+
+            // If no response processing value was specified, then attempt to use the highest level of processing
+            if (!isset($this[self::RESPONSE_PROCESSING])) {
+                $this[self::RESPONSE_PROCESSING] = self::TYPE_MODEL;
+            }
+
+            // Notify subscribers of the client that the command is being prepared
+            $this->client->dispatch('command.before_prepare', array('command' => $this));
+
+            // Fail on missing required arguments, and change parameters via filters
+            $this->validate();
+            // Delegate to the subclass that implements the build method
+            $this->build();
+
+            // Add custom request headers set on the command
+            if ($headers = $this[self::HEADERS_OPTION]) {
+                foreach ($headers as $key => $value) {
+                    $this->request->setHeader($key, $value);
+                }
+            }
+
+            // Add any curl options to the request
+            if ($options = $this[Client::CURL_OPTIONS]) {
+                $this->request->getCurlOptions()->overwriteWith(CurlHandle::parseCurlConfig($options));
+            }
+
+            // Set a custom response body
+            if ($responseBody = $this[self::RESPONSE_BODY]) {
+                $this->request->setResponseBody($responseBody);
+            }
+
+            $this->client->dispatch('command.after_prepare', array('command' => $this));
+        }
+
+        return $this->request;
+    }
+
+    /**
+     * Set the validator used to validate and prepare command parameters and nested JSON schemas. If no validator is
+     * set, then the command will validate using the default {@see SchemaValidator}.
+     *
+     * @param ValidatorInterface $validator Validator used to prepare and validate properties against a JSON schema
+     *
+     * @return self
+     */
+    public function setValidator(ValidatorInterface $validator)
+    {
+        $this->validator = $validator;
+
+        return $this;
+    }
+
+    public function getRequestHeaders()
+    {
+        return $this[self::HEADERS_OPTION];
+    }
+
+    /**
+     * Initialize the command (hook that can be implemented in subclasses)
+     */
+    protected function init() {}
+
+    /**
+     * Create the request object that will carry out the command
+     */
+    abstract protected function build();
+
+    /**
+     * Hook used to create an operation for concrete commands that are not associated with a service description
+     *
+     * @return OperationInterface
+     */
+    protected function createOperation()
+    {
+        return new Operation(array('name' => get_class($this)));
+    }
+
+    /**
+     * Create the result of the command after the request has been completed.
+     * Override this method in subclasses to customize this behavior
+     */
+    protected function process()
+    {
+        $this->result = $this[self::RESPONSE_PROCESSING] != self::TYPE_RAW
+            ? DefaultResponseParser::getInstance()->parse($this)
+            : $this->request->getResponse();
+    }
+
+    /**
+     * Validate and prepare the command based on the schema and rules defined by the command's Operation object
+     *
+     * @throws ValidationException when validation errors occur
+     */
+    protected function validate()
+    {
+        // Do not perform request validation/transformation if it is disable
+        if ($this[self::DISABLE_VALIDATION]) {
+            return;
+        }
+
+        $errors = array();
+        $validator = $this->getValidator();
+        foreach ($this->operation->getParams() as $name => $schema) {
+            $value = $this[$name];
+            if (!$validator->validate($schema, $value)) {
+                $errors = array_merge($errors, $validator->getErrors());
+            } elseif ($value !== $this[$name]) {
+                // Update the config value if it changed and no validation errors were encountered
+                $this->data[$name] = $value;
+            }
+        }
+
+        // Validate additional parameters
+        $hidden = $this[self::HIDDEN_PARAMS];
+
+        if ($properties = $this->operation->getAdditionalParameters()) {
+            foreach ($this->toArray() as $name => $value) {
+                // It's only additional if it isn't defined in the schema
+                if (!$this->operation->hasParam($name) && !in_array($name, $hidden)) {
+                    // Always set the name so that error messages are useful
+                    $properties->setName($name);
+                    if (!$validator->validate($properties, $value)) {
+                        $errors = array_merge($errors, $validator->getErrors());
+                    } elseif ($value !== $this[$name]) {
+                        $this->data[$name] = $value;
+                    }
+                }
+            }
+        }
+
+        if (!empty($errors)) {
+            $e = new ValidationException('Validation errors: ' . implode("\n", $errors));
+            $e->setErrors($errors);
+            throw $e;
+        }
+    }
+
+    /**
+     * Get the validator used to prepare and validate properties. If no validator has been set on the command, then
+     * the default {@see SchemaValidator} will be used.
+     *
+     * @return ValidatorInterface
+     */
+    protected function getValidator()
+    {
+        if (!$this->validator) {
+            $this->validator = SchemaValidator::getInstance();
+        }
+
+        return $this->validator;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ClosureCommand.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ClosureCommand.php
new file mode 100644
index 0000000000000000000000000000000000000000..cb6ac40ce092ea700c8f9defebda60e3db546ff0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ClosureCommand.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\UnexpectedValueException;
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * A ClosureCommand is a command that allows dynamic commands to be created at runtime using a closure to prepare the
+ * request. A closure key and \Closure value must be passed to the command in the constructor. The closure must
+ * accept the command object as an argument.
+ */
+class ClosureCommand extends AbstractCommand
+{
+    /**
+     * {@inheritdoc}
+     * @throws InvalidArgumentException if a closure was not passed
+     */
+    protected function init()
+    {
+        if (!$this['closure']) {
+            throw new InvalidArgumentException('A closure must be passed in the parameters array');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws UnexpectedValueException If the closure does not return a request
+     */
+    protected function build()
+    {
+        $closure = $this['closure'];
+        /** @var $closure \Closure */
+        $this->request = $closure($this, $this->operation);
+
+        if (!$this->request || !$this->request instanceof RequestInterface) {
+            throw new UnexpectedValueException('Closure command did not return a RequestInterface object');
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/CommandInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/CommandInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..fbb61d2ff4bc8f0f55a1f26c1748c53790c7b6c0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/CommandInterface.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Message\Response;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Exception\CommandException;
+use Guzzle\Service\Description\OperationInterface;
+use Guzzle\Service\ClientInterface;
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * A command object that contains parameters that can be modified and accessed like an array and turned into an array
+ */
+interface CommandInterface extends \ArrayAccess, ToArrayInterface
+{
+    /**
+     * Get the short form name of the command
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get the API operation information about the command
+     *
+     * @return OperationInterface
+     */
+    public function getOperation();
+
+    /**
+     * Execute the command and return the result
+     *
+     * @return mixed Returns the result of {@see CommandInterface::execute}
+     * @throws CommandException if a client has not been associated with the command
+     */
+    public function execute();
+
+    /**
+     * Get the client object that will execute the command
+     *
+     * @return ClientInterface|null
+     */
+    public function getClient();
+
+    /**
+     * Set the client object that will execute the command
+     *
+     * @param ClientInterface $client The client object that will execute the command
+     *
+     * @return self
+     */
+    public function setClient(ClientInterface $client);
+
+    /**
+     * Get the request object associated with the command
+     *
+     * @return RequestInterface
+     * @throws CommandException if the command has not been executed
+     */
+    public function getRequest();
+
+    /**
+     * Get the response object associated with the command
+     *
+     * @return Response
+     * @throws CommandException if the command has not been executed
+     */
+    public function getResponse();
+
+    /**
+     * Get the result of the command
+     *
+     * @return Response By default, commands return a Response object unless overridden in a subclass
+     * @throws CommandException if the command has not been executed
+     */
+    public function getResult();
+
+    /**
+     * Set the result of the command
+     *
+     * @param mixed $result Result to set
+     *
+     * @return self
+     */
+    public function setResult($result);
+
+    /**
+     * Returns TRUE if the command has been prepared for executing
+     *
+     * @return bool
+     */
+    public function isPrepared();
+
+    /**
+     * Returns TRUE if the command has been executed
+     *
+     * @return bool
+     */
+    public function isExecuted();
+
+    /**
+     * Prepare the command for executing and create a request object.
+     *
+     * @return RequestInterface Returns the generated request
+     * @throws CommandException if a client object has not been set previously or in the prepare()
+     */
+    public function prepare();
+
+    /**
+     * Get the object that manages the request headers that will be set on any outbound requests from the command
+     *
+     * @return Collection
+     */
+    public function getRequestHeaders();
+
+    /**
+     * Specify a callable to execute when the command completes
+     *
+     * @param mixed $callable Callable to execute when the command completes. The callable must accept a
+     *                        {@see CommandInterface} object as the only argument.
+     * @return self
+     * @throws InvalidArgumentException
+     */
+    public function setOnComplete($callable);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/DefaultRequestSerializer.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/DefaultRequestSerializer.php
new file mode 100644
index 0000000000000000000000000000000000000000..dfca2e1038db189430c1e56c6cf33c926b082880
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/DefaultRequestSerializer.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Url;
+use Guzzle\Service\Command\LocationVisitor\Request\RequestVisitorInterface;
+use Guzzle\Service\Command\LocationVisitor\VisitorFlyweight;
+use Guzzle\Service\Description\OperationInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Default request serializer that transforms command options and operation parameters into a request
+ */
+class DefaultRequestSerializer implements RequestSerializerInterface
+{
+    /** @var VisitorFlyweight $factory Visitor factory */
+    protected $factory;
+
+    /** @var self */
+    protected static $instance;
+
+    /**
+     * @return self
+     * @codeCoverageIgnore
+     */
+    public static function getInstance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self(VisitorFlyweight::getInstance());
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param VisitorFlyweight $factory Factory to use when creating visitors
+     */
+    public function __construct(VisitorFlyweight $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * Add a location visitor to the serializer
+     *
+     * @param string                   $location Location to associate with the visitor
+     * @param RequestVisitorInterface  $visitor  Visitor to attach
+     *
+     * @return self
+     */
+    public function addVisitor($location, RequestVisitorInterface $visitor)
+    {
+        $this->factory->addRequestVisitor($location, $visitor);
+
+        return $this;
+    }
+
+    public function prepare(CommandInterface $command)
+    {
+        $request = $this->createRequest($command);
+        // Keep an array of visitors found in the operation
+        $foundVisitors = array();
+        $operation = $command->getOperation();
+
+        // Add arguments to the request using the location attribute
+        foreach ($operation->getParams() as $name => $arg) {
+            /** @var $arg \Guzzle\Service\Description\Parameter */
+            $location = $arg->getLocation();
+            // Skip 'uri' locations because they've already been processed
+            if ($location && $location != 'uri') {
+                // Instantiate visitors as they are detected in the properties
+                if (!isset($foundVisitors[$location])) {
+                    $foundVisitors[$location] = $this->factory->getRequestVisitor($location);
+                }
+                // Ensure that a value has been set for this parameter
+                $value = $command[$name];
+                if ($value !== null) {
+                    // Apply the parameter value with the location visitor
+                    $foundVisitors[$location]->visit($command, $request, $arg, $value);
+                }
+            }
+        }
+
+        // Serialize additional parameters
+        if ($additional = $operation->getAdditionalParameters()) {
+            if ($visitor = $this->prepareAdditionalParameters($operation, $command, $request, $additional)) {
+                $foundVisitors[$additional->getLocation()] = $visitor;
+            }
+        }
+
+        // Call the after method on each visitor found in the operation
+        foreach ($foundVisitors as $visitor) {
+            $visitor->after($command, $request);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Serialize additional parameters
+     *
+     * @param OperationInterface $operation  Operation that owns the command
+     * @param CommandInterface   $command    Command to prepare
+     * @param RequestInterface   $request    Request to serialize
+     * @param Parameter          $additional Additional parameters
+     *
+     * @return null|RequestVisitorInterface
+     */
+    protected function prepareAdditionalParameters(
+        OperationInterface $operation,
+        CommandInterface $command,
+        RequestInterface $request,
+        Parameter $additional
+    ) {
+        if (!($location = $additional->getLocation())) {
+            return;
+        }
+
+        $visitor = $this->factory->getRequestVisitor($location);
+        $hidden = $command[$command::HIDDEN_PARAMS];
+
+        foreach ($command->toArray() as $key => $value) {
+            // Ignore values that are null or built-in command options
+            if ($value !== null
+                && !in_array($key, $hidden)
+                && !$operation->hasParam($key)
+            ) {
+                $additional->setName($key);
+                $visitor->visit($command, $request, $additional, $value);
+            }
+        }
+
+        return $visitor;
+    }
+
+    /**
+     * Create a request for the command and operation
+     *
+     * @param CommandInterface $command Command to create a request for
+     *
+     * @return RequestInterface
+     */
+    protected function createRequest(CommandInterface $command)
+    {
+        $operation = $command->getOperation();
+        $client = $command->getClient();
+        $options = $command[AbstractCommand::REQUEST_OPTIONS] ?: array();
+
+        // If the command does not specify a template, then assume the base URL of the client
+        if (!($uri = $operation->getUri())) {
+            return $client->createRequest($operation->getHttpMethod(), $client->getBaseUrl(), null, null, $options);
+        }
+
+        // Get the path values and use the client config settings
+        $variables = array();
+        foreach ($operation->getParams() as $name => $arg) {
+            if ($arg->getLocation() == 'uri') {
+                if (isset($command[$name])) {
+                    $variables[$name] = $arg->filter($command[$name]);
+                    if (!is_array($variables[$name])) {
+                        $variables[$name] = (string) $variables[$name];
+                    }
+                }
+            }
+        }
+
+        return $client->createRequest($operation->getHttpMethod(), array($uri, $variables), null, null, $options);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/DefaultResponseParser.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/DefaultResponseParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..da26caff9c2a232106ab7ac58f2575956129b41c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/DefaultResponseParser.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+use Guzzle\Http\Message\Response;
+
+/**
+ * Default HTTP response parser used to marshal JSON responses into arrays and XML responses into SimpleXMLElement
+ */
+class DefaultResponseParser implements ResponseParserInterface
+{
+    /** @var self */
+    protected static $instance;
+
+    /**
+     * @return self
+     * @codeCoverageIgnore
+     */
+    public static function getInstance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self;
+        }
+
+        return self::$instance;
+    }
+
+    public function parse(CommandInterface $command)
+    {
+        $response = $command->getRequest()->getResponse();
+
+        // Account for hard coded content-type values specified in service descriptions
+        if ($contentType = $command['command.expects']) {
+            $response->setHeader('Content-Type', $contentType);
+        } else {
+            $contentType = (string) $response->getHeader('Content-Type');
+        }
+
+        return $this->handleParsing($command, $response, $contentType);
+    }
+
+    protected function handleParsing(CommandInterface $command, Response $response, $contentType)
+    {
+        $result = $response;
+        if ($result->getBody()) {
+            if (stripos($contentType, 'json') !== false) {
+                $result = $result->json();
+            } if (stripos($contentType, 'xml') !== false) {
+                $result = $result->xml();
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/AliasFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/AliasFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..1c5ce0741e8945d0f17aa940a916610a3908950c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/AliasFactory.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Guzzle\Service\Command\Factory;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Service\ClientInterface;
+
+/**
+ * Command factory used when you need to provide aliases to commands
+ */
+class AliasFactory implements FactoryInterface
+{
+    /** @var array Associative array mapping command aliases to the aliased command */
+    protected $aliases;
+
+    /** @var ClientInterface Client used to retry using aliases */
+    protected $client;
+
+    /**
+     * @param ClientInterface $client  Client used to retry with the alias
+     * @param array           $aliases Associative array mapping aliases to the alias
+     */
+    public function __construct(ClientInterface $client, array $aliases)
+    {
+        $this->client = $client;
+        $this->aliases = $aliases;
+    }
+
+    public function factory($name, array $args = array())
+    {
+        if (isset($this->aliases[$name])) {
+            try {
+                return $this->client->getCommand($this->aliases[$name], $args);
+            } catch (InvalidArgumentException $e) {
+                return null;
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/CompositeFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/CompositeFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..8c46983d65178aa39dae6f9dbab2be4f1263e325
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/CompositeFactory.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Guzzle\Service\Command\Factory;
+
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\ClientInterface;
+
+/**
+ * Composite factory used by a client object to create command objects utilizing multiple factories
+ */
+class CompositeFactory implements \IteratorAggregate, \Countable, FactoryInterface
+{
+    /** @var array Array of command factories */
+    protected $factories;
+
+    /**
+     * Get the default chain to use with clients
+     *
+     * @param ClientInterface $client Client to base the chain on
+     *
+     * @return self
+     */
+    public static function getDefaultChain(ClientInterface $client)
+    {
+        $factories = array();
+        if ($description = $client->getDescription()) {
+            $factories[] = new ServiceDescriptionFactory($description);
+        }
+        $factories[] = new ConcreteClassFactory($client);
+
+        return new self($factories);
+    }
+
+    /**
+     * @param array $factories Array of command factories
+     */
+    public function __construct(array $factories = array())
+    {
+        $this->factories = $factories;
+    }
+
+    /**
+     * Add a command factory to the chain
+     *
+     * @param FactoryInterface        $factory Factory to add
+     * @param string|FactoryInterface $before  Insert the new command factory before a command factory class or object
+     *                                         matching a class name.
+     * @return CompositeFactory
+     */
+    public function add(FactoryInterface $factory, $before = null)
+    {
+        $pos = null;
+
+        if ($before) {
+            foreach ($this->factories as $i => $f) {
+                if ($before instanceof FactoryInterface) {
+                    if ($f === $before) {
+                        $pos = $i;
+                        break;
+                    }
+                } elseif (is_string($before)) {
+                    if ($f instanceof $before) {
+                        $pos = $i;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if ($pos === null) {
+            $this->factories[] = $factory;
+        } else {
+            array_splice($this->factories, $i, 0, array($factory));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Check if the chain contains a specific command factory
+     *
+     * @param FactoryInterface|string $factory Factory to check
+     *
+     * @return bool
+     */
+    public function has($factory)
+    {
+        return (bool) $this->find($factory);
+    }
+
+    /**
+     * Remove a specific command factory from the chain
+     *
+     * @param string|FactoryInterface $factory Factory to remove by name or instance
+     *
+     * @return CompositeFactory
+     */
+    public function remove($factory = null)
+    {
+        if (!($factory instanceof FactoryInterface)) {
+            $factory = $this->find($factory);
+        }
+
+        $this->factories = array_values(array_filter($this->factories, function($f) use ($factory) {
+            return $f !== $factory;
+        }));
+
+        return $this;
+    }
+
+    /**
+     * Get a command factory by class name
+     *
+     * @param string|FactoryInterface $factory Command factory class or instance
+     *
+     * @return null|FactoryInterface
+     */
+    public function find($factory)
+    {
+        foreach ($this->factories as $f) {
+            if ($factory === $f || (is_string($factory) && $f instanceof $factory)) {
+                return $f;
+            }
+        }
+    }
+
+    /**
+     * Create a command using the associated command factories
+     *
+     * @param string $name Name of the command
+     * @param array  $args Command arguments
+     *
+     * @return CommandInterface
+     */
+    public function factory($name, array $args = array())
+    {
+        foreach ($this->factories as $factory) {
+            $command = $factory->factory($name, $args);
+            if ($command) {
+                return $command;
+            }
+        }
+    }
+
+    public function count()
+    {
+        return count($this->factories);
+    }
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->factories);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/ConcreteClassFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/ConcreteClassFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e93deaa030b055a754e18b202521c36f4b7579d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/ConcreteClassFactory.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Guzzle\Service\Command\Factory;
+
+use Guzzle\Inflection\InflectorInterface;
+use Guzzle\Inflection\Inflector;
+use Guzzle\Service\ClientInterface;
+
+/**
+ * Command factory used to create commands referencing concrete command classes
+ */
+class ConcreteClassFactory implements FactoryInterface
+{
+    /** @var ClientInterface */
+    protected $client;
+
+    /** @var InflectorInterface */
+    protected $inflector;
+
+    /**
+     * @param ClientInterface    $client    Client that owns the commands
+     * @param InflectorInterface $inflector Inflector used to resolve class names
+     */
+    public function __construct(ClientInterface $client, InflectorInterface $inflector = null)
+    {
+        $this->client = $client;
+        $this->inflector = $inflector ?: Inflector::getDefault();
+    }
+
+    public function factory($name, array $args = array())
+    {
+        // Determine the class to instantiate based on the namespace of the current client and the default directory
+        $prefix = $this->client->getConfig('command.prefix');
+        if (!$prefix) {
+            // The prefix can be specified in a factory method and is cached
+            $prefix = implode('\\', array_slice(explode('\\', get_class($this->client)), 0, -1)) . '\\Command\\';
+            $this->client->getConfig()->set('command.prefix', $prefix);
+        }
+
+        $class = $prefix . str_replace(' ', '\\', ucwords(str_replace('.', ' ', $this->inflector->camel($name))));
+
+        // Create the concrete command if it exists
+        if (class_exists($class)) {
+            return new $class($args);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/FactoryInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/FactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..35c299d9d8cce5c5d74640500e48e5d26f320659
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/FactoryInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Guzzle\Service\Command\Factory;
+
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Interface for creating commands by name
+ */
+interface FactoryInterface
+{
+    /**
+     * Create a command by name
+     *
+     * @param string $name Command to create
+     * @param array  $args Command arguments
+     *
+     * @return CommandInterface|null
+     */
+    public function factory($name, array $args = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/MapFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/MapFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ad80bcf478393293f0ca9456939e4582d6e9f16
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/MapFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Guzzle\Service\Command\Factory;
+
+/**
+ * Command factory used when explicitly mapping strings to command classes
+ */
+class MapFactory implements FactoryInterface
+{
+    /** @var array Associative array mapping command names to classes */
+    protected $map;
+
+    /** @param array $map Associative array mapping command names to classes */
+    public function __construct(array $map)
+    {
+        $this->map = $map;
+    }
+
+    public function factory($name, array $args = array())
+    {
+        if (isset($this->map[$name])) {
+            $class = $this->map[$name];
+
+            return new $class($args);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/ServiceDescriptionFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/ServiceDescriptionFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..b943a5b50a585ffd40cc9f353fe58076837be5d5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/Factory/ServiceDescriptionFactory.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Guzzle\Service\Command\Factory;
+
+use Guzzle\Service\Description\ServiceDescriptionInterface;
+use Guzzle\Inflection\InflectorInterface;
+
+/**
+ * Command factory used to create commands based on service descriptions
+ */
+class ServiceDescriptionFactory implements FactoryInterface
+{
+    /** @var ServiceDescriptionInterface */
+    protected $description;
+
+    /** @var InflectorInterface */
+    protected $inflector;
+
+    /**
+     * @param ServiceDescriptionInterface $description Service description
+     * @param InflectorInterface          $inflector   Optional inflector to use if the command is not at first found
+     */
+    public function __construct(ServiceDescriptionInterface $description, InflectorInterface $inflector = null)
+    {
+        $this->setServiceDescription($description);
+        $this->inflector = $inflector;
+    }
+
+    /**
+     * Change the service description used with the factory
+     *
+     * @param ServiceDescriptionInterface $description Service description to use
+     *
+     * @return FactoryInterface
+     */
+    public function setServiceDescription(ServiceDescriptionInterface $description)
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     * Returns the service description
+     *
+     * @return ServiceDescriptionInterface
+     */
+    public function getServiceDescription()
+    {
+        return $this->description;
+    }
+
+    public function factory($name, array $args = array())
+    {
+        $command = $this->description->getOperation($name);
+
+        // If a command wasn't found, then try to uppercase the first letter and try again
+        if (!$command) {
+            $command = $this->description->getOperation(ucfirst($name));
+            // If an inflector was passed, then attempt to get the command using snake_case inflection
+            if (!$command && $this->inflector) {
+                $command = $this->description->getOperation($this->inflector->snake($name));
+            }
+        }
+
+        if ($command) {
+            $class = $command->getClass();
+            return new $class($args, $command, $this->description);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/AbstractRequestVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/AbstractRequestVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..adcfca1ba734c0483c9a7424ced069606779ff6a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/AbstractRequestVisitor.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Description\Parameter;
+
+abstract class AbstractRequestVisitor implements RequestVisitorInterface
+{
+    /**
+     * @codeCoverageIgnore
+     */
+    public function after(CommandInterface $command, RequestInterface $request) {}
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value) {}
+
+    /**
+     * Prepare (filter and set desired name for request item) the value for request.
+     *
+     * @param mixed                                     $value
+     * @param \Guzzle\Service\Description\Parameter     $param
+     *
+     * @return array|mixed
+     */
+    protected function prepareValue($value, Parameter $param)
+    {
+        return is_array($value)
+            ? $this->resolveRecursively($value, $param)
+            : $param->filter($value);
+    }
+
+    /**
+     * Map nested parameters into the location_key based parameters
+     *
+     * @param array     $value Value to map
+     * @param Parameter $param Parameter that holds information about the current key
+     *
+     * @return array Returns the mapped array
+     */
+    protected function resolveRecursively(array $value, Parameter $param)
+    {
+        foreach ($value as $name => &$v) {
+            switch ($param->getType()) {
+                case 'object':
+                    if ($subParam = $param->getProperty($name)) {
+                        $key = $subParam->getWireName();
+                        $value[$key] = $this->prepareValue($v, $subParam);
+                        if ($name != $key) {
+                            unset($value[$name]);
+                        }
+                    } elseif ($param->getAdditionalProperties() instanceof Parameter) {
+                        $v = $this->prepareValue($v, $param->getAdditionalProperties());
+                    }
+                    break;
+                case 'array':
+                    if ($items = $param->getItems()) {
+                        $v = $this->prepareValue($v, $items);
+                    }
+                    break;
+            }
+        }
+
+        return $param->filter($value);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/BodyVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/BodyVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..168d7806fc53b7ba3428faf4cdb0fcd1e10c73a4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/BodyVisitor.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\EntityBody;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\EntityBodyInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to apply a body to a request
+ *
+ * This visitor can use a data parameter of 'expect' to control the Expect header. Set the expect data parameter to
+ * false to disable the expect header, or set the value to an integer so that the expect 100-continue header is only
+ * added if the Content-Length of the entity body is greater than the value.
+ */
+class BodyVisitor extends AbstractRequestVisitor
+{
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $value = $param->filter($value);
+        $entityBody = EntityBody::factory($value);
+        $request->setBody($entityBody);
+        $this->addExpectHeader($request, $entityBody, $param->getData('expect_header'));
+        // Add the Content-Encoding header if one is set on the EntityBody
+        if ($encoding = $entityBody->getContentEncoding()) {
+            $request->setHeader('Content-Encoding', $encoding);
+        }
+    }
+
+    /**
+     * Add the appropriate expect header to a request
+     *
+     * @param EntityEnclosingRequestInterface $request Request to update
+     * @param EntityBodyInterface             $body    Entity body of the request
+     * @param string|int                      $expect  Expect header setting
+     */
+    protected function addExpectHeader(EntityEnclosingRequestInterface $request, EntityBodyInterface $body, $expect)
+    {
+        // Allow the `expect` data parameter to be set to remove the Expect header from the request
+        if ($expect === false) {
+            $request->removeHeader('Expect');
+        } elseif ($expect !== true) {
+            // Default to using a MB as the point in which to start using the expect header
+            $expect = $expect ?: 1048576;
+            // If the expect_header value is numeric then only add if the size is greater than the cutoff
+            if (is_numeric($expect) && $body->getSize()) {
+                if ($body->getSize() < $expect) {
+                    $request->removeHeader('Expect');
+                } else {
+                    $request->setHeader('Expect', '100-Continue');
+                }
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/HeaderVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/HeaderVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..2a537542ca7a9320589c920e1f4b1242fa833876
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/HeaderVisitor.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to apply a parameter to a header value
+ */
+class HeaderVisitor extends AbstractRequestVisitor
+{
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $value = $param->filter($value);
+        if ($param->getType() == 'object' && $param->getAdditionalProperties() instanceof Parameter) {
+            $this->addPrefixedHeaders($request, $param, $value);
+        } else {
+            $request->setHeader($param->getWireName(), $value);
+        }
+    }
+
+    /**
+     * Add a prefixed array of headers to the request
+     *
+     * @param RequestInterface $request Request to update
+     * @param Parameter        $param   Parameter object
+     * @param array            $value   Header array to add
+     *
+     * @throws InvalidArgumentException
+     */
+    protected function addPrefixedHeaders(RequestInterface $request, Parameter $param, $value)
+    {
+        if (!is_array($value)) {
+            throw new InvalidArgumentException('An array of mapped headers expected, but received a single value');
+        }
+        $prefix = $param->getSentAs();
+        foreach ($value as $headerName => $headerValue) {
+            $request->setHeader($prefix . $headerName, $headerValue);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/JsonVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/JsonVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..db0b00468e8b53cad8c86572b8d418faef930c26
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/JsonVisitor.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to apply a parameter to an array that will be serialized as a top level key-value pair in a JSON body
+ */
+class JsonVisitor extends AbstractRequestVisitor
+{
+    /** @var bool Whether or not to add a Content-Type header when JSON is found */
+    protected $jsonContentType = 'application/json';
+
+    /** @var \SplObjectStorage Data object for persisting JSON data */
+    protected $data;
+
+    public function __construct()
+    {
+        $this->data = new \SplObjectStorage();
+    }
+
+    /**
+     * Set the Content-Type header to add to the request if JSON is added to the body. This visitor does not add a
+     * Content-Type header unless you specify one here.
+     *
+     * @param string $header Header to set when JSON is added (e.g. application/json)
+     *
+     * @return self
+     */
+    public function setContentTypeHeader($header = 'application/json')
+    {
+        $this->jsonContentType = $header;
+
+        return $this;
+    }
+
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        if (isset($this->data[$command])) {
+            $json = $this->data[$command];
+        } else {
+            $json = array();
+        }
+        $json[$param->getWireName()] = $this->prepareValue($value, $param);
+        $this->data[$command] = $json;
+    }
+
+    public function after(CommandInterface $command, RequestInterface $request)
+    {
+        if (isset($this->data[$command])) {
+            $request->setBody(json_encode($this->data[$command]));
+            unset($this->data[$command]);
+            // Don't overwrite the Content-Type if one is set
+            if ($this->jsonContentType && !$request->hasHeader('Content-Type')) {
+                $request->setHeader('Content-Type', $this->jsonContentType);
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/PostFieldVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/PostFieldVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..975850b74eaea9fe2a85167b5a64ab2519dbc469
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/PostFieldVisitor.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to apply a parameter to a POST field
+ */
+class PostFieldVisitor extends AbstractRequestVisitor
+{
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $request->setPostField($param->getWireName(), $this->prepareValue($value, $param));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/PostFileVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/PostFileVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..0853ebe629304783d9fb7f57951daf22e4ed1c7a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/PostFileVisitor.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Message\PostFileInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to apply a parameter to a POST file
+ */
+class PostFileVisitor extends AbstractRequestVisitor
+{
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $value = $param->filter($value);
+        if ($value instanceof PostFileInterface) {
+            $request->addPostFile($value);
+        } else {
+            $request->addPostFile($param->getWireName(), $value);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/QueryVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/QueryVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..315877aa06c1e8d1ccc38f6810e778c7a62b2976
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/QueryVisitor.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to apply a parameter to a request's query string
+ */
+class QueryVisitor extends AbstractRequestVisitor
+{
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $request->getQuery()->set($param->getWireName(), $this->prepareValue($value, $param));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/RequestVisitorInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/RequestVisitorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..14e0b2d2b1e398380f2d62145b787258b0868bc7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/RequestVisitorInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Location visitor used to add values to different locations in a request with different behaviors as needed
+ */
+interface RequestVisitorInterface
+{
+    /**
+     * Called after visiting all parameters
+     *
+     * @param CommandInterface $command Command being visited
+     * @param RequestInterface $request Request being visited
+     */
+    public function after(CommandInterface $command, RequestInterface $request);
+
+    /**
+     * Called once for each parameter being visited that matches the location type
+     *
+     * @param CommandInterface $command Command being visited
+     * @param RequestInterface $request Request being visited
+     * @param Parameter        $param   Parameter being visited
+     * @param mixed            $value   Value to set
+     */
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/ResponseBodyVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/ResponseBodyVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..09f35f8ea45474eb9f5d49e70856dbc33a741a49
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/ResponseBodyVisitor.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to change the location in which a response body is saved
+ */
+class ResponseBodyVisitor extends AbstractRequestVisitor
+{
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $request->setResponseBody($value);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/XmlVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/XmlVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..01f42da65c4439905348c03d44cddc3cb34abbf9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Request/XmlVisitor.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Request;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Service\Description\Operation;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Location visitor used to serialize XML bodies
+ */
+class XmlVisitor extends AbstractRequestVisitor
+{
+    /** @var \SplObjectStorage Data object for persisting XML data */
+    protected $data;
+
+    /** @var bool Content-Type header added when XML is found */
+    protected $contentType = 'application/xml';
+
+    public function __construct()
+    {
+        $this->data = new \SplObjectStorage();
+    }
+
+    /**
+     * Change the content-type header that is added when XML is found
+     *
+     * @param string $header Header to set when XML is found
+     *
+     * @return self
+     */
+    public function setContentTypeHeader($header)
+    {
+        $this->contentType = $header;
+
+        return $this;
+    }
+
+    public function visit(CommandInterface $command, RequestInterface $request, Parameter $param, $value)
+    {
+        $xml = isset($this->data[$command])
+            ? $this->data[$command]
+            : $this->createRootElement($param->getParent());
+        $this->addXml($xml, $param, $value);
+        $this->data[$command] = $xml;
+    }
+
+    public function after(CommandInterface $command, RequestInterface $request)
+    {
+        $xml = null;
+
+        // If data was found that needs to be serialized, then do so
+        if (isset($this->data[$command])) {
+            $xml = $this->data[$command]->asXML();
+            unset($this->data[$command]);
+        } else {
+            // Check if XML should always be sent for the command
+            $operation = $command->getOperation();
+            if ($operation->getData('xmlAllowEmpty')) {
+                $xml = $this->createRootElement($operation)->asXML();
+            }
+        }
+
+        if ($xml) {
+            $request->setBody($xml);
+            // Don't overwrite the Content-Type if one is set
+            if ($this->contentType && !$request->hasHeader('Content-Type')) {
+                $request->setHeader('Content-Type', $this->contentType);
+            }
+        }
+    }
+
+    /**
+     * Create the root XML element to use with a request
+     *
+     * @param Operation $operation Operation object
+     *
+     * @return \SimpleXMLElement
+     */
+    protected function createRootElement(Operation $operation)
+    {
+        static $defaultRoot = array('name' => 'Request');
+        // If no root element was specified, then just wrap the XML in 'Request'
+        $root = $operation->getData('xmlRoot') ?: $defaultRoot;
+
+        // Allow the XML declaration to be customized with xmlEncoding
+        $declaration = '<?xml version="1.0"';
+        if ($encoding = $operation->getData('xmlEncoding')) {
+            $declaration .= ' encoding="' . $encoding . '"';
+        }
+        $declaration .= "?>";
+
+        // Create the wrapping element with no namespaces if no namespaces were present
+        if (empty($root['namespaces'])) {
+            return new \SimpleXMLElement("{$declaration}\n<{$root['name']}/>");
+        } else {
+            // Create the wrapping element with an array of one or more namespaces
+            $xml = "{$declaration}\n<{$root['name']} ";
+            foreach ((array) $root['namespaces'] as $prefix => $uri) {
+                $xml .= is_numeric($prefix) ? "xmlns=\"{$uri}\" " : "xmlns:{$prefix}=\"{$uri}\" ";
+            }
+            return new \SimpleXMLElement($xml . "/>");
+        }
+    }
+
+    /**
+     * Recursively build the XML body
+     *
+     * @param \SimpleXMLElement $xml   XML to modify
+     * @param Parameter         $param API Parameter
+     * @param mixed             $value Value to add
+     */
+    protected function addXml(\SimpleXMLElement $xml, Parameter $param, $value)
+    {
+        if ($value === null) {
+            return;
+        }
+
+        $value = $param->filter($value);
+        $type = $param->getType();
+
+        if ($type == 'object' || $type == 'array') {
+            $ele = $param->getData('xmlFlattened') ? $xml : $xml->addChild($param->getWireName());
+            if ($param->getType() == 'array') {
+                $this->addXmlArray($ele, $param, $value, $param->getData('xmlNamespace'));
+            } elseif ($param->getType() == 'object') {
+                $this->addXmlObject($ele, $param, $value);
+            }
+        } elseif ($param->getData('xmlAttribute')) {
+            $xml->addAttribute($param->getWireName(), $value, $param->getData('xmlNamespace'));
+        } else {
+            $xml->addChild($param->getWireName(), $value, $param->getData('xmlNamespace'));
+        }
+    }
+
+    /**
+     * Add an array to the XML
+     */
+    protected function addXmlArray(\SimpleXMLElement $xml, Parameter $param, &$value)
+    {
+        if ($items = $param->getItems()) {
+            foreach ($value as $v) {
+                $this->addXml($xml, $items, $v);
+            }
+        }
+    }
+
+    /**
+     * Add an object to the XML
+     */
+    protected function addXmlObject(\SimpleXMLElement $xml, Parameter $param, &$value)
+    {
+        foreach ($value as $name => $v) {
+            if ($property = $param->getProperty($name)) {
+                $this->addXml($xml, $property, $v);
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/AbstractResponseVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/AbstractResponseVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..d87eeb94598d4d854a98f0d775173087b7c114b9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/AbstractResponseVisitor.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * {@inheritdoc}
+ * @codeCoverageIgnore
+ */
+abstract class AbstractResponseVisitor implements ResponseVisitorInterface
+{
+    public function before(CommandInterface $command, array &$result) {}
+
+    public function after(CommandInterface $command) {}
+
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {}
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/BodyVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/BodyVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..f70b7276e93150e52029e28fb2f6108c7f06bc6c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/BodyVisitor.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Service\Command\CommandInterface;
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Visitor used to add the body of a response to a particular key
+ */
+class BodyVisitor extends AbstractResponseVisitor
+{
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {
+        $value[$param->getName()] = $param->filter($response->getBody());
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/HeaderVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/HeaderVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f8737cbd961517d97f18e960e6029825954bc58
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/HeaderVisitor.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Location visitor used to add a particular header of a response to a key in the result
+ */
+class HeaderVisitor extends AbstractResponseVisitor
+{
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {
+        if ($param->getType() == 'object' && $param->getAdditionalProperties() instanceof Parameter) {
+            $this->processPrefixedHeaders($response, $param, $value);
+        } else {
+            $value[$param->getName()] = $param->filter((string) $response->getHeader($param->getWireName()));
+        }
+    }
+
+    /**
+     * Process a prefixed header array
+     *
+     * @param Response  $response Response that contains the headers
+     * @param Parameter $param    Parameter object
+     * @param array     $value    Value response array to modify
+     */
+    protected function processPrefixedHeaders(Response $response, Parameter $param, &$value)
+    {
+        // Grab prefixed headers that should be placed into an array with the prefix stripped
+        if ($prefix = $param->getSentAs()) {
+            $container = $param->getName();
+            $len = strlen($prefix);
+            // Find all matching headers and place them into the containing element
+            foreach ($response->getHeaders()->toArray() as $key => $header) {
+                if (stripos($key, $prefix) === 0) {
+                    // Account for multi-value headers
+                    $value[$container][substr($key, $len)] = count($header) == 1 ? end($header) : $header;
+                }
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/JsonVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/JsonVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..b9b35a86d22ee005c134a59c3b54955a1d909a73
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/JsonVisitor.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Location visitor used to marshal JSON response data into a formatted array.
+ *
+ * Allows top level JSON parameters to be inserted into the result of a command. The top level attributes are grabbed
+ * from the response's JSON data using the name value by default. Filters can be applied to parameters as they are
+ * traversed. This allows data to be normalized before returning it to users (for example converting timestamps to
+ * DateTime objects).
+ */
+class JsonVisitor extends AbstractResponseVisitor
+{
+    public function before(CommandInterface $command, array &$result)
+    {
+        // Ensure that the result of the command is always rooted with the parsed JSON data
+        $result = $command->getResponse()->json();
+    }
+
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {
+        $name = $param->getName();
+        $key = $param->getWireName();
+        if (isset($value[$key])) {
+            $this->recursiveProcess($param, $value[$key]);
+            if ($key != $name) {
+                $value[$name] = $value[$key];
+                unset($value[$key]);
+            }
+        }
+    }
+
+    /**
+     * Recursively process a parameter while applying filters
+     *
+     * @param Parameter $param API parameter being validated
+     * @param mixed     $value Value to validate and process. The value may change during this process.
+     */
+    protected function recursiveProcess(Parameter $param, &$value)
+    {
+        if ($value === null) {
+            return;
+        }
+
+        if (is_array($value)) {
+            $type = $param->getType();
+            if ($type == 'array') {
+                foreach ($value as &$item) {
+                    $this->recursiveProcess($param->getItems(), $item);
+                }
+            } elseif ($type == 'object' && !isset($value[0])) {
+                // On the above line, we ensure that the array is associative and not numerically indexed
+                if ($properties = $param->getProperties()) {
+                    foreach ($properties as $property) {
+                        $name = $property->getName();
+                        $key = $property->getWireName();
+                        if (isset($value[$key])) {
+                            $this->recursiveProcess($property, $value[$key]);
+                            if ($key != $name) {
+                                $value[$name] = $value[$key];
+                                unset($value[$key]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        $value = $param->filter($value);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/ReasonPhraseVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/ReasonPhraseVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b10ebce761062529ffed28de79e69d38e9d9acd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/ReasonPhraseVisitor.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Location visitor used to add the reason phrase of a response to a key in the result
+ */
+class ReasonPhraseVisitor extends AbstractResponseVisitor
+{
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {
+        $value[$param->getName()] = $response->getReasonPhrase();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/ResponseVisitorInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/ResponseVisitorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..033f40c3f813424e66b4bf6444fcc24dae3122f5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/ResponseVisitorInterface.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Location visitor used to parse values out of a response into an associative array
+ */
+interface ResponseVisitorInterface
+{
+    /**
+     * Called before visiting all parameters. This can be used for seeding the result of a command with default
+     * data (e.g. populating with JSON data in the response then adding to the parsed data).
+     *
+     * @param CommandInterface $command Command being visited
+     * @param array            $result  Result value to update if needed (e.g. parsing XML or JSON)
+     */
+    public function before(CommandInterface $command, array &$result);
+
+    /**
+     * Called after visiting all parameters
+     *
+     * @param CommandInterface $command Command being visited
+     */
+    public function after(CommandInterface $command);
+
+    /**
+     * Called once for each parameter being visited that matches the location type
+     *
+     * @param CommandInterface $command  Command being visited
+     * @param Response         $response Response being visited
+     * @param Parameter        $param    Parameter being visited
+     * @param mixed            $value    Result associative array value being updated by reference
+     * @param mixed            $context  Parsing context
+     */
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    );
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/StatusCodeVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/StatusCodeVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..00c5ce0e697fc04aa3d98b449a7aef971389b787
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/StatusCodeVisitor.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Location visitor used to add the status code of a response to a key in the result
+ */
+class StatusCodeVisitor extends AbstractResponseVisitor
+{
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {
+        $value[$param->getName()] = $response->getStatusCode();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae1c556f980248f7a8660d8caeedfcf41472fce0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor\Response;
+
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Location visitor used to marshal XML response data into a formatted array
+ */
+class XmlVisitor extends AbstractResponseVisitor
+{
+    public function before(CommandInterface $command, array &$result)
+    {
+        // Set the result of the command to the array conversion of the XML body
+        $result = json_decode(json_encode($command->getResponse()->xml()), true);
+    }
+
+    public function visit(
+        CommandInterface $command,
+        Response $response,
+        Parameter $param,
+        &$value,
+        $context =  null
+    ) {
+        $sentAs = $param->getWireName();
+        $name = $param->getName();
+        if (isset($value[$sentAs])) {
+            $this->recursiveProcess($param, $value[$sentAs]);
+            if ($name != $sentAs) {
+                $value[$name] = $value[$sentAs];
+                unset($value[$sentAs]);
+            }
+        }
+    }
+
+    /**
+     * Recursively process a parameter while applying filters
+     *
+     * @param Parameter $param API parameter being processed
+     * @param mixed     $value Value to validate and process. The value may change during this process.
+     */
+    protected function recursiveProcess(Parameter $param, &$value)
+    {
+        $type = $param->getType();
+
+        if (!is_array($value)) {
+            if ($type == 'array') {
+                // Cast to an array if the value was a string, but should be an array
+                $this->recursiveProcess($param->getItems(), $value);
+                $value = array($value);
+            }
+        } elseif ($type == 'object') {
+            $this->processObject($param, $value);
+        } elseif ($type == 'array') {
+            $this->processArray($param, $value);
+        }
+
+        if ($value !== null) {
+            $value = $param->filter($value);
+        }
+    }
+
+    /**
+     * Process an array
+     *
+     * @param Parameter $param API parameter being parsed
+     * @param mixed     $value Value to process
+     */
+    protected function processArray(Parameter $param, &$value)
+    {
+        // Convert the node if it was meant to be an array
+        if (!isset($value[0])) {
+            // Collections fo nodes are sometimes wrapped in an additional array. For example:
+            // <Items><Item><a>1</a></Item><Item><a>2</a></Item></Items> should become:
+            // array('Items' => array(array('a' => 1), array('a' => 2))
+            // Some nodes are not wrapped. For example: <Foo><a>1</a></Foo><Foo><a>2</a></Foo>
+            // should become array('Foo' => array(array('a' => 1), array('a' => 2))
+            if ($param->getItems() && isset($value[$param->getItems()->getWireName()])) {
+                // Account for the case of a collection wrapping wrapped nodes: Items => Item[]
+                $value = $value[$param->getItems()->getWireName()];
+                // If the wrapped node only had one value, then make it an array of nodes
+                if (!isset($value[0]) || !is_array($value)) {
+                    $value = array($value);
+                }
+            } elseif (!empty($value)) {
+                // Account for repeated nodes that must be an array: Foo => Baz, Foo => Baz, but only if the
+                // value is set and not empty
+                $value = array($value);
+            }
+        }
+
+        foreach ($value as &$item) {
+            $this->recursiveProcess($param->getItems(), $item);
+        }
+    }
+
+    /**
+     * Process an object
+     *
+     * @param Parameter $param API parameter being parsed
+     * @param mixed     $value Value to process
+     */
+    protected function processObject(Parameter $param, &$value)
+    {
+        // Ensure that the array is associative and not numerically indexed
+        if (!isset($value[0]) && ($properties = $param->getProperties())) {
+            foreach ($properties as $property) {
+                $name = $property->getName();
+                $sentAs = $property->getWireName();
+                if ($property->getData('xmlAttribute')) {
+                    $this->processXmlAttribute($property, $value);
+                } elseif (isset($value[$sentAs])) {
+                    $this->recursiveProcess($property, $value[$sentAs]);
+                    if ($name != $sentAs) {
+                        $value[$name] = $value[$sentAs];
+                        unset($value[$sentAs]);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Process an XML attribute property
+     *
+     * @param Parameter $property Property to process
+     * @param array     $value    Value to process and update
+     */
+    protected function processXmlAttribute(Parameter $property, array &$value)
+    {
+        $sentAs = $property->getWireName();
+        if (isset($value['@attributes'][$sentAs])) {
+            $value[$property->getName()] = $value['@attributes'][$sentAs];
+            unset($value['@attributes'][$sentAs]);
+            if (empty($value['@attributes'])) {
+                unset($value['@attributes']);
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/VisitorFlyweight.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/VisitorFlyweight.php
new file mode 100644
index 0000000000000000000000000000000000000000..74cb62813b8bf5c2dae689b848c8a6545c340966
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/LocationVisitor/VisitorFlyweight.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Guzzle\Service\Command\LocationVisitor;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Service\Command\LocationVisitor\Request\RequestVisitorInterface;
+use Guzzle\Service\Command\LocationVisitor\Response\ResponseVisitorInterface;
+
+/**
+ * Flyweight factory used to instantiate request and response visitors
+ */
+class VisitorFlyweight
+{
+    /** @var self Singleton instance of self */
+    protected static $instance;
+
+    /** @var array Default array of mappings of location names to classes */
+    protected static $defaultMappings = array(
+        'request.body'          => 'Guzzle\Service\Command\LocationVisitor\Request\BodyVisitor',
+        'request.header'        => 'Guzzle\Service\Command\LocationVisitor\Request\HeaderVisitor',
+        'request.json'          => 'Guzzle\Service\Command\LocationVisitor\Request\JsonVisitor',
+        'request.postField'     => 'Guzzle\Service\Command\LocationVisitor\Request\PostFieldVisitor',
+        'request.postFile'      => 'Guzzle\Service\Command\LocationVisitor\Request\PostFileVisitor',
+        'request.query'         => 'Guzzle\Service\Command\LocationVisitor\Request\QueryVisitor',
+        'request.response_body' => 'Guzzle\Service\Command\LocationVisitor\Request\ResponseBodyVisitor',
+        'request.responseBody'  => 'Guzzle\Service\Command\LocationVisitor\Request\ResponseBodyVisitor',
+        'request.xml'           => 'Guzzle\Service\Command\LocationVisitor\Request\XmlVisitor',
+        'response.body'         => 'Guzzle\Service\Command\LocationVisitor\Response\BodyVisitor',
+        'response.header'       => 'Guzzle\Service\Command\LocationVisitor\Response\HeaderVisitor',
+        'response.json'         => 'Guzzle\Service\Command\LocationVisitor\Response\JsonVisitor',
+        'response.reasonPhrase' => 'Guzzle\Service\Command\LocationVisitor\Response\ReasonPhraseVisitor',
+        'response.statusCode'   => 'Guzzle\Service\Command\LocationVisitor\Response\StatusCodeVisitor',
+        'response.xml'          => 'Guzzle\Service\Command\LocationVisitor\Response\XmlVisitor'
+    );
+
+    /** @var array Array of mappings of location names to classes */
+    protected $mappings;
+
+    /** @var array Cache of instantiated visitors */
+    protected $cache = array();
+
+    /**
+     * @return self
+     * @codeCoverageIgnore
+     */
+    public static function getInstance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param array $mappings Array mapping request.name and response.name to location visitor classes. Leave null to
+     *                        use the default values.
+     */
+    public function __construct(array $mappings = null)
+    {
+        $this->mappings = $mappings === null ? self::$defaultMappings : $mappings;
+    }
+
+    /**
+     * Get an instance of a request visitor by location name
+     *
+     * @param string $visitor Visitor name
+     *
+     * @return RequestVisitorInterface
+     */
+    public function getRequestVisitor($visitor)
+    {
+        return $this->getKey('request.' . $visitor);
+    }
+
+    /**
+     * Get an instance of a response visitor by location name
+     *
+     * @param string $visitor Visitor name
+     *
+     * @return ResponseVisitorInterface
+     */
+    public function getResponseVisitor($visitor)
+    {
+        return $this->getKey('response.' . $visitor);
+    }
+
+    /**
+     * Add a response visitor to the factory by name
+     *
+     * @param string                  $name    Name of the visitor
+     * @param RequestVisitorInterface $visitor Visitor to add
+     *
+     * @return self
+     */
+    public function addRequestVisitor($name, RequestVisitorInterface $visitor)
+    {
+        $this->cache['request.' . $name] = $visitor;
+
+        return $this;
+    }
+
+    /**
+     * Add a response visitor to the factory by name
+     *
+     * @param string                   $name    Name of the visitor
+     * @param ResponseVisitorInterface $visitor Visitor to add
+     *
+     * @return self
+     */
+    public function addResponseVisitor($name, ResponseVisitorInterface $visitor)
+    {
+        $this->cache['response.' . $name] = $visitor;
+
+        return $this;
+    }
+
+    /**
+     * Get a visitor by key value name
+     *
+     * @param string $key Key name to retrieve
+     *
+     * @return mixed
+     * @throws InvalidArgumentException
+     */
+    private function getKey($key)
+    {
+        if (!isset($this->cache[$key])) {
+            if (!isset($this->mappings[$key])) {
+                list($type, $name) = explode('.', $key);
+                throw new InvalidArgumentException("No {$type} visitor has been mapped for {$name}");
+            }
+            $this->cache[$key] = new $this->mappings[$key];
+        }
+
+        return $this->cache[$key];
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/OperationCommand.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/OperationCommand.php
new file mode 100644
index 0000000000000000000000000000000000000000..0748b5af071d46b11555b49a78aec40831e023ce
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/OperationCommand.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+/**
+ * A command that creates requests based on {@see Guzzle\Service\Description\OperationInterface} objects, and if the
+ * matching operation uses a service description model in the responseClass attribute, then this command will marshal
+ * the response into an associative array based on the JSON schema of the model.
+ */
+class OperationCommand extends AbstractCommand
+{
+    /** @var RequestSerializerInterface */
+    protected $requestSerializer;
+
+    /** @var ResponseParserInterface Response parser */
+    protected $responseParser;
+
+    /**
+     * Set the response parser used with the command
+     *
+     * @param ResponseParserInterface $parser Response parser
+     *
+     * @return self
+     */
+    public function setResponseParser(ResponseParserInterface $parser)
+    {
+        $this->responseParser = $parser;
+
+        return $this;
+    }
+
+    /**
+     * Set the request serializer used with the command
+     *
+     * @param RequestSerializerInterface $serializer Request serializer
+     *
+     * @return self
+     */
+    public function setRequestSerializer(RequestSerializerInterface $serializer)
+    {
+        $this->requestSerializer = $serializer;
+
+        return $this;
+    }
+
+    /**
+     * Get the request serializer used with the command
+     *
+     * @return RequestSerializerInterface
+     */
+    public function getRequestSerializer()
+    {
+        if (!$this->requestSerializer) {
+            // Use the default request serializer if none was found
+            $this->requestSerializer = DefaultRequestSerializer::getInstance();
+        }
+
+        return $this->requestSerializer;
+    }
+
+    /**
+     * Get the response parser used for the operation
+     *
+     * @return ResponseParserInterface
+     */
+    public function getResponseParser()
+    {
+        if (!$this->responseParser) {
+            // Use the default response parser if none was found
+            $this->responseParser = OperationResponseParser::getInstance();
+        }
+
+        return $this->responseParser;
+    }
+
+    protected function build()
+    {
+        // Prepare and serialize the request
+        $this->request = $this->getRequestSerializer()->prepare($this);
+    }
+
+    protected function process()
+    {
+        // Do not process the response if 'command.response_processing' is set to 'raw'
+        $this->result = $this[self::RESPONSE_PROCESSING] == self::TYPE_RAW
+            ? $this->request->getResponse()
+            : $this->getResponseParser()->parse($this);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/OperationResponseParser.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/OperationResponseParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d51296e2805a9ab4fd51b9cd600a6781e8bd015
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/OperationResponseParser.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+use Guzzle\Http\Message\Response;
+use Guzzle\Service\Command\LocationVisitor\VisitorFlyweight;
+use Guzzle\Service\Command\LocationVisitor\Response\ResponseVisitorInterface;
+use Guzzle\Service\Description\Parameter;
+use Guzzle\Service\Description\OperationInterface;
+use Guzzle\Service\Description\Operation;
+use Guzzle\Service\Exception\ResponseClassException;
+use Guzzle\Service\Resource\Model;
+
+/**
+ * Response parser that attempts to marshal responses into an associative array based on models in a service description
+ */
+class OperationResponseParser extends DefaultResponseParser
+{
+    /** @var VisitorFlyweight $factory Visitor factory */
+    protected $factory;
+
+    /** @var self */
+    protected static $instance;
+
+    /**
+     * @return self
+     * @codeCoverageIgnore
+     */
+    public static function getInstance()
+    {
+        if (!static::$instance) {
+            static::$instance = new static(VisitorFlyweight::getInstance());
+        }
+
+        return static::$instance;
+    }
+
+    /**
+     * @param VisitorFlyweight $factory Factory to use when creating visitors
+     */
+    public function __construct(VisitorFlyweight $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * Add a location visitor to the command
+     *
+     * @param string                   $location Location to associate with the visitor
+     * @param ResponseVisitorInterface $visitor  Visitor to attach
+     *
+     * @return self
+     */
+    public function addVisitor($location, ResponseVisitorInterface $visitor)
+    {
+        $this->factory->addResponseVisitor($location, $visitor);
+
+        return $this;
+    }
+
+    protected function handleParsing(CommandInterface $command, Response $response, $contentType)
+    {
+        $operation = $command->getOperation();
+        $type = $operation->getResponseType();
+        $model = null;
+
+        if ($type == OperationInterface::TYPE_MODEL) {
+            $model = $operation->getServiceDescription()->getModel($operation->getResponseClass());
+        } elseif ($type == OperationInterface::TYPE_CLASS) {
+            $responseClassInterface = __NAMESPACE__ . '\ResponseClassInterface';
+            $className = $operation->getResponseClass();
+            if (!class_exists($className)) {
+                throw new ResponseClassException("{$className} does not exist");
+            } elseif (!method_exists($className, 'fromCommand')) {
+                throw new ResponseClassException("{$className} must implement {$responseClassInterface}");
+            }
+            return $className::fromCommand($command);
+        }
+
+        if (!$model) {
+            // Return basic processing if the responseType is not model or the model cannot be found
+            return parent::handleParsing($command, $response, $contentType);
+        } elseif ($command[AbstractCommand::RESPONSE_PROCESSING] != AbstractCommand::TYPE_MODEL) {
+            // Returns a model with no visiting if the command response processing is not model
+            return new Model(parent::handleParsing($command, $response, $contentType), $model);
+        } else {
+            return new Model($this->visitResult($model, $command, $response), $model);
+        }
+    }
+
+    /**
+     * Perform transformations on the result array
+     *
+     * @param Parameter        $model    Model that defines the structure
+     * @param CommandInterface $command  Command that performed the operation
+     * @param Response         $response Response received
+     *
+     * @return array Returns the array of result data
+     */
+    protected function visitResult(Parameter $model, CommandInterface $command, Response $response)
+    {
+        $foundVisitors = $result = array();
+        $props = $model->getProperties();
+
+        foreach ($props as $schema) {
+            if ($location = $schema->getLocation()) {
+                // Trigger the before method on the first found visitor of this type
+                if (!isset($foundVisitors[$location])) {
+                    $foundVisitors[$location] = $this->factory->getResponseVisitor($location);
+                    $foundVisitors[$location]->before($command, $result);
+                }
+            }
+        }
+
+        // Visit additional properties when it is an actual schema
+        if ($additional = $model->getAdditionalProperties()) {
+            if ($additional instanceof Parameter) {
+                // Only visit when a location is specified
+                if ($location = $additional->getLocation()) {
+                    if (!isset($foundVisitors[$location])) {
+                        $foundVisitors[$location] = $this->factory->getResponseVisitor($location);
+                        $foundVisitors[$location]->before($command, $result);
+                    }
+                    // Only traverse if an array was parsed from the before() visitors
+                    if (is_array($result)) {
+                        // Find each additional property
+                        foreach (array_keys($result) as $key) {
+                            // Check if the model actually knows this property. If so, then it is not additional
+                            if (!$model->getProperty($key)) {
+                                // Set the name to the key so that we can parse it with each visitor
+                                $additional->setName($key);
+                                $foundVisitors[$location]->visit($command, $response, $additional, $result);
+                            }
+                        }
+                        // Reset the additionalProperties name to null
+                        $additional->setName(null);
+                    }
+                }
+            }
+        }
+
+        // Apply the parameter value with the location visitor
+        foreach ($props as $schema) {
+            if ($location = $schema->getLocation()) {
+                $foundVisitors[$location]->visit($command, $response, $schema, $result);
+            }
+        }
+
+        // Call the after() method of each found visitor
+        foreach ($foundVisitors as $visitor) {
+            $visitor->after($command);
+        }
+
+        return $result;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/RequestSerializerInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/RequestSerializerInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..60b9334d450910afdb0fb58b5604c2e4fb795d89
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/RequestSerializerInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Translates command options and operation parameters into a request object
+ */
+interface RequestSerializerInterface
+{
+    /**
+     * Create a request for a command
+     *
+     * @param CommandInterface $command Command that will own the request
+     *
+     * @return RequestInterface
+     */
+    public function prepare(CommandInterface $command);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ResponseClassInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ResponseClassInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..325dd08dff0f22254d07ba718c5bdfc7e1940571
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ResponseClassInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+/**
+ * Interface used to accept a completed OperationCommand and parse the result into a specific response type
+ */
+interface ResponseClassInterface
+{
+    /**
+     * Create a response model object from a completed command
+     *
+     * @param OperationCommand $command That serialized the request
+     *
+     * @return self
+     */
+    public static function fromCommand(OperationCommand $command);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ResponseParserInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ResponseParserInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..015f0bb9860a24ecceb5160f9c831299befb7386
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Command/ResponseParserInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Guzzle\Service\Command;
+
+/**
+ * Parses the HTTP response of a command and sets the appropriate result on a command object
+ */
+interface ResponseParserInterface
+{
+    /**
+     * Parse the HTTP response received by the command and update the command's result contents
+     *
+     * @param CommandInterface $command Command to parse and update
+     *
+     * @return mixed Returns the result to set on the command
+     */
+    public function parse(CommandInterface $command);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/ConfigLoaderInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/ConfigLoaderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..304100dcf9fa8cef40bd9895589fa20f652a2123
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/ConfigLoaderInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Guzzle\Service;
+
+/**
+ * Interface used for loading configuration data (service descriptions, service builder configs, etc)
+ *
+ * If a loaded configuration data sets includes a top level key containing an 'includes' section, then the data in the
+ * file will extend the merged result of all of the included config files.
+ */
+interface ConfigLoaderInterface
+{
+    /**
+     * Loads configuration data and returns an array of the loaded result
+     *
+     * @param mixed $config  Data to load (filename or array of data)
+     * @param array $options Array of options to use when loading
+     *
+     * @return mixed
+     */
+    public function load($config, array $options = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/Operation.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/Operation.php
new file mode 100644
index 0000000000000000000000000000000000000000..8400ff64e192de01d02a61b96f5432f6904cdccc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/Operation.php
@@ -0,0 +1,550 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * Data object holding the information of an API command
+ */
+class Operation implements OperationInterface
+{
+    /** @var string Default command class to use when none is specified */
+    const DEFAULT_COMMAND_CLASS = 'Guzzle\\Service\\Command\\OperationCommand';
+
+    /** @var array Hashmap of properties that can be specified. Represented as a hash to speed up constructor. */
+    protected static $properties = array(
+        'name' => true, 'httpMethod' => true, 'uri' => true, 'class' => true, 'responseClass' => true,
+        'responseType' => true, 'responseNotes' => true, 'notes' => true, 'summary' => true, 'documentationUrl' => true,
+        'deprecated' => true, 'data' => true, 'parameters' => true, 'additionalParameters' => true,
+        'errorResponses' => true
+    );
+
+    /** @var array Parameters */
+    protected $parameters = array();
+
+    /** @var Parameter Additional parameters schema */
+    protected $additionalParameters;
+
+    /** @var string Name of the command */
+    protected $name;
+
+    /** @var string HTTP method */
+    protected $httpMethod;
+
+    /** @var string This is a short summary of what the operation does */
+    protected $summary;
+
+    /** @var string A longer text field to explain the behavior of the operation. */
+    protected $notes;
+
+    /** @var string Reference URL providing more information about the operation */
+    protected $documentationUrl;
+
+    /** @var string HTTP URI of the command */
+    protected $uri;
+
+    /** @var string Class of the command object */
+    protected $class;
+
+    /** @var string This is what is returned from the method */
+    protected $responseClass;
+
+    /** @var string Type information about the response */
+    protected $responseType;
+
+    /** @var string Information about the response returned by the operation */
+    protected $responseNotes;
+
+    /** @var bool Whether or not the command is deprecated */
+    protected $deprecated;
+
+    /** @var array Array of errors that could occur when running the command */
+    protected $errorResponses;
+
+    /** @var ServiceDescriptionInterface */
+    protected $description;
+
+    /** @var array Extra operation information */
+    protected $data;
+
+    /**
+     * Builds an Operation object using an array of configuration data:
+     * - name:               (string) Name of the command
+     * - httpMethod:         (string) HTTP method of the operation
+     * - uri:                (string) URI template that can create a relative or absolute URL
+     * - class:              (string) Concrete class that implements this command
+     * - parameters:         (array) Associative array of parameters for the command. {@see Parameter} for information.
+     * - summary:            (string) This is a short summary of what the operation does
+     * - notes:              (string) A longer text field to explain the behavior of the operation.
+     * - documentationUrl:   (string) Reference URL providing more information about the operation
+     * - responseClass:      (string) This is what is returned from the method. Can be a primitive, PSR-0 compliant
+     *                       class name, or model.
+     * - responseNotes:      (string) Information about the response returned by the operation
+     * - responseType:       (string) One of 'primitive', 'class', 'model', or 'documentation'. If not specified, this
+     *                       value will be automatically inferred based on whether or not there is a model matching the
+     *                       name, if a matching PSR-0 compliant class name is found, or set to 'primitive' by default.
+     * - deprecated:         (bool) Set to true if this is a deprecated command
+     * - errorResponses:     (array) Errors that could occur when executing the command. Array of hashes, each with a
+     *                       'code' (the HTTP response code), 'phrase' (response reason phrase or description of the
+     *                       error), and 'class' (a custom exception class that would be thrown if the error is
+     *                       encountered).
+     * - data:               (array) Any extra data that might be used to help build or serialize the operation
+     * - additionalParameters: (null|array) Parameter schema to use when an option is passed to the operation that is
+     *                                      not in the schema
+     *
+     * @param array                       $config      Array of configuration data
+     * @param ServiceDescriptionInterface $description Service description used to resolve models if $ref tags are found
+     */
+    public function __construct(array $config = array(), ServiceDescriptionInterface $description = null)
+    {
+        $this->description = $description;
+
+        // Get the intersection of the available properties and properties set on the operation
+        foreach (array_intersect_key($config, self::$properties) as $key => $value) {
+            $this->{$key} = $value;
+        }
+
+        $this->class = $this->class ?: self::DEFAULT_COMMAND_CLASS;
+        $this->deprecated = (bool) $this->deprecated;
+        $this->errorResponses = $this->errorResponses ?: array();
+        $this->data = $this->data ?: array();
+
+        if (!$this->responseClass) {
+            $this->responseClass = 'array';
+            $this->responseType = 'primitive';
+        } elseif ($this->responseType) {
+            // Set the response type to perform validation
+            $this->setResponseType($this->responseType);
+        } else {
+            // A response class was set and no response type was set, so guess what the type is
+            $this->inferResponseType();
+        }
+
+        // Parameters need special handling when adding
+        if ($this->parameters) {
+            foreach ($this->parameters as $name => $param) {
+                if ($param instanceof Parameter) {
+                    $param->setName($name)->setParent($this);
+                } elseif (is_array($param)) {
+                    $param['name'] = $name;
+                    $this->addParam(new Parameter($param, $this->description));
+                }
+            }
+        }
+
+        if ($this->additionalParameters) {
+            if ($this->additionalParameters instanceof Parameter) {
+                $this->additionalParameters->setParent($this);
+            } elseif (is_array($this->additionalParameters)) {
+                $this->setadditionalParameters(new Parameter($this->additionalParameters, $this->description));
+            }
+        }
+    }
+
+    public function toArray()
+    {
+        $result = array();
+        // Grab valid properties and filter out values that weren't set
+        foreach (array_keys(self::$properties) as $check) {
+            if ($value = $this->{$check}) {
+                $result[$check] = $value;
+            }
+        }
+        // Remove the name property
+        unset($result['name']);
+        // Parameters need to be converted to arrays
+        $result['parameters'] = array();
+        foreach ($this->parameters as $key => $param) {
+            $result['parameters'][$key] = $param->toArray();
+        }
+        // Additional parameters need to be cast to an array
+        if ($this->additionalParameters instanceof Parameter) {
+            $result['additionalParameters'] = $this->additionalParameters->toArray();
+        }
+
+        return $result;
+    }
+
+    public function getServiceDescription()
+    {
+        return $this->description;
+    }
+
+    public function setServiceDescription(ServiceDescriptionInterface $description)
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    public function getParams()
+    {
+        return $this->parameters;
+    }
+
+    public function getParamNames()
+    {
+        return array_keys($this->parameters);
+    }
+
+    public function hasParam($name)
+    {
+        return isset($this->parameters[$name]);
+    }
+
+    public function getParam($param)
+    {
+        return isset($this->parameters[$param]) ? $this->parameters[$param] : null;
+    }
+
+    /**
+     * Add a parameter to the command
+     *
+     * @param Parameter $param Parameter to add
+     *
+     * @return self
+     */
+    public function addParam(Parameter $param)
+    {
+        $this->parameters[$param->getName()] = $param;
+        $param->setParent($this);
+
+        return $this;
+    }
+
+    /**
+     * Remove a parameter from the command
+     *
+     * @param string $name Name of the parameter to remove
+     *
+     * @return self
+     */
+    public function removeParam($name)
+    {
+        unset($this->parameters[$name]);
+
+        return $this;
+    }
+
+    public function getHttpMethod()
+    {
+        return $this->httpMethod;
+    }
+
+    /**
+     * Set the HTTP method of the command
+     *
+     * @param string $httpMethod Method to set
+     *
+     * @return self
+     */
+    public function setHttpMethod($httpMethod)
+    {
+        $this->httpMethod = $httpMethod;
+
+        return $this;
+    }
+
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    /**
+     * Set the concrete class of the command
+     *
+     * @param string $className Concrete class name
+     *
+     * @return self
+     */
+    public function setClass($className)
+    {
+        $this->class = $className;
+
+        return $this;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set the name of the command
+     *
+     * @param string $name Name of the command
+     *
+     * @return self
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getSummary()
+    {
+        return $this->summary;
+    }
+
+    /**
+     * Set a short summary of what the operation does
+     *
+     * @param string $summary Short summary of the operation
+     *
+     * @return self
+     */
+    public function setSummary($summary)
+    {
+        $this->summary = $summary;
+
+        return $this;
+    }
+
+    public function getNotes()
+    {
+        return $this->notes;
+    }
+
+    /**
+     * Set a longer text field to explain the behavior of the operation.
+     *
+     * @param string $notes Notes on the operation
+     *
+     * @return self
+     */
+    public function setNotes($notes)
+    {
+        $this->notes = $notes;
+
+        return $this;
+    }
+
+    public function getDocumentationUrl()
+    {
+        return $this->documentationUrl;
+    }
+
+    /**
+     * Set the URL pointing to additional documentation on the command
+     *
+     * @param string $docUrl Documentation URL
+     *
+     * @return self
+     */
+    public function setDocumentationUrl($docUrl)
+    {
+        $this->documentationUrl = $docUrl;
+
+        return $this;
+    }
+
+    public function getResponseClass()
+    {
+        return $this->responseClass;
+    }
+
+    /**
+     * Set what is returned from the method. Can be a primitive, class name, or model. For example: 'array',
+     * 'Guzzle\\Foo\\Baz', or 'MyModelName' (to reference a model by ID).
+     *
+     * @param string $responseClass Type of response
+     *
+     * @return self
+     */
+    public function setResponseClass($responseClass)
+    {
+        $this->responseClass = $responseClass;
+        $this->inferResponseType();
+
+        return $this;
+    }
+
+    public function getResponseType()
+    {
+        return $this->responseType;
+    }
+
+    /**
+     * Set qualifying information about the responseClass. One of 'primitive', 'class', 'model', or 'documentation'
+     *
+     * @param string $responseType Response type information
+     *
+     * @return self
+     * @throws InvalidArgumentException
+     */
+    public function setResponseType($responseType)
+    {
+        static $types = array(
+            self::TYPE_PRIMITIVE => true,
+            self::TYPE_CLASS => true,
+            self::TYPE_MODEL => true,
+            self::TYPE_DOCUMENTATION => true
+        );
+        if (!isset($types[$responseType])) {
+            throw new InvalidArgumentException('responseType must be one of ' . implode(', ', array_keys($types)));
+        }
+
+        $this->responseType = $responseType;
+
+        return $this;
+    }
+
+    public function getResponseNotes()
+    {
+        return $this->responseNotes;
+    }
+
+    /**
+     * Set notes about the response of the operation
+     *
+     * @param string $notes Response notes
+     *
+     * @return self
+     */
+    public function setResponseNotes($notes)
+    {
+        $this->responseNotes = $notes;
+
+        return $this;
+    }
+
+    public function getDeprecated()
+    {
+        return $this->deprecated;
+    }
+
+    /**
+     * Set whether or not the command is deprecated
+     *
+     * @param bool $isDeprecated Set to true to mark as deprecated
+     *
+     * @return self
+     */
+    public function setDeprecated($isDeprecated)
+    {
+        $this->deprecated = $isDeprecated;
+
+        return $this;
+    }
+
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Set the URI template of the command
+     *
+     * @param string $uri URI template to set
+     *
+     * @return self
+     */
+    public function setUri($uri)
+    {
+        $this->uri = $uri;
+
+        return $this;
+    }
+
+    public function getErrorResponses()
+    {
+        return $this->errorResponses;
+    }
+
+    /**
+     * Add an error to the command
+     *
+     * @param string $code   HTTP response code
+     * @param string $reason HTTP response reason phrase or information about the error
+     * @param string $class  Exception class associated with the error
+     *
+     * @return self
+     */
+    public function addErrorResponse($code, $reason, $class)
+    {
+        $this->errorResponses[] = array('code' => $code, 'reason' => $reason, 'class' => $class);
+
+        return $this;
+    }
+
+    /**
+     * Set all of the error responses of the operation
+     *
+     * @param array $errorResponses Hash of error name to a hash containing a code, reason, class
+     *
+     * @return self
+     */
+    public function setErrorResponses(array $errorResponses)
+    {
+        $this->errorResponses = $errorResponses;
+
+        return $this;
+    }
+
+    public function getData($name)
+    {
+        return isset($this->data[$name]) ? $this->data[$name] : null;
+    }
+
+    /**
+     * Set a particular data point on the operation
+     *
+     * @param string $name  Name of the data value
+     * @param mixed  $value Value to set
+     *
+     * @return self
+     */
+    public function setData($name, $value)
+    {
+        $this->data[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get the additionalParameters of the operation
+     *
+     * @return Paramter|null
+     */
+    public function getAdditionalParameters()
+    {
+        return $this->additionalParameters;
+    }
+
+    /**
+     * Set the additionalParameters of the operation
+     *
+     * @param Parameter|null $parameter Parameter to set
+     *
+     * @return self
+     */
+    public function setAdditionalParameters($parameter)
+    {
+        if ($this->additionalParameters = $parameter) {
+            $this->additionalParameters->setParent($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Infer the response type from the responseClass value
+     */
+    protected function inferResponseType()
+    {
+        if (!$this->responseClass || $this->responseClass == 'array' || $this->responseClass == 'string'
+            || $this->responseClass == 'boolean' || $this->responseClass == 'integer'
+        ) {
+            $this->responseType = self::TYPE_PRIMITIVE;
+        } elseif ($this->description && $this->description->hasModel($this->responseClass)) {
+            $this->responseType = self::TYPE_MODEL;
+        } elseif (strpos($this->responseClass, '\\') !== false) {
+            $this->responseType = self::TYPE_CLASS;
+        } else {
+            $this->responseType = self::TYPE_PRIMITIVE;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/OperationInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/OperationInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..4de41bd67ea150fd656eff9d81a4ccc846c95a7b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/OperationInterface.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * Interface defining data objects that hold the information of an API operation
+ */
+interface OperationInterface extends ToArrayInterface
+{
+    const TYPE_PRIMITIVE = 'primitive';
+    const TYPE_CLASS = 'class';
+    const TYPE_DOCUMENTATION = 'documentation';
+    const TYPE_MODEL = 'model';
+
+    /**
+     * Get the service description that the operation belongs to
+     *
+     * @return ServiceDescriptionInterface|null
+     */
+    public function getServiceDescription();
+
+    /**
+     * Set the service description that the operation belongs to
+     *
+     * @param ServiceDescriptionInterface $description Service description
+     *
+     * @return self
+     */
+    public function setServiceDescription(ServiceDescriptionInterface $description);
+
+    /**
+     * Get the params of the operation
+     *
+     * @return array
+     */
+    public function getParams();
+
+    /**
+     * Returns an array of parameter names
+     *
+     * @return array
+     */
+    public function getParamNames();
+
+    /**
+     * Check if the operation has a specific parameter by name
+     *
+     * @param string $name Name of the param
+     *
+     * @return bool
+     */
+    public function hasParam($name);
+
+    /**
+     * Get a single parameter of the operation
+     *
+     * @param string $param Parameter to retrieve by name
+     *
+     * @return Parameter|null
+     */
+    public function getParam($param);
+
+    /**
+     * Get the HTTP method of the operation
+     *
+     * @return string|null
+     */
+    public function getHttpMethod();
+
+    /**
+     * Get the concrete operation class that implements this operation
+     *
+     * @return string
+     */
+    public function getClass();
+
+    /**
+     * Get the name of the operation
+     *
+     * @return string|null
+     */
+    public function getName();
+
+    /**
+     * Get a short summary of what the operation does
+     *
+     * @return string|null
+     */
+    public function getSummary();
+
+    /**
+     * Get a longer text field to explain the behavior of the operation
+     *
+     * @return string|null
+     */
+    public function getNotes();
+
+    /**
+     * Get the documentation URL of the operation
+     *
+     * @return string|null
+     */
+    public function getDocumentationUrl();
+
+    /**
+     * Get what is returned from the method. Can be a primitive, class name, or model. For example, the responseClass
+     * could be 'array', which would inherently use a responseType of 'primitive'. Using a class name would set a
+     * responseType of 'class'. Specifying a model by ID will use a responseType of 'model'.
+     *
+     * @return string|null
+     */
+    public function getResponseClass();
+
+    /**
+     * Get information about how the response is unmarshalled: One of 'primitive', 'class', 'model', or 'documentation'
+     *
+     * @return string
+     */
+    public function getResponseType();
+
+    /**
+     * Get notes about the response of the operation
+     *
+     * @return string|null
+     */
+    public function getResponseNotes();
+
+    /**
+     * Get whether or not the operation is deprecated
+     *
+     * @return bool
+     */
+    public function getDeprecated();
+
+    /**
+     * Get the URI that will be merged into the generated request
+     *
+     * @return string
+     */
+    public function getUri();
+
+    /**
+     * Get the errors that could be encountered when executing the operation
+     *
+     * @return array
+     */
+    public function getErrorResponses();
+
+    /**
+     * Get extra data from the operation
+     *
+     * @param string $name Name of the data point to retrieve
+     *
+     * @return mixed|null
+     */
+    public function getData($name);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/Parameter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/Parameter.php
new file mode 100644
index 0000000000000000000000000000000000000000..c856a79a5d1c4a24a6dc28de721e9e0362e20188
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/Parameter.php
@@ -0,0 +1,927 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * API parameter object used with service descriptions
+ */
+class Parameter
+{
+    protected $name;
+    protected $description;
+    protected $serviceDescription;
+    protected $type;
+    protected $required;
+    protected $enum;
+    protected $pattern;
+    protected $minimum;
+    protected $maximum;
+    protected $minLength;
+    protected $maxLength;
+    protected $minItems;
+    protected $maxItems;
+    protected $default;
+    protected $static;
+    protected $instanceOf;
+    protected $filters;
+    protected $location;
+    protected $sentAs;
+    protected $data;
+    protected $properties = array();
+    protected $additionalProperties;
+    protected $items;
+    protected $parent;
+    protected $ref;
+    protected $format;
+    protected $propertiesCache = null;
+
+    /**
+     * Create a new Parameter using an associative array of data. The array can contain the following information:
+     * - name:          (string) Unique name of the parameter
+     * - type:          (string|array) Type of variable (string, number, integer, boolean, object, array, numeric,
+     *                  null, any). Types are using for validation and determining the structure of a parameter. You
+     *                  can use a union type by providing an array of simple types. If one of the union types matches
+     *                  the provided value, then the value is valid.
+     * - instanceOf:    (string) When the type is an object, you can specify the class that the object must implement
+     * - required:      (bool) Whether or not the parameter is required
+     * - default:       (mixed) Default value to use if no value is supplied
+     * - static:        (bool) Set to true to specify that the parameter value cannot be changed from the default
+     * - description:   (string) Documentation of the parameter
+     * - location:      (string) The location of a request used to apply a parameter. Custom locations can be registered
+     *                  with a command, but the defaults are uri, query, header, body, json, xml, postField, postFile.
+     * - sentAs:        (string) Specifies how the data being modeled is sent over the wire. For example, you may wish
+     *                  to include certain headers in a response model that have a normalized casing of FooBar, but the
+     *                  actual header is x-foo-bar. In this case, sentAs would be set to x-foo-bar.
+     * - filters:       (array) Array of static method names to to run a parameter value through. Each value in the
+     *                  array must be a string containing the full class path to a static method or an array of complex
+     *                  filter information. You can specify static methods of classes using the full namespace class
+     *                  name followed by '::' (e.g. Foo\Bar::baz()). Some filters require arguments in order to properly
+     *                  filter a value. For complex filters, use a hash containing a 'method' key pointing to a static
+     *                  method, and an 'args' key containing an array of positional arguments to pass to the method.
+     *                  Arguments can contain keywords that are replaced when filtering a value: '@value' is replaced
+     *                  with the value being validated, '@api' is replaced with the Parameter object.
+     * - properties:    When the type is an object, you can specify nested parameters
+     * - additionalProperties: (array) This attribute defines a schema for all properties that are not explicitly
+     *                  defined in an object type definition. If specified, the value MUST be a schema or a boolean. If
+     *                  false is provided, no additional properties are allowed beyond the properties defined in the
+     *                  schema. The default value is an empty schema which allows any value for additional properties.
+     * - items:         This attribute defines the allowed items in an instance array, and MUST be a schema or an array
+     *                  of schemas. The default value is an empty schema which allows any value for items in the
+     *                  instance array.
+     *                  When this attribute value is a schema and the instance value is an array, then all the items
+     *                  in the array MUST be valid according to the schema.
+     * - pattern:       When the type is a string, you can specify the regex pattern that a value must match
+     * - enum:          When the type is a string, you can specify a list of acceptable values
+     * - minItems:      (int) Minimum number of items allowed in an array
+     * - maxItems:      (int) Maximum number of items allowed in an array
+     * - minLength:     (int) Minimum length of a string
+     * - maxLength:     (int) Maximum length of a string
+     * - minimum:       (int) Minimum value of an integer
+     * - maximum:       (int) Maximum value of an integer
+     * - data:          (array) Any additional custom data to use when serializing, validating, etc
+     * - format:        (string) Format used to coax a value into the correct format when serializing or unserializing.
+     *                  You may specify either an array of filters OR a format, but not both.
+     *                  Supported values: date-time, date, time, timestamp, date-time-http
+     * - $ref:          (string) String referencing a service description model. The parameter is replaced by the
+     *                  schema contained in the model.
+     *
+     * @param array                       $data        Array of data as seen in service descriptions
+     * @param ServiceDescriptionInterface $description Service description used to resolve models if $ref tags are found
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct(array $data = array(), ServiceDescriptionInterface $description = null)
+    {
+        if ($description) {
+            if (isset($data['$ref'])) {
+                if ($model = $description->getModel($data['$ref'])) {
+                    // The name of the original parameter should override the ref name if one is available
+                    $name = empty($data['name']) ? null : $data['name'];
+                    $data = $model->toArray();
+                    if ($name) {
+                        $data['name'] = $name;
+                    }
+                }
+            } elseif (isset($data['extends'])) {
+                // If this parameter extends from another parameter then start with the actual data
+                // union in the parent's data (e.g. actual supersedes parent)
+                if ($extends = $description->getModel($data['extends'])) {
+                    $data += $extends->toArray();
+                }
+            }
+        }
+
+        // Pull configuration data into the parameter
+        foreach ($data as $key => $value) {
+            $this->{$key} = $value;
+        }
+
+        $this->serviceDescription = $description;
+        $this->required = (bool) $this->required;
+        $this->data = (array) $this->data;
+
+        if ($this->filters) {
+            $this->setFilters((array) $this->filters);
+        }
+
+        if ($this->type == 'object' && $this->additionalProperties === null) {
+            $this->additionalProperties = true;
+        }
+    }
+
+    /**
+     * Convert the object to an array
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $result = array();
+        $checks = array('required', 'description', 'static', 'type', 'format', 'instanceOf', 'location', 'sentAs',
+            'pattern', 'minimum', 'maximum', 'minItems', 'maxItems', 'minLength', 'maxLength', 'data', 'enum',
+            'filters');
+
+        // Anything that is in the `Items` attribute of an array *must* include it's name if available
+        if ($this->parent instanceof self && $this->parent->getType() == 'array' && isset($this->name)) {
+            $result['name'] = $this->name;
+        }
+
+        foreach ($checks as $c) {
+            if ($value = $this->{$c}) {
+                $result[$c] = $value;
+            }
+        }
+
+        if ($this->default !== null) {
+            $result['default'] = $this->default;
+        }
+
+        if ($this->items !== null) {
+            $result['items'] = $this->getItems()->toArray();
+        }
+
+        if ($this->additionalProperties !== null) {
+            $result['additionalProperties'] = $this->getAdditionalProperties();
+            if ($result['additionalProperties'] instanceof self) {
+                $result['additionalProperties'] = $result['additionalProperties']->toArray();
+            }
+        }
+
+        if ($this->type == 'object' && $this->properties) {
+            $result['properties'] = array();
+            foreach ($this->getProperties() as $name => $property) {
+                $result['properties'][$name] = $property->toArray();
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get the default or static value of the command based on a value
+     *
+     * @param string $value Value that is currently set
+     *
+     * @return mixed Returns the value, a static value if one is present, or a default value
+     */
+    public function getValue($value)
+    {
+        return $this->static || ($this->default !== null && !$value && ($this->type != 'boolean' || $value !== false))
+            ? $this->default
+            : $value;
+    }
+
+    /**
+     * Run a value through the filters OR format attribute associated with the parameter
+     *
+     * @param mixed $value Value to filter
+     *
+     * @return mixed Returns the filtered value
+     */
+    public function filter($value)
+    {
+        // Formats are applied exclusively and supersed filters
+        if ($this->format) {
+            return SchemaFormatter::format($this->format, $value);
+        }
+
+        // Convert Boolean values
+        if ($this->type == 'boolean' && !is_bool($value)) {
+            $value = filter_var($value, FILTER_VALIDATE_BOOLEAN);
+        }
+
+        // Apply filters to the value
+        if ($this->filters) {
+            foreach ($this->filters as $filter) {
+                if (is_array($filter)) {
+                    // Convert complex filters that hold value place holders
+                    foreach ($filter['args'] as &$data) {
+                        if ($data == '@value') {
+                            $data = $value;
+                        } elseif ($data == '@api') {
+                            $data = $this;
+                        }
+                    }
+                    $value = call_user_func_array($filter['method'], $filter['args']);
+                } else {
+                    $value = call_user_func($filter, $value);
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get the name of the parameter
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get the key of the parameter, where sentAs will supersede name if it is set
+     *
+     * @return string
+     */
+    public function getWireName()
+    {
+        return $this->sentAs ?: $this->name;
+    }
+
+    /**
+     * Set the name of the parameter
+     *
+     * @param string $name Name to set
+     *
+     * @return self
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get the type(s) of the parameter
+     *
+     * @return string|array
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Set the type(s) of the parameter
+     *
+     * @param string|array $type Type of parameter or array of simple types used in a union
+     *
+     * @return self
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get if the parameter is required
+     *
+     * @return bool
+     */
+    public function getRequired()
+    {
+        return $this->required;
+    }
+
+    /**
+     * Set if the parameter is required
+     *
+     * @param bool $isRequired Whether or not the parameter is required
+     *
+     * @return self
+     */
+    public function setRequired($isRequired)
+    {
+        $this->required = (bool) $isRequired;
+
+        return $this;
+    }
+
+    /**
+     * Get the default value of the parameter
+     *
+     * @return string|null
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * Set the default value of the parameter
+     *
+     * @param string|null $default Default value to set
+     *
+     * @return self
+     */
+    public function setDefault($default)
+    {
+        $this->default = $default;
+
+        return $this;
+    }
+
+    /**
+     * Get the description of the parameter
+     *
+     * @return string|null
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * Set the description of the parameter
+     *
+     * @param string $description Description
+     *
+     * @return self
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     * Get the minimum acceptable value for an integer
+     *
+     * @return int|null
+     */
+    public function getMinimum()
+    {
+        return $this->minimum;
+    }
+
+    /**
+     * Set the minimum acceptable value for an integer
+     *
+     * @param int|null $min Minimum
+     *
+     * @return self
+     */
+    public function setMinimum($min)
+    {
+        $this->minimum = $min;
+
+        return $this;
+    }
+
+    /**
+     * Get the maximum acceptable value for an integer
+     *
+     * @return int|null
+     */
+    public function getMaximum()
+    {
+        return $this->maximum;
+    }
+
+    /**
+     * Set the maximum acceptable value for an integer
+     *
+     * @param int $max Maximum
+     *
+     * @return self
+     */
+    public function setMaximum($max)
+    {
+        $this->maximum = $max;
+
+        return $this;
+    }
+
+    /**
+     * Get the minimum allowed length of a string value
+     *
+     * @return int
+     */
+    public function getMinLength()
+    {
+        return $this->minLength;
+    }
+
+    /**
+     * Set the minimum allowed length of a string value
+     *
+     * @param int|null $min Minimum
+     *
+     * @return self
+     */
+    public function setMinLength($min)
+    {
+        $this->minLength = $min;
+
+        return $this;
+    }
+
+    /**
+     * Get the maximum allowed length of a string value
+     *
+     * @return int|null
+     */
+    public function getMaxLength()
+    {
+        return $this->maxLength;
+    }
+
+    /**
+     * Set the maximum allowed length of a string value
+     *
+     * @param int $max Maximum length
+     *
+     * @return self
+     */
+    public function setMaxLength($max)
+    {
+        $this->maxLength = $max;
+
+        return $this;
+    }
+
+    /**
+     * Get the maximum allowed number of items in an array value
+     *
+     * @return int|null
+     */
+    public function getMaxItems()
+    {
+        return $this->maxItems;
+    }
+
+    /**
+     * Set the maximum allowed number of items in an array value
+     *
+     * @param int $max Maximum
+     *
+     * @return self
+     */
+    public function setMaxItems($max)
+    {
+        $this->maxItems = $max;
+
+        return $this;
+    }
+
+    /**
+     * Get the minimum allowed number of items in an array value
+     *
+     * @return int
+     */
+    public function getMinItems()
+    {
+        return $this->minItems;
+    }
+
+    /**
+     * Set the minimum allowed number of items in an array value
+     *
+     * @param int|null $min Minimum
+     *
+     * @return self
+     */
+    public function setMinItems($min)
+    {
+        $this->minItems = $min;
+
+        return $this;
+    }
+
+    /**
+     * Get the location of the parameter
+     *
+     * @return string|null
+     */
+    public function getLocation()
+    {
+        return $this->location;
+    }
+
+    /**
+     * Set the location of the parameter
+     *
+     * @param string|null $location Location of the parameter
+     *
+     * @return self
+     */
+    public function setLocation($location)
+    {
+        $this->location = $location;
+
+        return $this;
+    }
+
+    /**
+     * Get the sentAs attribute of the parameter that used with locations to sentAs an attribute when it is being
+     * applied to a location.
+     *
+     * @return string|null
+     */
+    public function getSentAs()
+    {
+        return $this->sentAs;
+    }
+
+    /**
+     * Set the sentAs attribute
+     *
+     * @param string|null $name Name of the value as it is sent over the wire
+     *
+     * @return self
+     */
+    public function setSentAs($name)
+    {
+        $this->sentAs = $name;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve a known property from the parameter by name or a data property by name. When not specific name value
+     * is specified, all data properties will be returned.
+     *
+     * @param string|null $name Specify a particular property name to retrieve
+     *
+     * @return array|mixed|null
+     */
+    public function getData($name = null)
+    {
+        if (!$name) {
+            return $this->data;
+        }
+
+        if (isset($this->data[$name])) {
+            return $this->data[$name];
+        } elseif (isset($this->{$name})) {
+            return $this->{$name};
+        }
+
+        return null;
+    }
+
+    /**
+     * Set the extra data properties of the parameter or set a specific extra property
+     *
+     * @param string|array|null $nameOrData The name of a specific extra to set or an array of extras to set
+     * @param mixed|null        $data       When setting a specific extra property, specify the data to set for it
+     *
+     * @return self
+     */
+    public function setData($nameOrData, $data = null)
+    {
+        if (is_array($nameOrData)) {
+            $this->data = $nameOrData;
+        } else {
+            $this->data[$nameOrData] = $data;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get whether or not the default value can be changed
+     *
+     * @return mixed|null
+     */
+    public function getStatic()
+    {
+        return $this->static;
+    }
+
+    /**
+     * Set to true if the default value cannot be changed
+     *
+     * @param bool $static True or false
+     *
+     * @return self
+     */
+    public function setStatic($static)
+    {
+        $this->static = (bool) $static;
+
+        return $this;
+    }
+
+    /**
+     * Get an array of filters used by the parameter
+     *
+     * @return array
+     */
+    public function getFilters()
+    {
+        return $this->filters ?: array();
+    }
+
+    /**
+     * Set the array of filters used by the parameter
+     *
+     * @param array $filters Array of functions to use as filters
+     *
+     * @return self
+     */
+    public function setFilters(array $filters)
+    {
+        $this->filters = array();
+        foreach ($filters as $filter) {
+            $this->addFilter($filter);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a filter to the parameter
+     *
+     * @param string|array $filter Method to filter the value through
+     *
+     * @return self
+     * @throws InvalidArgumentException
+     */
+    public function addFilter($filter)
+    {
+        if (is_array($filter)) {
+            if (!isset($filter['method'])) {
+                throw new InvalidArgumentException('A [method] value must be specified for each complex filter');
+            }
+        }
+
+        if (!$this->filters) {
+            $this->filters = array($filter);
+        } else {
+            $this->filters[] = $filter;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the parent object (an {@see OperationInterface} or {@see Parameter}
+     *
+     * @return OperationInterface|Parameter|null
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Set the parent object of the parameter
+     *
+     * @param OperationInterface|Parameter|null $parent Parent container of the parameter
+     *
+     * @return self
+     */
+    public function setParent($parent)
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * Get the properties of the parameter
+     *
+     * @return array
+     */
+    public function getProperties()
+    {
+        if (!$this->propertiesCache) {
+            $this->propertiesCache = array();
+            foreach (array_keys($this->properties) as $name) {
+                $this->propertiesCache[$name] = $this->getProperty($name);
+            }
+        }
+
+        return $this->propertiesCache;
+    }
+
+    /**
+     * Get a specific property from the parameter
+     *
+     * @param string $name Name of the property to retrieve
+     *
+     * @return null|Parameter
+     */
+    public function getProperty($name)
+    {
+        if (!isset($this->properties[$name])) {
+            return null;
+        }
+
+        if (!($this->properties[$name] instanceof self)) {
+            $this->properties[$name]['name'] = $name;
+            $this->properties[$name] = new static($this->properties[$name], $this->serviceDescription);
+            $this->properties[$name]->setParent($this);
+        }
+
+        return $this->properties[$name];
+    }
+
+    /**
+     * Remove a property from the parameter
+     *
+     * @param string $name Name of the property to remove
+     *
+     * @return self
+     */
+    public function removeProperty($name)
+    {
+        unset($this->properties[$name]);
+        $this->propertiesCache = null;
+
+        return $this;
+    }
+
+    /**
+     * Add a property to the parameter
+     *
+     * @param Parameter $property Properties to set
+     *
+     * @return self
+     */
+    public function addProperty(Parameter $property)
+    {
+        $this->properties[$property->getName()] = $property;
+        $property->setParent($this);
+        $this->propertiesCache = null;
+
+        return $this;
+    }
+
+    /**
+     * Get the additionalProperties value of the parameter
+     *
+     * @return bool|Parameter|null
+     */
+    public function getAdditionalProperties()
+    {
+        if (is_array($this->additionalProperties)) {
+            $this->additionalProperties = new static($this->additionalProperties, $this->serviceDescription);
+            $this->additionalProperties->setParent($this);
+        }
+
+        return $this->additionalProperties;
+    }
+
+    /**
+     * Set the additionalProperties value of the parameter
+     *
+     * @param bool|Parameter|null $additional Boolean to allow any, an Parameter to specify a schema, or false to disallow
+     *
+     * @return self
+     */
+    public function setAdditionalProperties($additional)
+    {
+        $this->additionalProperties = $additional;
+
+        return $this;
+    }
+
+    /**
+     * Set the items data of the parameter
+     *
+     * @param Parameter|null $items Items to set
+     *
+     * @return self
+     */
+    public function setItems(Parameter $items = null)
+    {
+        if ($this->items = $items) {
+            $this->items->setParent($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the item data of the parameter
+     *
+     * @return Parameter|null
+     */
+    public function getItems()
+    {
+        if (is_array($this->items)) {
+            $this->items = new static($this->items, $this->serviceDescription);
+            $this->items->setParent($this);
+        }
+
+        return $this->items;
+    }
+
+    /**
+     * Get the class that the parameter must implement
+     *
+     * @return null|string
+     */
+    public function getInstanceOf()
+    {
+        return $this->instanceOf;
+    }
+
+    /**
+     * Set the class that the parameter must be an instance of
+     *
+     * @param string|null $instanceOf Class or interface name
+     *
+     * @return self
+     */
+    public function setInstanceOf($instanceOf)
+    {
+        $this->instanceOf = $instanceOf;
+
+        return $this;
+    }
+
+    /**
+     * Get the enum of strings that are valid for the parameter
+     *
+     * @return array|null
+     */
+    public function getEnum()
+    {
+        return $this->enum;
+    }
+
+    /**
+     * Set the enum of strings that are valid for the parameter
+     *
+     * @param array|null $enum Array of strings or null
+     *
+     * @return self
+     */
+    public function setEnum(array $enum = null)
+    {
+        $this->enum = $enum;
+
+        return $this;
+    }
+
+    /**
+     * Get the regex pattern that must match a value when the value is a string
+     *
+     * @return string
+     */
+    public function getPattern()
+    {
+        return $this->pattern;
+    }
+
+    /**
+     * Set the regex pattern that must match a value when the value is a string
+     *
+     * @param string $pattern Regex pattern
+     *
+     * @return self
+     */
+    public function setPattern($pattern)
+    {
+        $this->pattern = $pattern;
+
+        return $this;
+    }
+
+    /**
+     * Get the format attribute of the schema
+     *
+     * @return string
+     */
+    public function getFormat()
+    {
+        return $this->format;
+    }
+
+    /**
+     * Set the format attribute of the schema
+     *
+     * @param string $format Format to set (e.g. date, date-time, timestamp, time, date-time-http)
+     *
+     * @return self
+     */
+    public function setFormat($format)
+    {
+        $this->format = $format;
+
+        return $this;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/SchemaFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/SchemaFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..3f29550aae3f0af7970f0d24126c29d47b4c8602
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/SchemaFormatter.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * JSON Schema formatter class
+ */
+class SchemaFormatter
+{
+    /** @var \DateTimeZone */
+    protected static $utcTimeZone;
+
+    /**
+     * Format a value by a registered format name
+     *
+     * @param string $format Registered format used to format the value
+     * @param mixed  $value  Value being formatted
+     *
+     * @return mixed
+     */
+    public static function format($format, $value)
+    {
+        switch ($format) {
+            case 'date-time':
+                return self::formatDateTime($value);
+            case 'date-time-http':
+                return self::formatDateTimeHttp($value);
+            case 'date':
+                return self::formatDate($value);
+            case 'time':
+                return self::formatTime($value);
+            case 'timestamp':
+                return self::formatTimestamp($value);
+            case 'boolean-string':
+                return self::formatBooleanAsString($value);
+            default:
+                return $value;
+        }
+    }
+
+    /**
+     * Create a ISO 8601 (YYYY-MM-DDThh:mm:ssZ) formatted date time value in UTC time
+     *
+     * @param string|integer|\DateTime $value Date time value
+     *
+     * @return string
+     */
+    public static function formatDateTime($value)
+    {
+        return self::dateFormatter($value, 'Y-m-d\TH:i:s\Z');
+    }
+
+    /**
+     * Create an HTTP date (RFC 1123 / RFC 822) formatted UTC date-time string
+     *
+     * @param string|integer|\DateTime $value Date time value
+     *
+     * @return string
+     */
+    public static function formatDateTimeHttp($value)
+    {
+        return self::dateFormatter($value, 'D, d M Y H:i:s \G\M\T');
+    }
+
+    /**
+     * Create a YYYY-MM-DD formatted string
+     *
+     * @param string|integer|\DateTime $value Date time value
+     *
+     * @return string
+     */
+    public static function formatDate($value)
+    {
+        return self::dateFormatter($value, 'Y-m-d');
+    }
+
+    /**
+     * Create a hh:mm:ss formatted string
+     *
+     * @param string|integer|\DateTime $value Date time value
+     *
+     * @return string
+     */
+    public static function formatTime($value)
+    {
+        return self::dateFormatter($value, 'H:i:s');
+    }
+
+    /**
+     * Formats a boolean value as a string
+     *
+     * @param string|integer|bool $value Value to convert to a boolean 'true' / 'false' value
+     *
+     * @return string
+     */
+    public static function formatBooleanAsString($value)
+    {
+        return filter_var($value, FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false';
+    }
+
+    /**
+     * Return a UNIX timestamp in the UTC timezone
+     *
+     * @param string|integer|\DateTime $value Time value
+     *
+     * @return int
+     */
+    public static function formatTimestamp($value)
+    {
+        return self::dateFormatter($value, 'U');
+    }
+
+    /**
+     * Get a UTC DateTimeZone object
+     *
+     * @return \DateTimeZone
+     */
+    protected static function getUtcTimeZone()
+    {
+        // @codeCoverageIgnoreStart
+        if (!self::$utcTimeZone) {
+            self::$utcTimeZone = new \DateTimeZone('UTC');
+        }
+        // @codeCoverageIgnoreEnd
+
+        return self::$utcTimeZone;
+    }
+
+    /**
+     * Perform the actual DateTime formatting
+     *
+     * @param int|string|\DateTime $dateTime Date time value
+     * @param string               $format   Format of the result
+     *
+     * @return string
+     * @throws InvalidArgumentException
+     */
+    protected static function dateFormatter($dateTime, $format)
+    {
+        if (is_numeric($dateTime)) {
+            return gmdate($format, (int) $dateTime);
+        }
+
+        if (is_string($dateTime)) {
+            $dateTime = new \DateTime($dateTime);
+        }
+
+        if ($dateTime instanceof \DateTime) {
+            return $dateTime->setTimezone(self::getUtcTimeZone())->format($format);
+        }
+
+        throw new InvalidArgumentException('Date/Time values must be either a string, integer, or DateTime object');
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/SchemaValidator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/SchemaValidator.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d15f0fcfb2bf798367e4c608c3390fb1b3d1b85
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/SchemaValidator.php
@@ -0,0 +1,290 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * Default parameter validator
+ */
+class SchemaValidator implements ValidatorInterface
+{
+    /** @var self Cache instance of the object */
+    protected static $instance;
+
+    /** @var bool Whether or not integers are converted to strings when an integer is received for a string input */
+    protected $castIntegerToStringType;
+
+    /** @var array Errors encountered while validating */
+    protected $errors;
+
+    /**
+     * @return self
+     * @codeCoverageIgnore
+     */
+    public static function getInstance()
+    {
+        if (!self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * @param bool $castIntegerToStringType Set to true to convert integers into strings when a required type is a
+     *                                      string and the input value is an integer. Defaults to true.
+     */
+    public function __construct($castIntegerToStringType = true)
+    {
+        $this->castIntegerToStringType = $castIntegerToStringType;
+    }
+
+    public function validate(Parameter $param, &$value)
+    {
+        $this->errors = array();
+        $this->recursiveProcess($param, $value);
+
+        if (empty($this->errors)) {
+            return true;
+        } else {
+            sort($this->errors);
+            return false;
+        }
+    }
+
+    /**
+     * Get the errors encountered while validating
+     *
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->errors ?: array();
+    }
+
+    /**
+     * Recursively validate a parameter
+     *
+     * @param Parameter $param  API parameter being validated
+     * @param mixed     $value  Value to validate and validate. The value may change during this validate.
+     * @param string    $path   Current validation path (used for error reporting)
+     * @param int       $depth  Current depth in the validation validate
+     *
+     * @return bool Returns true if valid, or false if invalid
+     */
+    protected function recursiveProcess(Parameter $param, &$value, $path = '', $depth = 0)
+    {
+        // Update the value by adding default or static values
+        $value = $param->getValue($value);
+
+        $required = $param->getRequired();
+        // if the value is null and the parameter is not required or is static, then skip any further recursion
+        if ((null === $value && !$required) || $param->getStatic()) {
+            return true;
+        }
+
+        $type = $param->getType();
+        // Attempt to limit the number of times is_array is called by tracking if the value is an array
+        $valueIsArray = is_array($value);
+        // If a name is set then update the path so that validation messages are more helpful
+        if ($name = $param->getName()) {
+            $path .= "[{$name}]";
+        }
+
+        if ($type == 'object') {
+
+            // Objects are either associative arrays, ToArrayInterface, or some other object
+            if ($param->getInstanceOf()) {
+                $instance = $param->getInstanceOf();
+                if (!($value instanceof $instance)) {
+                    $this->errors[] = "{$path} must be an instance of {$instance}";
+                    return false;
+                }
+            }
+
+            // Determine whether or not this "value" has properties and should be traversed
+            $traverse = $temporaryValue = false;
+
+            // Convert the value to an array
+            if (!$valueIsArray && $value instanceof ToArrayInterface) {
+                $value = $value->toArray();
+            }
+
+            if ($valueIsArray) {
+                // Ensure that the array is associative and not numerically indexed
+                if (isset($value[0])) {
+                    $this->errors[] = "{$path} must be an array of properties. Got a numerically indexed array.";
+                    return false;
+                }
+                $traverse = true;
+            } elseif ($value === null) {
+                // Attempt to let the contents be built up by default values if possible
+                $value = array();
+                $temporaryValue = $valueIsArray = $traverse = true;
+            }
+
+            if ($traverse) {
+
+                if ($properties = $param->getProperties()) {
+                    // if properties were found, the validate each property of the value
+                    foreach ($properties as $property) {
+                        $name = $property->getName();
+                        if (isset($value[$name])) {
+                            $this->recursiveProcess($property, $value[$name], $path, $depth + 1);
+                        } else {
+                            $current = null;
+                            $this->recursiveProcess($property, $current, $path, $depth + 1);
+                            // Only set the value if it was populated with something
+                            if ($current) {
+                                $value[$name] = $current;
+                            }
+                        }
+                    }
+                }
+
+                $additional = $param->getAdditionalProperties();
+                if ($additional !== true) {
+                    // If additional properties were found, then validate each against the additionalProperties attr.
+                    $keys = array_keys($value);
+                    // Determine the keys that were specified that were not listed in the properties of the schema
+                    $diff = array_diff($keys, array_keys($properties));
+                    if (!empty($diff)) {
+                        // Determine which keys are not in the properties
+                        if ($additional instanceOf Parameter) {
+                            foreach ($diff as $key) {
+                                $this->recursiveProcess($additional, $value[$key], "{$path}[{$key}]", $depth);
+                            }
+                        } else {
+                            // if additionalProperties is set to false and there are additionalProperties in the values, then fail
+                            $keys = array_keys($value);
+                            $this->errors[] = sprintf('%s[%s] is not an allowed property', $path, reset($keys));
+                        }
+                    }
+                }
+
+                // A temporary value will be used to traverse elements that have no corresponding input value.
+                // This allows nested required parameters with default values to bubble up into the input.
+                // Here we check if we used a temp value and nothing bubbled up, then we need to remote the value.
+                if ($temporaryValue && empty($value)) {
+                    $value = null;
+                    $valueIsArray = false;
+                }
+            }
+
+        } elseif ($type == 'array' && $valueIsArray && $param->getItems()) {
+            foreach ($value as $i => &$item) {
+                // Validate each item in an array against the items attribute of the schema
+                $this->recursiveProcess($param->getItems(), $item, $path . "[{$i}]", $depth + 1);
+            }
+        }
+
+        // If the value is required and the type is not null, then there is an error if the value is not set
+        if ($required && $value === null && $type != 'null') {
+            $message = "{$path} is " . ($param->getType() ? ('a required ' . implode(' or ', (array) $param->getType())) : 'required');
+            if ($param->getDescription()) {
+                $message .= ': ' . $param->getDescription();
+            }
+            $this->errors[] = $message;
+            return false;
+        }
+
+        // Validate that the type is correct. If the type is string but an integer was passed, the class can be
+        // instructed to cast the integer to a string to pass validation. This is the default behavior.
+        if ($type && (!$type = $this->determineType($type, $value))) {
+            if ($this->castIntegerToStringType && $param->getType() == 'string' && is_integer($value)) {
+                $value = (string) $value;
+            } else {
+                $this->errors[] = "{$path} must be of type " . implode(' or ', (array) $param->getType());
+            }
+        }
+
+        // Perform type specific validation for strings, arrays, and integers
+        if ($type == 'string') {
+
+            // Strings can have enums which are a list of predefined values
+            if (($enum = $param->getEnum()) && !in_array($value, $enum)) {
+                $this->errors[] = "{$path} must be one of " . implode(' or ', array_map(function ($s) {
+                    return '"' . addslashes($s) . '"';
+                }, $enum));
+            }
+            // Strings can have a regex pattern that the value must match
+            if (($pattern  = $param->getPattern()) && !preg_match($pattern, $value)) {
+                $this->errors[] = "{$path} must match the following regular expression: {$pattern}";
+            }
+
+            $strLen = null;
+            if ($min = $param->getMinLength()) {
+                $strLen = strlen($value);
+                if ($strLen < $min) {
+                    $this->errors[] = "{$path} length must be greater than or equal to {$min}";
+                }
+            }
+            if ($max = $param->getMaxLength()) {
+                if (($strLen ?: strlen($value)) > $max) {
+                    $this->errors[] = "{$path} length must be less than or equal to {$max}";
+                }
+            }
+
+        } elseif ($type == 'array') {
+
+            $size = null;
+            if ($min = $param->getMinItems()) {
+                $size = count($value);
+                if ($size < $min) {
+                    $this->errors[] = "{$path} must contain {$min} or more elements";
+                }
+            }
+            if ($max = $param->getMaxItems()) {
+                if (($size ?: count($value)) > $max) {
+                    $this->errors[] = "{$path} must contain {$max} or fewer elements";
+                }
+            }
+
+        } elseif ($type == 'integer' || $type == 'number' || $type == 'numeric') {
+            if (($min = $param->getMinimum()) && $value < $min) {
+                $this->errors[] = "{$path} must be greater than or equal to {$min}";
+            }
+            if (($max = $param->getMaximum()) && $value > $max) {
+                $this->errors[] = "{$path} must be less than or equal to {$max}";
+            }
+        }
+
+        return empty($this->errors);
+    }
+
+    /**
+     * From the allowable types, determine the type that the variable matches
+     *
+     * @param string $type  Parameter type
+     * @param mixed  $value Value to determine the type
+     *
+     * @return string|bool Returns the matching type on
+     */
+    protected function determineType($type, $value)
+    {
+        foreach ((array) $type as $t) {
+            if ($t == 'string' && (is_string($value) || (is_object($value) && method_exists($value, '__toString')))) {
+                return 'string';
+            } elseif ($t == 'object' && (is_array($value) || is_object($value))) {
+                return 'object';
+            } elseif ($t == 'array' && is_array($value)) {
+                return 'array';
+            } elseif ($t == 'integer' && is_integer($value)) {
+                return 'integer';
+            } elseif ($t == 'boolean' && is_bool($value)) {
+                return 'boolean';
+            } elseif ($t == 'number' && is_numeric($value)) {
+                return 'number';
+            } elseif ($t == 'numeric' && is_numeric($value)) {
+                return 'numeric';
+            } elseif ($t == 'null' && !$value) {
+                return 'null';
+            } elseif ($t == 'any') {
+                return 'any';
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescription.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescription.php
new file mode 100644
index 0000000000000000000000000000000000000000..286e65eec5a8a4ac907a2a35018d81b63fd68359
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescription.php
@@ -0,0 +1,271 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * A ServiceDescription stores service information based on a service document
+ */
+class ServiceDescription implements ServiceDescriptionInterface, ToArrayInterface
+{
+    /** @var array Array of {@see OperationInterface} objects */
+    protected $operations = array();
+
+    /** @var array Array of API models */
+    protected $models = array();
+
+    /** @var string Name of the API */
+    protected $name;
+
+    /** @var string API version */
+    protected $apiVersion;
+
+    /** @var string Summary of the API */
+    protected $description;
+
+    /** @var array Any extra API data */
+    protected $extraData = array();
+
+    /** @var ServiceDescriptionLoader Factory used in factory method */
+    protected static $descriptionLoader;
+
+    /** @var string baseUrl/basePath */
+    protected $baseUrl;
+
+    /**
+     * {@inheritdoc}
+     * @param string|array $config  File to build or array of operation information
+     * @param array        $options Service description factory options
+     *
+     * @return self
+     */
+    public static function factory($config, array $options = array())
+    {
+        // @codeCoverageIgnoreStart
+        if (!self::$descriptionLoader) {
+            self::$descriptionLoader = new ServiceDescriptionLoader();
+        }
+        // @codeCoverageIgnoreEnd
+
+        return self::$descriptionLoader->load($config, $options);
+    }
+
+    /**
+     * @param array $config Array of configuration data
+     */
+    public function __construct(array $config = array())
+    {
+        $this->fromArray($config);
+    }
+
+    public function serialize()
+    {
+        return json_encode($this->toArray());
+    }
+
+    public function unserialize($json)
+    {
+        $this->operations = array();
+        $this->fromArray(json_decode($json, true));
+    }
+
+    public function toArray()
+    {
+        $result = array(
+            'name'        => $this->name,
+            'apiVersion'  => $this->apiVersion,
+            'baseUrl'     => $this->baseUrl,
+            'description' => $this->description
+        ) + $this->extraData;
+        $result['operations'] = array();
+        foreach ($this->getOperations() as $name => $operation) {
+            $result['operations'][$operation->getName() ?: $name] = $operation->toArray();
+        }
+        if (!empty($this->models)) {
+            $result['models'] = array();
+            foreach ($this->models as $id => $model) {
+                $result['models'][$id] = $model instanceof Parameter ? $model->toArray(): $model;
+            }
+        }
+
+        return array_filter($result);
+    }
+
+    public function getBaseUrl()
+    {
+        return $this->baseUrl;
+    }
+
+    /**
+     * Set the baseUrl of the description
+     *
+     * @param string $baseUrl Base URL of each operation
+     *
+     * @return self
+     */
+    public function setBaseUrl($baseUrl)
+    {
+        $this->baseUrl = $baseUrl;
+
+        return $this;
+    }
+
+    public function getOperations()
+    {
+        foreach (array_keys($this->operations) as $name) {
+            $this->getOperation($name);
+        }
+
+        return $this->operations;
+    }
+
+    public function hasOperation($name)
+    {
+        return isset($this->operations[$name]);
+    }
+
+    public function getOperation($name)
+    {
+        // Lazily retrieve and build operations
+        if (!isset($this->operations[$name])) {
+            return null;
+        }
+
+        if (!($this->operations[$name] instanceof Operation)) {
+            $this->operations[$name] = new Operation($this->operations[$name], $this);
+        }
+
+        return $this->operations[$name];
+    }
+
+    /**
+     * Add a operation to the service description
+     *
+     * @param OperationInterface $operation Operation to add
+     *
+     * @return self
+     */
+    public function addOperation(OperationInterface $operation)
+    {
+        $this->operations[$operation->getName()] = $operation->setServiceDescription($this);
+
+        return $this;
+    }
+
+    public function getModel($id)
+    {
+        if (!isset($this->models[$id])) {
+            return null;
+        }
+
+        if (!($this->models[$id] instanceof Parameter)) {
+            $this->models[$id] = new Parameter($this->models[$id] + array('name' => $id), $this);
+        }
+
+        return $this->models[$id];
+    }
+
+    public function getModels()
+    {
+        // Ensure all models are converted into parameter objects
+        foreach (array_keys($this->models) as $id) {
+            $this->getModel($id);
+        }
+
+        return $this->models;
+    }
+
+    public function hasModel($id)
+    {
+        return isset($this->models[$id]);
+    }
+
+    /**
+     * Add a model to the service description
+     *
+     * @param Parameter $model Model to add
+     *
+     * @return self
+     */
+    public function addModel(Parameter $model)
+    {
+        $this->models[$model->getName()] = $model;
+
+        return $this;
+    }
+
+    public function getApiVersion()
+    {
+        return $this->apiVersion;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    public function getData($key)
+    {
+        return isset($this->extraData[$key]) ? $this->extraData[$key] : null;
+    }
+
+    public function setData($key, $value)
+    {
+        $this->extraData[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Initialize the state from an array
+     *
+     * @param array $config Configuration data
+     * @throws InvalidArgumentException
+     */
+    protected function fromArray(array $config)
+    {
+        // Keep a list of default keys used in service descriptions that is later used to determine extra data keys
+        static $defaultKeys = array('name', 'models', 'apiVersion', 'baseUrl', 'description');
+        // Pull in the default configuration values
+        foreach ($defaultKeys as $key) {
+            if (isset($config[$key])) {
+                $this->{$key} = $config[$key];
+            }
+        }
+
+        // Account for the Swagger name for Guzzle's baseUrl
+        if (isset($config['basePath'])) {
+            $this->baseUrl = $config['basePath'];
+        }
+
+        // Ensure that the models and operations properties are always arrays
+        $this->models = (array) $this->models;
+        $this->operations = (array) $this->operations;
+
+        // We want to add operations differently than adding the other properties
+        $defaultKeys[] = 'operations';
+
+        // Create operations for each operation
+        if (isset($config['operations'])) {
+            foreach ($config['operations'] as $name => $operation) {
+                if (!($operation instanceof Operation) && !is_array($operation)) {
+                    throw new InvalidArgumentException('Invalid operation in service description: '
+                        . gettype($operation));
+                }
+                $this->operations[$name] = $operation;
+            }
+        }
+
+        // Get all of the additional properties of the service description and store them in a data array
+        foreach (array_diff(array_keys($config), $defaultKeys) as $key) {
+            $this->extraData[$key] = $config[$key];
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescriptionInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescriptionInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..5983e586b12a14af89f268f48579d903becdee56
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescriptionInterface.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+/**
+ * A ServiceDescription stores service information based on a service document
+ */
+interface ServiceDescriptionInterface extends \Serializable
+{
+    /**
+     * Get the basePath/baseUrl of the description
+     *
+     * @return string
+     */
+    public function getBaseUrl();
+
+    /**
+     * Get the API operations of the service
+     *
+     * @return array Returns an array of {@see OperationInterface} objects
+     */
+    public function getOperations();
+
+    /**
+     * Check if the service has an operation by name
+     *
+     * @param string $name Name of the operation to check
+     *
+     * @return bool
+     */
+    public function hasOperation($name);
+
+    /**
+     * Get an API operation by name
+     *
+     * @param string $name Name of the command
+     *
+     * @return OperationInterface|null
+     */
+    public function getOperation($name);
+
+    /**
+     * Get a specific model from the description
+     *
+     * @param string $id ID of the model
+     *
+     * @return Parameter|null
+     */
+    public function getModel($id);
+
+    /**
+     * Get all service description models
+     *
+     * @return array
+     */
+    public function getModels();
+
+    /**
+     * Check if the description has a specific model by name
+     *
+     * @param string $id ID of the model
+     *
+     * @return bool
+     */
+    public function hasModel($id);
+
+    /**
+     * Get the API version of the service
+     *
+     * @return string
+     */
+    public function getApiVersion();
+
+    /**
+     * Get the name of the API
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Get a summary of the purpose of the API
+     *
+     * @return string
+     */
+    public function getDescription();
+
+    /**
+     * Get arbitrary data from the service description that is not part of the Guzzle spec
+     *
+     * @param string $key Data key to retrieve
+     *
+     * @return null|mixed
+     */
+    public function getData($key);
+
+    /**
+     * Set arbitrary data on the service description
+     *
+     * @param string $key   Data key to set
+     * @param mixed  $value Value to set
+     *
+     * @return self
+     */
+    public function setData($key, $value);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescriptionLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescriptionLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..90fe7f4bb658c4ec83db41cec16c77f277c52bb4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ServiceDescriptionLoader.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+use Guzzle\Service\AbstractConfigLoader;
+use Guzzle\Service\Exception\DescriptionBuilderException;
+
+/**
+ * Loader for service descriptions
+ */
+class ServiceDescriptionLoader extends AbstractConfigLoader
+{
+    protected function build($config, array $options)
+    {
+        $operations = array();
+        if (!empty($config['operations'])) {
+            foreach ($config['operations'] as $name => $op) {
+                $name = $op['name'] = isset($op['name']) ? $op['name'] : $name;
+                // Extend other operations
+                if (!empty($op['extends'])) {
+                    $this->resolveExtension($name, $op, $operations);
+                }
+                $op['parameters'] = isset($op['parameters']) ? $op['parameters'] : array();
+                $operations[$name] = $op;
+            }
+        }
+
+        return new ServiceDescription(array(
+            'apiVersion'  => isset($config['apiVersion']) ? $config['apiVersion'] : null,
+            'baseUrl'     => isset($config['baseUrl']) ? $config['baseUrl'] : null,
+            'description' => isset($config['description']) ? $config['description'] : null,
+            'operations'  => $operations,
+            'models'      => isset($config['models']) ? $config['models'] : null
+        ) + $config);
+    }
+
+    /**
+     * @param string $name       Name of the operation
+     * @param array  $op         Operation value array
+     * @param array  $operations Currently loaded operations
+     * @throws DescriptionBuilderException when extending a non-existent operation
+     */
+    protected function resolveExtension($name, array &$op, array &$operations)
+    {
+        $resolved = array();
+        $original = empty($op['parameters']) ? false: $op['parameters'];
+        $hasClass = !empty($op['class']);
+        foreach ((array) $op['extends'] as $extendedCommand) {
+            if (empty($operations[$extendedCommand])) {
+                throw new DescriptionBuilderException("{$name} extends missing operation {$extendedCommand}");
+            }
+            $toArray = $operations[$extendedCommand];
+            $resolved = empty($resolved)
+                ? $toArray['parameters']
+                : array_merge($resolved, $toArray['parameters']);
+
+            $op = $op + $toArray;
+            if (!$hasClass && isset($toArray['class'])) {
+                $op['class'] = $toArray['class'];
+            }
+        }
+        $op['parameters'] = $original ? array_merge($resolved, $original) : $resolved;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ValidatorInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ValidatorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..94ca77da476f09ce4e7e678f3b38733033a47b59
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Description/ValidatorInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Guzzle\Service\Description;
+
+/**
+ * Validator responsible for preparing and validating parameters against the parameter's schema
+ */
+interface ValidatorInterface
+{
+    /**
+     * Validate a value against the acceptable types, regular expressions, minimum, maximums, instanceOf, enums, etc
+     * Add default and static values to the passed in variable. If the validation completes successfully, the input
+     * must be run correctly through the matching schema's filters attribute.
+     *
+     * @param Parameter $param Schema that is being validated against the value
+     * @param mixed     $value Value to validate and process. The value may change during this process.
+     *
+     * @return bool  Returns true if the input data is valid for the schema
+     */
+    public function validate(Parameter $param, &$value);
+
+    /**
+     * Get validation errors encountered while validating
+     *
+     * @return array
+     */
+    public function getErrors();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/CommandException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/CommandException.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f016fb952b5b8f09856b4250010dfe37f2b8089
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/CommandException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+class CommandException extends RuntimeException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/CommandTransferException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/CommandTransferException.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d4929eded033424638bfa21377e0a9902ea1722
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/CommandTransferException.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+use Guzzle\Http\Exception\MultiTransferException;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Exception thrown when transferring commands in parallel
+ */
+class CommandTransferException extends MultiTransferException
+{
+    protected $successfulCommands = array();
+    protected $failedCommands = array();
+
+    /**
+     * Creates a new CommandTransferException from a MultiTransferException
+     *
+     * @param MultiTransferException $e Exception to base a new exception on
+     *
+     * @return self
+     */
+    public static function fromMultiTransferException(MultiTransferException $e)
+    {
+        $ce = new self($e->getMessage(), $e->getCode(), $e->getPrevious());
+
+        return $ce->setExceptions($e->getIterator()->getArrayCopy())
+            ->setSuccessfulRequests($e->getSuccessfulRequests())
+            ->setFailedRequests($e->getFailedRequests());
+    }
+
+    /**
+     * Get all of the commands in the transfer
+     *
+     * @return array
+     */
+    public function getAllCommands()
+    {
+        return array_merge($this->successfulCommands, $this->failedCommands);
+    }
+
+    /**
+     * Add to the array of successful commands
+     *
+     * @param CommandInterface $command Successful command
+     *
+     * @return self
+     */
+    public function addSuccessfulCommand(CommandInterface $command)
+    {
+        $this->successfulCommands[] = $command;
+
+        return $this;
+    }
+
+    /**
+     * Add to the array of failed commands
+     *
+     * @param CommandInterface $command Failed command
+     *
+     * @return self
+     */
+    public function addFailedCommand(CommandInterface $command)
+    {
+        $this->failedCommands[] = $command;
+
+        return $this;
+    }
+
+    /**
+     * Get an array of successful commands
+     *
+     * @return array
+     */
+    public function getSuccessfulCommands()
+    {
+        return $this->successfulCommands;
+    }
+
+    /**
+     * Get an array of failed commands
+     *
+     * @return array
+     */
+    public function getFailedCommands()
+    {
+        return $this->failedCommands;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/DescriptionBuilderException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/DescriptionBuilderException.php
new file mode 100644
index 0000000000000000000000000000000000000000..1407e5687897395cf38e4e2001bb3c778e34043d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/DescriptionBuilderException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+class DescriptionBuilderException extends RuntimeException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/InconsistentClientTransferException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/InconsistentClientTransferException.php
new file mode 100644
index 0000000000000000000000000000000000000000..71cbc01b8c0a59fbab4b0ebfa3fef2b830fc9adf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/InconsistentClientTransferException.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+/**
+ * Command transfer exception when commands do not all use the same client
+ */
+class InconsistentClientTransferException extends RuntimeException
+{
+    /**
+     * @var array Commands with an invalid client
+     */
+    private $invalidCommands = array();
+
+    /**
+     * @param array $commands Invalid commands
+     */
+    public function __construct(array $commands)
+    {
+        $this->invalidCommands = $commands;
+        parent::__construct(
+            'Encountered commands in a batch transfer that use inconsistent clients. The batching ' .
+            'strategy you use with a command transfer must divide command batches by client.'
+        );
+    }
+
+    /**
+     * Get the invalid commands
+     *
+     * @return array
+     */
+    public function getCommands()
+    {
+        return $this->invalidCommands;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ResponseClassException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ResponseClassException.php
new file mode 100644
index 0000000000000000000000000000000000000000..d59ff2185134682d3e113f1b21e23c5b0cfeef4d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ResponseClassException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+class ResponseClassException extends RuntimeException
+{
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ServiceBuilderException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ServiceBuilderException.php
new file mode 100644
index 0000000000000000000000000000000000000000..e857e5ffd8a3a29c43fac3df675eeef479b695bf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ServiceBuilderException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+class ServiceBuilderException extends RuntimeException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ServiceNotFoundException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ServiceNotFoundException.php
new file mode 100644
index 0000000000000000000000000000000000000000..59a0d55693c06dd9aafad485c57211ac4e606fd5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ServiceNotFoundException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+class ServiceNotFoundException extends ServiceBuilderException {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ValidationException.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ValidationException.php
new file mode 100644
index 0000000000000000000000000000000000000000..9033bce5b56a2707ddae20ddfd9516cfd6a14cb3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Exception/ValidationException.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Guzzle\Service\Exception;
+
+use Guzzle\Common\Exception\RuntimeException;
+
+class ValidationException extends RuntimeException
+{
+    protected $errors = array();
+
+    /**
+     * Set the validation error messages
+     *
+     * @param array $errors Array of validation errors
+     */
+    public function setErrors(array $errors)
+    {
+        $this->errors = $errors;
+    }
+
+    /**
+     * Get any validation errors
+     *
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/AbstractResourceIteratorFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/AbstractResourceIteratorFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..21140e772ce356fd4ebfbd4403a9454b9ae0b9dc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/AbstractResourceIteratorFactory.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Abstract resource iterator factory implementation
+ */
+abstract class AbstractResourceIteratorFactory implements ResourceIteratorFactoryInterface
+{
+    public function build(CommandInterface $command, array $options = array())
+    {
+        if (!$this->canBuild($command)) {
+            throw new InvalidArgumentException('Iterator was not found for ' . $command->getName());
+        }
+
+        $className = $this->getClassName($command);
+
+        return new $className($command, $options);
+    }
+
+    public function canBuild(CommandInterface $command)
+    {
+        return (bool) $this->getClassName($command);
+    }
+
+    /**
+     * Get the name of the class to instantiate for the command
+     *
+     * @param CommandInterface $command Command that is associated with the iterator
+     *
+     * @return string
+     */
+    abstract protected function getClassName(CommandInterface $command);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/CompositeResourceIteratorFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/CompositeResourceIteratorFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..2efc133c65f2dd80a82565621bb59616ff5ecae8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/CompositeResourceIteratorFactory.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Factory that utilizes multiple factories for creating iterators
+ */
+class CompositeResourceIteratorFactory implements ResourceIteratorFactoryInterface
+{
+    /** @var array Array of factories */
+    protected $factories;
+
+    /** @param array $factories Array of factories used to instantiate iterators */
+    public function __construct(array $factories)
+    {
+        $this->factories = $factories;
+    }
+
+    public function build(CommandInterface $command, array $options = array())
+    {
+        if (!($factory = $this->getFactory($command))) {
+            throw new InvalidArgumentException('Iterator was not found for ' . $command->getName());
+        }
+
+        return $factory->build($command, $options);
+    }
+
+    public function canBuild(CommandInterface $command)
+    {
+        return $this->getFactory($command) !== false;
+    }
+
+    /**
+     * Add a factory to the composite factory
+     *
+     * @param ResourceIteratorFactoryInterface $factory Factory to add
+     *
+     * @return self
+     */
+    public function addFactory(ResourceIteratorFactoryInterface $factory)
+    {
+        $this->factories[] = $factory;
+
+        return $this;
+    }
+
+    /**
+     * Get the factory that matches the command object
+     *
+     * @param CommandInterface $command Command retrieving the iterator for
+     *
+     * @return ResourceIteratorFactoryInterface|bool
+     */
+    protected function getFactory(CommandInterface $command)
+    {
+        foreach ($this->factories as $factory) {
+            if ($factory->canBuild($command)) {
+                return $factory;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/MapResourceIteratorFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/MapResourceIteratorFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..c71ca9d85e7bc2c9e9e9b1043e9a5349b4ddf234
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/MapResourceIteratorFactory.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Resource iterator factory used when explicitly mapping strings to iterator classes
+ */
+class MapResourceIteratorFactory extends AbstractResourceIteratorFactory
+{
+    /** @var array Associative array mapping iterator names to class names */
+    protected $map;
+
+    /** @param array $map Associative array mapping iterator names to class names */
+    public function __construct(array $map)
+    {
+        $this->map = $map;
+    }
+
+    public function getClassName(CommandInterface $command)
+    {
+        $className = $command->getName();
+
+        if (isset($this->map[$className])) {
+            return $this->map[$className];
+        } elseif (isset($this->map['*'])) {
+            // If a wildcard was added, then always use that
+            return $this->map['*'];
+        }
+
+        return null;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/Model.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/Model.php
new file mode 100644
index 0000000000000000000000000000000000000000..d146b3ecb3284b16bd350f8a220d432074b01962
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/Model.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Common\Collection;
+use Guzzle\Service\Description\Parameter;
+
+/**
+ * Default model created when commands create service description model responses
+ */
+class Model extends Collection
+{
+    /** @var Parameter Structure of the model */
+    protected $structure;
+
+    /**
+     * @param array     $data      Data contained by the model
+     * @param Parameter $structure The structure of the model
+     */
+    public function __construct(array $data = array(), Parameter $structure = null)
+    {
+        $this->data = $data;
+        $this->structure = $structure ?: new Parameter();
+    }
+
+    /**
+     * Get the structure of the model
+     *
+     * @return Parameter
+     */
+    public function getStructure()
+    {
+        return $this->structure;
+    }
+
+    /**
+     * Provides debug information about the model object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $output = 'Debug output of ' . ($this->structure->getName() ?: ' the model');
+        $output = str_repeat('=', strlen($output)) . "\n" . $output . "\n" . str_repeat('=', strlen($output)) . "\n\n";
+        $output .= "Model data\n-----------\n\n";
+        $output .= "This data can be retrieved from the model object using the get() method of the model "
+            . "(e.g. \$model->get(\$key)) or accessing the model like an associative array (e.g. \$model['key']).\n\n";
+        $lines = array_slice(explode("\n", trim(print_r($this->toArray(), true))), 2, -1);
+        $output .=  implode("\n", $lines) . "\n\n";
+        $output .= "Model structure\n---------------\n\n";
+        $output .= "The following JSON document defines how the model was parsed from an HTTP response into the "
+            . "associative array strucure you see above.\n\n";
+        $output .= '  ' . json_encode($this->structure->toArray()) . "\n\n";
+
+        return $output;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIterator.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIterator.php
new file mode 100644
index 0000000000000000000000000000000000000000..e1415243256c5aa8ab2ad10d0227c29d68f2347d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIterator.php
@@ -0,0 +1,254 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Service\Command\CommandInterface;
+
+abstract class ResourceIterator extends AbstractHasDispatcher implements ResourceIteratorInterface
+{
+    /** @var CommandInterface Command used to send requests */
+    protected $command;
+
+    /** @var CommandInterface First sent command */
+    protected $originalCommand;
+
+    /** @var array Currently loaded resources */
+    protected $resources;
+
+    /** @var int Total number of resources that have been retrieved */
+    protected $retrievedCount = 0;
+
+    /** @var int Total number of resources that have been iterated */
+    protected $iteratedCount = 0;
+
+    /** @var string NextToken/Marker for a subsequent request */
+    protected $nextToken = false;
+
+    /** @var int Maximum number of resources to fetch per request */
+    protected $pageSize;
+
+    /** @var int Maximum number of resources to retrieve in total */
+    protected $limit;
+
+    /** @var int Number of requests sent */
+    protected $requestCount = 0;
+
+    /** @var array Initial data passed to the constructor */
+    protected $data = array();
+
+    /** @var bool Whether or not the current value is known to be invalid */
+    protected $invalid;
+
+    public static function getAllEvents()
+    {
+        return array(
+            // About to issue another command to get more results
+            'resource_iterator.before_send',
+            // Issued another command to get more results
+            'resource_iterator.after_send'
+        );
+    }
+
+    /**
+     * @param CommandInterface $command Initial command used for iteration
+     * @param array            $data    Associative array of additional parameters. You may specify any number of custom
+     *     options for an iterator. Among these options, you may also specify the following values:
+     *     - limit: Attempt to limit the maximum number of resources to this amount
+     *     - page_size: Attempt to retrieve this number of resources per request
+     */
+    public function __construct(CommandInterface $command, array $data = array())
+    {
+        // Clone the command to keep track of the originating command for rewind
+        $this->originalCommand = $command;
+
+        // Parse options from the array of options
+        $this->data = $data;
+        $this->limit = array_key_exists('limit', $data) ? $data['limit'] : 0;
+        $this->pageSize = array_key_exists('page_size', $data) ? $data['page_size'] : false;
+    }
+
+    /**
+     * Get all of the resources as an array (Warning: this could issue a large number of requests)
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return iterator_to_array($this, false);
+    }
+
+    public function setLimit($limit)
+    {
+        $this->limit = $limit;
+        $this->resetState();
+
+        return $this;
+    }
+
+    public function setPageSize($pageSize)
+    {
+        $this->pageSize = $pageSize;
+        $this->resetState();
+
+        return $this;
+    }
+
+    /**
+     * Get an option from the iterator
+     *
+     * @param string $key Key of the option to retrieve
+     *
+     * @return mixed|null Returns NULL if not set or the value if set
+     */
+    public function get($key)
+    {
+        return array_key_exists($key, $this->data) ? $this->data[$key] : null;
+    }
+
+    /**
+     * Set an option on the iterator
+     *
+     * @param string $key   Key of the option to set
+     * @param mixed  $value Value to set for the option
+     *
+     * @return ResourceIterator
+     */
+    public function set($key, $value)
+    {
+        $this->data[$key] = $value;
+
+        return $this;
+    }
+
+    public function current()
+    {
+        return $this->resources ? current($this->resources) : false;
+    }
+
+    public function key()
+    {
+        return max(0, $this->iteratedCount - 1);
+    }
+
+    public function count()
+    {
+        return $this->retrievedCount;
+    }
+
+    /**
+     * Get the total number of requests sent
+     *
+     * @return int
+     */
+    public function getRequestCount()
+    {
+        return $this->requestCount;
+    }
+
+    /**
+     * Rewind the Iterator to the first element and send the original command
+     */
+    public function rewind()
+    {
+        // Use the original command
+        $this->command = clone $this->originalCommand;
+        $this->resetState();
+        $this->next();
+    }
+
+    public function valid()
+    {
+        return !$this->invalid && (!$this->resources || $this->current() || $this->nextToken)
+            && (!$this->limit || $this->iteratedCount < $this->limit + 1);
+    }
+
+    public function next()
+    {
+        $this->iteratedCount++;
+
+        // Check if a new set of resources needs to be retrieved
+        $sendRequest = false;
+        if (!$this->resources) {
+            $sendRequest = true;
+        } else {
+            // iterate over the internal array
+            $current = next($this->resources);
+            $sendRequest = $current === false && $this->nextToken && (!$this->limit || $this->iteratedCount < $this->limit + 1);
+        }
+
+        if ($sendRequest) {
+
+            $this->dispatch('resource_iterator.before_send', array(
+                'iterator'  => $this,
+                'resources' => $this->resources
+            ));
+
+            // Get a new command object from the original command
+            $this->command = clone $this->originalCommand;
+            // Send a request and retrieve the newly loaded resources
+            $this->resources = $this->sendRequest();
+            $this->requestCount++;
+
+            // If no resources were found, then the last request was not needed
+            // and iteration must stop
+            if (empty($this->resources)) {
+                $this->invalid = true;
+            } else {
+                // Add to the number of retrieved resources
+                $this->retrievedCount += count($this->resources);
+                // Ensure that we rewind to the beginning of the array
+                reset($this->resources);
+            }
+
+            $this->dispatch('resource_iterator.after_send', array(
+                'iterator'  => $this,
+                'resources' => $this->resources
+            ));
+        }
+    }
+
+    /**
+     * Retrieve the NextToken that can be used in other iterators.
+     *
+     * @return string Returns a NextToken
+     */
+    public function getNextToken()
+    {
+        return $this->nextToken;
+    }
+
+    /**
+     * Returns the value that should be specified for the page size for a request that will maintain any hard limits,
+     * but still honor the specified pageSize if the number of items retrieved + pageSize < hard limit
+     *
+     * @return int Returns the page size of the next request.
+     */
+    protected function calculatePageSize()
+    {
+        if ($this->limit && $this->iteratedCount + $this->pageSize > $this->limit) {
+            return 1 + ($this->limit - $this->iteratedCount);
+        }
+
+        return (int) $this->pageSize;
+    }
+
+    /**
+     * Reset the internal state of the iterator without triggering a rewind()
+     */
+    protected function resetState()
+    {
+        $this->iteratedCount = 0;
+        $this->retrievedCount = 0;
+        $this->nextToken = false;
+        $this->resources = null;
+        $this->invalid = false;
+    }
+
+    /**
+     * Send a request to retrieve the next page of results. Hook for subclasses to implement.
+     *
+     * @return array Returns the newly loaded resources
+     */
+    abstract protected function sendRequest();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorApplyBatched.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorApplyBatched.php
new file mode 100644
index 0000000000000000000000000000000000000000..6aa36153fc0d7368df8f64a2788990c1457125a2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorApplyBatched.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Common\AbstractHasDispatcher;
+use Guzzle\Batch\BatchBuilder;
+use Guzzle\Batch\BatchSizeDivisor;
+use Guzzle\Batch\BatchClosureTransfer;
+use Guzzle\Common\Version;
+
+/**
+ * Apply a callback to the contents of a {@see ResourceIteratorInterface}
+ * @deprecated Will be removed in a future version and is no longer maintained. Use the Batch\ abstractions instead.
+ * @codeCoverageIgnore
+ */
+class ResourceIteratorApplyBatched extends AbstractHasDispatcher
+{
+    /** @var callable|array */
+    protected $callback;
+
+    /** @var ResourceIteratorInterface */
+    protected $iterator;
+
+    /** @var integer Total number of sent batches */
+    protected $batches = 0;
+
+    /** @var int Total number of iterated resources */
+    protected $iterated = 0;
+
+    public static function getAllEvents()
+    {
+        return array(
+            // About to send a batch of requests to the callback
+            'iterator_batch.before_batch',
+            // Finished sending a batch of requests to the callback
+            'iterator_batch.after_batch',
+            // Created the batch object
+            'iterator_batch.created_batch'
+        );
+    }
+
+    /**
+     * @param ResourceIteratorInterface $iterator Resource iterator to apply a callback to
+     * @param array|callable            $callback Callback method accepting the resource iterator
+     *                                            and an array of the iterator's current resources
+     */
+    public function __construct(ResourceIteratorInterface $iterator, $callback)
+    {
+        $this->iterator = $iterator;
+        $this->callback = $callback;
+        Version::warn(__CLASS__ . ' is deprecated');
+    }
+
+    /**
+     * Apply the callback to the contents of the resource iterator
+     *
+     * @param int $perBatch The number of records to group per batch transfer
+     *
+     * @return int Returns the number of iterated resources
+     */
+    public function apply($perBatch = 50)
+    {
+        $this->iterated = $this->batches = $batches = 0;
+        $that = $this;
+        $it = $this->iterator;
+        $callback = $this->callback;
+
+        $batch = BatchBuilder::factory()
+            ->createBatchesWith(new BatchSizeDivisor($perBatch))
+            ->transferWith(new BatchClosureTransfer(function (array $batch) use ($that, $callback, &$batches, $it) {
+                $batches++;
+                $that->dispatch('iterator_batch.before_batch', array('iterator' => $it, 'batch' => $batch));
+                call_user_func_array($callback, array($it, $batch));
+                $that->dispatch('iterator_batch.after_batch', array('iterator' => $it, 'batch' => $batch));
+            }))
+            ->autoFlushAt($perBatch)
+            ->build();
+
+        $this->dispatch('iterator_batch.created_batch', array('batch' => $batch));
+
+        foreach ($this->iterator as $resource) {
+            $this->iterated++;
+            $batch->add($resource);
+        }
+
+        $batch->flush();
+        $this->batches = $batches;
+
+        return $this->iterated;
+    }
+
+    /**
+     * Get the total number of batches sent
+     *
+     * @return int
+     */
+    public function getBatchCount()
+    {
+        return $this->batches;
+    }
+
+    /**
+     * Get the total number of iterated resources
+     *
+     * @return int
+     */
+    public function getIteratedCount()
+    {
+        return $this->iterated;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorClassFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorClassFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..2fd9980717b168c5c904ba7b0215a39fe42cee11
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorClassFactory.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Inflection\InflectorInterface;
+use Guzzle\Inflection\Inflector;
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Factory for creating {@see ResourceIteratorInterface} objects using a convention of storing iterator classes under a
+ * root namespace using the name of a {@see CommandInterface} object as a convention for determining the name of an
+ * iterator class. The command name is converted to CamelCase and Iterator is appended (e.g. abc_foo => AbcFoo).
+ */
+class ResourceIteratorClassFactory extends AbstractResourceIteratorFactory
+{
+    /** @var array List of namespaces used to look for classes */
+    protected $namespaces;
+
+    /** @var InflectorInterface Inflector used to determine class names */
+    protected $inflector;
+
+    /**
+     * @param string|array       $namespaces List of namespaces for iterator objects
+     * @param InflectorInterface $inflector  Inflector used to resolve class names
+     */
+    public function __construct($namespaces = array(), InflectorInterface $inflector = null)
+    {
+        $this->namespaces = (array) $namespaces;
+        $this->inflector = $inflector ?: Inflector::getDefault();
+    }
+
+    /**
+     * Registers a namespace to check for Iterators
+     *
+     * @param string $namespace Namespace which contains Iterator classes
+     *
+     * @return self
+     */
+    public function registerNamespace($namespace)
+    {
+        array_unshift($this->namespaces, $namespace);
+
+        return $this;
+    }
+
+    protected function getClassName(CommandInterface $command)
+    {
+        $iteratorName = $this->inflector->camel($command->getName()) . 'Iterator';
+
+        // Determine the name of the class to load
+        foreach ($this->namespaces as $namespace) {
+            $potentialClassName = $namespace . '\\' . $iteratorName;
+            if (class_exists($potentialClassName)) {
+                return $potentialClassName;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorFactoryInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorFactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..8b4e8dbe0a8903524d677c41833a5b5ad8680634
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorFactoryInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Service\Command\CommandInterface;
+
+/**
+ * Factory for creating {@see ResourceIteratorInterface} objects
+ */
+interface ResourceIteratorFactoryInterface
+{
+    /**
+     * Create a resource iterator
+     *
+     * @param CommandInterface $command Command to create an iterator for
+     * @param array                 $options Iterator options that are exposed as data.
+     *
+     * @return ResourceIteratorInterface
+     */
+    public function build(CommandInterface $command, array $options = array());
+
+    /**
+     * Check if the factory can create an iterator
+     *
+     * @param CommandInterface $command Command to create an iterator for
+     *
+     * @return bool
+     */
+    public function canBuild(CommandInterface $command);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbaafdec1e2836dd430e121421750f4c5869a383
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Service/Resource/ResourceIteratorInterface.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Guzzle\Service\Resource;
+
+use Guzzle\Common\HasDispatcherInterface;
+use Guzzle\Common\ToArrayInterface;
+
+/**
+ * Iterates over a paginated resource using subsequent requests in order to retrieve the entire matching result set
+ */
+interface ResourceIteratorInterface extends ToArrayInterface, HasDispatcherInterface, \Iterator, \Countable
+{
+    /**
+     * Retrieve the NextToken that can be used in other iterators.
+     *
+     * @return string Returns a NextToken
+     */
+    public function getNextToken();
+
+    /**
+     * Attempt to limit the total number of resources returned by the iterator.
+     *
+     * You may still receive more items than you specify. Set to 0 to specify no limit.
+     *
+     * @param int $limit Limit amount
+     *
+     * @return ResourceIteratorInterface
+     */
+    public function setLimit($limit);
+
+    /**
+     * Attempt to limit the total number of resources retrieved per request by  the iterator.
+     *
+     * The iterator may return more than you specify in the page size argument depending on the service and underlying
+     * command implementation.  Set to 0 to specify no page size limitation.
+     *
+     * @param int $pageSize Limit amount
+     *
+     * @return ResourceIteratorInterface
+     */
+    public function setPageSize($pageSize);
+
+    /**
+     * Get a data option from the iterator
+     *
+     * @param string $key Key of the option to retrieve
+     *
+     * @return mixed|null Returns NULL if not set or the value if set
+     */
+    public function get($key);
+
+    /**
+     * Set a data option on the iterator
+     *
+     * @param string $key   Key of the option to set
+     * @param mixed  $value Value to set for the option
+     *
+     * @return ResourceIteratorInterface
+     */
+    public function set($key, $value);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/PhpStreamRequestFactory.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/PhpStreamRequestFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..0c2c94f264020cd483dd691b46eb619c78120210
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/PhpStreamRequestFactory.php
@@ -0,0 +1,270 @@
+<?php
+
+namespace Guzzle\Stream;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Exception\RuntimeException;
+use Guzzle\Http\Message\EntityEnclosingRequestInterface;
+use Guzzle\Http\Message\RequestInterface;
+use Guzzle\Http\Url;
+
+/**
+ * Factory used to create fopen streams using PHP's http and https stream wrappers
+ *
+ * Note: PHP's http stream wrapper only supports streaming downloads. It does not support streaming uploads.
+ */
+class PhpStreamRequestFactory implements StreamRequestFactoryInterface
+{
+    /** @var resource Stream context options */
+    protected $context;
+
+    /** @var array Stream context */
+    protected $contextOptions;
+
+    /** @var Url Stream URL */
+    protected $url;
+
+    /** @var array Last response headers received by the HTTP request */
+    protected $lastResponseHeaders;
+
+    /**
+     * {@inheritdoc}
+     *
+     * The $params array can contain the following custom keys specific to the PhpStreamRequestFactory:
+     * - stream_class: The name of a class to create instead of a Guzzle\Stream\Stream object
+     */
+    public function fromRequest(RequestInterface $request, $context = array(), array $params = array())
+    {
+        if (is_resource($context)) {
+            $this->contextOptions = stream_context_get_options($context);
+            $this->context = $context;
+        } elseif (is_array($context) || !$context) {
+            $this->contextOptions = $context;
+            $this->createContext($params);
+        } elseif ($context) {
+            throw new InvalidArgumentException('$context must be an array or resource');
+        }
+
+        $this->setUrl($request);
+        $this->addDefaultContextOptions($request);
+        $this->addSslOptions($request);
+        $this->addBodyOptions($request);
+        $this->addProxyOptions($request);
+
+        // Dispatch the before send event
+        $request->dispatch('request.before_send', array(
+            'request'         => $request,
+            'context'         => $this->context,
+            'context_options' => $this->contextOptions
+        ));
+
+        // Create the file handle but silence errors
+        return $this->createStream($params)
+            ->setCustomData('request', $request)
+            ->setCustomData('response_headers', $this->getLastResponseHeaders());
+    }
+
+    /**
+     * Set an option on the context and the internal options array
+     *
+     * @param string $wrapper   Stream wrapper name of http
+     * @param string $name      Context name
+     * @param mixed  $value     Context value
+     * @param bool   $overwrite Set to true to overwrite an existing value
+     */
+    protected function setContextValue($wrapper, $name, $value, $overwrite = false)
+    {
+        if (!isset($this->contextOptions[$wrapper])) {
+            $this->contextOptions[$wrapper] = array($name => $value);
+        } elseif (!$overwrite && isset($this->contextOptions[$wrapper][$name])) {
+            return;
+        }
+        $this->contextOptions[$wrapper][$name] = $value;
+        stream_context_set_option($this->context, $wrapper, $name, $value);
+    }
+
+    /**
+     * Create a stream context
+     *
+     * @param array $params Parameter array
+     */
+    protected function createContext(array $params)
+    {
+        $options = $this->contextOptions;
+        $this->context = $this->createResource(function () use ($params, $options) {
+            return stream_context_create($options, $params);
+        });
+    }
+
+    /**
+     * Get the last response headers received by the HTTP request
+     *
+     * @return array
+     */
+    public function getLastResponseHeaders()
+    {
+        return $this->lastResponseHeaders;
+    }
+
+    /**
+     * Adds the default context options to the stream context options
+     *
+     * @param RequestInterface $request Request
+     */
+    protected function addDefaultContextOptions(RequestInterface $request)
+    {
+        $this->setContextValue('http', 'method', $request->getMethod());
+        $this->setContextValue('http', 'header', $request->getHeaderLines());
+        // Force 1.0 for now until PHP fully support chunked transfer-encoding decoding
+        $this->setContextValue('http', 'protocol_version', '1.0');
+        $this->setContextValue('http', 'ignore_errors', true);
+    }
+
+    /**
+     * Set the URL to use with the factory
+     *
+     * @param RequestInterface $request Request that owns the URL
+     */
+    protected function setUrl(RequestInterface $request)
+    {
+        $this->url = $request->getUrl(true);
+
+        // Check for basic Auth username
+        if ($request->getUsername()) {
+            $this->url->setUsername($request->getUsername());
+        }
+
+        // Check for basic Auth password
+        if ($request->getPassword()) {
+            $this->url->setPassword($request->getPassword());
+        }
+    }
+
+    /**
+     * Add SSL options to the stream context
+     *
+     * @param RequestInterface $request Request
+     */
+    protected function addSslOptions(RequestInterface $request)
+    {
+        if ($verify = $request->getCurlOptions()->get(CURLOPT_SSL_VERIFYPEER)) {
+            $this->setContextValue('ssl', 'verify_peer', true, true);
+            if ($cafile = $request->getCurlOptions()->get(CURLOPT_CAINFO)) {
+                $this->setContextValue('ssl', 'cafile', $cafile, true);
+            }
+        } else {
+            $this->setContextValue('ssl', 'verify_peer', false, true);
+        }
+    }
+
+    /**
+     * Add body (content) specific options to the context options
+     *
+     * @param RequestInterface $request
+     */
+    protected function addBodyOptions(RequestInterface $request)
+    {
+        // Add the content for the request if needed
+        if (!($request instanceof EntityEnclosingRequestInterface)) {
+            return;
+        }
+
+        if (count($request->getPostFields())) {
+            $this->setContextValue('http', 'content', (string) $request->getPostFields(), true);
+        } elseif ($request->getBody()) {
+            $this->setContextValue('http', 'content', (string) $request->getBody(), true);
+        }
+
+        // Always ensure a content-length header is sent
+        if (isset($this->contextOptions['http']['content'])) {
+            $headers = isset($this->contextOptions['http']['header']) ? $this->contextOptions['http']['header'] : array();
+            $headers[] = 'Content-Length: ' . strlen($this->contextOptions['http']['content']);
+            $this->setContextValue('http', 'header', $headers, true);
+        }
+    }
+
+    /**
+     * Add proxy parameters to the context if needed
+     *
+     * @param RequestInterface $request Request
+     */
+    protected function addProxyOptions(RequestInterface $request)
+    {
+        if ($proxy = $request->getCurlOptions()->get(CURLOPT_PROXY)) {
+            $this->setContextValue('http', 'proxy', $proxy);
+        }
+    }
+
+    /**
+     * Create the stream for the request with the context options
+     *
+     * @param array $params Parameters of the stream
+     *
+     * @return StreamInterface
+     */
+    protected function createStream(array $params)
+    {
+        $http_response_header = null;
+        $url = $this->url;
+        $context = $this->context;
+        $fp = $this->createResource(function () use ($context, $url, &$http_response_header) {
+            return fopen((string) $url, 'r', false, $context);
+        });
+
+        // Determine the class to instantiate
+        $className = isset($params['stream_class']) ? $params['stream_class'] : __NAMESPACE__ . '\\Stream';
+
+        /** @var $stream StreamInterface */
+        $stream = new $className($fp);
+
+        // Track the response headers of the request
+        if (isset($http_response_header)) {
+            $this->lastResponseHeaders = $http_response_header;
+            $this->processResponseHeaders($stream);
+        }
+
+        return $stream;
+    }
+
+    /**
+     * Process response headers
+     *
+     * @param StreamInterface $stream
+     */
+    protected function processResponseHeaders(StreamInterface $stream)
+    {
+        // Set the size on the stream if it was returned in the response
+        foreach ($this->lastResponseHeaders as $header) {
+            if (($pos = stripos($header, 'Content-Length:')) === 0) {
+                $stream->setSize(trim(substr($header, 15)));
+            }
+        }
+    }
+
+    /**
+     * Create a resource and check to ensure it was created successfully
+     *
+     * @param callable $callback Closure to invoke that must return a valid resource
+     *
+     * @return resource
+     * @throws RuntimeException on error
+     */
+    protected function createResource($callback)
+    {
+        // Turn off error reporting while we try to initiate the request
+        $level = error_reporting(0);
+        $resource = call_user_func($callback);
+        error_reporting($level);
+
+        // If the resource could not be created, then grab the last error and throw an exception
+        if (false === $resource) {
+            $message = 'Error creating resource. ';
+            foreach (error_get_last() as $key => $value) {
+                $message .= "[{$key}] {$value} ";
+            }
+            throw new RuntimeException(trim($message));
+        }
+
+        return $resource;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/Stream.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/Stream.php
new file mode 100644
index 0000000000000000000000000000000000000000..e222e02ebee1376eb09ce1f3c9efe5259194076a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/Stream.php
@@ -0,0 +1,294 @@
+<?php
+
+namespace Guzzle\Stream;
+
+use Guzzle\Common\Exception\InvalidArgumentException;
+
+/**
+ * PHP stream implementation
+ */
+class Stream implements StreamInterface
+{
+    const STREAM_TYPE = 'stream_type';
+    const WRAPPER_TYPE = 'wrapper_type';
+    const IS_LOCAL = 'is_local';
+    const IS_READABLE = 'is_readable';
+    const IS_WRITABLE = 'is_writable';
+    const SEEKABLE = 'seekable';
+
+    /** @var resource Stream resource */
+    protected $stream;
+
+    /** @var int Size of the stream contents in bytes */
+    protected $size;
+
+    /** @var array Stream cached data */
+    protected $cache = array();
+
+    /** @var array Custom stream data */
+    protected $customData = array();
+
+    /** @var array Hash table of readable and writeable stream types for fast lookups */
+    protected static $readWriteHash = array(
+        'read' => array(
+            'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
+            'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true, 'c+b' => true,
+            'rt' => true, 'w+t' => true, 'r+t' => true, 'x+t' => true, 'c+t' => true, 'a+' => true
+        ),
+        'write' => array(
+            'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true, 'c+' => true,
+            'wb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true, 'c+b' => true,
+            'w+t' => true, 'r+t' => true, 'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true
+        )
+    );
+
+    /**
+     * @param resource $stream Stream resource to wrap
+     * @param int      $size   Size of the stream in bytes. Only pass if the size cannot be obtained from the stream.
+     *
+     * @throws InvalidArgumentException if the stream is not a stream resource
+     */
+    public function __construct($stream, $size = null)
+    {
+        $this->setStream($stream, $size);
+    }
+
+    /**
+     * Closes the stream when the helper is destructed
+     */
+    public function __destruct()
+    {
+        $this->close();
+    }
+
+    public function __toString()
+    {
+        if (!$this->isReadable() || (!$this->isSeekable() && $this->isConsumed())) {
+            return '';
+        }
+
+        $originalPos = $this->ftell();
+        $body = stream_get_contents($this->stream, -1, 0);
+        $this->seek($originalPos);
+
+        return $body;
+    }
+
+    public function close()
+    {
+        if (is_resource($this->stream)) {
+            fclose($this->stream);
+        }
+        $this->cache[self::IS_READABLE] = false;
+        $this->cache[self::IS_WRITABLE] = false;
+    }
+
+    /**
+     * Calculate a hash of a Stream
+     *
+     * @param StreamInterface $stream    Stream to calculate the hash for
+     * @param string          $algo      Hash algorithm (e.g. md5, crc32, etc)
+     * @param bool            $rawOutput Whether or not to use raw output
+     *
+     * @return bool|string Returns false on failure or a hash string on success
+     */
+    public static function getHash(StreamInterface $stream, $algo, $rawOutput = false)
+    {
+        $pos = $stream->ftell();
+        if (!$stream->seek(0)) {
+            return false;
+        }
+
+        $ctx = hash_init($algo);
+        while ($data = $stream->read(8192)) {
+            hash_update($ctx, $data);
+        }
+
+        $out = hash_final($ctx, (bool) $rawOutput);
+        $stream->seek($pos);
+
+        return $out;
+    }
+
+    public function getMetaData($key = null)
+    {
+        $meta = stream_get_meta_data($this->stream);
+
+        return !$key ? $meta : (array_key_exists($key, $meta) ? $meta[$key] : null);
+    }
+
+    public function getStream()
+    {
+        return $this->stream;
+    }
+
+    public function setStream($stream, $size = null)
+    {
+        if (!is_resource($stream)) {
+            throw new InvalidArgumentException('Stream must be a resource');
+        }
+
+        $this->size = $size;
+        $this->stream = $stream;
+        $this->rebuildCache();
+
+        return $this;
+    }
+
+    public function detachStream()
+    {
+        $this->stream = null;
+
+        return $this;
+    }
+
+    public function getWrapper()
+    {
+        return $this->cache[self::WRAPPER_TYPE];
+    }
+
+    public function getWrapperData()
+    {
+        return $this->getMetaData('wrapper_data') ?: array();
+    }
+
+    public function getStreamType()
+    {
+        return $this->cache[self::STREAM_TYPE];
+    }
+
+    public function getUri()
+    {
+        return $this->cache['uri'];
+    }
+
+    public function getSize()
+    {
+        if ($this->size !== null) {
+            return $this->size;
+        }
+
+        // If the stream is a file based stream and local, then use fstat
+        clearstatcache(true, $this->cache['uri']);
+        $stats = fstat($this->stream);
+        if (isset($stats['size'])) {
+            $this->size = $stats['size'];
+            return $this->size;
+        } elseif ($this->cache[self::IS_READABLE] && $this->cache[self::SEEKABLE]) {
+            // Only get the size based on the content if the the stream is readable and seekable
+            $pos = $this->ftell();
+            $this->size = strlen((string) $this);
+            $this->seek($pos);
+            return $this->size;
+        }
+
+        return false;
+    }
+
+    public function isReadable()
+    {
+        return $this->cache[self::IS_READABLE];
+    }
+
+    public function isRepeatable()
+    {
+        return $this->cache[self::IS_READABLE] && $this->cache[self::SEEKABLE];
+    }
+
+    public function isWritable()
+    {
+        return $this->cache[self::IS_WRITABLE];
+    }
+
+    public function isConsumed()
+    {
+        return feof($this->stream);
+    }
+
+    public function feof()
+    {
+        return $this->isConsumed();
+    }
+
+    public function isLocal()
+    {
+        return $this->cache[self::IS_LOCAL];
+    }
+
+    public function isSeekable()
+    {
+        return $this->cache[self::SEEKABLE];
+    }
+
+    public function setSize($size)
+    {
+        $this->size = $size;
+
+        return $this;
+    }
+
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        return $this->cache[self::SEEKABLE] ? fseek($this->stream, $offset, $whence) === 0 : false;
+    }
+
+    public function read($length)
+    {
+        return $this->cache[self::IS_READABLE] ? fread($this->stream, $length) : false;
+    }
+
+    public function write($string)
+    {
+        if (!$this->cache[self::IS_WRITABLE]) {
+            return 0;
+        }
+
+        $bytes = fwrite($this->stream, $string);
+        // We can't know the size after writing anything
+        $this->size = null;
+
+        return $bytes;
+    }
+
+    public function ftell()
+    {
+        return ftell($this->stream);
+    }
+
+    public function rewind()
+    {
+        return $this->seek(0);
+    }
+
+    public function readLine($maxLength = null)
+    {
+        if (!$this->cache[self::IS_READABLE]) {
+            return false;
+        } else {
+            return $maxLength ? fgets($this->getStream(), $maxLength) : fgets($this->getStream());
+        }
+    }
+
+    public function setCustomData($key, $value)
+    {
+        $this->customData[$key] = $value;
+
+        return $this;
+    }
+
+    public function getCustomData($key)
+    {
+        return isset($this->customData[$key]) ? $this->customData[$key] : null;
+    }
+
+    /**
+     * Reprocess stream metadata
+     */
+    protected function rebuildCache()
+    {
+        $this->cache = stream_get_meta_data($this->stream);
+        $this->cache[self::IS_LOCAL] = stream_is_local($this->stream);
+        $this->cache[self::IS_READABLE] = isset(self::$readWriteHash['read'][$this->cache['mode']]);
+        $this->cache[self::IS_WRITABLE] = isset(self::$readWriteHash['write'][$this->cache['mode']]);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d7dc37613c0dab97ddde1955d1fac58687f3b49
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamInterface.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace Guzzle\Stream;
+
+/**
+ * OO interface to PHP streams
+ */
+interface StreamInterface
+{
+    /**
+     * Convert the stream to a string if the stream is readable and the stream is seekable.
+     *
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Close the underlying stream
+     */
+    public function close();
+
+    /**
+     * Get stream metadata
+     *
+     * @param string $key Specific metadata to retrieve
+     *
+     * @return array|mixed|null
+     */
+    public function getMetaData($key = null);
+
+    /**
+     * Get the stream resource
+     *
+     * @return resource
+     */
+    public function getStream();
+
+    /**
+     * Set the stream that is wrapped by the object
+     *
+     * @param resource $stream Stream resource to wrap
+     * @param int      $size   Size of the stream in bytes. Only pass if the size cannot be obtained from the stream.
+     *
+     * @return self
+     */
+    public function setStream($stream, $size = null);
+
+    /**
+     * Detach the current stream resource
+     *
+     * @return self
+     */
+    public function detachStream();
+
+    /**
+     * Get the stream wrapper type
+     *
+     * @return string
+     */
+    public function getWrapper();
+
+    /**
+     * Wrapper specific data attached to this stream.
+     *
+     * @return array
+     */
+    public function getWrapperData();
+
+    /**
+     * Get a label describing the underlying implementation of the stream
+     *
+     * @return string
+     */
+    public function getStreamType();
+
+    /**
+     * Get the URI/filename associated with this stream
+     *
+     * @return string
+     */
+    public function getUri();
+
+    /**
+     * Get the size of the stream if able
+     *
+     * @return int|bool
+     */
+    public function getSize();
+
+    /**
+     * Check if the stream is readable
+     *
+     * @return bool
+     */
+    public function isReadable();
+
+    /**
+     * Check if the stream is repeatable
+     *
+     * @return bool
+     */
+    public function isRepeatable();
+
+    /**
+     * Check if the stream is writable
+     *
+     * @return bool
+     */
+    public function isWritable();
+
+    /**
+     * Check if the stream has been consumed
+     *
+     * @return bool
+     */
+    public function isConsumed();
+
+    /**
+     * Alias of isConsumed
+     *
+     * @return bool
+     */
+    public function feof();
+
+    /**
+     * Check if the stream is a local stream vs a remote stream
+     *
+     * @return bool
+     */
+    public function isLocal();
+
+    /**
+     * Check if the string is repeatable
+     *
+     * @return bool
+     */
+    public function isSeekable();
+
+    /**
+     * Specify the size of the stream in bytes
+     *
+     * @param int $size Size of the stream contents in bytes
+     *
+     * @return self
+     */
+    public function setSize($size);
+
+    /**
+     * Seek to a position in the stream
+     *
+     * @param int $offset Stream offset
+     * @param int $whence Where the offset is applied
+     *
+     * @return bool Returns TRUE on success or FALSE on failure
+     * @link   http://www.php.net/manual/en/function.fseek.php
+     */
+    public function seek($offset, $whence = SEEK_SET);
+
+    /**
+     * Read data from the stream
+     *
+     * @param int $length Up to length number of bytes read.
+     *
+     * @return string|bool Returns the data read from the stream or FALSE on failure or EOF
+     */
+    public function read($length);
+
+    /**
+     * Write data to the stream
+     *
+     * @param string $string The string that is to be written.
+     *
+     * @return int|bool Returns the number of bytes written to the stream on success or FALSE on failure.
+     */
+    public function write($string);
+
+    /**
+     * Returns the current position of the file read/write pointer
+     *
+     * @return int|bool Returns the position of the file pointer or false on error
+     */
+    public function ftell();
+
+    /**
+     * Rewind to the beginning of the stream
+     *
+     * @return bool Returns true on success or false on failure
+     */
+    public function rewind();
+
+    /**
+     * Read a line from the stream up to the maximum allowed buffer length
+     *
+     * @param int $maxLength Maximum buffer length
+     *
+     * @return string|bool
+     */
+    public function readLine($maxLength = null);
+
+    /**
+     * Set custom data on the stream
+     *
+     * @param string $key   Key to set
+     * @param mixed  $value Value to set
+     *
+     * @return self
+     */
+    public function setCustomData($key, $value);
+
+    /**
+     * Get custom data from the stream
+     *
+     * @param string $key Key to retrieve
+     *
+     * @return null|mixed
+     */
+    public function getCustomData($key);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamRequestFactoryInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamRequestFactoryInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..d00e622e1d4192eaf80f07c931e5677f299ad7d1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamRequestFactoryInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Guzzle\Stream;
+
+use Guzzle\Http\Message\RequestInterface;
+
+/**
+ * Interface used for creating streams from requests
+ */
+interface StreamRequestFactoryInterface
+{
+    /**
+     * Create a stream based on a request object
+     *
+     * @param RequestInterface $request Base the stream on a request
+     * @param array|resource   $context A stream_context_options resource or array of parameters used to create a
+     *                                  stream context.
+     * @param array            $params  Optional array of parameters specific to the factory
+     *
+     * @return StreamInterface Returns a stream object
+     * @throws \Guzzle\Common\Exception\RuntimeException if the stream cannot be opened or an error occurs
+     */
+    public function fromRequest(RequestInterface $request, $context = array(), array $params = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/ChromePHPFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/ChromePHPFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..56d3e278a535e7ccb1e7c843792f71590be8ef14
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/ChromePHPFormatter.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+use Monolog\Logger;
+
+/**
+ * Formats a log message according to the ChromePHP array format
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class ChromePHPFormatter implements FormatterInterface
+{
+    /**
+     * Translates Monolog log levels to Wildfire levels.
+     */
+    private $logLevels = array(
+        Logger::DEBUG     => 'log',
+        Logger::INFO      => 'info',
+        Logger::NOTICE    => 'info',
+        Logger::WARNING   => 'warn',
+        Logger::ERROR     => 'error',
+        Logger::CRITICAL  => 'error',
+        Logger::ALERT     => 'error',
+        Logger::EMERGENCY => 'error',
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(array $record)
+    {
+        // Retrieve the line and file if set and remove them from the formatted extra
+        $backtrace = 'unknown';
+        if (isset($record['extra']['file']) && isset($record['extra']['line'])) {
+            $backtrace = $record['extra']['file'].' : '.$record['extra']['line'];
+            unset($record['extra']['file']);
+            unset($record['extra']['line']);
+        }
+
+        $message = array('message' => $record['message']);
+        if ($record['context']) {
+            $message['context'] = $record['context'];
+        }
+        if ($record['extra']) {
+            $message['extra'] = $record['extra'];
+        }
+        if (count($message) === 1) {
+            $message = reset($message);
+        }
+
+        return array(
+            $record['channel'],
+            $message,
+            $backtrace,
+            $this->logLevels[$record['level']],
+        );
+    }
+
+    public function formatBatch(array $records)
+    {
+        $formatted = array();
+
+        foreach ($records as $record) {
+            $formatted[] = $this->format($record);
+        }
+
+        return $formatted;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/FormatterInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/FormatterInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..b5de751112bd2cfc59b86ed40515c5b9d33b7af0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/FormatterInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+/**
+ * Interface for formatters
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface FormatterInterface
+{
+    /**
+     * Formats a log record.
+     *
+     * @param  array $record A record to format
+     * @return mixed The formatted record
+     */
+    public function format(array $record);
+
+    /**
+     * Formats a set of log records.
+     *
+     * @param  array $records A set of records to format
+     * @return mixed The formatted set of records
+     */
+    public function formatBatch(array $records);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/GelfMessageFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/GelfMessageFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..aa01f491eb2d2d997eddcc2b913f2e6318588544
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/GelfMessageFormatter.php
@@ -0,0 +1,94 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+use Monolog\Logger;
+use Gelf\Message;
+
+/**
+ * Serializes a log message to GELF
+ * @see http://www.graylog2.org/about/gelf
+ *
+ * @author Matt Lehner <mlehner@gmail.com>
+ */
+class GelfMessageFormatter extends NormalizerFormatter
+{
+    /**
+     * @var string the name of the system for the Gelf log message
+     */
+    protected $systemName;
+
+    /**
+     * @var string a prefix for 'extra' fields from the Monolog record (optional)
+     */
+    protected $extraPrefix;
+
+    /**
+     * @var string a prefix for 'context' fields from the Monolog record (optional)
+     */
+    protected $contextPrefix;
+
+    /**
+     * Translates Monolog log levels to Graylog2 log priorities.
+     */
+    private $logLevels = array(
+        Logger::DEBUG     => 7,
+        Logger::INFO      => 6,
+        Logger::NOTICE    => 5,
+        Logger::WARNING   => 4,
+        Logger::ERROR     => 3,
+        Logger::CRITICAL  => 2,
+        Logger::ALERT     => 1,
+        Logger::EMERGENCY => 0,
+    );
+
+    public function __construct($systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_')
+    {
+        parent::__construct('U.u');
+
+        $this->systemName = $systemName ?: gethostname();
+
+        $this->extraPrefix = $extraPrefix;
+        $this->contextPrefix = $contextPrefix;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(array $record)
+    {
+        $record = parent::format($record);
+        $message = new Message();
+        $message
+            ->setTimestamp($record['datetime'])
+            ->setShortMessage((string) $record['message'])
+            ->setFacility($record['channel'])
+            ->setHost($this->systemName)
+            ->setLine(isset($record['extra']['line']) ? $record['extra']['line'] : null)
+            ->setFile(isset($record['extra']['file']) ? $record['extra']['file'] : null)
+            ->setLevel($this->logLevels[$record['level']]);
+
+        // Do not duplicate these values in the additional fields
+        unset($record['extra']['line']);
+        unset($record['extra']['file']);
+
+        foreach ($record['extra'] as $key => $val) {
+            $message->setAdditional($this->extraPrefix . $key, is_scalar($val) ? $val : $this->toJson($val));
+        }
+
+        foreach ($record['context'] as $key => $val) {
+            $message->setAdditional($this->contextPrefix . $key, is_scalar($val) ? $val : $this->toJson($val));
+        }
+
+        return $message;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/JsonFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/JsonFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..822af0ea436270b535f919fefcec566937638e48
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/JsonFormatter.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+/**
+ * Encodes whatever record data is passed to it as json
+ *
+ * This can be useful to log to databases or remote APIs
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class JsonFormatter implements FormatterInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function format(array $record)
+    {
+        return json_encode($record);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function formatBatch(array $records)
+    {
+        return json_encode($records);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/LineFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/LineFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..40b79e8ea125450f18116d39c0f548e68fcc77ef
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/LineFormatter.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+/**
+ * Formats incoming records into a one-line string
+ *
+ * This is especially useful for logging to files
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class LineFormatter extends NormalizerFormatter
+{
+    const SIMPLE_FORMAT = "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n";
+
+    protected $format;
+
+    /**
+     * @param string $format     The format of the message
+     * @param string $dateFormat The format of the timestamp: one supported by DateTime::format
+     */
+    public function __construct($format = null, $dateFormat = null)
+    {
+        $this->format = $format ?: static::SIMPLE_FORMAT;
+        parent::__construct($dateFormat);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(array $record)
+    {
+        $vars = parent::format($record);
+
+        $output = $this->format;
+        foreach ($vars['extra'] as $var => $val) {
+            if (false !== strpos($output, '%extra.'.$var.'%')) {
+                $output = str_replace('%extra.'.$var.'%', $this->convertToString($val), $output);
+                unset($vars['extra'][$var]);
+            }
+        }
+        foreach ($vars as $var => $val) {
+            $output = str_replace('%'.$var.'%', $this->convertToString($val), $output);
+        }
+
+        return $output;
+    }
+
+    public function formatBatch(array $records)
+    {
+        $message = '';
+        foreach ($records as $record) {
+            $message .= $this->format($record);
+        }
+
+        return $message;
+    }
+
+    protected function normalize($data)
+    {
+        if (is_bool($data) || is_null($data)) {
+            return var_export($data, true);
+        }
+
+        if ($data instanceof \Exception) {
+            return '[object] ('.get_class($data).': '.$data->getMessage().' at '.$data->getFile().':'.$data->getLine().')';
+        }
+
+        return parent::normalize($data);
+    }
+
+    protected function convertToString($data)
+    {
+        if (null === $data || is_scalar($data)) {
+            return (string) $data;
+        }
+
+        $data = $this->normalize($data);
+        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+            return $this->toJson($data);
+        }
+
+        return str_replace('\\/', '/', json_encode($data));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/LogstashFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/LogstashFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..7aa8ad33cbe15733a72e554cbbf8744805b3d996
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/LogstashFormatter.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+/**
+ * Serializes a log message to Logstash Event Format
+ *
+ * @see http://logstash.net/
+ * @see https://github.com/logstash/logstash/blob/master/lib/logstash/event.rb
+ *
+ * @author Tim Mower <timothy.mower@gmail.com>
+ */
+class LogstashFormatter extends NormalizerFormatter
+{
+    /**
+     * @var string the name of the system for the Logstash log message, used to fill the @source field
+     */
+    protected $systemName;
+
+    /**
+     * @var string an application name for the Logstash log message, used to fill the @type field
+     */
+    protected $applicationName;
+
+    /**
+     * @var string a prefix for 'extra' fields from the Monolog record (optional)
+     */
+    protected $extraPrefix;
+
+    /**
+     * @var string a prefix for 'context' fields from the Monolog record (optional)
+     */
+    protected $contextPrefix;
+
+    /**
+     * @param string $applicationName the application that sends the data, used as the "type" field of logstash
+     * @param string $systemName      the system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine
+     * @param string $extraPrefix     prefix for extra keys inside logstash "fields"
+     * @param string $contextPrefix   prefix for context keys inside logstash "fields", defaults to ctxt_
+     */
+    public function __construct($applicationName, $systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_')
+    {
+        //log stash requires a ISO 8601 format date
+        parent::__construct('c');
+
+        $this->systemName = $systemName ?: gethostname();
+        $this->applicationName = $applicationName;
+
+        $this->extraPrefix = $extraPrefix;
+        $this->contextPrefix = $contextPrefix;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(array $record)
+    {
+        $record = parent::format($record);
+        $message = array(
+            '@timestamp' => $record['datetime'],
+            '@message' => $record['message'],
+            '@tags' => array($record['channel']),
+            '@source' => $this->systemName
+        );
+
+        if ($this->applicationName) {
+            $message['@type'] = $this->applicationName;
+        }
+        $message['@fields'] = array();
+        $message['@fields']['channel'] = $record['channel'];
+        $message['@fields']['level'] = $record['level'];
+
+        if (isset($record['extra']['server'])) {
+            $message['@source_host'] = $record['extra']['server'];
+        }
+        if (isset($record['extra']['url'])) {
+            $message['@source_path'] = $record['extra']['url'];
+        }
+        foreach ($record['extra'] as $key => $val) {
+            $message['@fields'][$this->extraPrefix . $key] = $val;
+        }
+
+        foreach ($record['context'] as $key => $val) {
+            $message['@fields'][$this->contextPrefix . $key] = $val;
+        }
+
+        return json_encode($message) . "\n";
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/NormalizerFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/NormalizerFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8b05fba8eaab0aba1025ec654b48df1b5155038
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/NormalizerFormatter.php
@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+/**
+ * Normalizes incoming records to remove objects/resources so it's easier to dump to various targets
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class NormalizerFormatter implements FormatterInterface
+{
+    const SIMPLE_DATE = "Y-m-d H:i:s";
+
+    protected $dateFormat;
+
+    /**
+     * @param string $dateFormat The format of the timestamp: one supported by DateTime::format
+     */
+    public function __construct($dateFormat = null)
+    {
+        $this->dateFormat = $dateFormat ?: static::SIMPLE_DATE;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(array $record)
+    {
+        return $this->normalize($record);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function formatBatch(array $records)
+    {
+        foreach ($records as $key => $record) {
+            $records[$key] = $this->format($record);
+        }
+
+        return $records;
+    }
+
+    protected function normalize($data)
+    {
+        if (null === $data || is_scalar($data)) {
+            return $data;
+        }
+
+        if (is_array($data) || $data instanceof \Traversable) {
+            $normalized = array();
+
+            foreach ($data as $key => $value) {
+                $normalized[$key] = $this->normalize($value);
+            }
+
+            return $normalized;
+        }
+
+        if ($data instanceof \DateTime) {
+            return $data->format($this->dateFormat);
+        }
+
+        if (is_object($data)) {
+            return sprintf("[object] (%s: %s)", get_class($data), $this->toJson($data, true));
+        }
+
+        if (is_resource($data)) {
+            return '[resource]';
+        }
+
+        return '[unknown('.gettype($data).')]';
+    }
+
+    protected function toJson($data, $ignoreErrors = false)
+    {
+        // suppress json_encode errors since it's twitchy with some inputs
+        if ($ignoreErrors) {
+            if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+                return @json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            }
+
+            return @json_encode($data);
+        }
+
+        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+            return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+        }
+
+        return json_encode($data);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/WildfireFormatter.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/WildfireFormatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..b3e9b186449fdc3a573d2e0005bd0ff7e0ea5175
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Formatter/WildfireFormatter.php
@@ -0,0 +1,102 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+use Monolog\Logger;
+
+/**
+ * Serializes a log message according to Wildfire's header requirements
+ *
+ * @author Eric Clemmons (@ericclemmons) <eric@uxdriven.com>
+ * @author Christophe Coevoet <stof@notk.org>
+ * @author Kirill chEbba Chebunin <iam@chebba.org>
+ */
+class WildfireFormatter extends NormalizerFormatter
+{
+    /**
+     * Translates Monolog log levels to Wildfire levels.
+     */
+    private $logLevels = array(
+        Logger::DEBUG     => 'LOG',
+        Logger::INFO      => 'INFO',
+        Logger::NOTICE    => 'INFO',
+        Logger::WARNING   => 'WARN',
+        Logger::ERROR     => 'ERROR',
+        Logger::CRITICAL  => 'ERROR',
+        Logger::ALERT     => 'ERROR',
+        Logger::EMERGENCY => 'ERROR',
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(array $record)
+    {
+        // Retrieve the line and file if set and remove them from the formatted extra
+        $file = $line = '';
+        if (isset($record['extra']['file'])) {
+            $file = $record['extra']['file'];
+            unset($record['extra']['file']);
+        }
+        if (isset($record['extra']['line'])) {
+            $line = $record['extra']['line'];
+            unset($record['extra']['line']);
+        }
+
+        $record = $this->normalize($record);
+        $message = array('message' => $record['message']);
+        $handleError = false;
+        if ($record['context']) {
+            $message['context'] = $record['context'];
+            $handleError = true;
+        }
+        if ($record['extra']) {
+            $message['extra'] = $record['extra'];
+            $handleError = true;
+        }
+        if (count($message) === 1) {
+            $message = reset($message);
+        }
+
+        // Create JSON object describing the appearance of the message in the console
+        $json = $this->toJson(array(
+            array(
+                'Type'  => $this->logLevels[$record['level']],
+                'File'  => $file,
+                'Line'  => $line,
+                'Label' => $record['channel'],
+            ),
+            $message,
+        ), $handleError);
+
+        // The message itself is a serialization of the above JSON object + it's length
+        return sprintf(
+            '%s|%s|',
+            strlen($json),
+            $json
+        );
+    }
+
+    public function formatBatch(array $records)
+    {
+        throw new \BadMethodCallException('Batch formatting does not make sense for the WildfireFormatter');
+    }
+
+    protected function normalize($data)
+    {
+        if (is_object($data) && !$data instanceof \DateTime) {
+            return $data;
+        }
+
+        return parent::normalize($data);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AbstractHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AbstractHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ea9f5599b413bfa6846763f8afd2f721c64a875
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AbstractHandler.php
@@ -0,0 +1,174 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+use Monolog\Formatter\FormatterInterface;
+use Monolog\Formatter\LineFormatter;
+
+/**
+ * Base Handler class providing the Handler structure
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+abstract class AbstractHandler implements HandlerInterface
+{
+    protected $level = Logger::DEBUG;
+    protected $bubble = false;
+
+    /**
+     * @var FormatterInterface
+     */
+    protected $formatter;
+    protected $processors = array();
+
+    /**
+     * @param integer $level  The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct($level = Logger::DEBUG, $bubble = true)
+    {
+        $this->level = $level;
+        $this->bubble = $bubble;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isHandling(array $record)
+    {
+        return $record['level'] >= $this->level;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleBatch(array $records)
+    {
+        foreach ($records as $record) {
+            $this->handle($record);
+        }
+    }
+
+    /**
+     * Closes the handler.
+     *
+     * This will be called automatically when the object is destroyed
+     */
+    public function close()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function pushProcessor($callback)
+    {
+        if (!is_callable($callback)) {
+            throw new \InvalidArgumentException('Processors must be valid callables (callback or object with an __invoke method), '.var_export($callback, true).' given');
+        }
+        array_unshift($this->processors, $callback);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function popProcessor()
+    {
+        if (!$this->processors) {
+            throw new \LogicException('You tried to pop from an empty processor stack.');
+        }
+
+        return array_shift($this->processors);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setFormatter(FormatterInterface $formatter)
+    {
+        $this->formatter = $formatter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormatter()
+    {
+        if (!$this->formatter) {
+            $this->formatter = $this->getDefaultFormatter();
+        }
+
+        return $this->formatter;
+    }
+
+    /**
+     * Sets minimum logging level at which this handler will be triggered.
+     *
+     * @param integer $level
+     */
+    public function setLevel($level)
+    {
+        $this->level = $level;
+    }
+
+    /**
+     * Gets minimum logging level at which this handler will be triggered.
+     *
+     * @return integer
+     */
+    public function getLevel()
+    {
+        return $this->level;
+    }
+
+    /**
+     * Sets the bubbling behavior.
+     *
+     * @param Boolean $bubble True means that bubbling is not permitted.
+     *                        False means that this handler allows bubbling.
+     */
+    public function setBubble($bubble)
+    {
+        $this->bubble = $bubble;
+    }
+
+    /**
+     * Gets the bubbling behavior.
+     *
+     * @return Boolean True means that bubbling is not permitted.
+     *                 False means that this handler allows bubbling.
+     */
+    public function getBubble()
+    {
+        return $this->bubble;
+    }
+
+    public function __destruct()
+    {
+        try {
+            $this->close();
+        } catch (\Exception $e) {
+            // do nothing
+        }
+    }
+
+    /**
+     * Gets the default formatter.
+     *
+     * @return FormatterInterface
+     */
+    protected function getDefaultFormatter()
+    {
+        return new LineFormatter();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AbstractProcessingHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AbstractProcessingHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..e1e5b89311beb4d990cc5631a1a2e01b107f90d9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AbstractProcessingHandler.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+/**
+ * Base Handler class providing the Handler structure
+ *
+ * Classes extending it should (in most cases) only implement write($record)
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+abstract class AbstractProcessingHandler extends AbstractHandler
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(array $record)
+    {
+        if ($record['level'] < $this->level) {
+            return false;
+        }
+
+        $record = $this->processRecord($record);
+
+        $record['formatted'] = $this->getFormatter()->format($record);
+
+        $this->write($record);
+
+        return false === $this->bubble;
+    }
+
+    /**
+     * Writes the record down to the log of the implementing handler
+     *
+     * @param  array $record
+     * @return void
+     */
+    abstract protected function write(array $record);
+
+    /**
+     * Processes a record.
+     *
+     * @param  array $record
+     * @return array
+     */
+    protected function processRecord(array $record)
+    {
+        if ($this->processors) {
+            foreach ($this->processors as $processor) {
+                $record = call_user_func($processor, $record);
+            }
+        }
+
+        return $record;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AmqpHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AmqpHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..00703436c55f1e774fcd802af136d182d6b7c8d6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/AmqpHandler.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+use Monolog\Formatter\JsonFormatter;
+
+class AmqpHandler extends AbstractProcessingHandler
+{
+    /**
+     * @var \AMQPExchange $exchange
+     */
+    protected $exchange;
+
+    /**
+     * @param \AMQPExchange $exchange     AMQP exchange, ready for use
+     * @param string        $exchangeName
+     * @param int           $level
+     * @param bool          $bubble       Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct(\AMQPExchange $exchange, $exchangeName = 'log', $level = Logger::DEBUG, $bubble = true)
+    {
+        $this->exchange = $exchange;
+        $this->exchange->setName($exchangeName);
+
+        parent::__construct($level, $bubble);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function write(array $record)
+    {
+        $data = $record["formatted"];
+
+        $routingKey = sprintf(
+            '%s.%s',
+            substr($record['level_name'], 0, 4),
+            $record['channel']
+        );
+
+        $this->exchange->publish(
+            $data,
+            strtolower($routingKey),
+            0,
+            array(
+                'delivery_mode' => 2,
+                'Content-type' => 'application/json'
+            )
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new JsonFormatter();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/BufferHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/BufferHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..e9a4dc358bc9656963977eab5ed126d1fba8b68f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/BufferHandler.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Buffers all records until closing the handler and then pass them as batch.
+ *
+ * This is useful for a MailHandler to send only one mail per request instead of
+ * sending one per log message.
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class BufferHandler extends AbstractHandler
+{
+    protected $handler;
+    protected $bufferSize = 0;
+    protected $bufferLimit;
+    protected $flushOnOverflow;
+    protected $buffer = array();
+
+    /**
+     * @param HandlerInterface $handler         Handler.
+     * @param integer          $bufferSize      How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
+     * @param integer          $level           The minimum logging level at which this handler will be triggered
+     * @param Boolean          $bubble          Whether the messages that are handled can bubble up the stack or not
+     * @param Boolean          $flushOnOverflow If true, the buffer is flushed when the max size has been reached, by default oldest entries are discarded
+     */
+    public function __construct(HandlerInterface $handler, $bufferSize = 0, $level = Logger::DEBUG, $bubble = true, $flushOnOverflow = false)
+    {
+        parent::__construct($level, $bubble);
+        $this->handler = $handler;
+        $this->bufferLimit = (int) $bufferSize;
+        $this->flushOnOverflow = $flushOnOverflow;
+
+        // __destructor() doesn't get called on Fatal errors
+        register_shutdown_function(array($this, 'close'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(array $record)
+    {
+        if ($record['level'] < $this->level) {
+            return false;
+        }
+
+        if ($this->bufferLimit > 0 && $this->bufferSize === $this->bufferLimit) {
+            if ($this->flushOnOverflow) {
+                $this->flush();
+            } else {
+                array_shift($this->buffer);
+                $this->bufferSize--;
+            }
+        }
+
+        if ($this->processors) {
+            foreach ($this->processors as $processor) {
+                $record = call_user_func($processor, $record);
+            }
+        }
+
+        $this->buffer[] = $record;
+        $this->bufferSize++;
+
+        return false === $this->bubble;
+    }
+
+    public function flush()
+    {
+        if ($this->bufferSize === 0) {
+            return;
+        }
+
+        $this->handler->handleBatch($this->buffer);
+        $this->bufferSize = 0;
+        $this->buffer = array();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        $this->flush();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/ChromePHPHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/ChromePHPHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5a910ac5124aef7ada02855accfba8f3378ee81
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/ChromePHPHandler.php
@@ -0,0 +1,151 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\ChromePHPFormatter;
+
+/**
+ * Handler sending logs to the ChromePHP extension (http://www.chromephp.com/)
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class ChromePHPHandler extends AbstractProcessingHandler
+{
+    /**
+     * Version of the extension
+     */
+    const VERSION = '3.0';
+
+    /**
+     * Header name
+     */
+    const HEADER_NAME = 'X-ChromePhp-Data';
+
+    protected static $initialized = false;
+
+    protected static $json = array(
+        'version' => self::VERSION,
+        'columns' => array('label', 'log', 'backtrace', 'type'),
+        'rows' => array(),
+    );
+
+    protected static $sendHeaders = true;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleBatch(array $records)
+    {
+        $messages = array();
+
+        foreach ($records as $record) {
+            if ($record['level'] < $this->level) {
+                continue;
+            }
+            $messages[] = $this->processRecord($record);
+        }
+
+        if (!empty($messages)) {
+            $messages = $this->getFormatter()->formatBatch($messages);
+            self::$json['rows'] = array_merge(self::$json['rows'], $messages);
+            $this->send();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new ChromePHPFormatter();
+    }
+
+    /**
+     * Creates & sends header for a record
+     *
+     * @see sendHeader()
+     * @see send()
+     * @param array $record
+     */
+    protected function write(array $record)
+    {
+        self::$json['rows'][] = $record['formatted'];
+
+        $this->send();
+    }
+
+    /**
+     * Sends the log header
+     *
+     * @see sendHeader()
+     */
+    protected function send()
+    {
+        if (!self::$initialized) {
+            self::$sendHeaders = $this->headersAccepted();
+            self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
+
+            self::$initialized = true;
+        }
+
+        $json = @json_encode(self::$json);
+        $this->sendHeader(self::HEADER_NAME, base64_encode(utf8_encode($json)));
+    }
+
+    /**
+     * Send header string to the client
+     *
+     * @param string $header
+     * @param string $content
+     */
+    protected function sendHeader($header, $content)
+    {
+        if (!headers_sent() && self::$sendHeaders) {
+            header(sprintf('%s: %s', $header, $content));
+        }
+    }
+
+    /**
+     * Verifies if the headers are accepted by the current user agent
+     *
+     * @return Boolean
+     */
+    protected function headersAccepted()
+    {
+        return !isset($_SERVER['HTTP_USER_AGENT'])
+               || preg_match('{\bChrome/\d+[\.\d+]*\b}', $_SERVER['HTTP_USER_AGENT']);
+    }
+
+    /**
+     * BC getter for the sendHeaders property that has been made static
+     */
+    public function __get($property)
+    {
+        if ('sendHeaders' !== $property) {
+            throw new \InvalidArgumentException('Undefined property '.$property);
+        }
+
+        return static::$sendHeaders;
+    }
+
+    /**
+     * BC setter for the sendHeaders property that has been made static
+     */
+    public function __set($property, $value)
+    {
+        if ('sendHeaders' !== $property) {
+            throw new \InvalidArgumentException('Undefined property '.$property);
+        }
+
+        static::$sendHeaders = $value;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/CouchDBHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/CouchDBHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..4877b345d629faf1b22d912c2e19615995f39dbf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/CouchDBHandler.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\JsonFormatter;
+use Monolog\Logger;
+
+/**
+ * CouchDB handler
+ *
+ * @author Markus Bachmann <markus.bachmann@bachi.biz>
+ */
+class CouchDBHandler extends AbstractProcessingHandler
+{
+    private $options;
+
+    public function __construct(array $options = array(), $level = Logger::DEBUG, $bubble = true)
+    {
+        $this->options = array_merge(array(
+            'host'     => 'localhost',
+            'port'     => 5984,
+            'dbname'   => 'logger',
+            'username' => null,
+            'password' => null,
+        ), $options);
+
+        parent::__construct($level, $bubble);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function write(array $record)
+    {
+        $basicAuth = null;
+        if ($this->options['username']) {
+            $basicAuth = sprintf('%s:%s@', $this->options['username'], $this->options['password']);
+        }
+
+        $url = 'http://'.$basicAuth.$this->options['host'].':'.$this->options['port'].'/'.$this->options['dbname'];
+        $context = stream_context_create(array(
+            'http' => array(
+                'method'        => 'POST',
+                'content'       => $record['formatted'],
+                'ignore_errors' => true,
+                'max_redirects' => 0,
+                'header'        => 'Content-type: application/json',
+            )
+        ));
+
+        if (false === @file_get_contents($url, null, $context)) {
+            throw new \RuntimeException(sprintf('Could not connect to %s', $url));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new JsonFormatter();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/CubeHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/CubeHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ccff26e06f0b44a5712f33f8d11a18d20d4f023
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/CubeHandler.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Logs to Cube.
+ *
+ * @link http://square.github.com/cube/
+ * @author Wan Chen <kami@kamisama.me>
+ */
+class CubeHandler extends AbstractProcessingHandler
+{
+    private $udpConnection = null;
+    private $httpConnection = null;
+    private $scheme = null;
+    private $host = null;
+    private $port = null;
+    private $acceptedSchemes = array('http', 'udp');
+
+    /**
+     * Create a Cube handler
+     *
+     * @throws UnexpectedValueException when given url is not a valid url.
+     * A valid url must consists of three parts : protocol://host:port
+     * Only valid protocol used by Cube are http and udp
+     */
+    public function __construct($url, $level = Logger::DEBUG, $bubble = true)
+    {
+        $urlInfos = parse_url($url);
+
+        if (!isset($urlInfos['scheme']) || !isset($urlInfos['host']) || !isset($urlInfos['port'])) {
+            throw new \UnexpectedValueException('URL "'.$url.'" is not valid');
+        }
+
+        if (!in_array($urlInfos['scheme'], $this->acceptedSchemes)) {
+            throw new \UnexpectedValueException(
+                'Invalid protocol (' . $urlInfos['scheme']  . ').'
+                . ' Valid options are ' . implode(', ', $this->acceptedSchemes));
+        }
+
+        $this->scheme = $urlInfos['scheme'];
+        $this->host = $urlInfos['host'];
+        $this->port = $urlInfos['port'];
+
+        parent::__construct($level, $bubble);
+    }
+
+    /**
+     * Establish a connection to an UDP socket
+     *
+     * @throws LogicException when unable to connect to the socket
+     */
+    protected function connectUdp()
+    {
+        if (!extension_loaded('sockets')) {
+            throw new \LogicException('The sockets extension is needed to use udp URLs with the CubeHandler');
+        }
+
+        $this->udpConnection = socket_create(AF_INET, SOCK_DGRAM, 0);
+        if (!$this->udpConnection) {
+            throw new \LogicException('Unable to create a socket');
+        }
+
+        if (!socket_connect($this->udpConnection, $this->host, $this->port)) {
+            throw new \LogicException('Unable to connect to the socket at ' . $this->host . ':' . $this->port);
+        }
+    }
+
+    /**
+     * Establish a connection to a http server
+     */
+    protected function connectHttp()
+    {
+        if (!extension_loaded('curl')) {
+            throw new \LogicException('The curl extension is needed to use http URLs with the CubeHandler');
+        }
+
+        $this->httpConnection = curl_init('http://'.$this->host.':'.$this->port.'/1.0/event/put');
+
+        if (!$this->httpConnection) {
+            throw new \LogicException('Unable to connect to ' . $this->host . ':' . $this->port);
+        }
+
+        curl_setopt($this->httpConnection, CURLOPT_CUSTOMREQUEST, "POST");
+        curl_setopt($this->httpConnection, CURLOPT_RETURNTRANSFER, true);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        $date = $record['datetime'];
+
+        $data = array('time' => $date->format('Y-m-d\TH:i:s.u'));
+        unset($record['datetime']);
+
+        if (isset($record['context']['type'])) {
+            $data['type'] = $record['context']['type'];
+            unset($record['context']['type']);
+        } else {
+            $data['type'] = $record['channel'];
+        }
+
+        $data['data'] = $record['context'];
+        $data['data']['level'] = $record['level'];
+
+        $this->{'write'.$this->scheme}(json_encode($data));
+    }
+
+    private function writeUdp($data)
+    {
+        if (!$this->udpConnection) {
+            $this->connectUdp();
+        }
+
+        socket_send($this->udpConnection, $data, strlen($data), 0);
+    }
+
+    private function writeHttp($data)
+    {
+        if (!$this->httpConnection) {
+            $this->connectHttp();
+        }
+
+        curl_setopt($this->httpConnection, CURLOPT_POSTFIELDS, '['.$data.']');
+        curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, array(
+                'Content-Type: application/json',
+                'Content-Length: ' . strlen('['.$data.']'))
+        );
+
+        return curl_exec($this->httpConnection);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/DoctrineCouchDBHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/DoctrineCouchDBHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..b91ffec90530cb31633d302e9c5fe13177e39256
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/DoctrineCouchDBHandler.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+use Monolog\Formatter\NormalizerFormatter;
+use Doctrine\CouchDB\CouchDBClient;
+
+/**
+ * CouchDB handler for Doctrine CouchDB ODM
+ *
+ * @author Markus Bachmann <markus.bachmann@bachi.biz>
+ */
+class DoctrineCouchDBHandler extends AbstractProcessingHandler
+{
+    private $client;
+
+    public function __construct(CouchDBClient $client, $level = Logger::DEBUG, $bubble = true)
+    {
+        $this->client = $client;
+        parent::__construct($level, $bubble);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function write(array $record)
+    {
+        $this->client->postDocument($record['formatted']);
+    }
+
+    protected function getDefaultFormatter()
+    {
+        return new NormalizerFormatter;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3e42efefaa657b73ca43d9893fca40cbc88d6cd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler\FingersCrossed;
+
+/**
+ * Interface for activation strategies for the FingersCrossedHandler.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+interface ActivationStrategyInterface
+{
+    /**
+     * Returns whether the given record activates the handler.
+     *
+     * @param  array   $record
+     * @return Boolean
+     */
+    public function isHandlerActivated(array $record);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
new file mode 100644
index 0000000000000000000000000000000000000000..7cd8ef1b621e51ed1e4dbe65fcca641be12f6618
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler\FingersCrossed;
+
+/**
+ * Error level based activation strategy.
+ *
+ * @author Johannes M. Schmitt <schmittjoh@gmail.com>
+ */
+class ErrorLevelActivationStrategy implements ActivationStrategyInterface
+{
+    private $actionLevel;
+
+    public function __construct($actionLevel)
+    {
+        $this->actionLevel = $actionLevel;
+    }
+
+    public function isHandlerActivated(array $record)
+    {
+        return $record['level'] >= $this->actionLevel;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossedHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossedHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..5ac6d7771aef6a015483105215c02afce54a9ccd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FingersCrossedHandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
+use Monolog\Handler\FingersCrossed\ActivationStrategyInterface;
+use Monolog\Logger;
+
+/**
+ * Buffers all records until a certain level is reached
+ *
+ * The advantage of this approach is that you don't get any clutter in your log files.
+ * Only requests which actually trigger an error (or whatever your actionLevel is) will be
+ * in the logs, but they will contain all records, not only those above the level threshold.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class FingersCrossedHandler extends AbstractHandler
+{
+    protected $handler;
+    protected $activationStrategy;
+    protected $buffering = true;
+    protected $bufferSize;
+    protected $buffer = array();
+    protected $stopBuffering;
+
+    /**
+     * @param callable|HandlerInterface       $handler            Handler or factory callable($record, $fingersCrossedHandler).
+     * @param int|ActivationStrategyInterface $activationStrategy Strategy which determines when this handler takes action
+     * @param int                             $bufferSize         How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
+     * @param Boolean                         $bubble             Whether the messages that are handled can bubble up the stack or not
+     * @param Boolean                         $stopBuffering      Whether the handler should stop buffering after being triggered (default true)
+     */
+    public function __construct($handler, $activationStrategy = null, $bufferSize = 0, $bubble = true, $stopBuffering = true)
+    {
+        if (null === $activationStrategy) {
+            $activationStrategy = new ErrorLevelActivationStrategy(Logger::WARNING);
+        }
+        if (!$activationStrategy instanceof ActivationStrategyInterface) {
+            $activationStrategy = new ErrorLevelActivationStrategy($activationStrategy);
+        }
+
+        $this->handler = $handler;
+        $this->activationStrategy = $activationStrategy;
+        $this->bufferSize = $bufferSize;
+        $this->bubble = $bubble;
+        $this->stopBuffering = $stopBuffering;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isHandling(array $record)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(array $record)
+    {
+        if ($this->processors) {
+            foreach ($this->processors as $processor) {
+                $record = call_user_func($processor, $record);
+            }
+        }
+
+        if ($this->buffering) {
+            $this->buffer[] = $record;
+            if ($this->bufferSize > 0 && count($this->buffer) > $this->bufferSize) {
+                array_shift($this->buffer);
+            }
+            if ($this->activationStrategy->isHandlerActivated($record)) {
+                if ($this->stopBuffering) {
+                    $this->buffering = false;
+                }
+                if (!$this->handler instanceof HandlerInterface) {
+                    if (!is_callable($this->handler)) {
+                        throw new \RuntimeException("The given handler (".json_encode($this->handler).") is not a callable nor a Monolog\Handler\HandlerInterface object");
+                    }
+                    $this->handler = call_user_func($this->handler, $record, $this);
+                    if (!$this->handler instanceof HandlerInterface) {
+                        throw new \RuntimeException("The factory callable should return a HandlerInterface");
+                    }
+                }
+                $this->handler->handleBatch($this->buffer);
+                $this->buffer = array();
+            }
+        } else {
+            $this->handler->handle($record);
+        }
+
+        return false === $this->bubble;
+    }
+
+    /**
+     * Resets the state of the handler. Stops forwarding records to the wrapped handler.
+     */
+    public function reset()
+    {
+        $this->buffering = true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FirePHPHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FirePHPHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..46a039ad72b5505c366314b7dc31ce96214bafbd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/FirePHPHandler.php
@@ -0,0 +1,184 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\WildfireFormatter;
+
+/**
+ * Simple FirePHP Handler (http://www.firephp.org/), which uses the Wildfire protocol.
+ *
+ * @author Eric Clemmons (@ericclemmons) <eric@uxdriven.com>
+ */
+class FirePHPHandler extends AbstractProcessingHandler
+{
+    /**
+     * WildFire JSON header message format
+     */
+    const PROTOCOL_URI = 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2';
+
+    /**
+     * FirePHP structure for parsing messages & their presentation
+     */
+    const STRUCTURE_URI = 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1';
+
+    /**
+     * Must reference a "known" plugin, otherwise headers won't display in FirePHP
+     */
+    const PLUGIN_URI = 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3';
+
+    /**
+     * Header prefix for Wildfire to recognize & parse headers
+     */
+    const HEADER_PREFIX = 'X-Wf';
+
+    /**
+     * Whether or not Wildfire vendor-specific headers have been generated & sent yet
+     */
+    protected static $initialized = false;
+
+    /**
+     * Shared static message index between potentially multiple handlers
+     * @var int
+     */
+    protected static $messageIndex = 1;
+
+    protected static $sendHeaders = true;
+
+    /**
+     * Base header creation function used by init headers & record headers
+     *
+     * @param  array  $meta    Wildfire Plugin, Protocol & Structure Indexes
+     * @param  string $message Log message
+     * @return array  Complete header string ready for the client as key and message as value
+     */
+    protected function createHeader(array $meta, $message)
+    {
+        $header = sprintf('%s-%s', self::HEADER_PREFIX, join('-', $meta));
+
+        return array($header => $message);
+    }
+
+    /**
+     * Creates message header from record
+     *
+     * @see createHeader()
+     * @param  array  $record
+     * @return string
+     */
+    protected function createRecordHeader(array $record)
+    {
+        // Wildfire is extensible to support multiple protocols & plugins in a single request,
+        // but we're not taking advantage of that (yet), so we're using "1" for simplicity's sake.
+        return $this->createHeader(
+            array(1, 1, 1, self::$messageIndex++),
+            $record['formatted']
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new WildfireFormatter();
+    }
+
+    /**
+     * Wildfire initialization headers to enable message parsing
+     *
+     * @see createHeader()
+     * @see sendHeader()
+     * @return array
+     */
+    protected function getInitHeaders()
+    {
+        // Initial payload consists of required headers for Wildfire
+        return array_merge(
+            $this->createHeader(array('Protocol', 1), self::PROTOCOL_URI),
+            $this->createHeader(array(1, 'Structure', 1), self::STRUCTURE_URI),
+            $this->createHeader(array(1, 'Plugin', 1), self::PLUGIN_URI)
+        );
+    }
+
+    /**
+     * Send header string to the client
+     *
+     * @param string $header
+     * @param string $content
+     */
+    protected function sendHeader($header, $content)
+    {
+        if (!headers_sent() && self::$sendHeaders) {
+            header(sprintf('%s: %s', $header, $content));
+        }
+    }
+
+    /**
+     * Creates & sends header for a record, ensuring init headers have been sent prior
+     *
+     * @see sendHeader()
+     * @see sendInitHeaders()
+     * @param array $record
+     */
+    protected function write(array $record)
+    {
+        // WildFire-specific headers must be sent prior to any messages
+        if (!self::$initialized) {
+            self::$sendHeaders = $this->headersAccepted();
+
+            foreach ($this->getInitHeaders() as $header => $content) {
+                $this->sendHeader($header, $content);
+            }
+
+            self::$initialized = true;
+        }
+
+        $header = $this->createRecordHeader($record);
+        $this->sendHeader(key($header), current($header));
+    }
+
+    /**
+     * Verifies if the headers are accepted by the current user agent
+     *
+     * @return Boolean
+     */
+    protected function headersAccepted()
+    {
+        return !isset($_SERVER['HTTP_USER_AGENT'])
+               || preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT'])
+               || isset($_SERVER['HTTP_X_FIREPHP_VERSION']);
+    }
+
+    /**
+     * BC getter for the sendHeaders property that has been made static
+     */
+    public function __get($property)
+    {
+        if ('sendHeaders' !== $property) {
+            throw new \InvalidArgumentException('Undefined property '.$property);
+        }
+
+        return static::$sendHeaders;
+    }
+
+    /**
+     * BC setter for the sendHeaders property that has been made static
+     */
+    public function __set($property, $value)
+    {
+        if ('sendHeaders' !== $property) {
+            throw new \InvalidArgumentException('Undefined property '.$property);
+        }
+
+        static::$sendHeaders = $value;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/GelfHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/GelfHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..34d48e75066cddd5f4a105ef75f6a9082e7bec89
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/GelfHandler.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Gelf\IMessagePublisher;
+use Monolog\Logger;
+use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Formatter\GelfMessageFormatter;
+
+/**
+ * Handler to send messages to a Graylog2 (http://www.graylog2.org) server
+ *
+ * @author Matt Lehner <mlehner@gmail.com>
+ */
+class GelfHandler extends AbstractProcessingHandler
+{
+    /**
+     * @var Gelf\IMessagePublisher the publisher object that sends the message to the server
+     */
+    protected $publisher;
+
+    /**
+     * @param Gelf\IMessagePublisher $publisher a publisher object
+     * @param integer                $level     The minimum logging level at which this handler will be triggered
+     * @param Boolean                $bubble    Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct(IMessagePublisher $publisher, $level = Logger::DEBUG, $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+
+        $this->publisher = $publisher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        $this->publisher = null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        $this->publisher->publish($record['formatted']);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new GelfMessageFormatter();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/GroupHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/GroupHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..99384d35f1f3019471d14fa170c0dd5fef7a3139
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/GroupHandler.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+/**
+ * Forwards records to multiple handlers
+ *
+ * @author Lenar LÃµhmus <lenar@city.ee>
+ */
+class GroupHandler extends AbstractHandler
+{
+    protected $handlers;
+
+    /**
+     * @param array   $handlers Array of Handlers.
+     * @param Boolean $bubble   Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct(array $handlers, $bubble = true)
+    {
+        foreach ($handlers as $handler) {
+            if (!$handler instanceof HandlerInterface) {
+                throw new \InvalidArgumentException('The first argument of the GroupHandler must be an array of HandlerInterface instances.');
+            }
+        }
+
+        $this->handlers = $handlers;
+        $this->bubble = $bubble;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isHandling(array $record)
+    {
+        foreach ($this->handlers as $handler) {
+            if ($handler->isHandling($record)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(array $record)
+    {
+        if ($this->processors) {
+            foreach ($this->processors as $processor) {
+                $record = call_user_func($processor, $record);
+            }
+        }
+
+        foreach ($this->handlers as $handler) {
+            $handler->handle($record);
+        }
+
+        return false === $this->bubble;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleBatch(array $records)
+    {
+        foreach ($this->handlers as $handler) {
+            $handler->handleBatch($records);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/HandlerInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/HandlerInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac15d7decbe5127c5d459b7c280ff11e20a4fb04
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/HandlerInterface.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\FormatterInterface;
+
+/**
+ * Interface that all Monolog Handlers must implement
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+interface HandlerInterface
+{
+    /**
+     * Checks whether the given record will be handled by this handler.
+     *
+     * This is mostly done for performance reasons, to avoid calling processors for nothing.
+     *
+     * Handlers should still check the record levels within handle(), returning false in isHandling()
+     * is no guarantee that handle() will not be called, and isHandling() might not be called
+     * for a given record.
+     *
+     * @param array $record
+     *
+     * @return Boolean
+     */
+    public function isHandling(array $record);
+
+    /**
+     * Handles a record.
+     *
+     * All records may be passed to this method, and the handler should discard
+     * those that it does not want to handle.
+     *
+     * The return value of this function controls the bubbling process of the handler stack.
+     * Unless the bubbling is interrupted (by returning true), the Logger class will keep on
+     * calling further handlers in the stack with a given log record.
+     *
+     * @param  array   $record The record to handle
+     * @return Boolean True means that this handler handled the record, and that bubbling is not permitted.
+     *                 False means the record was either not processed or that this handler allows bubbling.
+     */
+    public function handle(array $record);
+
+    /**
+     * Handles a set of records at once.
+     *
+     * @param array $records The records to handle (an array of record arrays)
+     */
+    public function handleBatch(array $records);
+
+    /**
+     * Adds a processor in the stack.
+     *
+     * @param callable $callback
+     */
+    public function pushProcessor($callback);
+
+    /**
+     * Removes the processor on top of the stack and returns it.
+     *
+     * @return callable
+     */
+    public function popProcessor();
+
+    /**
+     * Sets the formatter.
+     *
+     * @param FormatterInterface $formatter
+     */
+    public function setFormatter(FormatterInterface $formatter);
+
+    /**
+     * Gets the formatter.
+     *
+     * @return FormatterInterface
+     */
+    public function getFormatter();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MailHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MailHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..86292727f3799cfb2c731076e5331ecc1fbfb76f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MailHandler.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+/**
+ * Base class for all mail handlers
+ *
+ * @author Gyula Sallai
+ */
+abstract class MailHandler extends AbstractProcessingHandler
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handleBatch(array $records)
+    {
+        $messages = array();
+
+        foreach ($records as $record) {
+            if ($record['level'] < $this->level) {
+                continue;
+            }
+            $messages[] = $this->processRecord($record);
+        }
+
+        if (!empty($messages)) {
+            $this->send((string) $this->getFormatter()->formatBatch($messages), $messages);
+        }
+    }
+
+    /**
+     * Send a mail with the given content
+     *
+     * @param string $content
+     * @param array  $records the array of log records that formed this content
+     */
+    abstract protected function send($content, array $records);
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        $this->send((string) $record['formatted'], array($record));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MissingExtensionException.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MissingExtensionException.php
new file mode 100644
index 0000000000000000000000000000000000000000..0cb21cd227cfd62f6b5116e8473d9ca18de2032f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MissingExtensionException.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+/**
+ * Exception can be thrown if an extension for an handler is missing
+ *
+ * @author  Christian Bergau <cbergau86@gmail.com>
+ */
+class MissingExtensionException extends \Exception
+{
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MongoDBHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MongoDBHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a59201a117060d75e92a98bf2d1dd43d3992827
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/MongoDBHandler.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Thomas Tourlourat <thomas@tourlourat.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+use Monolog\Formatter\NormalizerFormatter;
+
+/**
+ * Logs to a MongoDB database.
+ *
+ * usage example:
+ *
+ *   $log = new Logger('application');
+ *   $mongodb = new MongoDBHandler(new \Mongo("mongodb://localhost:27017"), "logs", "prod");
+ *   $log->pushHandler($mongodb);
+ *
+ * @author Thomas Tourlourat <thomas@tourlourat.com>
+ */
+class MongoDBHandler extends AbstractProcessingHandler
+{
+    private $mongoCollection;
+
+    public function __construct($mongo, $database, $collection, $level = Logger::DEBUG, $bubble = true)
+    {
+        if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
+            throw new \InvalidArgumentException('MongoClient or Mongo instance required');
+        }
+
+        $this->mongoCollection = $mongo->selectCollection($database, $collection);
+
+        parent::__construct($level, $bubble);
+    }
+
+    protected function write(array $record)
+    {
+        $this->mongoCollection->save($record["formatted"]);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new NormalizerFormatter();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/NativeMailerHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/NativeMailerHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..c7ac63a0e8114c1cb52454e6145dd456126dd44e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/NativeMailerHandler.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * NativeMailerHandler uses the mail() function to send the emails
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class NativeMailerHandler extends MailHandler
+{
+    protected $to;
+    protected $subject;
+    protected $headers = array(
+        'Content-type: text/plain; charset=utf-8'
+    );
+
+    /**
+     * @param string|array $to      The receiver of the mail
+     * @param string       $subject The subject of the mail
+     * @param string       $from    The sender of the mail
+     * @param integer      $level   The minimum logging level at which this handler will be triggered
+     * @param boolean      $bubble  Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct($to, $subject, $from, $level = Logger::ERROR, $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+        $this->to = is_array($to) ? $to : array($to);
+        $this->subject = $subject;
+        $this->addHeader(sprintf('From: %s', $from));
+    }
+
+    /**
+     * @param string|array $headers Custom added headers
+     */
+    public function addHeader($headers)
+    {
+        foreach ((array) $headers as $header) {
+            if (strpos($header, "\n") !== false || strpos($header, "\r") !== false) {
+                throw new \InvalidArgumentException('Headers can not contain newline characters for security reasons');
+            }
+            $this->headers[] = $header;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function send($content, array $records)
+    {
+        $content = wordwrap($content, 70);
+        $headers = implode("\r\n", $this->headers) . "\r\n";
+        foreach ($this->to as $to) {
+            mail($to, $this->subject, $content, $headers);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/NullHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/NullHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..3754e45dbca195177a015a269fcdb9f139261f28
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/NullHandler.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Blackhole
+ *
+ * Any record it can handle will be thrown away. This can be used
+ * to put on top of an existing stack to override it temporarily.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class NullHandler extends AbstractHandler
+{
+    /**
+     * @param integer $level The minimum logging level at which this handler will be triggered
+     */
+    public function __construct($level = Logger::DEBUG)
+    {
+        parent::__construct($level, false);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(array $record)
+    {
+        if ($record['level'] < $this->level) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/PushoverHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/PushoverHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..068183939dfd291a6d6f3b022bd1ee75147facda
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/PushoverHandler.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Sends notifications through the pushover api to mobile phones
+ *
+ * @author Sebastian GÃ¶ttschkes <sebastian.goettschkes@googlemail.com>
+ * @see    https://www.pushover.net/api
+ */
+class PushoverHandler extends SocketHandler
+{
+    private $token;
+    private $user;
+    private $title;
+
+    /**
+     * @param string  $token  Pushover api token
+     * @param string  $user   Pushover user id the message will be sent to
+     * @param string  $title  Title sent to Pushover API
+     * @param integer $level  The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+     * @param Boolean $useSSL Whether to connect via SSL. Required when pushing messages to users that are not
+     *                        the pushover.net app owner. OpenSSL is required for this option.
+     */
+    public function __construct($token, $user, $title = null, $level = Logger::CRITICAL, $bubble = true, $useSSL = true)
+    {
+        $connectionString = $useSSL ? 'ssl://api.pushover.net:443' : 'api.pushover.net:80';
+        parent::__construct($connectionString, $level, $bubble);
+
+        $this->token = $token;
+        $this->user = $user;
+        $this->title = $title ?: gethostname();
+    }
+
+    protected function generateDataStream($record)
+    {
+        $content = $this->buildContent($record);
+
+        return $this->buildHeader($content) . $content;
+    }
+
+    private function buildContent($record)
+    {
+        // Pushover has a limit of 512 characters on title and message combined.
+        $maxMessageLength = 512 - strlen($this->title);
+        $message = substr($record['message'], 0, $maxMessageLength);
+        $timestamp = $record['datetime']->getTimestamp();
+
+        $dataArray = array(
+            'token' => $this->token,
+            'user' => $this->user,
+            'message' => $message,
+            'title' => $this->title,
+            'timestamp' => $timestamp
+        );
+
+        return http_build_query($dataArray);
+    }
+
+    private function buildHeader($content)
+    {
+        $header = "POST /1/messages.json HTTP/1.1\r\n";
+        $header .= "Host: api.pushover.net\r\n";
+        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
+        $header .= "Content-Length: " . strlen($content) . "\r\n";
+        $header .= "\r\n";
+
+        return $header;
+    }
+
+    public function write(array $record)
+    {
+        parent::write($record);
+        $this->closeSocket();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RavenHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RavenHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b44f2700e9e0a5380083a1a5b0c71daa30c7782
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RavenHandler.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\LineFormatter;
+use Monolog\Logger;
+use Monolog\Handler\AbstractProcessingHandler;
+use Raven_Client;
+
+/**
+ * Handler to send messages to a Sentry (https://github.com/dcramer/sentry) server
+ * using raven-php (https://github.com/getsentry/raven-php)
+ *
+ * @author Marc Abramowitz <marc@marc-abramowitz.com>
+ */
+class RavenHandler extends AbstractProcessingHandler
+{
+    /**
+     * Translates Monolog log levels to Raven log levels.
+     */
+    private $logLevels = array(
+        Logger::DEBUG     => Raven_Client::DEBUG,
+        Logger::INFO      => Raven_Client::INFO,
+        Logger::NOTICE    => Raven_Client::INFO,
+        Logger::WARNING   => Raven_Client::WARNING,
+        Logger::ERROR     => Raven_Client::ERROR,
+        Logger::CRITICAL  => Raven_Client::FATAL,
+        Logger::ALERT     => Raven_Client::FATAL,
+        Logger::EMERGENCY => Raven_Client::FATAL,
+    );
+
+    /**
+     * @var Raven_Client the client object that sends the message to the server
+     */
+    protected $ravenClient;
+
+    /**
+     * @param Raven_Client $ravenClient
+     * @param integer $level The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct(Raven_Client $ravenClient, $level = Logger::DEBUG, $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+
+        $this->ravenClient = $ravenClient;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        $level = $this->logLevels[$record['level']];
+
+        $options = array();
+        $options['level'] = $level;
+        if (!empty($record['context'])) {
+            $options['extra']['context'] = $record['context'];
+        }
+        if (!empty($record['extra'])) {
+            $options['extra']['extra'] = $record['extra'];
+        }
+
+        $this->ravenClient->captureMessage(
+            $record['formatted'],
+            array(),                                                                  // $params - not used
+            version_compare(Raven_Client::VERSION, '0.1.0', '>') ? $options : $level, // $level or $options
+            false                                                                     // $stack
+        );
+        if ($record['level'] >= Logger::ERROR && isset($record['context']['exception'])) {
+            $this->ravenClient->captureException($record['context']['exception']);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new LineFormatter('[%channel%] %message%');
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RedisHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RedisHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..51a8e7df800932fd9dd5dd26101433b9b41b2fbe
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RedisHandler.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Thomas Tourlourat <thomas@tourlourat.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+use Monolog\Formatter\LineFormatter;
+
+/**
+ * Logs to a Redis key using rpush
+ *
+ * usage example:
+ *
+ *   $log = new Logger('application');
+ *   $redis = new RedisHandler(new Predis\Client("tcp://localhost:6379"), "logs", "prod");
+ *   $log->pushHandler($redis);
+ *
+ * @author Thomas Tourlourat <thomas@tourlourat.com>
+ */
+class RedisHandler extends AbstractProcessingHandler
+{
+    private $redisClient;
+    private $redisKey;
+
+    # redis instance, key to use
+    public function __construct($redis, $key, $level = Logger::DEBUG, $bubble = true)
+    {
+        if (!(($redis instanceof \Predis\Client) || ($redis instanceof \Redis))) {
+            throw new \InvalidArgumentException('Predis\Client or Redis instance required');
+        }
+
+        $this->redisClient = $redis;
+        $this->redisKey = $key;
+
+        parent::__construct($level, $bubble);
+    }
+
+    protected function write(array $record)
+    {
+        $this->redisClient->rpush($this->redisKey, $record["formatted"]);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new LineFormatter();
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RotatingFileHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RotatingFileHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..cfb0d5aa2e23f2b9721e8577858ab73d13bfaa12
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/RotatingFileHandler.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Stores logs to files that are rotated every day and a limited number of files are kept.
+ *
+ * This rotation is only intended to be used as a workaround. Using logrotate to
+ * handle the rotation is strongly encouraged when you can use it.
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class RotatingFileHandler extends StreamHandler
+{
+    protected $filename;
+    protected $maxFiles;
+    protected $mustRotate;
+    protected $nextRotation;
+
+    /**
+     * @param string  $filename
+     * @param integer $maxFiles The maximal amount of files to keep (0 means unlimited)
+     * @param integer $level    The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble   Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true)
+    {
+        $this->filename = $filename;
+        $this->maxFiles = (int) $maxFiles;
+        $this->nextRotation = new \DateTime('tomorrow');
+
+        parent::__construct($this->getTimedFilename(), $level, $bubble);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        parent::close();
+
+        if (true === $this->mustRotate) {
+            $this->rotate();
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        // on the first record written, if the log is new, we should rotate (once per day)
+        if (null === $this->mustRotate) {
+            $this->mustRotate = !file_exists($this->url);
+        }
+
+        if ($this->nextRotation < $record['datetime']) {
+            $this->mustRotate = true;
+            $this->close();
+        }
+
+        parent::write($record);
+    }
+
+    /**
+     * Rotates the files.
+     */
+    protected function rotate()
+    {
+        // update filename
+        $this->url = $this->getTimedFilename();
+        $this->nextRotation = new \DateTime('tomorrow');
+
+        // skip GC of old logs if files are unlimited
+        if (0 === $this->maxFiles) {
+            return;
+        }
+
+        $fileInfo = pathinfo($this->filename);
+        $glob = $fileInfo['dirname'].'/'.$fileInfo['filename'].'-*';
+        if (!empty($fileInfo['extension'])) {
+            $glob .= '.'.$fileInfo['extension'];
+        }
+        $iterator = new \GlobIterator($glob);
+        $count = $iterator->count();
+        if ($this->maxFiles >= $count) {
+            // no files to remove
+            return;
+        }
+
+        // Sorting the files by name to remove the older ones
+        $array = iterator_to_array($iterator);
+        usort($array, function($a, $b) {
+            return strcmp($b->getFilename(), $a->getFilename());
+        });
+
+        foreach (array_slice($array, $this->maxFiles) as $file) {
+            if ($file->isWritable()) {
+                unlink($file->getRealPath());
+            }
+        }
+    }
+
+    protected function getTimedFilename()
+    {
+        $fileInfo = pathinfo($this->filename);
+        $timedFilename = $fileInfo['dirname'].'/'.$fileInfo['filename'].'-'.date('Y-m-d');
+        if (!empty($fileInfo['extension'])) {
+            $timedFilename .= '.'.$fileInfo['extension'];
+        }
+
+        return $timedFilename;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SocketHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SocketHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..4faa327d6378b26a4f5ac82ffdc8402536af7d1a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SocketHandler.php
@@ -0,0 +1,285 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Stores to any socket - uses fsockopen() or pfsockopen().
+ *
+ * @author Pablo de Leon Belloc <pablolb@gmail.com>
+ * @see    http://php.net/manual/en/function.fsockopen.php
+ */
+class SocketHandler extends AbstractProcessingHandler
+{
+    private $connectionString;
+    private $connectionTimeout;
+    private $resource;
+    private $timeout = 0;
+    private $persistent = false;
+    private $errno;
+    private $errstr;
+
+    /**
+     * @param string  $connectionString Socket connection string
+     * @param integer $level            The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble           Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct($connectionString, $level = Logger::DEBUG, $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+        $this->connectionString = $connectionString;
+        $this->connectionTimeout = (float) ini_get('default_socket_timeout');
+    }
+
+    /**
+     * Connect (if necessary) and write to the socket
+     *
+     * @param array $record
+     *
+     * @throws \UnexpectedValueException
+     * @throws \RuntimeException
+     */
+    public function write(array $record)
+    {
+        $this->connectIfNotConnected();
+        $data = $this->generateDataStream($record);
+        $this->writeToSocket($data);
+    }
+
+    /**
+     * We will not close a PersistentSocket instance so it can be reused in other requests.
+     */
+    public function close()
+    {
+        if (!$this->isPersistent()) {
+            $this->closeSocket();
+        }
+    }
+
+    /**
+     * Close socket, if open
+     */
+    public function closeSocket()
+    {
+        if (is_resource($this->resource)) {
+            fclose($this->resource);
+            $this->resource = null;
+        }
+    }
+
+    /**
+     * Set socket connection to nbe persistent. It only has effect before the connection is initiated.
+     *
+     * @param type $boolean
+     */
+    public function setPersistent($boolean)
+    {
+        $this->persistent = (boolean) $boolean;
+    }
+
+    /**
+     * Set connection timeout.  Only has effect before we connect.
+     *
+     * @param float $seconds
+     *
+     * @see http://php.net/manual/en/function.fsockopen.php
+     */
+    public function setConnectionTimeout($seconds)
+    {
+        $this->validateTimeout($seconds);
+        $this->connectionTimeout = (float) $seconds;
+    }
+
+    /**
+     * Set write timeout. Only has effect before we connect.
+     *
+     * @param float $seconds
+     *
+     * @see http://php.net/manual/en/function.stream-set-timeout.php
+     */
+    public function setTimeout($seconds)
+    {
+        $this->validateTimeout($seconds);
+        $this->timeout = (float) $seconds;
+    }
+
+    /**
+     * Get current connection string
+     *
+     * @return string
+     */
+    public function getConnectionString()
+    {
+        return $this->connectionString;
+    }
+
+    /**
+     * Get persistent setting
+     *
+     * @return boolean
+     */
+    public function isPersistent()
+    {
+        return $this->persistent;
+    }
+
+    /**
+     * Get current connection timeout setting
+     *
+     * @return float
+     */
+    public function getConnectionTimeout()
+    {
+        return $this->connectionTimeout;
+    }
+
+    /**
+     * Get current in-transfer timeout
+     *
+     * @return float
+     */
+    public function getTimeout()
+    {
+        return $this->timeout;
+    }
+
+    /**
+     * Check to see if the socket is currently available.
+     *
+     * UDP might appear to be connected but might fail when writing.  See http://php.net/fsockopen for details.
+     *
+     * @return boolean
+     */
+    public function isConnected()
+    {
+        return is_resource($this->resource)
+            && !feof($this->resource);  // on TCP - other party can close connection.
+    }
+
+    /**
+     * Wrapper to allow mocking
+     */
+    protected function pfsockopen()
+    {
+        return @pfsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
+    }
+
+    /**
+     * Wrapper to allow mocking
+     */
+    protected function fsockopen()
+    {
+        return @fsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
+    }
+
+    /**
+     * Wrapper to allow mocking
+     *
+     * @see http://php.net/manual/en/function.stream-set-timeout.php
+     */
+    protected function streamSetTimeout()
+    {
+        $seconds = floor($this->timeout);
+        $microseconds = round(($this->timeout - $seconds)*1e6);
+
+        return stream_set_timeout($this->resource, $seconds, $microseconds);
+    }
+
+    /**
+     * Wrapper to allow mocking
+     */
+    protected function fwrite($data)
+    {
+        return @fwrite($this->resource, $data);
+    }
+
+    /**
+     * Wrapper to allow mocking
+     */
+    protected function streamGetMetadata()
+    {
+        return stream_get_meta_data($this->resource);
+    }
+
+    private function validateTimeout($value)
+    {
+        $ok = filter_var($value, FILTER_VALIDATE_FLOAT);
+        if ($ok === false || $value < 0) {
+            throw new \InvalidArgumentException("Timeout must be 0 or a positive float (got $value)");
+        }
+    }
+
+    private function connectIfNotConnected()
+    {
+        if ($this->isConnected()) {
+            return;
+        }
+        $this->connect();
+    }
+
+    protected function generateDataStream($record)
+    {
+        return (string) $record['formatted'];
+    }
+
+    private function connect()
+    {
+        $this->createSocketResource();
+        $this->setSocketTimeout();
+    }
+
+    private function createSocketResource()
+    {
+        if ($this->isPersistent()) {
+            $resource = $this->pfsockopen();
+        } else {
+            $resource = $this->fsockopen();
+        }
+        if (!$resource) {
+            throw new \UnexpectedValueException("Failed connecting to $this->connectionString ($this->errno: $this->errstr)");
+        }
+        $this->resource = $resource;
+    }
+
+    private function setSocketTimeout()
+    {
+        if (!$this->streamSetTimeout()) {
+            throw new \UnexpectedValueException("Failed setting timeout with stream_set_timeout()");
+        }
+    }
+
+    private function writeToSocket($data)
+    {
+        $length = strlen($data);
+        $sent = 0;
+        while ($this->isConnected() && $sent < $length) {
+            if (0 == $sent) {
+                $chunk = $this->fwrite($data);
+            } else {
+                $chunk = $this->fwrite(substr($data, $sent));
+            }
+            if ($chunk === false) {
+                throw new \RuntimeException("Could not write to socket");
+            }
+            $sent += $chunk;
+            $socketInfo = $this->streamGetMetadata();
+            if ($socketInfo['timed_out']) {
+                throw new \RuntimeException("Write timed-out");
+            }
+        }
+        if (!$this->isConnected() && $sent < $length) {
+            throw new \RuntimeException("End-of-file reached, probably we got disconnected (sent $sent of $length)");
+        }
+    }
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/StreamHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/StreamHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..96ce7fc0c00d84f0aa8f1623a791492a849fa12f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/StreamHandler.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Stores to any stream resource
+ *
+ * Can be used to store into php://stderr, remote and local files, etc.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class StreamHandler extends AbstractProcessingHandler
+{
+    protected $stream;
+    protected $url;
+
+    /**
+     * @param string  $stream
+     * @param integer $level  The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct($stream, $level = Logger::DEBUG, $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+        if (is_resource($stream)) {
+            $this->stream = $stream;
+        } else {
+            $this->url = $stream;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        if (is_resource($this->stream)) {
+            fclose($this->stream);
+        }
+        $this->stream = null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        if (null === $this->stream) {
+            if (!$this->url) {
+                throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().');
+            }
+            $errorMessage = null;
+            set_error_handler(function ($code, $msg) use (&$errorMessage) {
+                $errorMessage = preg_replace('{^fopen\(.*?\): }', '', $msg);
+            });
+            $this->stream = fopen($this->url, 'a');
+            restore_error_handler();
+            if (!is_resource($this->stream)) {
+                $this->stream = null;
+                throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened: '.$errorMessage, $this->url));
+            }
+        }
+        fwrite($this->stream, (string) $record['formatted']);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SwiftMailerHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SwiftMailerHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..ca03ccaa9a875eb8d8a0d7888ff36e64d5a63652
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SwiftMailerHandler.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * SwiftMailerHandler uses Swift_Mailer to send the emails
+ *
+ * @author Gyula Sallai
+ */
+class SwiftMailerHandler extends MailHandler
+{
+    protected $mailer;
+    protected $message;
+
+    /**
+     * @param \Swift_Mailer           $mailer  The mailer to use
+     * @param callable|\Swift_Message $message An example message for real messages, only the body will be replaced
+     * @param integer                 $level   The minimum logging level at which this handler will be triggered
+     * @param Boolean                 $bubble  Whether the messages that are handled can bubble up the stack or not
+     */
+    public function __construct(\Swift_Mailer $mailer, $message, $level = Logger::ERROR, $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+        $this->mailer  = $mailer;
+        if (!$message instanceof \Swift_Message && is_callable($message)) {
+            $message = call_user_func($message);
+        }
+        if (!$message instanceof \Swift_Message) {
+            throw new \InvalidArgumentException('You must provide either a Swift_Message instance or a callable returning it');
+        }
+        $this->message = $message;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function send($content, array $records)
+    {
+        $message = clone $this->message;
+        $message->setBody($content);
+
+        $this->mailer->send($message);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SyslogHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SyslogHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4856cf7315a2f93adcf8ba300b3020caaf27652
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/SyslogHandler.php
@@ -0,0 +1,120 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+use Monolog\Formatter\LineFormatter;
+
+/**
+ * Logs to syslog service.
+ *
+ * usage example:
+ *
+ *   $log = new Logger('application');
+ *   $syslog = new SyslogHandler('myfacility', 'local6');
+ *   $formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%");
+ *   $syslog->setFormatter($formatter);
+ *   $log->pushHandler($syslog);
+ *
+ * @author Sven Paulus <sven@karlsruhe.org>
+ */
+class SyslogHandler extends AbstractProcessingHandler
+{
+    /**
+     * Translates Monolog log levels to syslog log priorities.
+     */
+    private $logLevels = array(
+        Logger::DEBUG     => LOG_DEBUG,
+        Logger::INFO      => LOG_INFO,
+        Logger::NOTICE    => LOG_NOTICE,
+        Logger::WARNING   => LOG_WARNING,
+        Logger::ERROR     => LOG_ERR,
+        Logger::CRITICAL  => LOG_CRIT,
+        Logger::ALERT     => LOG_ALERT,
+        Logger::EMERGENCY => LOG_EMERG,
+    );
+
+    /**
+     * List of valid log facility names.
+     */
+    private $facilities = array(
+        'auth'     => LOG_AUTH,
+        'authpriv' => LOG_AUTHPRIV,
+        'cron'     => LOG_CRON,
+        'daemon'   => LOG_DAEMON,
+        'kern'     => LOG_KERN,
+        'lpr'      => LOG_LPR,
+        'mail'     => LOG_MAIL,
+        'news'     => LOG_NEWS,
+        'syslog'   => LOG_SYSLOG,
+        'user'     => LOG_USER,
+        'uucp'     => LOG_UUCP,
+    );
+
+    /**
+     * @param string  $ident
+     * @param mixed   $facility
+     * @param integer $level    The minimum logging level at which this handler will be triggered
+     * @param Boolean $bubble   Whether the messages that are handled can bubble up the stack or not
+     * @param int     $logopts  Option flags for the openlog() call, defaults to LOG_PID
+     */
+    public function __construct($ident, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $logopts = LOG_PID)
+    {
+        parent::__construct($level, $bubble);
+
+        if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
+            $this->facilities['local0'] = LOG_LOCAL0;
+            $this->facilities['local1'] = LOG_LOCAL1;
+            $this->facilities['local2'] = LOG_LOCAL2;
+            $this->facilities['local3'] = LOG_LOCAL3;
+            $this->facilities['local4'] = LOG_LOCAL4;
+            $this->facilities['local5'] = LOG_LOCAL5;
+            $this->facilities['local6'] = LOG_LOCAL6;
+            $this->facilities['local7'] = LOG_LOCAL7;
+        }
+
+        // convert textual description of facility to syslog constant
+        if (array_key_exists(strtolower($facility), $this->facilities)) {
+            $facility = $this->facilities[strtolower($facility)];
+        } elseif (!in_array($facility, array_values($this->facilities), true)) {
+            throw new \UnexpectedValueException('Unknown facility value "'.$facility.'" given');
+        }
+
+        if (!openlog($ident, $logopts, $facility)) {
+            throw new \LogicException('Can\'t open syslog for ident "'.$ident.'" and facility "'.$facility.'"');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        closelog();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        syslog($this->logLevels[$record['level']], (string) $record['formatted']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDefaultFormatter()
+    {
+        return new LineFormatter('%channel%.%level_name%: %message% %context% %extra%');
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/TestHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/TestHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..085d9e17198b72445e57b5a5fb81daa0c51a254b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/TestHandler.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Logger;
+
+/**
+ * Used for testing purposes.
+ *
+ * It records all records and gives you access to them for verification.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class TestHandler extends AbstractProcessingHandler
+{
+    protected $records = array();
+    protected $recordsByLevel = array();
+
+    public function getRecords()
+    {
+        return $this->records;
+    }
+
+    public function hasEmergency($record)
+    {
+        return $this->hasRecord($record, Logger::EMERGENCY);
+    }
+
+    public function hasAlert($record)
+    {
+        return $this->hasRecord($record, Logger::ALERT);
+    }
+
+    public function hasCritical($record)
+    {
+        return $this->hasRecord($record, Logger::CRITICAL);
+    }
+
+    public function hasError($record)
+    {
+        return $this->hasRecord($record, Logger::ERROR);
+    }
+
+    public function hasWarning($record)
+    {
+        return $this->hasRecord($record, Logger::WARNING);
+    }
+
+    public function hasNotice($record)
+    {
+        return $this->hasRecord($record, Logger::NOTICE);
+    }
+
+    public function hasInfo($record)
+    {
+        return $this->hasRecord($record, Logger::INFO);
+    }
+
+    public function hasDebug($record)
+    {
+        return $this->hasRecord($record, Logger::DEBUG);
+    }
+
+    public function hasEmergencyRecords()
+    {
+        return isset($this->recordsByLevel[Logger::EMERGENCY]);
+    }
+
+    public function hasAlertRecords()
+    {
+        return isset($this->recordsByLevel[Logger::ALERT]);
+    }
+
+    public function hasCriticalRecords()
+    {
+        return isset($this->recordsByLevel[Logger::CRITICAL]);
+    }
+
+    public function hasErrorRecords()
+    {
+        return isset($this->recordsByLevel[Logger::ERROR]);
+    }
+
+    public function hasWarningRecords()
+    {
+        return isset($this->recordsByLevel[Logger::WARNING]);
+    }
+
+    public function hasNoticeRecords()
+    {
+        return isset($this->recordsByLevel[Logger::NOTICE]);
+    }
+
+    public function hasInfoRecords()
+    {
+        return isset($this->recordsByLevel[Logger::INFO]);
+    }
+
+    public function hasDebugRecords()
+    {
+        return isset($this->recordsByLevel[Logger::DEBUG]);
+    }
+
+    protected function hasRecord($record, $level)
+    {
+        if (!isset($this->recordsByLevel[$level])) {
+            return false;
+        }
+
+        if (is_array($record)) {
+            $record = $record['message'];
+        }
+
+        foreach ($this->recordsByLevel[$level] as $rec) {
+            if ($rec['message'] === $record) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        $this->recordsByLevel[$record['level']][] = $record;
+        $this->records[] = $record;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/ZendMonitorHandler.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/ZendMonitorHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a264231d672e39d2e7124b469b972e755f86b8e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Handler/ZendMonitorHandler.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Handler;
+
+use Monolog\Formatter\NormalizerFormatter;
+use Monolog\Logger;
+
+/**
+ * Handler sending logs to Zend Monitor
+ *
+ * @author  Christian Bergau <cbergau86@gmail.com>
+ */
+class ZendMonitorHandler extends AbstractProcessingHandler
+{
+    /**
+     * Monolog level / ZendMonitor Custom Event priority map
+     *
+     * @var array
+     */
+    protected $levelMap = array(
+        Logger::DEBUG     => 1,
+        Logger::INFO      => 2,
+        Logger::NOTICE    => 3,
+        Logger::WARNING   => 4,
+        Logger::ERROR     => 5,
+        Logger::CRITICAL  => 6,
+        Logger::ALERT     => 7,
+        Logger::EMERGENCY => 0,
+    );
+
+    /**
+     * Construct
+     *
+     * @param   int     $level
+     * @param   bool    $bubble
+     * @throws  MissingExtensionException
+     */
+    public function __construct($level = Logger::DEBUG, $bubble = true)
+    {
+        if (!function_exists('zend_monitor_custom_event')) {
+            throw new MissingExtensionException('You must have Zend Server installed in order to use this handler');
+        }
+        parent::__construct($level, $bubble);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function write(array $record)
+    {
+        $this->writeZendMonitorCustomEvent(
+            $this->levelMap[$record['level']],
+            $record['message'],
+            $record['formatted']
+        );
+    }
+
+    /**
+     * Write a record to Zend Monitor
+     *
+     * @param   int     $level
+     * @param   string  $message
+     * @param   array   $formatted
+     */
+    protected function writeZendMonitorCustomEvent($level, $message, $formatted)
+    {
+        zend_monitor_custom_event($level, $message, $formatted);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefaultFormatter()
+    {
+        return new NormalizerFormatter();
+    }
+
+    /**
+     * Get the level map
+     *
+     * @return array
+     */
+    public function getLevelMap()
+    {
+        return $this->levelMap;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Logger.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Logger.php
new file mode 100644
index 0000000000000000000000000000000000000000..78406e2d4d70017168f3afd5ef07340d3c2cf57e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Logger.php
@@ -0,0 +1,554 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog;
+
+use Monolog\Handler\HandlerInterface;
+use Monolog\Handler\StreamHandler;
+use Psr\Log\LoggerInterface;
+use Psr\Log\InvalidArgumentException;
+
+/**
+ * Monolog log channel
+ *
+ * It contains a stack of Handlers and a stack of Processors,
+ * and uses them to store records that are added to it.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class Logger implements LoggerInterface
+{
+    /**
+     * Detailed debug information
+     */
+    const DEBUG = 100;
+
+    /**
+     * Interesting events
+     *
+     * Examples: User logs in, SQL logs.
+     */
+    const INFO = 200;
+
+    /**
+     * Uncommon events
+     */
+    const NOTICE = 250;
+
+    /**
+     * Exceptional occurrences that are not errors
+     *
+     * Examples: Use of deprecated APIs, poor use of an API,
+     * undesirable things that are not necessarily wrong.
+     */
+    const WARNING = 300;
+
+    /**
+     * Runtime errors
+     */
+    const ERROR = 400;
+
+    /**
+     * Critical conditions
+     *
+     * Example: Application component unavailable, unexpected exception.
+     */
+    const CRITICAL = 500;
+
+    /**
+     * Action must be taken immediately
+     *
+     * Example: Entire website down, database unavailable, etc.
+     * This should trigger the SMS alerts and wake you up.
+     */
+    const ALERT = 550;
+
+    /**
+     * Urgent alert.
+     */
+    const EMERGENCY = 600;
+
+    protected static $levels = array(
+        100 => 'DEBUG',
+        200 => 'INFO',
+        250 => 'NOTICE',
+        300 => 'WARNING',
+        400 => 'ERROR',
+        500 => 'CRITICAL',
+        550 => 'ALERT',
+        600 => 'EMERGENCY',
+    );
+
+    /**
+     * @var DateTimeZone
+     */
+    protected static $timezone;
+
+    protected $name;
+
+    /**
+     * The handler stack
+     *
+     * @var array of Monolog\Handler\HandlerInterface
+     */
+    protected $handlers;
+
+    /**
+     * Processors that will process all log records
+     *
+     * To process records of a single handler instead, add the processor on that specific handler
+     *
+     * @var array of callables
+     */
+    protected $processors;
+
+    /**
+     * @param string $name       The logging channel
+     * @param array  $handlers   Optional stack of handlers, the first one in the array is called first, etc.
+     * @param array  $processors Optional array of processors
+     */
+    public function __construct($name, array $handlers = array(), array $processors = array())
+    {
+        $this->name = $name;
+        $this->handlers = $handlers;
+        $this->processors = $processors;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Pushes a handler on to the stack.
+     *
+     * @param HandlerInterface $handler
+     */
+    public function pushHandler(HandlerInterface $handler)
+    {
+        array_unshift($this->handlers, $handler);
+    }
+
+    /**
+     * Pops a handler from the stack
+     *
+     * @return HandlerInterface
+     */
+    public function popHandler()
+    {
+        if (!$this->handlers) {
+            throw new \LogicException('You tried to pop from an empty handler stack.');
+        }
+
+        return array_shift($this->handlers);
+    }
+
+    /**
+     * Adds a processor on to the stack.
+     *
+     * @param callable $callback
+     */
+    public function pushProcessor($callback)
+    {
+        if (!is_callable($callback)) {
+            throw new \InvalidArgumentException('Processors must be valid callables (callback or object with an __invoke method), '.var_export($callback, true).' given');
+        }
+        array_unshift($this->processors, $callback);
+    }
+
+    /**
+     * Removes the processor on top of the stack and returns it.
+     *
+     * @return callable
+     */
+    public function popProcessor()
+    {
+        if (!$this->processors) {
+            throw new \LogicException('You tried to pop from an empty processor stack.');
+        }
+
+        return array_shift($this->processors);
+    }
+
+    /**
+     * Adds a log record.
+     *
+     * @param  integer $level   The logging level
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addRecord($level, $message, array $context = array())
+    {
+        if (!$this->handlers) {
+            $this->pushHandler(new StreamHandler('php://stderr', static::DEBUG));
+        }
+
+        if (!static::$timezone) {
+            static::$timezone = new \DateTimeZone(date_default_timezone_get() ?: 'UTC');
+        }
+
+        $record = array(
+            'message' => (string) $message,
+            'context' => $context,
+            'level' => $level,
+            'level_name' => static::getLevelName($level),
+            'channel' => $this->name,
+            'datetime' => \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)), static::$timezone)->setTimezone(static::$timezone),
+            'extra' => array(),
+        );
+        // check if any handler will handle this message
+        $handlerKey = null;
+        foreach ($this->handlers as $key => $handler) {
+            if ($handler->isHandling($record)) {
+                $handlerKey = $key;
+                break;
+            }
+        }
+        // none found
+        if (null === $handlerKey) {
+            return false;
+        }
+
+        // found at least one, process message and dispatch it
+        foreach ($this->processors as $processor) {
+            $record = call_user_func($processor, $record);
+        }
+        while (isset($this->handlers[$handlerKey]) &&
+            false === $this->handlers[$handlerKey]->handle($record)) {
+            $handlerKey++;
+        }
+
+        return true;
+    }
+
+    /**
+     * Adds a log record at the DEBUG level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addDebug($message, array $context = array())
+    {
+        return $this->addRecord(static::DEBUG, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the INFO level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addInfo($message, array $context = array())
+    {
+        return $this->addRecord(static::INFO, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the NOTICE level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addNotice($message, array $context = array())
+    {
+        return $this->addRecord(static::NOTICE, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the WARNING level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addWarning($message, array $context = array())
+    {
+        return $this->addRecord(static::WARNING, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the ERROR level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addError($message, array $context = array())
+    {
+        return $this->addRecord(static::ERROR, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the CRITICAL level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addCritical($message, array $context = array())
+    {
+        return $this->addRecord(static::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the ALERT level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addAlert($message, array $context = array())
+    {
+        return $this->addRecord(static::ALERT, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the EMERGENCY level.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function addEmergency($message, array $context = array())
+    {
+      return $this->addRecord(static::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Gets the name of the logging level.
+     *
+     * @param  integer $level
+     * @return string
+     */
+    public static function getLevelName($level)
+    {
+        if (!isset(static::$levels[$level])) {
+            throw new InvalidArgumentException('Level "'.$level.'" is not defined, use one of: '.implode(', ', array_keys(static::$levels)));
+        }
+
+        return static::$levels[$level];
+    }
+
+    /**
+     * Checks whether the Logger has a handler that listens on the given level
+     *
+     * @param  integer $level
+     * @return Boolean
+     */
+    public function isHandling($level)
+    {
+        $record = array(
+            'level' => $level,
+        );
+
+        foreach ($this->handlers as $key => $handler) {
+            if ($handler->isHandling($record)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Adds a log record at an arbitrary level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  mixed   $level   The log level
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function log($level, $message, array $context = array())
+    {
+        if (is_string($level) && defined(__CLASS__.'::'.strtoupper($level))) {
+            $level = constant(__CLASS__.'::'.strtoupper($level));
+        }
+
+        return $this->addRecord($level, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the DEBUG level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function debug($message, array $context = array())
+    {
+        return $this->addRecord(static::DEBUG, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the INFO level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function info($message, array $context = array())
+    {
+        return $this->addRecord(static::INFO, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the INFO level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function notice($message, array $context = array())
+    {
+        return $this->addRecord(static::NOTICE, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the WARNING level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function warn($message, array $context = array())
+    {
+        return $this->addRecord(static::WARNING, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the WARNING level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function warning($message, array $context = array())
+    {
+        return $this->addRecord(static::WARNING, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the ERROR level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function err($message, array $context = array())
+    {
+        return $this->addRecord(static::ERROR, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the ERROR level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function error($message, array $context = array())
+    {
+        return $this->addRecord(static::ERROR, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the CRITICAL level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function crit($message, array $context = array())
+    {
+        return $this->addRecord(static::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the CRITICAL level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function critical($message, array $context = array())
+    {
+        return $this->addRecord(static::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the ALERT level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function alert($message, array $context = array())
+    {
+        return $this->addRecord(static::ALERT, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the EMERGENCY level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function emerg($message, array $context = array())
+    {
+        return $this->addRecord(static::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Adds a log record at the EMERGENCY level.
+     *
+     * This method allows for compatibility with common interfaces.
+     *
+     * @param  string  $message The log message
+     * @param  array   $context The log context
+     * @return Boolean Whether the record has been processed
+     */
+    public function emergency($message, array $context = array())
+    {
+        return $this->addRecord(static::EMERGENCY, $message, $context);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/IntrospectionProcessor.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/IntrospectionProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..b126218ee492856eeeebf84603808d2b2bb13bf7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/IntrospectionProcessor.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Injects line/file:class/function where the log message came from
+ *
+ * Warning: This only works if the handler processes the logs directly.
+ * If you put the processor on a handler that is behind a FingersCrossedHandler
+ * for example, the processor will only be called once the trigger level is reached,
+ * and all the log records will have the same file/line/.. data from the call that
+ * triggered the FingersCrossedHandler.
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class IntrospectionProcessor
+{
+    /**
+     * @param  array $record
+     * @return array
+     */
+    public function __invoke(array $record)
+    {
+        $trace = debug_backtrace();
+
+        // skip first since it's always the current method
+        array_shift($trace);
+        // the call_user_func call is also skipped
+        array_shift($trace);
+
+        $i = 0;
+        while (isset($trace[$i]['class']) && false !== strpos($trace[$i]['class'], 'Monolog\\')) {
+            $i++;
+        }
+
+        // we should have the call source now
+        $record['extra'] = array_merge(
+            $record['extra'],
+            array(
+                'file'      => isset($trace[$i-1]['file']) ? $trace[$i-1]['file'] : null,
+                'line'      => isset($trace[$i-1]['line']) ? $trace[$i-1]['line'] : null,
+                'class'     => isset($trace[$i]['class']) ? $trace[$i]['class'] : null,
+                'function'  => isset($trace[$i]['function']) ? $trace[$i]['function'] : null,
+            )
+        );
+
+        return $record;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryPeakUsageProcessor.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryPeakUsageProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..e48672bf2e0e91df67f35d9c32e3e280e764e97f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryPeakUsageProcessor.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Injects memory_get_peak_usage in all records
+ *
+ * @see Monolog\Processor\MemoryProcessor::__construct() for options
+ * @author Rob Jensen
+ */
+class MemoryPeakUsageProcessor extends MemoryProcessor
+{
+    /**
+     * @param  array $record
+     * @return array
+     */
+    public function __invoke(array $record)
+    {
+        $bytes = memory_get_peak_usage($this->realUsage);
+        $formatted = self::formatBytes($bytes);
+
+        $record['extra'] = array_merge(
+            $record['extra'],
+            array(
+                'memory_peak_usage' => $formatted,
+            )
+        );
+
+        return $record;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryProcessor.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..7551043e12ca46497ac04687ed5c1025ea7b7ca9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryProcessor.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Some methods that are common for all memory processors
+ *
+ * @author Rob Jensen
+ */
+abstract class MemoryProcessor
+{
+    protected $realUsage;
+
+    /**
+     * @param boolean $realUsage
+     */
+    public function __construct($realUsage = true)
+    {
+        $this->realUsage = (boolean) $realUsage;
+    }
+
+    /**
+     * Formats bytes into a human readable string
+     *
+     * @param  int    $bytes
+     * @return string
+     */
+    protected static function formatBytes($bytes)
+    {
+        $bytes = (int) $bytes;
+
+        if ($bytes > 1024*1024) {
+            return round($bytes/1024/1024, 2).' MB';
+        } elseif ($bytes > 1024) {
+            return round($bytes/1024, 2).' KB';
+        }
+
+        return $bytes . ' B';
+    }
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryUsageProcessor.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryUsageProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..2c4a8079f019c7c0ba66956d789855622aa76c9e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/MemoryUsageProcessor.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Injects memory_get_usage in all records
+ *
+ * @see Monolog\Processor\MemoryProcessor::__construct() for options
+ * @author Rob Jensen
+ */
+class MemoryUsageProcessor extends MemoryProcessor
+{
+    /**
+     * @param  array $record
+     * @return array
+     */
+    public function __invoke(array $record)
+    {
+        $bytes = memory_get_usage($this->realUsage);
+        $formatted = self::formatBytes($bytes);
+
+        $record['extra'] = array_merge(
+            $record['extra'],
+            array(
+                'memory_usage' => $formatted,
+            )
+        );
+
+        return $record;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/PsrLogMessageProcessor.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/PsrLogMessageProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..b63fcccce313d165a5c2525a4d9b603d86af0fbd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/PsrLogMessageProcessor.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Processes a record's message according to PSR-3 rules
+ *
+ * It replaces {foo} with the value from $context['foo']
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class PsrLogMessageProcessor
+{
+    /**
+     * @param  array $record
+     * @return array
+     */
+    public function __invoke(array $record)
+    {
+        if (false === strpos($record['message'], '{')) {
+            return $record;
+        }
+
+        $replacements = array();
+        foreach ($record['context'] as $key => $val) {
+            $replacements['{'.$key.'}'] = $val;
+        }
+
+        $record['message'] = strtr($record['message'], $replacements);
+
+        return $record;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/WebProcessor.php b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/WebProcessor.php
new file mode 100644
index 0000000000000000000000000000000000000000..9916cc087f8b050b8171ca0b89cc6a0f75fdddc3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Monolog/Processor/WebProcessor.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Injects url/method and remote IP of the current web request in all records
+ *
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class WebProcessor
+{
+    protected $serverData;
+
+    /**
+     * @param mixed $serverData array or object w/ ArrayAccess that provides access to the $_SERVER data
+     */
+    public function __construct($serverData = null)
+    {
+        if (null === $serverData) {
+            $this->serverData =& $_SERVER;
+        } elseif (is_array($serverData) || $serverData instanceof \ArrayAccess) {
+            $this->serverData = $serverData;
+        } else {
+            throw new \UnexpectedValueException('$serverData must be an array or object implementing ArrayAccess.');
+        }
+    }
+
+    /**
+     * @param  array $record
+     * @return array
+     */
+    public function __invoke(array $record)
+    {
+        // skip processing if for some reason request data
+        // is not present (CLI or wonky SAPIs)
+        if (!isset($this->serverData['REQUEST_URI'])) {
+            return $record;
+        }
+
+        $record['extra'] = array_merge(
+            $record['extra'],
+            array(
+                'url'         => $this->serverData['REQUEST_URI'],
+                'ip'          => isset($this->serverData['REMOTE_ADDR']) ? $this->serverData['REMOTE_ADDR'] : null,
+                'http_method' => isset($this->serverData['REQUEST_METHOD']) ? $this->serverData['REQUEST_METHOD'] : null,
+                'server'      => isset($this->serverData['SERVER_NAME']) ? $this->serverData['SERVER_NAME'] : null,
+                'referrer'    => isset($this->serverData['HTTP_REFERER']) ? $this->serverData['HTTP_REFERER'] : null,
+            )
+        );
+
+        return $record;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/AbstractLogger.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/AbstractLogger.php
new file mode 100644
index 0000000000000000000000000000000000000000..00f9034521b4237809cb525591aacb8f6820a6e8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/AbstractLogger.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger implementation that other Loggers can inherit from.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+abstract class AbstractLogger implements LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/InvalidArgumentException.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/InvalidArgumentException.php
new file mode 100644
index 0000000000000000000000000000000000000000..67f852d1dbc660ba05e703fe9b727727da2b3f78
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psr\Log;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LogLevel.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LogLevel.php
new file mode 100644
index 0000000000000000000000000000000000000000..e32c151cb19558859d4a096a6e64d61f1fe99bcf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LogLevel.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes log levels
+ */
+class LogLevel
+{
+    const EMERGENCY = 'emergency';
+    const ALERT = 'alert';
+    const CRITICAL = 'critical';
+    const ERROR = 'error';
+    const WARNING = 'warning';
+    const NOTICE = 'notice';
+    const INFO = 'info';
+    const DEBUG = 'debug';
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerAwareInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerAwareInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..2eebc4ebddb59af7fa0c4d91b9c9f401c98754a4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerAwareInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger-aware instance
+ */
+interface LoggerAwareInterface
+{
+    /**
+     * Sets a logger instance on the object
+     *
+     * @param LoggerInterface $logger
+     * @return null
+     */
+    public function setLogger(LoggerInterface $logger);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerAwareTrait.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerAwareTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..f087a3dac894750a999e4e329662451f4ec0c8b0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerAwareTrait.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Basic Implementation of LoggerAwareInterface.
+ */
+trait LoggerAwareTrait
+{
+    /** @var LoggerInterface */
+    protected $logger;
+
+    /**
+     * Sets a logger.
+     * 
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..476bb962af7880187a12e5d404cbd742c441a5c7
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerInterface.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger instance
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data, the only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ */
+interface LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function emergency($message, array $context = array());
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function alert($message, array $context = array());
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function critical($message, array $context = array());
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function error($message, array $context = array());
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function warning($message, array $context = array());
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function notice($message, array $context = array());
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function info($message, array $context = array());
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function debug($message, array $context = array());
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function log($level, $message, array $context = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerTrait.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..5912496000b18d57bf80da4fdb056e4fca2bf1a6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/LoggerTrait.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger trait that classes unable to extend AbstractLogger
+ * (because they extend another class, etc) can include.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to 
+ * reduce boilerplate code that a simple Logger that does the same thing with 
+ * messages regardless of the error level has to implement.
+ */
+trait LoggerTrait
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    abstract public function log($level, $message, array $context = array());
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/NullLogger.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/NullLogger.php
new file mode 100644
index 0000000000000000000000000000000000000000..553a3c593ae5ff3660f729fffe052eb88735bc6d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/NullLogger.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This Logger can be used to avoid conditional log calls
+ *
+ * Logging should always be optional, and if no logger is provided to your
+ * library creating a NullLogger instance to have something to throw logs at
+ * is a good way to avoid littering your code with `if ($this->logger) { }`
+ * blocks.
+ */
+class NullLogger extends AbstractLogger
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function log($level, $message, array $context = array())
+    {
+        // noop
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/Test/LoggerInterfaceTest.php b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/Test/LoggerInterfaceTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9328151112a809106b4508c676e8994717583e2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Psr/Log/Test/LoggerInterfaceTest.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Psr\Log\Test;
+
+use Psr\Log\LogLevel;
+
+/**
+ * Provides a base test class for ensuring compliance with the LoggerInterface
+ *
+ * Implementors can extend the class and implement abstract methods to run this as part of their test suite
+ */
+abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @return LoggerInterface
+     */
+    abstract function getLogger();
+
+    /**
+     * This must return the log messages in order with a simple formatting: "<LOG LEVEL> <MESSAGE>"
+     *
+     * Example ->error('Foo') would yield "error Foo"
+     *
+     * @return string[]
+     */
+    abstract function getLogs();
+
+    public function testImplements()
+    {
+        $this->assertInstanceOf('Psr\Log\LoggerInterface', $this->getLogger());
+    }
+
+    /**
+     * @dataProvider provideLevelsAndMessages
+     */
+    public function testLogsAtAllLevels($level, $message)
+    {
+        $logger = $this->getLogger();
+        $logger->{$level}($message, array('user' => 'Bob'));
+        $logger->log($level, $message, array('user' => 'Bob'));
+
+        $expected = array(
+            $level.' message of level '.$level.' with context: Bob',
+            $level.' message of level '.$level.' with context: Bob',
+        );
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function provideLevelsAndMessages()
+    {
+        return array(
+            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
+            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
+            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
+            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
+            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
+            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
+            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
+            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
+        );
+    }
+
+    /**
+     * @expectedException Psr\Log\InvalidArgumentException
+     */
+    public function testThrowsOnInvalidLevel()
+    {
+        $logger = $this->getLogger();
+        $logger->log('invalid level', 'Foo');
+    }
+
+    public function testContextReplacement()
+    {
+        $logger = $this->getLogger();
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+
+        $expected = array('info {Message {nothing} Bob Bar a}');
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testObjectCastToString()
+    {
+        $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
+        $dummy->expects($this->once())
+            ->method('__toString')
+            ->will($this->returnValue('DUMMY'));
+
+        $this->getLogger()->warning($dummy);
+    }
+
+    public function testContextCanContainAnything()
+    {
+        $context = array(
+            'bool' => true,
+            'null' => null,
+            'string' => 'Foo',
+            'int' => 0,
+            'float' => 0.5,
+            'nested' => array('with object' => new DummyTest),
+            'object' => new \DateTime,
+            'resource' => fopen('php://memory', 'r'),
+        );
+
+        $this->getLogger()->warning('Crazy context data', $context);
+    }
+
+    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+    {
+        $this->getLogger()->warning('Random message', array('exception' => 'oops'));
+        $this->getLogger()->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+    }
+}
+
+class DummyTest
+{
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4c156f7030a6ccd13fb0acb39b1388005abb3c8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcClassLoader.php
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * ApcClassLoader implements a wrapping autoloader cached in APC for PHP 5.3.
+ *
+ * It expects an object implementing a findFile method to find the file. This
+ * allow using it as a wrapper around the other loaders of the component (the
+ * ClassLoader and the UniversalClassLoader for instance) but also around any
+ * other autoloader following this convention (the Composer one for instance)
+ *
+ *     $loader = new ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     $cachedLoader = new ApcClassLoader('my_prefix', $loader);
+ *
+ *     // activate the cached autoloader
+ *     $cachedLoader->register();
+ *
+ *     // eventually deactivate the non-cached loader if it was registered previously
+ *     // to be sure to use the cached one.
+ *     $loader->unregister();
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Kris Wallsmith <kris@symfony.com>
+ *
+ * @api
+ */
+class ApcClassLoader
+{
+    private $prefix;
+
+    /**
+     * The class loader object being decorated.
+     *
+     * @var \Symfony\Component\ClassLoader\ClassLoader
+     *   A class loader object that implements the findFile() method.
+     */
+    protected $decorated;
+
+    /**
+     * Constructor.
+     *
+     * @param string $prefix      The APC namespace prefix to use.
+     * @param object $decorated   A class loader object that implements the findFile() method.
+     *
+     * @throws \RuntimeException
+     * @throws \InvalidArgumentException
+     *
+     * @api
+     */
+    public function __construct($prefix, $decorated)
+    {
+        if (!extension_loaded('apc')) {
+            throw new \RuntimeException('Unable to use ApcClassLoader as APC is not enabled.');
+        }
+
+        if (!method_exists($decorated, 'findFile')) {
+            throw new \InvalidArgumentException('The class finder must implement a "findFile" method.');
+        }
+
+        $this->prefix = $prefix;
+        $this->decorated = $decorated;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param Boolean $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $class The name of the class
+     *
+     * @return Boolean|null True, if loaded
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            require $file;
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds a file by class name while caching lookups to APC.
+     *
+     * @param string $class A class name to resolve to file
+     *
+     * @return string|null
+     */
+    public function findFile($class)
+    {
+        if (false === $file = apc_fetch($this->prefix.$class)) {
+            apc_store($this->prefix.$class, $file = $this->decorated->findFile($class));
+        }
+
+        return $file;
+    }
+
+    /**
+     * Passes through all unknown calls onto the decorated object.
+     */
+    public function __call($method, $args)
+    {
+        return call_user_func_array(array($this->decorated, $method), $args);
+    }
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..023f7ba1a62e5c1a16ffb27a7d31de9227bb1087
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
+ *
+ * It is able to load classes that use either:
+ *
+ *  * The technical interoperability standards for PHP 5.3 namespaces and
+ *    class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
+ *
+ *  * The PEAR naming convention for classes (http://pear.php.net/).
+ *
+ * Classes from a sub-namespace or a sub-hierarchy of PEAR classes can be
+ * looked for in a list of locations to ease the vendoring of a sub-set of
+ * classes for large projects.
+ *
+ * Example usage:
+ *
+ *     require 'vendor/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+ *     require 'vendor/symfony/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
+ *
+ *     use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
+ *
+ *     $loader = new ApcUniversalClassLoader('apc.prefix.');
+ *
+ *     // register classes with namespaces
+ *     $loader->registerNamespaces(array(
+ *         'Symfony\Component' => __DIR__.'/component',
+ *         'Symfony'           => __DIR__.'/framework',
+ *         'Sensio'            => array(__DIR__.'/src', __DIR__.'/vendor'),
+ *     ));
+ *
+ *     // register a library using the PEAR naming convention
+ *     $loader->registerPrefixes(array(
+ *         'Swift_' => __DIR__.'/Swift',
+ *     ));
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Kris Wallsmith <kris@symfony.com>
+ *
+ * @api
+ */
+class ApcUniversalClassLoader extends UniversalClassLoader
+{
+    private $prefix;
+
+    /**
+     * Constructor.
+     *
+     * @param string $prefix A prefix to create a namespace in APC
+     *
+     * @throws \RuntimeException
+     *
+     * @api
+     */
+    public function __construct($prefix)
+    {
+        if (!extension_loaded('apc')) {
+            throw new \RuntimeException('Unable to use ApcUniversalClassLoader as APC is not enabled.');
+        }
+
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Finds a file by class name while caching lookups to APC.
+     *
+     * @param string $class A class name to resolve to file
+     *
+     * @return string|null The path, if found
+     */
+    public function findFile($class)
+    {
+        if (false === $file = apc_fetch($this->prefix.$class)) {
+            apc_store($this->prefix.$class, $file = parent::findFile($class));
+        }
+
+        return $file;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassCollectionLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..be1c7e2b5563a99df74456a663c203fbb5b77343
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -0,0 +1,367 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * ClassCollectionLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class ClassCollectionLoader
+{
+    private static $loaded;
+    private static $seen;
+    private static $useTokenizer = true;
+
+    /**
+     * Loads a list of classes and caches them in one big file.
+     *
+     * @param array   $classes    An array of classes to load
+     * @param string  $cacheDir   A cache directory
+     * @param string  $name       The cache name prefix
+     * @param Boolean $autoReload Whether to flush the cache when the cache is stale or not
+     * @param Boolean $adaptive   Whether to remove already declared classes or not
+     * @param string  $extension  File extension of the resulting file
+     *
+     * @throws \InvalidArgumentException When class can't be loaded
+     */
+    public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
+    {
+        // each $name can only be loaded once per PHP process
+        if (isset(self::$loaded[$name])) {
+            return;
+        }
+
+        self::$loaded[$name] = true;
+
+        $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+        if (function_exists('get_declared_traits')) {
+            $declared = array_merge($declared, get_declared_traits());
+        }
+
+        if ($adaptive) {
+            // don't include already declared classes
+            $classes = array_diff($classes, $declared);
+
+            // the cache is different depending on which classes are already declared
+            $name = $name.'-'.substr(md5(implode('|', $classes)), 0, 5);
+        }
+
+        $classes = array_unique($classes);
+
+        $cache = $cacheDir.'/'.$name.$extension;
+
+        // auto-reload
+        $reload = false;
+        if ($autoReload) {
+            $metadata = $cache.'.meta';
+            if (!is_file($metadata) || !is_file($cache)) {
+                $reload = true;
+            } else {
+                $time = filemtime($cache);
+                $meta = unserialize(file_get_contents($metadata));
+
+                sort($meta[1]);
+                sort($classes);
+
+                if ($meta[1] != $classes) {
+                    $reload = true;
+                } else {
+                    foreach ($meta[0] as $resource) {
+                        if (!is_file($resource) || filemtime($resource) > $time) {
+                            $reload = true;
+
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!$reload && is_file($cache)) {
+            require_once $cache;
+
+            return;
+        }
+
+        $files = array();
+        $content = '';
+        foreach (self::getOrderedClasses($classes) as $class) {
+            if (in_array($class->getName(), $declared)) {
+                continue;
+            }
+
+            $files[] = $class->getFileName();
+
+            $c = preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', file_get_contents($class->getFileName()));
+
+            // fakes namespace declaration for global code
+            if (!$class->inNamespace()) {
+                $c = "\nnamespace\n{\n".$c."\n}\n";
+            }
+
+            $c = self::fixNamespaceDeclarations('<?php '.$c);
+            $c = preg_replace('/^\s*<\?php/', '', $c);
+
+            $content .= $c;
+        }
+
+        // cache the core classes
+        if (!is_dir(dirname($cache))) {
+            mkdir(dirname($cache), 0777, true);
+        }
+        self::writeCacheFile($cache, '<?php '.$content);
+
+        if ($autoReload) {
+            // save the resources
+            self::writeCacheFile($metadata, serialize(array($files, $classes)));
+        }
+    }
+
+    /**
+     * Adds brackets around each namespace if it's not already the case.
+     *
+     * @param string $source Namespace string
+     *
+     * @return string Namespaces with brackets
+     */
+    public static function fixNamespaceDeclarations($source)
+    {
+        if (!function_exists('token_get_all') || !self::$useTokenizer) {
+            if (preg_match('/namespace(.*?)\s*;/', $source)) {
+                $source = preg_replace('/namespace(.*?)\s*;/', "namespace$1\n{", $source)."}\n";
+            }
+
+            return $source;
+        }
+
+        $rawChunk = '';
+        $output = '';
+        $inNamespace = false;
+        $tokens = token_get_all($source);
+
+        for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
+            if (is_string($token)) {
+                $rawChunk .= $token;
+            } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
+                // strip comments
+                continue;
+            } elseif (T_NAMESPACE === $token[0]) {
+                if ($inNamespace) {
+                    $rawChunk .= "}\n";
+                }
+                $rawChunk .= $token[1];
+
+                // namespace name and whitespaces
+                while (($t = next($tokens)) && is_array($t) && in_array($t[0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
+                    $rawChunk .= $t[1];
+                }
+                if ('{' === $t) {
+                    $inNamespace = false;
+                    prev($tokens);
+                } else {
+                    $rawChunk = rtrim($rawChunk)."\n{";
+                    $inNamespace = true;
+                }
+            } elseif (T_START_HEREDOC === $token[0]) {
+                $output .= self::compressCode($rawChunk).$token[1];
+                do {
+                    $token = next($tokens);
+                    $output .= is_string($token) ? $token : $token[1];
+                } while ($token[0] !== T_END_HEREDOC);
+                $output .= "\n";
+                $rawChunk = '';
+            } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
+                $output .= self::compressCode($rawChunk).$token[1];
+                $rawChunk = '';
+            } else {
+                $rawChunk .= $token[1];
+            }
+        }
+
+        if ($inNamespace) {
+            $rawChunk .= "}\n";
+        }
+
+        return $output.self::compressCode($rawChunk);
+    }
+
+    /**
+     * This method is only useful for testing.
+     */
+    public static function enableTokenizer($bool)
+    {
+        self::$useTokenizer = (Boolean) $bool;
+    }
+
+    /**
+     * Strips leading & trailing ws, multiple EOL, multiple ws.
+     *
+     * @param string $code Original PHP code
+     *
+     * @return string compressed code
+     */
+    private static function compressCode($code)
+    {
+        return preg_replace(
+            array('/^\s+/m', '/\s+$/m', '/([\n\r]+ *[\n\r]+)+/', '/[ \t]+/'),
+            array('', '', "\n", ' '),
+            $code
+        );
+    }
+
+    /**
+     * Writes a cache file.
+     *
+     * @param string $file    Filename
+     * @param string $content Temporary file content
+     *
+     * @throws \RuntimeException when a cache file cannot be written
+     */
+    private static function writeCacheFile($file, $content)
+    {
+        $tmpFile = tempnam(dirname($file), basename($file));
+        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
+            @chmod($file, 0666 & ~umask());
+
+            return;
+        }
+
+        throw new \RuntimeException(sprintf('Failed to write cache file "%s".', $file));
+    }
+
+    /**
+     * Gets an ordered array of passed classes including all their dependencies.
+     *
+     * @param array $classes
+     *
+     * @return \ReflectionClass[] An array of sorted \ReflectionClass instances (dependencies added if needed)
+     *
+     * @throws \InvalidArgumentException When a class can't be loaded
+     */
+    private static function getOrderedClasses(array $classes)
+    {
+        $map = array();
+        self::$seen = array();
+        foreach ($classes as $class) {
+            try {
+                $reflectionClass = new \ReflectionClass($class);
+            } catch (\ReflectionException $e) {
+                throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
+            }
+
+            $map = array_merge($map, self::getClassHierarchy($reflectionClass));
+        }
+
+        return $map;
+    }
+
+    private static function getClassHierarchy(\ReflectionClass $class)
+    {
+        if (isset(self::$seen[$class->getName()])) {
+            return array();
+        }
+
+        self::$seen[$class->getName()] = true;
+
+        $classes = array($class);
+        $parent = $class;
+        while (($parent = $parent->getParentClass()) && $parent->isUserDefined() && !isset(self::$seen[$parent->getName()])) {
+            self::$seen[$parent->getName()] = true;
+
+            array_unshift($classes, $parent);
+        }
+
+        $traits = array();
+
+        if (function_exists('get_declared_traits')) {
+            foreach ($classes as $c) {
+                foreach (self::resolveDependencies(self::computeTraitDeps($c), $c) as $trait) {
+                    if ($trait !== $c) {
+                        $traits[] = $trait;
+                    }
+                }
+            }
+        }
+
+        return array_merge(self::getInterfaces($class), $traits, $classes);
+    }
+
+    private static function getInterfaces(\ReflectionClass $class)
+    {
+        $classes = array();
+
+        foreach ($class->getInterfaces() as $interface) {
+            $classes = array_merge($classes, self::getInterfaces($interface));
+        }
+
+        if ($class->isUserDefined() && $class->isInterface() && !isset(self::$seen[$class->getName()])) {
+            self::$seen[$class->getName()] = true;
+
+            $classes[] = $class;
+        }
+
+        return $classes;
+    }
+
+    private static function computeTraitDeps(\ReflectionClass $class)
+    {
+        $traits = $class->getTraits();
+        $deps = array($class->getName() => $traits);
+        while ($trait = array_pop($traits)) {
+            if ($trait->isUserDefined() && !isset(self::$seen[$trait->getName()])) {
+                self::$seen[$trait->getName()] = true;
+                $traitDeps = $trait->getTraits();
+                $deps[$trait->getName()] = $traitDeps;
+                $traits = array_merge($traits, $traitDeps);
+            }
+        }
+
+        return $deps;
+    }
+
+    /**
+     * Dependencies resolution.
+     *
+     * This function does not check for circular dependencies as it should never
+     * occur with PHP traits.
+     *
+     * @param array             $tree       The dependency tree
+     * @param \ReflectionClass  $node       The node
+     * @param \ArrayObject      $resolved   An array of already resolved dependencies
+     * @param \ArrayObject      $unresolved An array of dependencies to be resolved
+     *
+     * @return \ArrayObject The dependencies for the given node
+     *
+     * @throws \RuntimeException if a circular dependency is detected
+     */
+    private static function resolveDependencies(array $tree, $node, \ArrayObject $resolved = null, \ArrayObject $unresolved = null)
+    {
+        if (null === $resolved) {
+            $resolved = new \ArrayObject();
+        }
+        if (null === $unresolved) {
+            $unresolved = new \ArrayObject();
+        }
+        $nodeName = $node->getName();
+        $unresolved[$nodeName] = $node;
+        foreach ($tree[$nodeName] as $dependency) {
+            if (!$resolved->offsetExists($dependency->getName())) {
+                self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
+            }
+        }
+        $resolved[$nodeName] = $node;
+        unset($unresolved[$nodeName]);
+
+        return $resolved;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..1a359794ab2c507e65915857522b56a662ff1190
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassLoader.php
@@ -0,0 +1,199 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * ClassLoader implements an PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ *     $loader = new ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
+ *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (e.g. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class ClassLoader
+{
+    private $prefixes = array();
+    private $fallbackDirs = array();
+    private $useIncludePath = false;
+
+    /**
+     * Returns prefixes.
+     *
+     * @return array
+     */
+    public function getPrefixes()
+    {
+        return $this->prefixes;
+    }
+
+    /**
+     * Returns fallback directories.
+     *
+     * @return array
+     */
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirs;
+    }
+
+    /**
+     * Adds prefixes.
+     *
+     * @param array $prefixes Prefixes to add
+     */
+    public function addPrefixes(array $prefixes)
+    {
+        foreach ($prefixes as $prefix => $path) {
+            $this->addPrefix($prefix, $path);
+        }
+    }
+
+    /**
+     * Registers a set of classes
+     *
+     * @param string       $prefix The classes prefix
+     * @param array|string $paths  The location(s) of the classes
+     */
+    public function addPrefix($prefix, $paths)
+    {
+        if (!$prefix) {
+            foreach ((array) $paths as $path) {
+                $this->fallbackDirs[] = $path;
+            }
+
+            return;
+        }
+        if (isset($this->prefixes[$prefix])) {
+            $this->prefixes[$prefix] = array_merge(
+                $this->prefixes[$prefix],
+                (array) $paths
+            );
+        } else {
+            $this->prefixes[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include for class files.
+     *
+     * @param Boolean $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return Boolean
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param Boolean $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $class The name of the class
+     *
+     * @return Boolean|null True, if loaded
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            require $file;
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|null The path, if found
+     */
+    public function findFile($class)
+    {
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)).DIRECTORY_SEPARATOR;
+            $className = substr($class, $pos + 1);
+        } else {
+            // PEAR-like class name
+            $classPath = null;
+            $className = $class;
+        }
+
+        $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
+
+        foreach ($this->prefixes as $prefix => $dirs) {
+            if (0 === strpos($class, $prefix)) {
+                foreach ($dirs as $dir) {
+                    if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
+                        return $dir.DIRECTORY_SEPARATOR.$classPath;
+                    }
+                }
+            }
+        }
+
+        foreach ($this->fallbackDirs as $dir) {
+            if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
+                return $dir.DIRECTORY_SEPARATOR.$classPath;
+            }
+        }
+
+        if ($this->useIncludePath && $file = stream_resolve_include_path($classPath)) {
+            return $file;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassMapGenerator.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassMapGenerator.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b09305954f3417c08198459369fcbed6521db46
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * ClassMapGenerator
+ *
+ * @author Gyula Sallai <salla016@gmail.com>
+ */
+class ClassMapGenerator
+{
+    /**
+     * Generate a class map file
+     *
+     * @param array|string $dirs Directories or a single path to search in
+     * @param string       $file The name of the class map file
+     */
+    public static function dump($dirs, $file)
+    {
+        $dirs = (array) $dirs;
+        $maps = array();
+
+        foreach ($dirs as $dir) {
+            $maps = array_merge($maps, static::createMap($dir));
+        }
+
+        file_put_contents($file, sprintf('<?php return %s;', var_export($maps, true)));
+    }
+
+    /**
+     * Iterate over all files in the given directory searching for classes
+     *
+     * @param Iterator|string $dir The directory to search in or an iterator
+     *
+     * @return array A class map array
+     */
+    public static function createMap($dir)
+    {
+        if (is_string($dir)) {
+            $dir = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir));
+        }
+
+        $map = array();
+
+        foreach ($dir as $file) {
+            if (!$file->isFile()) {
+                continue;
+            }
+
+            $path = $file->getRealPath();
+
+            if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') {
+                continue;
+            }
+
+            $classes = self::findClasses($path);
+
+            foreach ($classes as $class) {
+                $map[$class] = $path;
+            }
+
+        }
+
+        return $map;
+    }
+
+    /**
+     * Extract the classes in the given file
+     *
+     * @param string $path The file to check
+     *
+     * @return array The found classes
+     */
+    private static function findClasses($path)
+    {
+        $contents = file_get_contents($path);
+        $tokens   = token_get_all($contents);
+        $T_TRAIT  = version_compare(PHP_VERSION, '5.4', '<') ? -1 : T_TRAIT;
+
+        $classes = array();
+
+        $namespace = '';
+        for ($i = 0, $max = count($tokens); $i < $max; $i++) {
+            $token = $tokens[$i];
+
+            if (is_string($token)) {
+                continue;
+            }
+
+            $class = '';
+
+            switch ($token[0]) {
+                case T_NAMESPACE:
+                    $namespace = '';
+                    // If there is a namespace, extract it
+                    while (($t = $tokens[++$i]) && is_array($t)) {
+                        if (in_array($t[0], array(T_STRING, T_NS_SEPARATOR))) {
+                            $namespace .= $t[1];
+                        }
+                    }
+                    $namespace .= '\\';
+                    break;
+                case T_CLASS:
+                case T_INTERFACE:
+                case $T_TRAIT:
+                    // Find the classname
+                    while (($t = $tokens[++$i]) && is_array($t)) {
+                        if (T_STRING === $t[0]) {
+                            $class .= $t[1];
+                        } elseif ($class !== '' && T_WHITESPACE == $t[0]) {
+                            break;
+                        }
+                    }
+
+                    $classes[] = ltrim($namespace.$class, '\\');
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return $classes;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/DebugClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/DebugClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..842f4744c0f66be3b0ef8697fac82b0bf2c0dd6b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * Autoloader checking if the class is really defined in the file found.
+ *
+ * The DebugClassLoader will wrap all registered autoloaders providing a
+ * findFile method and will throw an exception if a file is found but does
+ * not declare the class.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Christophe Coevoet <stof@notk.org>
+ *
+ * @api
+ */
+class DebugClassLoader
+{
+    private $classFinder;
+
+    /**
+     * Constructor.
+     *
+     * @param object $classFinder
+     *
+     * @api
+     */
+    public function __construct($classFinder)
+    {
+        $this->classFinder = $classFinder;
+    }
+
+    /**
+     * Replaces all autoloaders implementing a findFile method by a DebugClassLoader wrapper.
+     */
+    public static function enable()
+    {
+        if (!is_array($functions = spl_autoload_functions())) {
+            return;
+        }
+
+        foreach ($functions as $function) {
+            spl_autoload_unregister($function);
+        }
+
+        foreach ($functions as $function) {
+            if (is_array($function) && !$function[0] instanceof self && method_exists($function[0], 'findFile')) {
+                $function = array(new static($function[0]), 'loadClass');
+            }
+
+            spl_autoload_register($function);
+        }
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Finds a file by class name
+     *
+     * @param string $class A class name to resolve to file
+     *
+     * @return string|null
+     */
+    public function findFile($class)
+    {
+        return $this->classFinder->findFile($class);
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $class The name of the class
+     *
+     * @return Boolean|null True, if loaded
+     *
+     * @throws \RuntimeException
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->classFinder->findFile($class)) {
+            require $file;
+
+            if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
+                if (false !== strpos($class, '/')) {
+                    throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
+                }
+
+                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..96c6290fc23093ce0a7b7c3f381269c6efa63bb9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * Checks that the class is actually declared in the included file.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DebugUniversalClassLoader extends UniversalClassLoader
+{
+    /**
+     * Replaces all regular UniversalClassLoader instances by a DebugUniversalClassLoader ones.
+     */
+    public static function enable()
+    {
+        if (!is_array($functions = spl_autoload_functions())) {
+            return;
+        }
+
+        foreach ($functions as $function) {
+            spl_autoload_unregister($function);
+        }
+
+        foreach ($functions as $function) {
+            if (is_array($function) && $function[0] instanceof UniversalClassLoader) {
+                $loader = new static();
+                $loader->registerNamespaceFallbacks($function[0]->getNamespaceFallbacks());
+                $loader->registerPrefixFallbacks($function[0]->getPrefixFallbacks());
+                $loader->registerNamespaces($function[0]->getNamespaces());
+                $loader->registerPrefixes($function[0]->getPrefixes());
+                $loader->useIncludePath($function[0]->getUseIncludePath());
+
+                $function[0] = $loader;
+            }
+
+            spl_autoload_register($function);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            require $file;
+
+            if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
+                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/MapClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/MapClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..82010a77aebba261e947e66c4e080b5553828c87
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/MapClassLoader.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * A class loader that uses a mapping file to look up paths.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class MapClassLoader
+{
+    private $map = array();
+
+    /**
+     * Constructor.
+     *
+     * @param array $map A map where keys are classes and values the absolute file path
+     */
+    public function __construct(array $map)
+    {
+        $this->map = $map;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param Boolean $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $class The name of the class
+     */
+    public function loadClass($class)
+    {
+        if (isset($this->map[$class])) {
+            require $this->map[$class];
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|null The path, if found
+     */
+    public function findFile($class)
+    {
+        if (isset($this->map[$class])) {
+            return $this->map[$class];
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a7acfd7167c482bb0dc2a911f8b7bacc79d0196
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
@@ -0,0 +1,192 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
+
+class ApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        if (!extension_loaded('apc')) {
+            $this->markTestSkipped('The apc extension is not available.');
+        }
+
+        if (!(ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {
+            $this->markTestSkipped('The apc extension is available, but not enabled.');
+        } else {
+            apc_clear_cache('user');
+        }
+    }
+
+    protected function tearDown()
+    {
+        if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
+            apc_clear_cache('user');
+        }
+    }
+
+    public function testConstructor()
+    {
+        $loader = new ApcUniversalClassLoader('test.prefix.');
+        $loader->registerNamespace('Apc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+
+        $this->assertEquals($loader->findFile('\Apc\Namespaced\FooBar'), apc_fetch('test.prefix.\Apc\Namespaced\FooBar'), '__construct() takes a prefix as its first argument');
+    }
+
+   /**
+    * @dataProvider getLoadClassTests
+    */
+   public function testLoadClass($className, $testClassName, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.');
+       $loader->registerNamespace('Apc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->registerPrefix('Apc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->loadClass($testClassName);
+       $this->assertTrue(class_exists($className), $message);
+   }
+
+   public function getLoadClassTests()
+   {
+       return array(
+           array('\\Apc\\Namespaced\\Foo', '\\Apc\\Namespaced\\Foo',   '->loadClass() loads Apc\Namespaced\Foo class'),
+           array('Apc_Pearlike_Foo',    'Apc_Pearlike_Foo',      '->loadClass() loads Apc_Pearlike_Foo class'),
+           array('\\Apc\\Namespaced\\Bar', '\\Apc\\Namespaced\\Bar', '->loadClass() loads Apc\Namespaced\Bar class with a leading slash'),
+           array('Apc_Pearlike_Bar',    '\\Apc_Pearlike_Bar',    '->loadClass() loads Apc_Pearlike_Bar class with a leading slash'),
+       );
+   }
+
+   /**
+    * @dataProvider getLoadClassFromFallbackTests
+    */
+   public function testLoadClassFromFallback($className, $testClassName, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.fallback');
+       $loader->registerNamespace('Apc\Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->registerPrefix('Apc_Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+       $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/fallback'));
+       $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/fallback'));
+       $loader->loadClass($testClassName);
+       $this->assertTrue(class_exists($className), $message);
+   }
+
+   public function getLoadClassFromFallbackTests()
+   {
+       return array(
+           array('\\Apc\\Namespaced\\Baz',    '\\Apc\\Namespaced\\Baz',    '->loadClass() loads Apc\Namespaced\Baz class'),
+           array('Apc_Pearlike_Baz',       'Apc_Pearlike_Baz',       '->loadClass() loads Apc_Pearlike_Baz class'),
+           array('\\Apc\\Namespaced\\FooBar', '\\Apc\\Namespaced\\FooBar', '->loadClass() loads Apc\Namespaced\Baz class from fallback dir'),
+           array('Apc_Pearlike_FooBar',    'Apc_Pearlike_FooBar',    '->loadClass() loads Apc_Pearlike_Baz class from fallback dir'),
+       );
+   }
+
+   /**
+    * @dataProvider getLoadClassNamespaceCollisionTests
+    */
+   public function testLoadClassNamespaceCollision($namespaces, $className, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.collision.');
+       $loader->registerNamespaces($namespaces);
+
+       $loader->loadClass($className);
+
+       $this->assertTrue(class_exists($className), $message);
+   }
+
+   public function getLoadClassNamespaceCollisionTests()
+   {
+       return array(
+           array(
+               array(
+                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+               ),
+               '\Apc\NamespaceCollision\A\Foo',
+               '->loadClass() loads NamespaceCollision\A\Foo from alpha.',
+           ),
+           array(
+               array(
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+               ),
+               '\Apc\NamespaceCollision\A\Bar',
+               '->loadClass() loads NamespaceCollision\A\Bar from alpha.',
+           ),
+           array(
+               array(
+                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+               ),
+               '\Apc\NamespaceCollision\A\B\Foo',
+               '->loadClass() loads NamespaceCollision\A\B\Foo from beta.',
+           ),
+           array(
+               array(
+                   'Apc\\NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta',
+                   'Apc\\NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha',
+               ),
+               '\Apc\NamespaceCollision\A\B\Bar',
+               '->loadClass() loads NamespaceCollision\A\B\Bar from beta.',
+           ),
+       );
+   }
+
+   /**
+    * @dataProvider getLoadClassPrefixCollisionTests
+    */
+   public function testLoadClassPrefixCollision($prefixes, $className, $message)
+   {
+       $loader = new ApcUniversalClassLoader('test.prefix.collision.');
+       $loader->registerPrefixes($prefixes);
+
+       $loader->loadClass($className);
+       $this->assertTrue(class_exists($className), $message);
+   }
+
+   public function getLoadClassPrefixCollisionTests()
+   {
+       return array(
+           array(
+               array(
+                   'ApcPrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+                   'ApcPrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+               ),
+               'ApcPrefixCollision_A_Foo',
+               '->loadClass() loads ApcPrefixCollision_A_Foo from alpha.',
+           ),
+           array(
+               array(
+                   'ApcPrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+                   'ApcPrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+               ),
+               'ApcPrefixCollision_A_Bar',
+               '->loadClass() loads ApcPrefixCollision_A_Bar from alpha.',
+           ),
+           array(
+               array(
+                   'ApcPrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+                   'ApcPrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+               ),
+               'ApcPrefixCollision_A_B_Foo',
+               '->loadClass() loads ApcPrefixCollision_A_B_Foo from beta.',
+           ),
+           array(
+               array(
+                   'ApcPrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/beta/Apc',
+                   'ApcPrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/Apc/alpha/Apc',
+               ),
+               'ApcPrefixCollision_A_B_Bar',
+               '->loadClass() loads ApcPrefixCollision_A_B_Bar from beta.',
+           ),
+       );
+   }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..dfa51e37fed1335d881d0ccaa60f61cedb134a6a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
@@ -0,0 +1,260 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\ClassCollectionLoader;
+
+require_once __DIR__.'/Fixtures/ClassesWithParents/GInterface.php';
+require_once __DIR__.'/Fixtures/ClassesWithParents/CInterface.php';
+require_once __DIR__.'/Fixtures/ClassesWithParents/B.php';
+require_once __DIR__.'/Fixtures/ClassesWithParents/A.php';
+
+class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testTraitDependencies()
+    {
+        if (version_compare(phpversion(), '5.4', '<')) {
+            $this->markTestSkipped('Requires PHP > 5.4');
+
+            return;
+        }
+
+        require_once __DIR__.'/Fixtures/deps/traits.php';
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', array('CTFoo'));
+
+        $this->assertEquals(
+            array('TD', 'TC', 'TB', 'TA', 'TZ', 'CTFoo'),
+            array_map(function ($class) { return $class->getName(); }, $ordered)
+        );
+
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', array('CTBar'));
+
+        $this->assertEquals(
+            array('TD', 'TZ', 'TC', 'TB', 'TA', 'CTBar'),
+            array_map(function ($class) { return $class->getName(); }, $ordered)
+        );
+    }
+
+    /**
+     * @dataProvider getDifferentOrders
+     */
+    public function testClassReordering(array $classes)
+    {
+        $expected = array(
+            'ClassesWithParents\\GInterface',
+            'ClassesWithParents\\CInterface',
+            'ClassesWithParents\\B',
+            'ClassesWithParents\\A',
+        );
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
+
+        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
+    }
+
+    public function getDifferentOrders()
+    {
+        return array(
+            array(array(
+                'ClassesWithParents\\A',
+                'ClassesWithParents\\CInterface',
+                'ClassesWithParents\\GInterface',
+                'ClassesWithParents\\B',
+            )),
+            array(array(
+                'ClassesWithParents\\B',
+                'ClassesWithParents\\A',
+                'ClassesWithParents\\CInterface',
+            )),
+            array(array(
+                'ClassesWithParents\\CInterface',
+                'ClassesWithParents\\B',
+                'ClassesWithParents\\A',
+            )),
+            array(array(
+                'ClassesWithParents\\A',
+            )),
+        );
+    }
+
+    /**
+     * @dataProvider getDifferentOrdersForTraits
+     */
+    public function testClassWithTraitsReordering(array $classes)
+    {
+        if (version_compare(phpversion(), '5.4', '<')) {
+            $this->markTestSkipped('Requires PHP > 5.4');
+
+            return;
+        }
+
+        require_once __DIR__.'/Fixtures/ClassesWithParents/ATrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/BTrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/CTrait.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/D.php';
+        require_once __DIR__.'/Fixtures/ClassesWithParents/E.php';
+
+        $expected = array(
+            'ClassesWithParents\\GInterface',
+            'ClassesWithParents\\CInterface',
+            'ClassesWithParents\\ATrait',
+            'ClassesWithParents\\BTrait',
+            'ClassesWithParents\\CTrait',
+            'ClassesWithParents\\B',
+            'ClassesWithParents\\A',
+            'ClassesWithParents\\D',
+            'ClassesWithParents\\E',
+        );
+
+        $r = new \ReflectionClass('Symfony\Component\ClassLoader\ClassCollectionLoader');
+        $m = $r->getMethod('getOrderedClasses');
+        $m->setAccessible(true);
+
+        $ordered = $m->invoke('Symfony\Component\ClassLoader\ClassCollectionLoader', $classes);
+
+        $this->assertEquals($expected, array_map(function ($class) { return $class->getName(); }, $ordered));
+    }
+
+    public function getDifferentOrdersForTraits()
+    {
+        return array(
+            array(array(
+                'ClassesWithParents\\E',
+                'ClassesWithParents\\ATrait',
+            )),
+            array(array(
+                'ClassesWithParents\\E',
+            )),
+        );
+    }
+
+    /**
+     * @dataProvider getFixNamespaceDeclarationsData
+     */
+    public function testFixNamespaceDeclarations($source, $expected)
+    {
+        $this->assertEquals('<?php '.$expected, ClassCollectionLoader::fixNamespaceDeclarations('<?php '.$source));
+    }
+
+    public function getFixNamespaceDeclarationsData()
+    {
+        return array(
+            array("namespace;\nclass Foo {}\n", "namespace\n{\nclass Foo {}\n}"),
+            array("namespace Foo;\nclass Foo {}\n", "namespace Foo\n{\nclass Foo {}\n}"),
+            array("namespace   Bar ;\nclass Foo {}\n", "namespace Bar\n{\nclass Foo {}\n}"),
+            array("namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}"),
+            array("namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}"),
+            array("namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}"),
+        );
+    }
+
+    /**
+     * @dataProvider getFixNamespaceDeclarationsDataWithoutTokenizer
+     */
+    public function testFixNamespaceDeclarationsWithoutTokenizer($source, $expected)
+    {
+        ClassCollectionLoader::enableTokenizer(false);
+        $this->assertEquals('<?php '.$expected, ClassCollectionLoader::fixNamespaceDeclarations('<?php '.$source));
+        ClassCollectionLoader::enableTokenizer(true);
+    }
+
+    public function getFixNamespaceDeclarationsDataWithoutTokenizer()
+    {
+        return array(
+            array("namespace;\nclass Foo {}\n", "namespace\n{\nclass Foo {}\n}\n"),
+            array("namespace Foo;\nclass Foo {}\n", "namespace Foo\n{\nclass Foo {}\n}\n"),
+            array("namespace   Bar ;\nclass Foo {}\n", "namespace   Bar\n{\nclass Foo {}\n}\n"),
+            array("namespace Foo\Bar;\nclass Foo {}\n", "namespace Foo\Bar\n{\nclass Foo {}\n}\n"),
+            array("namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n", "namespace Foo\Bar\Bar\n{\nclass Foo {}\n}\n"),
+            array("namespace\n{\nclass Foo {}\n}\n", "namespace\n{\nclass Foo {}\n}\n"),
+        );
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testUnableToLoadClassException()
+    {
+        if (is_file($file = sys_get_temp_dir().'/foo.php')) {
+            unlink($file);
+        }
+
+        ClassCollectionLoader::load(array('SomeNotExistingClass'), sys_get_temp_dir(), 'foo', false);
+    }
+
+    public function testCommentStripping()
+    {
+        if (is_file($file = sys_get_temp_dir().'/bar.php')) {
+            unlink($file);
+        }
+        spl_autoload_register($r = function ($class) {
+            if (0 === strpos($class, 'Namespaced') || 0 === strpos($class, 'Pearlike_')) {
+                require_once __DIR__.'/Fixtures/'.str_replace(array('\\', '_'), '/', $class).'.php';
+            }
+        });
+
+        ClassCollectionLoader::load(
+            array('Namespaced\\WithComments', 'Pearlike_WithComments'),
+            sys_get_temp_dir(),
+            'bar',
+            false
+        );
+
+        spl_autoload_unregister($r);
+
+        $this->assertEquals(<<<EOF
+namespace Namespaced
+{
+class WithComments
+{
+public static \$loaded = true;
+}
+\$string ='string shoult not be   modified {\$string}';
+\$heredoc = (<<<HD
+
+
+Heredoc should not be   modified {\$string}
+
+
+HD
+);
+\$nowdoc =<<<'ND'
+
+
+Nowdoc should not be   modified {\$string}
+
+
+ND
+;
+}
+namespace
+{
+class Pearlike_WithComments
+{
+public static \$loaded = true;
+}
+}
+EOF
+        , str_replace("<?php \n", '', file_get_contents($file)));
+
+        unlink($file);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9dae537442f5455f234be5b5ae797fa16fb8979f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
@@ -0,0 +1,212 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\ClassLoader;
+
+class ClassLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetPrefixes()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Foo', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Bar', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Bas', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertArrayNotHasKey('Foo1', $prefixes);
+        $this->assertArrayHasKey('Bar', $prefixes);
+        $this->assertArrayHasKey('Bas', $prefixes);
+    }
+
+    public function testGetFallbackDirs()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix(null, __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix(null, __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $fallback_dirs = $loader->getFallbackDirs();
+        $this->assertCount(2, $fallback_dirs);
+    }
+
+    /**
+     * @dataProvider getLoadClassTests
+     */
+    public function testLoadClass($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Namespaced2\\', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Pearlike2_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->loadClass($testClassName);
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassTests()
+    {
+        return array(
+            array('\\Namespaced2\\Foo', 'Namespaced2\\Foo',   '->loadClass() loads Namespaced2\Foo class'),
+            array('\\Pearlike2_Foo',    'Pearlike2_Foo',      '->loadClass() loads Pearlike2_Foo class'),
+        );
+    }
+
+    /**
+     * @dataProvider getLoadNonexistentClassTests
+     */
+    public function testLoadNonexistentClass($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Namespaced2\\', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Pearlike2_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->loadClass($testClassName);
+        $this->assertFalse(class_exists($className), $message);
+    }
+
+    public function getLoadNonexistentClassTests()
+    {
+        return array(
+            array('\\Pearlike3_Bar', '\\Pearlike3_Bar', '->loadClass() loads non exising Pearlike3_Bar class with a leading slash'),
+        );
+    }
+
+    public function testAddPrefix()
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Foo', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Foo', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertCount(2, $prefixes['Foo']);
+    }
+
+    public function testUseIncludePath()
+    {
+        $loader = new ClassLoader();
+        $this->assertFalse($loader->getUseIncludePath());
+
+        $this->assertNull($loader->findFile('Foo'));
+
+        $includePath = get_include_path();
+
+        $loader->setUseIncludePath(true);
+        $this->assertTrue($loader->getUseIncludePath());
+
+        set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
+
+        $this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'includepath'.DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));
+
+        set_include_path($includePath);
+    }
+
+    /**
+     * @dataProvider getLoadClassFromFallbackTests
+     */
+    public function testLoadClassFromFallback($className, $testClassName, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefix('Namespaced2\\', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('Pearlike2_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->addPrefix('', array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'));
+        $loader->loadClass($testClassName);
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassFromFallbackTests()
+    {
+        return array(
+            array('\\Namespaced2\\Baz',    'Namespaced2\\Baz',    '->loadClass() loads Namespaced2\Baz class'),
+            array('\\Pearlike2_Baz',       'Pearlike2_Baz',       '->loadClass() loads Pearlike2_Baz class'),
+            array('\\Namespaced2\\FooBar', 'Namespaced2\\FooBar', '->loadClass() loads Namespaced2\Baz class from fallback dir'),
+            array('\\Pearlike2_FooBar',    'Pearlike2_FooBar',    '->loadClass() loads Pearlike2_Baz class from fallback dir'),
+        );
+    }
+
+    /**
+     * @dataProvider getLoadClassNamespaceCollisionTests
+     */
+    public function testLoadClassNamespaceCollision($namespaces, $className, $message)
+    {
+        $loader = new ClassLoader();
+        $loader->addPrefixes($namespaces);
+
+        $loader->loadClass($className);
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassNamespaceCollisionTests()
+    {
+        return array(
+            array(
+                array(
+                    'NamespaceCollision\\C' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'NamespaceCollision\\C\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'NamespaceCollision\C\Foo',
+                '->loadClass() loads NamespaceCollision\C\Foo from alpha.',
+            ),
+            array(
+                array(
+                    'NamespaceCollision\\C\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'NamespaceCollision\\C' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'NamespaceCollision\C\Bar',
+                '->loadClass() loads NamespaceCollision\C\Bar from alpha.',
+            ),
+            array(
+                array(
+                    'NamespaceCollision\\C' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'NamespaceCollision\\C\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'NamespaceCollision\C\B\Foo',
+                '->loadClass() loads NamespaceCollision\C\B\Foo from beta.',
+            ),
+            array(
+                array(
+                    'NamespaceCollision\\C\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'NamespaceCollision\\C' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'NamespaceCollision\C\B\Bar',
+                '->loadClass() loads NamespaceCollision\C\B\Bar from beta.',
+            ),
+            array(
+                array(
+                    'PrefixCollision_C_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'PrefixCollision_C_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'PrefixCollision_C_Foo',
+                '->loadClass() loads PrefixCollision_C_Foo from alpha.',
+            ),
+            array(
+                array(
+                    'PrefixCollision_C_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'PrefixCollision_C_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'PrefixCollision_C_Bar',
+                '->loadClass() loads PrefixCollision_C_Bar from alpha.',
+            ),
+            array(
+                array(
+                    'PrefixCollision_C_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'PrefixCollision_C_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'PrefixCollision_C_B_Foo',
+                '->loadClass() loads PrefixCollision_C_B_Foo from beta.',
+            ),
+            array(
+                array(
+                    'PrefixCollision_C_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'PrefixCollision_C_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'PrefixCollision_C_B_Bar',
+                '->loadClass() loads PrefixCollision_C_B_Bar from beta.',
+            ),
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..18f64f75887ef749a2b08f3c048e6e617700bafb
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -0,0 +1,148 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\ClassMapGenerator;
+
+class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var string $workspace
+     */
+    private $workspace = null;
+
+    public function prepare_workspace()
+    {
+        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
+        mkdir($this->workspace, 0777, true);
+        $this->workspace = realpath($this->workspace);
+    }
+
+    /**
+     * @param string $file
+     */
+    private function clean($file)
+    {
+        if (is_dir($file) && !is_link($file)) {
+            $dir = new \FilesystemIterator($file);
+            foreach ($dir as $childFile) {
+                $this->clean($childFile);
+            }
+
+            rmdir($file);
+        } else {
+            unlink($file);
+        }
+    }
+
+    /**
+     * @dataProvider getTestCreateMapTests
+     */
+    public function testDump($directory, $expected)
+    {
+        $this->prepare_workspace();
+
+        $file = $this->workspace.'/file';
+
+        $generator = new ClassMapGenerator();
+        $generator->dump($directory, $file);
+        $this->assertFileExists($file);
+
+        $this->clean($this->workspace);
+    }
+
+    /**
+     * @dataProvider getTestCreateMapTests
+     */
+    public function testCreateMap($directory, $expected)
+    {
+        $this->assertEqualsNormalized($expected, ClassMapGenerator::createMap($directory));
+    }
+
+    public function getTestCreateMapTests()
+    {
+        $data = array(
+            array(__DIR__.'/Fixtures/Namespaced', array(
+                'Namespaced\\Bar'          => realpath(__DIR__).'/Fixtures/Namespaced/Bar.php',
+                'Namespaced\\Foo'          => realpath(__DIR__).'/Fixtures/Namespaced/Foo.php',
+                'Namespaced\\Baz'          => realpath(__DIR__).'/Fixtures/Namespaced/Baz.php',
+                'Namespaced\\WithComments' => realpath(__DIR__).'/Fixtures/Namespaced/WithComments.php',
+                )
+            ),
+            array(__DIR__.'/Fixtures/beta/NamespaceCollision', array(
+                'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',
+                'NamespaceCollision\\A\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Foo.php',
+                'NamespaceCollision\\C\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Bar.php',
+                'NamespaceCollision\\C\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Foo.php',
+            )),
+            array(__DIR__.'/Fixtures/Pearlike', array(
+                'Pearlike_Foo'          => realpath(__DIR__).'/Fixtures/Pearlike/Foo.php',
+                'Pearlike_Bar'          => realpath(__DIR__).'/Fixtures/Pearlike/Bar.php',
+                'Pearlike_Baz'          => realpath(__DIR__).'/Fixtures/Pearlike/Baz.php',
+                'Pearlike_WithComments' => realpath(__DIR__).'/Fixtures/Pearlike/WithComments.php',
+            )),
+            array(__DIR__.'/Fixtures/classmap', array(
+                'Foo\\Bar\\A'             => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
+                'Foo\\Bar\\B'             => realpath(__DIR__).'/Fixtures/classmap/sameNsMultipleClasses.php',
+                'A'                       => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Alpha\\A'                => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Alpha\\B'                => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Beta\\A'                 => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'Beta\\B'                 => realpath(__DIR__).'/Fixtures/classmap/multipleNs.php',
+                'ClassMap\\SomeInterface' => realpath(__DIR__).'/Fixtures/classmap/SomeInterface.php',
+                'ClassMap\\SomeParent'    => realpath(__DIR__).'/Fixtures/classmap/SomeParent.php',
+                'ClassMap\\SomeClass'     => realpath(__DIR__).'/Fixtures/classmap/SomeClass.php',
+            )),
+        );
+
+        if (version_compare(PHP_VERSION, '5.4', '>=')) {
+            $data[] = array(__DIR__.'/Fixtures/php5.4', array(
+                'TFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'CFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\TBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\IBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\TFooBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+                'Foo\\CBar' => __DIR__.'/Fixtures/php5.4/traits.php',
+            ));
+        }
+
+        return $data;
+    }
+
+    public function testCreateMapFinderSupport()
+    {
+        if (!class_exists('Symfony\\Component\\Finder\\Finder')) {
+            $this->markTestSkipped('Finder component is not available');
+        }
+
+        $finder = new \Symfony\Component\Finder\Finder();
+        $finder->files()->in(__DIR__.'/Fixtures/beta/NamespaceCollision');
+
+        $this->assertEqualsNormalized(array(
+            'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',
+            'NamespaceCollision\\A\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Foo.php',
+            'NamespaceCollision\\C\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Bar.php',
+            'NamespaceCollision\\C\\B\\Foo' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/C/B/Foo.php',
+        ), ClassMapGenerator::createMap($finder));
+    }
+
+    protected function assertEqualsNormalized($expected, $actual, $message = null)
+    {
+        foreach ($expected as $ns => $path) {
+            $expected[$ns] = strtr($path, '\\', '/');
+        }
+        foreach ($actual as $ns => $path) {
+            $actual[$ns] = strtr($path, '\\', '/');
+        }
+        $this->assertEquals($expected, $actual, $message);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..873515c3369f594a814363d3b7aed6ecabaa4bd8
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\ClassLoader;
+use Symfony\Component\ClassLoader\DebugClassLoader;
+
+class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    private $loader;
+
+    protected function setUp()
+    {
+        $this->loader = new ClassLoader();
+        spl_autoload_register(array($this->loader, 'loadClass'));
+    }
+
+    protected function tearDown()
+    {
+        spl_autoload_unregister(array($this->loader, 'loadClass'));
+    }
+
+    public function testIdempotence()
+    {
+        DebugClassLoader::enable();
+        DebugClassLoader::enable();
+
+        $functions = spl_autoload_functions();
+        foreach ($functions as $function) {
+            if (is_array($function) && $function[0] instanceof DebugClassLoader) {
+                $reflClass = new \ReflectionClass($function[0]);
+                $reflProp = $reflClass->getProperty('classFinder');
+                $reflProp->setAccessible(true);
+
+                $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $reflProp->getValue($function[0]));
+
+                return;
+            }
+        }
+
+        throw new \Exception('DebugClassLoader did not register');
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..4259f1451e2c94a5ebb93b72a324a6396d404aa2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Baz.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Baz.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ddb595e25164aee4320aba4744617499bd828e9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Baz.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class Baz
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf0a4b741fd9f382496887df284b6265a0b1051b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/FooBar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/FooBar.php
new file mode 100644
index 0000000000000000000000000000000000000000..bbbc81515a80fbc50eaa9a53f7df596b537d1a6e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced/FooBar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..e774cb9bfbbae3adb49f2b4466dbd1dd20ea4c9c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Baz.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Baz.php
new file mode 100644
index 0000000000000000000000000000000000000000..b2847443124f9dcc6a76bff99e9a0dee59ad18fc
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Baz.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_Baz
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..3cf8aa8097e78095890e63c32ca16ec640427823
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..3df50fab5a9df0d6e1a41fdeb2ef3d6e590ee793
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..206c9f8e6730cd45caf7c587108425859abdbc81
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a4f73ee02ef01669895588d8eae69b389d12065
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..184a1b1daf159f5c158f7e617cddaefbd1c1c501
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..3892f70683debf2b598b3f84f3b0d05c475b1a91
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_B_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..62e749f75741b87205acbdd0f4dbf65baacb2522
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class ApcPrefixCollision_A_B_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..e406a69e8fe6e87998ff023ecec0ef6adbeda211
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A\B;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..450eeb50b9e347401cdca4080f01a935ecfc5538
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\NamespaceCollision\A\B;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php
new file mode 100644
index 0000000000000000000000000000000000000000..96f2f76c6f94d938aa5855b7e42384b391b3800a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Apc/Pearlike/FooBar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Apc_Pearlike_FooBar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php
new file mode 100644
index 0000000000000000000000000000000000000000..bbbc81515a80fbc50eaa9a53f7df596b537d1a6e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Namespaced/FooBar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Apc\Namespaced;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/A.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/A.php
new file mode 100644
index 0000000000000000000000000000000000000000..dff891dcb79a6dca068c1aa8ad58127c114ada61
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/A.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace ClassesWithParents;
+
+class A extends B {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/ATrait.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/ATrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..b02d1859bcbf848f004b5cd7f155644774c32fb1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/ATrait.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+trait ATrait
+{
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/B.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/B.php
new file mode 100644
index 0000000000000000000000000000000000000000..196bf7a2d31b44c39beac08177ee882a3716b750
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/B.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace ClassesWithParents;
+
+class B implements CInterface {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/BTrait.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/BTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..7242a9f1f2e055ff2bbe52bc5ba76c104e9549d5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/BTrait.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+trait BTrait
+{
+    use ATrait;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..8eec389be46ebd74ce86f94847555fd2156b7dd6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+interface CInterface extends GInterface
+{
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CTrait.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..110c624965fef800b0c12ae34b214f51e1d77089
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CTrait.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+trait CTrait
+{
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/D.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/D.php
new file mode 100644
index 0000000000000000000000000000000000000000..28514d73758f5e7ee2bd1c9a682419caec94b651
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/D.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class D extends A
+{
+    use BTrait;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/E.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/E.php
new file mode 100644
index 0000000000000000000000000000000000000000..6dc603589834dbd99ce92189dce4fa5a780f676d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/E.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ClassesWithParents;
+
+class E extends D
+{
+    use CTrait;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/GInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/GInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..208a19d6d80f506290c499a5dbf8e2db1d37b957
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/GInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+interface GInterface
+{
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..02b589d27faeeb9e4806085bb9e8bb4b6161c310
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Baz.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Baz.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b0bbd057c44acdb378fcfb859b6a91094013933
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Baz.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class Baz
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..df5e1f4ce2ec33878192110f1c4bc8fd57393d26
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithComments.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithComments.php
new file mode 100644
index 0000000000000000000000000000000000000000..53d520031e3ae83106463c411d784b52391e06b0
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithComments.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class WithComments
+{
+    /** @Boolean */
+    public static $loaded = true;
+}
+
+$string = 'string shoult not be   modified {$string}';
+
+$heredoc = (<<<HD
+
+
+Heredoc should not be   modified {$string}
+
+
+HD
+);
+
+$nowdoc = <<<'ND'
+
+
+Nowdoc should not be   modified {$string}
+
+
+ND;
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..7bf42ab1b95c54d356efd17b7022187c0dc828ac
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Bar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Baz.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Baz.php
new file mode 100644
index 0000000000000000000000000000000000000000..fed3e01d67bcb418870dacdccd74539e4c016db4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Baz.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class Baz
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d7452a64361ede7204c8f877897dd8f32ecc17d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2/Foo.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..63661695b06f36c07418d6efe98a683fd980cb2b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Baz.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Baz.php
new file mode 100644
index 0000000000000000000000000000000000000000..3aa8367557bae67df3199bcaedfe731628ae7daf
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Baz.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_Baz
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..c51b1569cbdc5c9d83e3f4cf4224fb8ede1fcd9a
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/WithComments.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/WithComments.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0fd2060d3da6f2f3bce2080931aae929e9f73bd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike/WithComments.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class Pearlike_WithComments
+{
+    /** @Boolean */
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f5f7977308b7f0217e930c39c15e441df3fe2c4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Baz.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Baz.php
new file mode 100644
index 0000000000000000000000000000000000000000..8317a0efd83996d81436cbd97a087508a7ff9dc3
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Baz.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_Baz
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f62ca480fbb8b29a4a7983c31763e3bf4f2b980
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..b8d1a1399f82ee501f4abbe9b880880e2191c883
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..aee6a080dfb76041a0b0bfcb8b83a7b5d5b76efd
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..c1b8dd65ddfa319b946d4f20c3a8670b9e9dcf30
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Bar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fffbbacf256916dc8a1bc582ded3086f9aaec28
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C/Foo.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..676daadd2bd1cc388580f08e74d4ea54e9fcac60
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..44388be7c62a6a881d0d3767cf47ada43a83dec1
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..0bbc3684af0196419b7968752567727bb361ec7c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..73f4ac4c31d3621a98f5896f2845e6f4a9fe9319
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f0915571a519f2ffb88ee812d353bf4510b6eae
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B/Bar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A\B;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..f5f2d727ef5e6be849e3882c19dc42fe75b6475e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B/Foo.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace NamespaceCollision\A\B;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C/B/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C/B/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..4bb03dc7fd65a921b31b741977c255f79a85fe44
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C/B/Bar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C\B;
+
+class Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C/B/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C/B/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..195d88875829230d90f2595bb7c7b66ff884a43b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C/B/Foo.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace NamespaceCollision\C\B;
+
+class Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A/B/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A/B/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..f2682e4982b31fe380ae3bb1ffb713b75644d2a9
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A/B/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_B_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A/B/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A/B/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..af7ca704310787dfc17e0cb2455100d702e2f640
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A/B/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_A_B_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C/B/Bar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C/B/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..f313438494d170e7c4e540567984491f55ff2c57
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C/B/Bar.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_B_Bar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C/B/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C/B/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..a9bf820516cc00c612c9577f281ffa42f9cec166
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C/B/Foo.php
@@ -0,0 +1,6 @@
+<?php
+
+class PrefixCollision_C_B_Foo
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeClass.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..26fabbd96e2d29a45b81eec123e73e93764b463e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeClass.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassMap;
+
+class SomeClass extends SomeParent implements SomeInterface
+{
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..09d7a8f35a436f80dc8153e099057be01cc8f05d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassMap;
+
+interface SomeInterface
+{
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeParent.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeParent.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a859a94607fbf810d5546c248be5e027ece239d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/SomeParent.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ClassMap;
+
+abstract class SomeParent
+{
+
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/multipleNs.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/multipleNs.php
new file mode 100644
index 0000000000000000000000000000000000000000..d19e07fc11a5e50a9b0b0d39e1fbe57d97a024ce
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/multipleNs.php
@@ -0,0 +1,14 @@
+<?php
+namespace {
+    class A {}
+}
+
+namespace Alpha {
+    class A {}
+    class B {}
+}
+
+namespace Beta {
+    class A {}
+    class B {}
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/notAClass.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/notAClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..49eb3ff0528e313fa20673efea2da787318eb93f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/notAClass.php
@@ -0,0 +1,3 @@
+<?php
+
+$a = new stdClass();
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/sameNsMultipleClasses.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/sameNsMultipleClasses.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5ef5e5aa25716c24a1ca0b36c85c128fd5f7f27
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/classmap/sameNsMultipleClasses.php
@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Foo\Bar;
+
+class A {}
+class B {}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/deps/traits.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/deps/traits.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5537ac92fa82608f57f054b7453f560f4a6342f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/deps/traits.php
@@ -0,0 +1,36 @@
+<?php
+
+trait TD
+{}
+
+trait TZ
+{
+    use TD;
+}
+
+trait TC
+{
+    use TD;
+}
+
+trait TB
+{
+    use TC;
+}
+
+trait TA
+{
+    use TB;
+}
+
+class CTFoo
+{
+    use TA;
+    use TZ;
+}
+
+class CTBar
+{
+    use TZ;
+    use TA;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced/FooBar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced/FooBar.php
new file mode 100644
index 0000000000000000000000000000000000000000..0fd29efbb236beb688faf5dedef67ac1b292f05c
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced/FooBar.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Namespaced;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced2/FooBar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced2/FooBar.php
new file mode 100644
index 0000000000000000000000000000000000000000..1036d435900659e6a446b039f7c44d9264a5374e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced2/FooBar.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Namespaced2;
+
+class FooBar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike/FooBar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike/FooBar.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ebe5260b99fee9053670e56e69836350a4ebf76
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike/FooBar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike_FooBar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike2/FooBar.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike2/FooBar.php
new file mode 100644
index 0000000000000000000000000000000000000000..9bf0007aaeec89fbedcba520d3923577a3cf49f4
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike2/FooBar.php
@@ -0,0 +1,6 @@
+<?php
+
+class Pearlike2_FooBar
+{
+    public static $loaded = true;
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/includepath/Foo.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/includepath/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..a8f0bc75db9f49a34af2293a6330566d509b077b
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/includepath/Foo.php
@@ -0,0 +1,5 @@
+<?php
+
+class Foo
+{
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d92c378e1a41e7bb06bb11347cb7e6cfa5e6b0e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
@@ -0,0 +1,30 @@
+<?php
+namespace {
+    trait TFoo
+    {
+    }
+
+    class CFoo
+    {
+        use TFoo;
+    }
+}
+
+namespace Foo {
+    trait TBar
+    {
+    }
+
+    interface IBar
+    {
+    }
+
+    trait TFooBar
+    {
+    }
+
+    class CBar implements IBar
+    {
+        use TBar, TFooBar;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..6bd7e43621770ec685848e541f8ab97a5f7f912e
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php
@@ -0,0 +1,220 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\UniversalClassLoader;
+
+class UniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getLoadClassTests
+     */
+    public function testLoadClass($className, $testClassName, $message)
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $this->assertTrue($loader->loadClass($testClassName));
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassTests()
+    {
+        return array(
+            array('\\Namespaced\\Foo', 'Namespaced\\Foo',   '->loadClass() loads Namespaced\Foo class'),
+            array('\\Pearlike_Foo',    'Pearlike_Foo',      '->loadClass() loads Pearlike_Foo class'),
+        );
+    }
+
+    public function testUseIncludePath()
+    {
+        $loader = new UniversalClassLoader();
+        $this->assertFalse($loader->getUseIncludePath());
+
+        $this->assertNull($loader->findFile('Foo'));
+
+        $includePath = get_include_path();
+
+        $loader->useIncludePath(true);
+        $this->assertTrue($loader->getUseIncludePath());
+
+        set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
+
+        $this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'includepath'.DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));
+
+        set_include_path($includePath);
+    }
+
+    public function testGetNamespaces()
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerNamespace('Foo', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->registerNamespace('Bar', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->registerNamespace('Bas', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $namespaces = $loader->getNamespaces();
+        $this->assertArrayHasKey('Foo', $namespaces);
+        $this->assertArrayNotHasKey('Foo1', $namespaces);
+        $this->assertArrayHasKey('Bar', $namespaces);
+        $this->assertArrayHasKey('Bas', $namespaces);
+    }
+
+    public function testGetPrefixes()
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerPrefix('Foo', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->registerPrefix('Bar', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->registerPrefix('Bas', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $prefixes = $loader->getPrefixes();
+        $this->assertArrayHasKey('Foo', $prefixes);
+        $this->assertArrayNotHasKey('Foo1', $prefixes);
+        $this->assertArrayHasKey('Bar', $prefixes);
+        $this->assertArrayHasKey('Bas', $prefixes);
+    }
+
+    /**
+     * @dataProvider getLoadClassFromFallbackTests
+     */
+    public function testLoadClassFromFallback($className, $testClassName, $message)
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
+        $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'));
+        $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'));
+        $this->assertTrue($loader->loadClass($testClassName));
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassFromFallbackTests()
+    {
+        return array(
+            array('\\Namespaced\\Baz',    'Namespaced\\Baz',    '->loadClass() loads Namespaced\Baz class'),
+            array('\\Pearlike_Baz',       'Pearlike_Baz',       '->loadClass() loads Pearlike_Baz class'),
+            array('\\Namespaced\\FooBar', 'Namespaced\\FooBar', '->loadClass() loads Namespaced\Baz class from fallback dir'),
+            array('\\Pearlike_FooBar',    'Pearlike_FooBar',    '->loadClass() loads Pearlike_Baz class from fallback dir'),
+        );
+    }
+
+    public function testRegisterPrefixFallback()
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerPrefixFallback(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback');
+        $this->assertEquals(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'), $loader->getPrefixFallbacks());
+    }
+
+    public function testRegisterNamespaceFallback()
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerNamespaceFallback(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/Namespaced/fallback');
+        $this->assertEquals(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/Namespaced/fallback'), $loader->getNamespaceFallbacks());
+    }
+
+    /**
+     * @dataProvider getLoadClassNamespaceCollisionTests
+     */
+    public function testLoadClassNamespaceCollision($namespaces, $className, $message)
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerNamespaces($namespaces);
+
+        $this->assertTrue($loader->loadClass($className));
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassNamespaceCollisionTests()
+    {
+        return array(
+            array(
+                array(
+                    'NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'NamespaceCollision\A\Foo',
+                '->loadClass() loads NamespaceCollision\A\Foo from alpha.',
+            ),
+            array(
+                array(
+                    'NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'NamespaceCollision\A\Bar',
+                '->loadClass() loads NamespaceCollision\A\Bar from alpha.',
+            ),
+            array(
+                array(
+                    'NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'NamespaceCollision\A\B\Foo',
+                '->loadClass() loads NamespaceCollision\A\B\Foo from beta.',
+            ),
+            array(
+                array(
+                    'NamespaceCollision\\A\\B' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'NamespaceCollision\\A' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'NamespaceCollision\A\B\Bar',
+                '->loadClass() loads NamespaceCollision\A\B\Bar from beta.',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider getLoadClassPrefixCollisionTests
+     */
+    public function testLoadClassPrefixCollision($prefixes, $className, $message)
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerPrefixes($prefixes);
+
+        $this->assertTrue($loader->loadClass($className));
+        $this->assertTrue(class_exists($className), $message);
+    }
+
+    public function getLoadClassPrefixCollisionTests()
+    {
+        return array(
+            array(
+                array(
+                    'PrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'PrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'PrefixCollision_A_Foo',
+                '->loadClass() loads PrefixCollision_A_Foo from alpha.',
+            ),
+            array(
+                array(
+                    'PrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'PrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'PrefixCollision_A_Bar',
+                '->loadClass() loads PrefixCollision_A_Bar from alpha.',
+            ),
+            array(
+                array(
+                    'PrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                    'PrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                ),
+                'PrefixCollision_A_B_Foo',
+                '->loadClass() loads PrefixCollision_A_B_Foo from beta.',
+            ),
+            array(
+                array(
+                    'PrefixCollision_A_B_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/beta',
+                    'PrefixCollision_A_' => __DIR__.DIRECTORY_SEPARATOR.'Fixtures/alpha',
+                ),
+                'PrefixCollision_A_B_Bar',
+                '->loadClass() loads PrefixCollision_A_B_Bar from beta.',
+            ),
+        );
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/UniversalClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/UniversalClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..734af7430c59ff0a93157aeed0a128c60962cd37
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -0,0 +1,319 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * UniversalClassLoader implements a "universal" autoloader for PHP 5.3.
+ *
+ * It is able to load classes that use either:
+ *
+ *  * The technical interoperability standards for PHP 5.3 namespaces and
+ *    class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
+ *
+ *  * The PEAR naming convention for classes (http://pear.php.net/).
+ *
+ * Classes from a sub-namespace or a sub-hierarchy of PEAR classes can be
+ * looked for in a list of locations to ease the vendoring of a sub-set of
+ * classes for large projects.
+ *
+ * Example usage:
+ *
+ *     $loader = new UniversalClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->registerNamespaces(array(
+ *         'Symfony\Component' => __DIR__.'/component',
+ *         'Symfony'           => __DIR__.'/framework',
+ *         'Sensio'            => array(__DIR__.'/src', __DIR__.'/vendor'),
+ *     ));
+ *
+ *     // register a library using the PEAR naming convention
+ *     $loader->registerPrefixes(array(
+ *         'Swift_' => __DIR__.'/Swift',
+ *     ));
+ *
+ *
+ *     // to enable searching the include path (e.g. for PEAR packages)
+ *     $loader->useIncludePath(true);
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @api
+ */
+class UniversalClassLoader
+{
+    private $namespaces = array();
+    private $prefixes = array();
+    private $namespaceFallbacks = array();
+    private $prefixFallbacks = array();
+    private $useIncludePath = false;
+
+    /**
+     * Turns on searching the include for class files. Allows easy loading
+     * of installed PEAR packages
+     *
+     * @param Boolean $useIncludePath
+     */
+    public function useIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return Boolean
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Gets the configured namespaces.
+     *
+     * @return array A hash with namespaces as keys and directories as values
+     */
+    public function getNamespaces()
+    {
+        return $this->namespaces;
+    }
+
+    /**
+     * Gets the configured class prefixes.
+     *
+     * @return array A hash with class prefixes as keys and directories as values
+     */
+    public function getPrefixes()
+    {
+        return $this->prefixes;
+    }
+
+    /**
+     * Gets the directory(ies) to use as a fallback for namespaces.
+     *
+     * @return array An array of directories
+     */
+    public function getNamespaceFallbacks()
+    {
+        return $this->namespaceFallbacks;
+    }
+
+    /**
+     * Gets the directory(ies) to use as a fallback for class prefixes.
+     *
+     * @return array An array of directories
+     */
+    public function getPrefixFallbacks()
+    {
+        return $this->prefixFallbacks;
+    }
+
+    /**
+     * Registers the directory to use as a fallback for namespaces.
+     *
+     * @param array $dirs An array of directories
+     *
+     * @api
+     */
+    public function registerNamespaceFallbacks(array $dirs)
+    {
+        $this->namespaceFallbacks = $dirs;
+    }
+
+    /**
+     * Registers a directory to use as a fallback for namespaces.
+     *
+     * @param string $dir A directory
+     */
+    public function registerNamespaceFallback($dir)
+    {
+        $this->namespaceFallbacks[] = $dir;
+    }
+
+    /**
+     * Registers directories to use as a fallback for class prefixes.
+     *
+     * @param array $dirs An array of directories
+     *
+     * @api
+     */
+    public function registerPrefixFallbacks(array $dirs)
+    {
+        $this->prefixFallbacks = $dirs;
+    }
+
+    /**
+     * Registers a directory to use as a fallback for class prefixes.
+     *
+     * @param string $dir A directory
+     */
+    public function registerPrefixFallback($dir)
+    {
+        $this->prefixFallbacks[] = $dir;
+    }
+
+    /**
+     * Registers an array of namespaces
+     *
+     * @param array $namespaces An array of namespaces (namespaces as keys and locations as values)
+     *
+     * @api
+     */
+    public function registerNamespaces(array $namespaces)
+    {
+        foreach ($namespaces as $namespace => $locations) {
+            $this->namespaces[$namespace] = (array) $locations;
+        }
+    }
+
+    /**
+     * Registers a namespace.
+     *
+     * @param string       $namespace The namespace
+     * @param array|string $paths     The location(s) of the namespace
+     *
+     * @api
+     */
+    public function registerNamespace($namespace, $paths)
+    {
+        $this->namespaces[$namespace] = (array) $paths;
+    }
+
+    /**
+     * Registers an array of classes using the PEAR naming convention.
+     *
+     * @param array $classes An array of classes (prefixes as keys and locations as values)
+     *
+     * @api
+     */
+    public function registerPrefixes(array $classes)
+    {
+        foreach ($classes as $prefix => $locations) {
+            $this->prefixes[$prefix] = (array) $locations;
+        }
+    }
+
+    /**
+     * Registers a set of classes using the PEAR naming convention.
+     *
+     * @param string       $prefix The classes prefix
+     * @param array|string $paths  The location(s) of the classes
+     *
+     * @api
+     */
+    public function registerPrefix($prefix, $paths)
+    {
+        $this->prefixes[$prefix] = (array) $paths;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param Boolean $prepend Whether to prepend the autoloader or not
+     *
+     * @api
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $class The name of the class
+     *
+     * @return Boolean|null True, if loaded
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            require $file;
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|null The path, if found
+     */
+    public function findFile($class)
+    {
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $namespace = substr($class, 0, $pos);
+            $className = substr($class, $pos + 1);
+            $normalizedClass = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
+            foreach ($this->namespaces as $ns => $dirs) {
+                if (0 !== strpos($namespace, $ns)) {
+                    continue;
+                }
+
+                foreach ($dirs as $dir) {
+                    $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+                    if (is_file($file)) {
+                        return $file;
+                    }
+                }
+            }
+
+            foreach ($this->namespaceFallbacks as $dir) {
+                $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+                if (is_file($file)) {
+                    return $file;
+                }
+            }
+
+        } else {
+            // PEAR-like class name
+            $normalizedClass = str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
+            foreach ($this->prefixes as $prefix => $dirs) {
+                if (0 !== strpos($class, $prefix)) {
+                    continue;
+                }
+
+                foreach ($dirs as $dir) {
+                    $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+                    if (is_file($file)) {
+                        return $file;
+                    }
+                }
+            }
+
+            foreach ($this->prefixFallbacks as $dir) {
+                $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
+                if (is_file($file)) {
+                    return $file;
+                }
+            }
+        }
+
+        if ($this->useIncludePath && $file = stream_resolve_include_path($normalizedClass)) {
+            return $file;
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/WinCacheClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/WinCacheClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d09fa99f90571f4baa0d495157283281a47850f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/WinCacheClassLoader.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * WinCacheClassLoader implements a wrapping autoloader cached in WinCache.
+ *
+ * It expects an object implementing a findFile method to find the file. This
+ * allow using it as a wrapper around the other loaders of the component (the
+ * ClassLoader and the UniversalClassLoader for instance) but also around any
+ * other autoloader following this convention (the Composer one for instance)
+ *
+ *     $loader = new ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     $cachedLoader = new WinCacheClassLoader('my_prefix', $loader);
+ *
+ *     // activate the cached autoloader
+ *     $cachedLoader->register();
+ *
+ *     // eventually deactivate the non-cached loader if it was registered previously
+ *     // to be sure to use the cached one.
+ *     $loader->unregister();
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Kris Wallsmith <kris@symfony.com>
+ * @author Artem Ryzhkov <artem@smart-core.org>
+ */
+class WinCacheClassLoader
+{
+    private $prefix;
+
+    /**
+     * The class loader object being decorated.
+     *
+     * @var \Symfony\Component\ClassLoader\ClassLoader
+     *   A class loader object that implements the findFile() method.
+     */
+    protected $decorated;
+
+    /**
+     * Constructor.
+     *
+     * @param string $prefix      The WinCache namespace prefix to use.
+     * @param object $decorated   A class loader object that implements the findFile() method.
+     *
+     * @throws \RuntimeException
+     * @throws \InvalidArgumentException
+     */
+    public function __construct($prefix, $decorated)
+    {
+        if (!extension_loaded('wincache')) {
+            throw new \RuntimeException('Unable to use WinCacheClassLoader as WinCache is not enabled.');
+        }
+
+        if (!method_exists($decorated, 'findFile')) {
+            throw new \InvalidArgumentException('The class finder must implement a "findFile" method.');
+        }
+
+        $this->prefix = $prefix;
+        $this->decorated = $decorated;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param Boolean $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $class The name of the class
+     *
+     * @return Boolean|null True, if loaded
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            require $file;
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds a file by class name while caching lookups to WinCache.
+     *
+     * @param string $class A class name to resolve to file
+     *
+     * @return string|null
+     */
+    public function findFile($class)
+    {
+        if (false === $file = wincache_ucache_get($this->prefix.$class)) {
+            wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class), 0);
+        }
+
+        return $file;
+    }
+
+    /**
+     * Passes through all unknown calls onto the decorated object.
+     */
+    public function __call($method, $args)
+    {
+        return call_user_func_array(array($this->decorated, $method), $args);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/XcacheClassLoader.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/XcacheClassLoader.php
new file mode 100644
index 0000000000000000000000000000000000000000..31bb00684b6bb403b393c1afa270eb936a93c897
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/XcacheClassLoader.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader;
+
+/**
+ * XcacheClassLoader implements a wrapping autoloader cached in Xcache for PHP 5.3.
+ *
+ * It expects an object implementing a findFile method to find the file. This
+ * allows using it as a wrapper around the other loaders of the component (the
+ * ClassLoader and the UniversalClassLoader for instance) but also around any
+ * other autoloader following this convention (the Composer one for instance)
+ *
+ *     $loader = new ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     $cachedLoader = new XcacheClassLoader('my_prefix', $loader);
+ *
+ *     // activate the cached autoloader
+ *     $cachedLoader->register();
+ *
+ *     // eventually deactivate the non-cached loader if it was registered previously
+ *     // to be sure to use the cached one.
+ *     $loader->unregister();
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Kris Wallsmith <kris@symfony.com>
+ * @author Kim HemsÃ¸ Rasmussen <kimhemsoe@gmail.com>
+ *
+ * @api
+ */
+class XcacheClassLoader
+{
+    private $prefix;
+    private $classFinder;
+
+    /**
+     * Constructor.
+     *
+     * @param string $prefix      A prefix to create a namespace in Xcache
+     * @param object $classFinder An object that implements findFile() method.
+     *
+     * @throws \RuntimeException
+     * @throws \InvalidArgumentException
+     *
+     * @api
+     */
+    public function __construct($prefix, $classFinder)
+    {
+        if (!extension_loaded('Xcache')) {
+            throw new \RuntimeException('Unable to use XcacheClassLoader as Xcache is not enabled.');
+        }
+
+        if (!method_exists($classFinder, 'findFile')) {
+            throw new \InvalidArgumentException('The class finder must implement a "findFile" method.');
+        }
+
+        $this->prefix = $prefix;
+        $this->classFinder = $classFinder;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param Boolean $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param string $class The name of the class
+     *
+     * @return Boolean|null True, if loaded
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            require $file;
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds a file by class name while caching lookups to Xcache.
+     *
+     * @param string $class A class name to resolve to file
+     *
+     * @return string|null
+     */
+    public function findFile($class)
+    {
+        if (xcache_isset($this->prefix.$class)) {
+            $file = xcache_get($this->prefix.$class);
+        } else {
+            xcache_set($this->prefix.$class, $file = $this->classFinder->findFile($class));
+        }
+
+        return $file;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..9448ed43e932dbf9923e5311115f78e543a0ee4d
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -0,0 +1,202 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Lazily loads listeners and subscribers from the dependency injection
+ * container
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ * @author Jordan Alliot <jordan.alliot@gmail.com>
+ */
+class ContainerAwareEventDispatcher extends EventDispatcher
+{
+    /**
+     * The container from where services are loaded
+     * @var ContainerInterface
+     */
+    private $container;
+
+    /**
+     * The service IDs of the event listeners and subscribers
+     * @var array
+     */
+    private $listenerIds = array();
+
+    /**
+     * The services registered as listeners
+     * @var array
+     */
+    private $listeners = array();
+
+    /**
+     * Constructor.
+     *
+     * @param ContainerInterface $container A ContainerInterface instance
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Adds a service as event listener
+     *
+     * @param string $eventName Event for which the listener is added
+     * @param array  $callback  The service ID of the listener service & the method
+     *                            name that has to be called
+     * @param integer $priority The higher this value, the earlier an event listener
+     *                            will be triggered in the chain.
+     *                            Defaults to 0.
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addListenerService($eventName, $callback, $priority = 0)
+    {
+        if (!is_array($callback) || 2 !== count($callback)) {
+            throw new \InvalidArgumentException('Expected an array("service", "method") argument');
+        }
+
+        $this->listenerIds[$eventName][] = array($callback[0], $callback[1], $priority);
+    }
+
+    public function removeListener($eventName, $listener)
+    {
+        $this->lazyLoad($eventName);
+
+        if (isset($this->listeners[$eventName])) {
+            foreach ($this->listeners[$eventName] as $key => $l) {
+                foreach ($this->listenerIds[$eventName] as $i => $args) {
+                    list($serviceId, $method, $priority) = $args;
+                    if ($key === $serviceId.'.'.$method) {
+                        if ($listener === array($l, $method)) {
+                            unset($this->listeners[$eventName][$key]);
+                            if (empty($this->listeners[$eventName])) {
+                                unset($this->listeners[$eventName]);
+                            }
+                            unset($this->listenerIds[$eventName][$i]);
+                            if (empty($this->listenerIds[$eventName])) {
+                                unset($this->listenerIds[$eventName]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        parent::removeListener($eventName, $listener);
+    }
+
+    /**
+     * @see EventDispatcherInterface::hasListeners
+     */
+    public function hasListeners($eventName = null)
+    {
+        if (null === $eventName) {
+            return (Boolean) count($this->listenerIds) || (Boolean) count($this->listeners);
+        }
+
+        if (isset($this->listenerIds[$eventName])) {
+            return true;
+        }
+
+        return parent::hasListeners($eventName);
+    }
+
+    /**
+     * @see EventDispatcherInterface::getListeners
+     */
+    public function getListeners($eventName = null)
+    {
+        if (null === $eventName) {
+            foreach (array_keys($this->listenerIds) as $serviceEventName) {
+                $this->lazyLoad($serviceEventName);
+            }
+        } else {
+            $this->lazyLoad($eventName);
+        }
+
+        return parent::getListeners($eventName);
+    }
+
+    /**
+     * Adds a service as event subscriber
+     *
+     * @param string $serviceId The service ID of the subscriber service
+     * @param string $class     The service's class name (which must implement EventSubscriberInterface)
+     */
+    public function addSubscriberService($serviceId, $class)
+    {
+        foreach ($class::getSubscribedEvents() as $eventName => $params) {
+            if (is_string($params)) {
+                $this->listenerIds[$eventName][] = array($serviceId, $params, 0);
+            } elseif (is_string($params[0])) {
+                $this->listenerIds[$eventName][] = array($serviceId, $params[0], isset($params[1]) ? $params[1] : 0);
+            } else {
+                foreach ($params as $listener) {
+                    $this->listenerIds[$eventName][] = array($serviceId, $listener[0], isset($listener[1]) ? $listener[1] : 0);
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Lazily loads listeners for this event from the dependency injection
+     * container.
+     *
+     * @throws \InvalidArgumentException if the service is not defined
+     */
+    public function dispatch($eventName, Event $event = null)
+    {
+        $this->lazyLoad($eventName);
+
+        return parent::dispatch($eventName, $event);
+    }
+
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
+    /**
+     * Lazily loads listeners for this event from the dependency injection
+     * container.
+     *
+     * @param string $eventName The name of the event to dispatch. The name of
+     *                          the event is the name of the method that is
+     *                          invoked on listeners.
+     */
+    protected function lazyLoad($eventName)
+    {
+        if (isset($this->listenerIds[$eventName])) {
+            foreach ($this->listenerIds[$eventName] as $args) {
+                list($serviceId, $method, $priority) = $args;
+                $listener = $this->container->get($serviceId);
+
+                $key = $serviceId.'.'.$method;
+                if (!isset($this->listeners[$eventName][$key])) {
+                    $this->addListener($eventName, array($listener, $method), $priority);
+                } elseif ($listener !== $this->listeners[$eventName][$key]) {
+                    parent::removeListener($eventName, array($this->listeners[$eventName][$key], $method));
+                    $this->addListener($eventName, array($listener, $method), $priority);
+                }
+
+                $this->listeners[$eventName][$key] = $listener;
+            }
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..a67a979014f9be5409e5c2cac86a3b0fac7b6242
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher\Debug;
+
+/**
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface TraceableEventDispatcherInterface
+{
+    /**
+     * Gets the called listeners.
+     *
+     * @return array An array of called listeners
+     */
+    public function getCalledListeners();
+
+    /**
+     * Gets the not called listeners.
+     *
+     * @return array An array of not called listeners
+     */
+    public function getNotCalledListeners();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Event.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Event.php
new file mode 100644
index 0000000000000000000000000000000000000000..42f09eaa5118e30b49c4af3160fd21a762b7d3b6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Event.php
@@ -0,0 +1,121 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher;
+
+/**
+ * Event is the base class for classes containing event data.
+ *
+ * This class contains no event data. It is used by events that do not pass
+ * state information to an event handler when an event is raised.
+ *
+ * You can call the method stopPropagation() to abort the execution of
+ * further listeners in your event listener.
+ *
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @api
+ */
+class Event
+{
+    /**
+     * @var Boolean Whether no further event listeners should be triggered
+     */
+    private $propagationStopped = false;
+
+    /**
+     * @var EventDispatcher Dispatcher that dispatched this event
+     */
+    private $dispatcher;
+
+    /**
+     * @var string This event's name
+     */
+    private $name;
+
+    /**
+     * Returns whether further event listeners should be triggered.
+     *
+     * @see Event::stopPropagation
+     * @return Boolean Whether propagation was already stopped for this event.
+     *
+     * @api
+     */
+    public function isPropagationStopped()
+    {
+        return $this->propagationStopped;
+    }
+
+    /**
+     * Stops the propagation of the event to further event listeners.
+     *
+     * If multiple event listeners are connected to the same event, no
+     * further event listener will be triggered once any trigger calls
+     * stopPropagation().
+     *
+     * @api
+     */
+    public function stopPropagation()
+    {
+        $this->propagationStopped = true;
+    }
+
+    /**
+     * Stores the EventDispatcher that dispatches this Event
+     *
+     * @param EventDispatcherInterface $dispatcher
+     *
+     * @api
+     */
+    public function setDispatcher(EventDispatcherInterface $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Returns the EventDispatcher that dispatches this Event
+     *
+     * @return EventDispatcherInterface
+     *
+     * @api
+     */
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
+    }
+
+    /**
+     * Gets the event's name.
+     *
+     * @return string
+     *
+     * @api
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Sets the event's name property.
+     *
+     * @param string $name The event name.
+     *
+     * @api
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventDispatcher.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventDispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..eb1fb5949efbba0bf5baac46ee6e5dc3b699d9ec
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher;
+
+/**
+ * The EventDispatcherInterface is the central point of Symfony's event listener system.
+ *
+ * Listeners are registered on the manager and events are dispatched through the
+ * manager.
+ *
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  Bernhard Schussek <bschussek@gmail.com>
+ * @author  Fabien Potencier <fabien@symfony.com>
+ * @author  Jordi Boggiano <j.boggiano@seld.be>
+ * @author  Jordan Alliot <jordan.alliot@gmail.com>
+ *
+ * @api
+ */
+class EventDispatcher implements EventDispatcherInterface
+{
+    private $listeners = array();
+    private $sorted = array();
+
+    /**
+     * @see EventDispatcherInterface::dispatch
+     *
+     * @api
+     */
+    public function dispatch($eventName, Event $event = null)
+    {
+        if (null === $event) {
+            $event = new Event();
+        }
+
+        $event->setDispatcher($this);
+        $event->setName($eventName);
+
+        if (!isset($this->listeners[$eventName])) {
+            return $event;
+        }
+
+        $this->doDispatch($this->getListeners($eventName), $eventName, $event);
+
+        return $event;
+    }
+
+    /**
+     * @see EventDispatcherInterface::getListeners
+     */
+    public function getListeners($eventName = null)
+    {
+        if (null !== $eventName) {
+            if (!isset($this->sorted[$eventName])) {
+                $this->sortListeners($eventName);
+            }
+
+            return $this->sorted[$eventName];
+        }
+
+        foreach (array_keys($this->listeners) as $eventName) {
+            if (!isset($this->sorted[$eventName])) {
+                $this->sortListeners($eventName);
+            }
+        }
+
+        return $this->sorted;
+    }
+
+    /**
+     * @see EventDispatcherInterface::hasListeners
+     */
+    public function hasListeners($eventName = null)
+    {
+        return (Boolean) count($this->getListeners($eventName));
+    }
+
+    /**
+     * @see EventDispatcherInterface::addListener
+     *
+     * @api
+     */
+    public function addListener($eventName, $listener, $priority = 0)
+    {
+        $this->listeners[$eventName][$priority][] = $listener;
+        unset($this->sorted[$eventName]);
+    }
+
+    /**
+     * @see EventDispatcherInterface::removeListener
+     */
+    public function removeListener($eventName, $listener)
+    {
+        if (!isset($this->listeners[$eventName])) {
+            return;
+        }
+
+        foreach ($this->listeners[$eventName] as $priority => $listeners) {
+            if (false !== ($key = array_search($listener, $listeners, true))) {
+                unset($this->listeners[$eventName][$priority][$key], $this->sorted[$eventName]);
+            }
+        }
+    }
+
+    /**
+     * @see EventDispatcherInterface::addSubscriber
+     *
+     * @api
+     */
+    public function addSubscriber(EventSubscriberInterface $subscriber)
+    {
+        foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
+            if (is_string($params)) {
+                $this->addListener($eventName, array($subscriber, $params));
+            } elseif (is_string($params[0])) {
+                $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
+            } else {
+                foreach ($params as $listener) {
+                    $this->addListener($eventName, array($subscriber, $listener[0]), isset($listener[1]) ? $listener[1] : 0);
+                }
+            }
+        }
+    }
+
+    /**
+     * @see EventDispatcherInterface::removeSubscriber
+     */
+    public function removeSubscriber(EventSubscriberInterface $subscriber)
+    {
+        foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
+            if (is_array($params) && is_array($params[0])) {
+                foreach ($params as $listener) {
+                    $this->removeListener($eventName, array($subscriber, $listener[0]));
+                }
+            } else {
+                $this->removeListener($eventName, array($subscriber, is_string($params) ? $params : $params[0]));
+            }
+        }
+    }
+
+    /**
+     * Triggers the listeners of an event.
+     *
+     * This method can be overridden to add functionality that is executed
+     * for each listener.
+     *
+     * @param array[callback] $listeners The event listeners.
+     * @param string          $eventName The name of the event to dispatch.
+     * @param Event           $event     The event object to pass to the event handlers/listeners.
+     */
+    protected function doDispatch($listeners, $eventName, Event $event)
+    {
+        foreach ($listeners as $listener) {
+            call_user_func($listener, $event);
+            if ($event->isPropagationStopped()) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Sorts the internal list of listeners for the given event by priority.
+     *
+     * @param string $eventName The name of the event.
+     */
+    private function sortListeners($eventName)
+    {
+        $this->sorted[$eventName] = array();
+
+        if (isset($this->listeners[$eventName])) {
+            krsort($this->listeners[$eventName]);
+            $this->sorted[$eventName] = call_user_func_array('array_merge', $this->listeners[$eventName]);
+        }
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..7aead23b0d9259f9fa8fbe9d211aff3d6d64bfec
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher;
+
+/**
+ * The EventDispatcherInterface is the central point of Symfony's event listener system.
+ * Listeners are registered on the manager and events are dispatched through the
+ * manager.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @api
+ */
+interface EventDispatcherInterface
+{
+    /**
+     * Dispatches an event to all registered listeners.
+     *
+     * @param string $eventName The name of the event to dispatch. The name of
+     *                          the event is the name of the method that is
+     *                          invoked on listeners.
+     * @param Event $event The event to pass to the event handlers/listeners.
+     *                          If not supplied, an empty Event instance is created.
+     *
+     * @return Event
+     *
+     * @api
+     */
+    public function dispatch($eventName, Event $event = null);
+
+    /**
+     * Adds an event listener that listens on the specified events.
+     *
+     * @param string   $eventName The event to listen on
+     * @param callable $listener  The listener
+     * @param integer  $priority  The higher this value, the earlier an event
+     *                            listener will be triggered in the chain (defaults to 0)
+     *
+     * @api
+     */
+    public function addListener($eventName, $listener, $priority = 0);
+
+    /**
+     * Adds an event subscriber.
+     *
+     * The subscriber is asked for all the events he is
+     * interested in and added as a listener for these events.
+     *
+     * @param EventSubscriberInterface $subscriber The subscriber.
+     *
+     * @api
+     */
+    public function addSubscriber(EventSubscriberInterface $subscriber);
+
+    /**
+     * Removes an event listener from the specified events.
+     *
+     * @param string|array $eventName The event(s) to remove a listener from
+     * @param callable     $listener  The listener to remove
+     */
+    public function removeListener($eventName, $listener);
+
+    /**
+     * Removes an event subscriber.
+     *
+     * @param EventSubscriberInterface $subscriber The subscriber
+     */
+    public function removeSubscriber(EventSubscriberInterface $subscriber);
+
+    /**
+     * Gets the listeners of a specific event or all listeners.
+     *
+     * @param string $eventName The name of the event
+     *
+     * @return array The event listeners for the specified event, or all event listeners by event name
+     */
+    public function getListeners($eventName = null);
+
+    /**
+     * Checks whether an event has any registered listeners.
+     *
+     * @param string $eventName The name of the event
+     *
+     * @return Boolean true if the specified event has any listeners, false otherwise
+     */
+    public function hasListeners($eventName = null);
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..080f892fdf60a5c47655f2a107ce8bd825c9e968
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher;
+
+/**
+ * An EventSubscriber knows himself what events he is interested in.
+ * If an EventSubscriber is added to an EventDispatcherInterface, the manager invokes
+ * {@link getSubscribedEvents} and registers the subscriber as a listener for all
+ * returned events.
+ *
+ * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author  Jonathan Wage <jonwage@gmail.com>
+ * @author  Roman Borschel <roman@code-factory.org>
+ * @author  Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @api
+ */
+interface EventSubscriberInterface
+{
+    /**
+     * Returns an array of event names this subscriber wants to listen to.
+     *
+     * The array keys are event names and the value can be:
+     *
+     *  * The method name to call (priority defaults to 0)
+     *  * An array composed of the method name to call and the priority
+     *  * An array of arrays composed of the method names to call and respective
+     *    priorities, or 0 if unset
+     *
+     * For instance:
+     *
+     *  * array('eventName' => 'methodName')
+     *  * array('eventName' => array('methodName', $priority))
+     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
+     *
+     * @return array The event names to listen to
+     *
+     * @api
+     */
+    public static function getSubscribedEvents();
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/GenericEvent.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/GenericEvent.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a5efcfecc262c3d96efe28427615422c5dd13e2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -0,0 +1,186 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher;
+
+/**
+ * Event encapsulation class.
+ *
+ * Encapsulates events thus decoupling the observer from the subject they encapsulate.
+ *
+ * @author Drak <drak@zikula.org>
+ */
+class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
+{
+    /**
+     * Observer pattern subject.
+     *
+     * @var mixed usually object or callable
+     */
+    protected $subject;
+
+    /**
+     * Array of arguments.
+     *
+     * @var array
+     */
+    protected $arguments;
+
+    /**
+     * Encapsulate an event with $subject and $args.
+     *
+     * @param mixed $subject   The subject of the event, usually an object.
+     * @param array $arguments Arguments to store in the event.
+     */
+    public function __construct($subject = null, array $arguments = array())
+    {
+        $this->subject = $subject;
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * Getter for subject property.
+     *
+     * @return mixed $subject The observer subject.
+     */
+    public function getSubject()
+    {
+        return $this->subject;
+    }
+
+    /**
+     * Get argument by key.
+     *
+     * @param string $key Key.
+     *
+     * @throws \InvalidArgumentException If key is not found.
+     *
+     * @return mixed Contents of array key.
+     */
+    public function getArgument($key)
+    {
+        if ($this->hasArgument($key)) {
+            return $this->arguments[$key];
+        }
+
+        throw new \InvalidArgumentException(sprintf('%s not found in %s', $key, $this->getName()));
+    }
+
+    /**
+     * Add argument to event.
+     *
+     * @param string $key   Argument name.
+     * @param mixed  $value Value.
+     *
+     * @return GenericEvent
+     */
+    public function setArgument($key, $value)
+    {
+        $this->arguments[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Getter for all arguments.
+     *
+     * @return array
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Set args property.
+     *
+     * @param array $args Arguments.
+     *
+     * @return GenericEvent
+     */
+    public function setArguments(array $args = array())
+    {
+        $this->arguments = $args;
+
+        return $this;
+    }
+
+    /**
+     * Has argument.
+     *
+     * @param string $key Key of arguments array.
+     *
+     * @return boolean
+     */
+    public function hasArgument($key)
+    {
+        return array_key_exists($key, $this->arguments);
+    }
+
+    /**
+     * ArrayAccess for argument getter.
+     *
+     * @param string $key Array key.
+     *
+     * @throws \InvalidArgumentException If key does not exist in $this->args.
+     *
+     * @return mixed
+     */
+    public function offsetGet($key)
+    {
+        return $this->getArgument($key);
+    }
+
+    /**
+     * ArrayAccess for argument setter.
+     *
+     * @param string $key   Array key to set.
+     * @param mixed  $value Value.
+     */
+    public function offsetSet($key, $value)
+    {
+        $this->setArgument($key, $value);
+    }
+
+    /**
+     * ArrayAccess for unset argument.
+     *
+     * @param string $key Array key.
+     */
+    public function offsetUnset($key)
+    {
+        if ($this->hasArgument($key)) {
+            unset($this->arguments[$key]);
+        }
+    }
+
+    /**
+     * ArrayAccess has argument.
+     *
+     * @param string $key Array key.
+     *
+     * @return boolean
+     */
+    public function offsetExists($key)
+    {
+        return $this->hasArgument($key);
+    }
+
+    /**
+     * IteratorAggregate for iterating over the object like an array
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->arguments);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..b70b81a8b2ed79b8001cef0c4932b9bf741cdcc2
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher;
+
+/**
+ * A read-only proxy for an event dispatcher.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class ImmutableEventDispatcher implements EventDispatcherInterface
+{
+    /**
+     * The proxied dispatcher.
+     * @var EventDispatcherInterface
+     */
+    private $dispatcher;
+
+    /**
+     * Creates an unmodifiable proxy for an event dispatcher.
+     *
+     * @param EventDispatcherInterface $dispatcher The proxied event dispatcher.
+     */
+    public function __construct(EventDispatcherInterface $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dispatch($eventName, Event $event = null)
+    {
+        return $this->dispatcher->dispatch($eventName, $event);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addListener($eventName, $listener, $priority = 0)
+    {
+        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addSubscriber(EventSubscriberInterface $subscriber)
+    {
+        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function removeListener($eventName, $listener)
+    {
+        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function removeSubscriber(EventSubscriberInterface $subscriber)
+    {
+        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getListeners($eventName = null)
+    {
+        return $this->dispatcher->getListeners($eventName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasListeners($eventName = null)
+    {
+        return $this->dispatcher->hasListeners($eventName);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..71f3ad05215ecdf15117050fef95b6d3e2e75ea6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
@@ -0,0 +1,257 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher\Tests;
+
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Scope;
+use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class ContainerAwareEventDispatcherTest extends \PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        if (!class_exists('Symfony\Component\DependencyInjection\Container')) {
+            $this->markTestSkipped('The "DependencyInjection" component is not available');
+        }
+    }
+
+    public function testAddAListenerService()
+    {
+        $event = new Event();
+
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $service
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
+
+        $dispatcher->dispatch('onEvent', $event);
+    }
+
+    public function testAddASubscriberService()
+    {
+        $event = new Event();
+
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\SubscriberService');
+
+        $service
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $container = new Container();
+        $container->set('service.subscriber', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addSubscriberService('service.subscriber', 'Symfony\Component\EventDispatcher\Tests\SubscriberService');
+
+        $dispatcher->dispatch('onEvent', $event);
+    }
+
+    public function testPreventDuplicateListenerService()
+    {
+        $event = new Event();
+
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $service
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'), 5);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'), 10);
+
+        $dispatcher->dispatch('onEvent', $event);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testTriggerAListenerServiceOutOfScope()
+    {
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $scope = new Scope('scope');
+        $container = new Container();
+        $container->addScope($scope);
+        $container->enterScope('scope');
+
+        $container->set('service.listener', $service, 'scope');
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
+
+        $container->leaveScope('scope');
+        $dispatcher->dispatch('onEvent');
+    }
+
+    public function testReEnteringAScope()
+    {
+        $event = new Event();
+
+        $service1 = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $service1
+            ->expects($this->exactly(2))
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $scope = new Scope('scope');
+        $container = new Container();
+        $container->addScope($scope);
+        $container->enterScope('scope');
+
+        $container->set('service.listener', $service1, 'scope');
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
+        $dispatcher->dispatch('onEvent', $event);
+
+        $service2 = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $service2
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $container->enterScope('scope');
+        $container->set('service.listener', $service2, 'scope');
+
+        $dispatcher->dispatch('onEvent', $event);
+
+        $container->leaveScope('scope');
+
+        $dispatcher->dispatch('onEvent');
+    }
+
+    public function testHasListenersOnLazyLoad()
+    {
+        $event = new Event();
+
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
+
+        $event->setDispatcher($dispatcher);
+        $event->setName('onEvent');
+
+        $service
+            ->expects($this->once())
+            ->method('onEvent')
+            ->with($event)
+        ;
+
+        $this->assertTrue($dispatcher->hasListeners());
+
+        if ($dispatcher->hasListeners('onEvent')) {
+            $dispatcher->dispatch('onEvent');
+        }
+    }
+
+    public function testGetListenersOnLazyLoad()
+    {
+        $event = new Event();
+
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
+
+        $listeners = $dispatcher->getListeners();
+
+        $this->assertTrue(isset($listeners['onEvent']));
+
+        $this->assertCount(1, $dispatcher->getListeners('onEvent'));
+    }
+
+    public function testRemoveAfterDispatch()
+    {
+        $event = new Event();
+
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
+
+        $dispatcher->dispatch('onEvent', new Event());
+        $dispatcher->removeListener('onEvent', array($container->get('service.listener'), 'onEvent'));
+        $this->assertFalse($dispatcher->hasListeners('onEvent'));
+    }
+
+    public function testRemoveBeforeDispatch()
+    {
+        $event = new Event();
+
+        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
+
+        $container = new Container();
+        $container->set('service.listener', $service);
+
+        $dispatcher = new ContainerAwareEventDispatcher($container);
+        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
+
+        $dispatcher->removeListener('onEvent', array($container->get('service.listener'), 'onEvent'));
+        $this->assertFalse($dispatcher->hasListeners('onEvent'));
+    }
+}
+
+class Service
+{
+    public function onEvent(Event $e)
+    {
+    }
+}
+
+class SubscriberService implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'onEvent' => 'onEvent',
+            'onEvent' => array('onEvent', 10),
+            'onEvent' => array('onEvent'),
+        );
+    }
+
+    public function onEvent(Event $e)
+    {
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ad7e4484541b3b0e9ebd6612fe4e0bd50d835ab5
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
@@ -0,0 +1,320 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher\Tests;
+
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class EventDispatcherTest extends \PHPUnit_Framework_TestCase
+{
+    /* Some pseudo events */
+    const preFoo = 'pre.foo';
+    const postFoo = 'post.foo';
+    const preBar = 'pre.bar';
+    const postBar = 'post.bar';
+
+    private $dispatcher;
+
+    private $listener;
+
+    protected function setUp()
+    {
+        $this->dispatcher = new EventDispatcher();
+        $this->listener = new TestEventListener();
+    }
+
+    protected function tearDown()
+    {
+        $this->dispatcher = null;
+        $this->listener = null;
+    }
+
+    public function testInitialState()
+    {
+        $this->assertEquals(array(), $this->dispatcher->getListeners());
+        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertFalse($this->dispatcher->hasListeners(self::postFoo));
+    }
+
+    public function testAddListener()
+    {
+        $this->dispatcher->addListener('pre.foo', array($this->listener, 'preFoo'));
+        $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'));
+        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
+        $this->assertCount(1, $this->dispatcher->getListeners(self::preFoo));
+        $this->assertCount(1, $this->dispatcher->getListeners(self::postFoo));
+        $this->assertCount(2, $this->dispatcher->getListeners());
+    }
+
+    public function testGetListenersSortsByPriority()
+    {
+        $listener1 = new TestEventListener();
+        $listener2 = new TestEventListener();
+        $listener3 = new TestEventListener();
+        $listener1->name = '1';
+        $listener2->name = '2';
+        $listener3->name = '3';
+
+        $this->dispatcher->addListener('pre.foo', array($listener1, 'preFoo'), -10);
+        $this->dispatcher->addListener('pre.foo', array($listener2, 'preFoo'), 10);
+        $this->dispatcher->addListener('pre.foo', array($listener3, 'preFoo'));
+
+        $expected = array(
+            array($listener2, 'preFoo'),
+            array($listener3, 'preFoo'),
+            array($listener1, 'preFoo'),
+        );
+
+        $this->assertSame($expected, $this->dispatcher->getListeners('pre.foo'));
+    }
+
+    public function testGetAllListenersSortsByPriority()
+    {
+        $listener1 = new TestEventListener();
+        $listener2 = new TestEventListener();
+        $listener3 = new TestEventListener();
+        $listener4 = new TestEventListener();
+        $listener5 = new TestEventListener();
+        $listener6 = new TestEventListener();
+
+        $this->dispatcher->addListener('pre.foo', $listener1, -10);
+        $this->dispatcher->addListener('pre.foo', $listener2);
+        $this->dispatcher->addListener('pre.foo', $listener3, 10);
+        $this->dispatcher->addListener('post.foo', $listener4, -10);
+        $this->dispatcher->addListener('post.foo', $listener5);
+        $this->dispatcher->addListener('post.foo', $listener6, 10);
+
+        $expected = array(
+            'pre.foo'  => array($listener3, $listener2, $listener1),
+            'post.foo' => array($listener6, $listener5, $listener4),
+        );
+
+        $this->assertSame($expected, $this->dispatcher->getListeners());
+    }
+
+    public function testDispatch()
+    {
+        $this->dispatcher->addListener('pre.foo', array($this->listener, 'preFoo'));
+        $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'));
+        $this->dispatcher->dispatch(self::preFoo);
+        $this->assertTrue($this->listener->preFooInvoked);
+        $this->assertFalse($this->listener->postFooInvoked);
+        $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch('noevent'));
+        $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch(self::preFoo));
+        $event = new Event();
+        $return = $this->dispatcher->dispatch(self::preFoo, $event);
+        $this->assertEquals('pre.foo', $event->getName());
+        $this->assertSame($event, $return);
+    }
+
+    public function testDispatchForClosure()
+    {
+        $invoked = 0;
+        $listener = function () use (&$invoked) {
+            $invoked++;
+        };
+        $this->dispatcher->addListener('pre.foo', $listener);
+        $this->dispatcher->addListener('post.foo', $listener);
+        $this->dispatcher->dispatch(self::preFoo);
+        $this->assertEquals(1, $invoked);
+    }
+
+    public function testStopEventPropagation()
+    {
+        $otherListener = new TestEventListener();
+
+        // postFoo() stops the propagation, so only one listener should
+        // be executed
+        // Manually set priority to enforce $this->listener to be called first
+        $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'), 10);
+        $this->dispatcher->addListener('post.foo', array($otherListener, 'preFoo'));
+        $this->dispatcher->dispatch(self::postFoo);
+        $this->assertTrue($this->listener->postFooInvoked);
+        $this->assertFalse($otherListener->postFooInvoked);
+    }
+
+    public function testDispatchByPriority()
+    {
+        $invoked = array();
+        $listener1 = function () use (&$invoked) {
+            $invoked[] = '1';
+        };
+        $listener2 = function () use (&$invoked) {
+            $invoked[] = '2';
+        };
+        $listener3 = function () use (&$invoked) {
+            $invoked[] = '3';
+        };
+        $this->dispatcher->addListener('pre.foo', $listener1, -10);
+        $this->dispatcher->addListener('pre.foo', $listener2);
+        $this->dispatcher->addListener('pre.foo', $listener3, 10);
+        $this->dispatcher->dispatch(self::preFoo);
+        $this->assertEquals(array('3', '2', '1'), $invoked);
+    }
+
+    public function testRemoveListener()
+    {
+        $this->dispatcher->addListener('pre.bar', $this->listener);
+        $this->assertTrue($this->dispatcher->hasListeners(self::preBar));
+        $this->dispatcher->removeListener('pre.bar', $this->listener);
+        $this->assertFalse($this->dispatcher->hasListeners(self::preBar));
+        $this->dispatcher->removeListener('notExists', $this->listener);
+    }
+
+    public function testAddSubscriber()
+    {
+        $eventSubscriber = new TestEventSubscriber();
+        $this->dispatcher->addSubscriber($eventSubscriber);
+        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
+    }
+
+    public function testAddSubscriberWithPriorities()
+    {
+        $eventSubscriber = new TestEventSubscriber();
+        $this->dispatcher->addSubscriber($eventSubscriber);
+
+        $eventSubscriber = new TestEventSubscriberWithPriorities();
+        $this->dispatcher->addSubscriber($eventSubscriber);
+
+        $listeners = $this->dispatcher->getListeners('pre.foo');
+        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertCount(2, $listeners);
+        $this->assertInstanceOf('Symfony\Component\EventDispatcher\Tests\TestEventSubscriberWithPriorities', $listeners[0][0]);
+    }
+
+    public function testAddSubscriberWithMultipleListeners()
+    {
+        $eventSubscriber = new TestEventSubscriberWithMultipleListeners();
+        $this->dispatcher->addSubscriber($eventSubscriber);
+
+        $listeners = $this->dispatcher->getListeners('pre.foo');
+        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertCount(2, $listeners);
+        $this->assertEquals('preFoo2', $listeners[0][1]);
+    }
+
+    public function testRemoveSubscriber()
+    {
+        $eventSubscriber = new TestEventSubscriber();
+        $this->dispatcher->addSubscriber($eventSubscriber);
+        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
+        $this->dispatcher->removeSubscriber($eventSubscriber);
+        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertFalse($this->dispatcher->hasListeners(self::postFoo));
+    }
+
+    public function testRemoveSubscriberWithPriorities()
+    {
+        $eventSubscriber = new TestEventSubscriberWithPriorities();
+        $this->dispatcher->addSubscriber($eventSubscriber);
+        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
+        $this->dispatcher->removeSubscriber($eventSubscriber);
+        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
+    }
+
+    public function testRemoveSubscriberWithMultipleListeners()
+    {
+        $eventSubscriber = new TestEventSubscriberWithMultipleListeners();
+        $this->dispatcher->addSubscriber($eventSubscriber);
+        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
+        $this->assertCount(2, $this->dispatcher->getListeners(self::preFoo));
+        $this->dispatcher->removeSubscriber($eventSubscriber);
+        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
+    }
+
+    public function testEventReceivesTheDispatcherInstance()
+    {
+        $test = $this;
+        $this->dispatcher->addListener('test', function ($event) use (&$dispatcher) {
+            $dispatcher = $event->getDispatcher();
+        });
+        $this->dispatcher->dispatch('test');
+        $this->assertSame($this->dispatcher, $dispatcher);
+    }
+
+    /**
+     * @see https://bugs.php.net/bug.php?id=62976
+     *
+     * This bug affects:
+     *  - The PHP 5.3 branch for versions < 5.3.18
+     *  - The PHP 5.4 branch for versions < 5.4.8
+     *  - The PHP 5.5 branch is not affected
+     */
+    public function testWorkaroundForPhpBug62976()
+    {
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener('bug.62976', new CallableClass());
+        $dispatcher->removeListener('bug.62976', function() {});
+        $this->assertTrue($dispatcher->hasListeners('bug.62976'));
+    }
+}
+
+class CallableClass
+{
+    public function __invoke()
+    {
+    }
+}
+
+class TestEventListener
+{
+    public $preFooInvoked = false;
+    public $postFooInvoked = false;
+
+    /* Listener methods */
+
+    public function preFoo(Event $e)
+    {
+        $this->preFooInvoked = true;
+    }
+
+    public function postFoo(Event $e)
+    {
+        $this->postFooInvoked = true;
+
+        $e->stopPropagation();
+    }
+}
+
+class TestEventSubscriber implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return array('pre.foo' => 'preFoo', 'post.foo' => 'postFoo');
+    }
+}
+
+class TestEventSubscriberWithPriorities implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return array(
+            'pre.foo' => array('preFoo', 10),
+            'post.foo' => array('postFoo'),
+            );
+    }
+}
+
+class TestEventSubscriberWithMultipleListeners implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return array('pre.foo' => array(
+            array('preFoo1'),
+            array('preFoo2', 10)
+        ));
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/EventTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/EventTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..52aa9ad68a8f431320f23210fb7d87343b56c38f
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/EventTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher\Tests;
+
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+/**
+ * Test class for Event.
+ */
+class EventTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Symfony\Component\EventDispatcher\Event
+     */
+    protected $event;
+
+    /**
+     * @var \Symfony\Component\EventDispatcher\EventDispatcher
+     */
+    protected $dispatcher;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->event = new Event;
+        $this->dispatcher = new EventDispatcher();
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+        $this->event = null;
+        $this->eventDispatcher = null;
+    }
+
+    public function testIsPropagationStopped()
+    {
+        $this->assertFalse($this->event->isPropagationStopped());
+    }
+
+    public function testStopPropagationAndIsPropagationStopped()
+    {
+        $this->event->stopPropagation();
+        $this->assertTrue($this->event->isPropagationStopped());
+    }
+
+    public function testSetDispatcher()
+    {
+        $this->event->setDispatcher($this->dispatcher);
+        $this->assertSame($this->dispatcher, $this->event->getDispatcher());
+    }
+
+    public function testGetDispatcher()
+    {
+        $this->assertNull($this->event->getDispatcher());
+    }
+
+    public function testGetName()
+    {
+        $this->assertNull($this->event->getName());
+    }
+
+    public function testSetName()
+    {
+        $this->event->setName('foo');
+        $this->assertEquals('foo', $this->event->getName());
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..8dd6f5b419acca67b20521ad694cde5fec6f5821
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
@@ -0,0 +1,140 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher\Tests;
+
+use Symfony\Component\EventDispatcher\GenericEvent;
+
+/**
+ * Test class for Event.
+ */
+class GenericEventTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @var GenericEvent
+     */
+    private $event;
+
+    private $subject;
+
+    /**
+     * Prepares the environment before running a test.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->subject = new \StdClass();
+        $this->event = new GenericEvent($this->subject, array('name' => 'Event'), 'foo');
+    }
+
+    /**
+     * Cleans up the environment after running a test.
+     */
+    protected function tearDown()
+    {
+        $this->subject = null;
+        $this->event = null;
+
+        parent::tearDown();
+    }
+
+    public function testConstruct()
+    {
+        $this->assertEquals($this->event, new GenericEvent($this->subject, array('name' => 'Event')));
+    }
+
+    /**
+     * Tests Event->getArgs()
+     */
+    public function testGetArguments()
+    {
+        // test getting all
+        $this->assertSame(array('name' => 'Event'), $this->event->getArguments());
+    }
+
+    public function testSetArguments()
+    {
+        $result = $this->event->setArguments(array('foo' => 'bar'));
+        $this->assertAttributeSame(array('foo' => 'bar'), 'arguments', $this->event);
+        $this->assertSame($this->event, $result);
+    }
+
+    public function testSetArgument()
+    {
+        $result = $this->event->setArgument('foo2', 'bar2');
+        $this->assertAttributeSame(array('name' => 'Event', 'foo2' => 'bar2'), 'arguments', $this->event);
+        $this->assertEquals($this->event, $result);
+    }
+
+    public function testGetArgument()
+    {
+        // test getting key
+        $this->assertEquals('Event', $this->event->getArgument('name'));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testGetArgException()
+    {
+        $this->event->getArgument('nameNotExist');
+    }
+
+    public function testOffsetGet()
+    {
+        // test getting key
+        $this->assertEquals('Event', $this->event['name']);
+
+        // test getting invalid arg
+        $this->setExpectedException('InvalidArgumentException');
+        $this->assertFalse($this->event['nameNotExist']);
+    }
+
+    public function testOffsetSet()
+    {
+        $this->event['foo2'] = 'bar2';
+        $this->assertAttributeSame(array('name' => 'Event', 'foo2' => 'bar2'), 'arguments', $this->event);
+    }
+
+    public function testOffsetUnset()
+    {
+        unset($this->event['name']);
+        $this->assertAttributeSame(array(), 'arguments', $this->event);
+    }
+
+    public function testOffsetIsset()
+    {
+        $this->assertTrue(isset($this->event['name']));
+        $this->assertFalse(isset($this->event['nameNotExist']));
+    }
+
+    public function testHasArgument()
+    {
+        $this->assertTrue($this->event->hasArgument('name'));
+        $this->assertFalse($this->event->hasArgument('nameNotExist'));
+    }
+
+    public function testGetSubject()
+    {
+        $this->assertSame($this->subject, $this->event->getSubject());
+    }
+
+    public function testHasIterator()
+    {
+        $data = array();
+        foreach ($this->event as $key => $value) {
+            $data[$key] = $value;
+        }
+        $this->assertEquals(array('name' => 'Event'), $data);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..6402f89fa5fd4bc8822b4e6d57025b4619e6c796
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher\Tests;
+
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ */
+class ImmutableEventDispatcherTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $innerDispatcher;
+
+    /**
+     * @var ImmutableEventDispatcher
+     */
+    private $dispatcher;
+
+    protected function setUp()
+    {
+        $this->innerDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+        $this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
+    }
+
+    public function testDispatchDelegates()
+    {
+        $event = new Event();
+
+        $this->innerDispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with('event', $event)
+            ->will($this->returnValue('result'));
+
+        $this->assertSame('result', $this->dispatcher->dispatch('event', $event));
+    }
+
+    public function testGetListenersDelegates()
+    {
+        $this->innerDispatcher->expects($this->once())
+            ->method('getListeners')
+            ->with('event')
+            ->will($this->returnValue('result'));
+
+        $this->assertSame('result', $this->dispatcher->getListeners('event'));
+    }
+
+    public function testHasListenersDelegates()
+    {
+        $this->innerDispatcher->expects($this->once())
+            ->method('hasListeners')
+            ->with('event')
+            ->will($this->returnValue('result'));
+
+        $this->assertSame('result', $this->dispatcher->hasListeners('event'));
+    }
+
+    /**
+     * @expectedException \BadMethodCallException
+     */
+    public function testAddListenerDisallowed()
+    {
+        $this->dispatcher->addListener('event', function () { return 'foo'; });
+    }
+
+    /**
+     * @expectedException \BadMethodCallException
+     */
+    public function testAddSubscriberDisallowed()
+    {
+        $subscriber = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
+
+        $this->dispatcher->addSubscriber($subscriber);
+    }
+
+    /**
+     * @expectedException \BadMethodCallException
+     */
+    public function testRemoveListenerDisallowed()
+    {
+        $this->dispatcher->removeListener('event', function () { return 'foo'; });
+    }
+
+    /**
+     * @expectedException \BadMethodCallException
+     */
+    public function testRemoveSubscriberDisallowed()
+    {
+        $subscriber = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
+
+        $this->dispatcher->removeSubscriber($subscriber);
+    }
+}
diff --git a/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php b/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b7d7acf5e0c16f220d8e77a607975ef4b4206b6
--- /dev/null
+++ b/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+require_once __DIR__ . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+
+if (!defined('AWS_FILE_PREFIX')) {
+    define('AWS_FILE_PREFIX', __DIR__);
+}
+
+$classLoader = new Symfony\Component\ClassLoader\UniversalClassLoader();
+$classLoader->registerNamespaces(array(
+    'Aws'      => AWS_FILE_PREFIX,
+    'Guzzle'   => AWS_FILE_PREFIX,
+    'Symfony'  => AWS_FILE_PREFIX,
+    'Doctrine' => AWS_FILE_PREFIX,
+    'Psr'      => AWS_FILE_PREFIX,
+    'Monolog'  => AWS_FILE_PREFIX
+));
+
+$classLoader->register();
+
+return $classLoader;
diff --git a/apps/files_external/3rdparty/google-api-php-client/LICENSE b/apps/files_external/3rdparty/google-api-php-client/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..a148ba564bf25ee9234bc1a71d6d807ad8cf763e
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/LICENSE
@@ -0,0 +1,203 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following
+boilerplate notice, with the fields enclosed by brackets "[]"
+replaced with your own identifying information. (Don't include
+the brackets!) The text should be enclosed in the appropriate
+comment syntax for the file format. We also recommend that a
+file or class name and description of purpose be included on the
+same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
diff --git a/apps/files_external/3rdparty/google-api-php-client/NOTICE b/apps/files_external/3rdparty/google-api-php-client/NOTICE
new file mode 100644
index 0000000000000000000000000000000000000000..22d7cb59867c301cbe1d33aa661628d5cf879dce
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/NOTICE
@@ -0,0 +1,4 @@
+This product contains the following libraries:
+
+XRDS-Simple library from http://code.google.com/p/diso/
+Apache License 2.0
diff --git a/apps/files_external/3rdparty/google-api-php-client/README b/apps/files_external/3rdparty/google-api-php-client/README
new file mode 100644
index 0000000000000000000000000000000000000000..42c42c0d5c73dcefc72f2d17097cfc6894674972
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/README
@@ -0,0 +1,40 @@
+Google APIs Client Library for PHP
+=====================================
+
+== Description
+The Google API Client Library enables you to work with Google APIs such as Google+, Drive, Tasks, or Latitude on your server.
+
+Requirements:
+  PHP 5.2.x or higher [http://www.php.net/]
+  PHP Curl extension [http://www.php.net/manual/en/intro.curl.php]
+  PHP JSON extension [http://php.net/manual/en/book.json.php]
+
+Project page:
+  http://code.google.com/p/google-api-php-client
+
+OAuth 2 instructions:
+  http://code.google.com/p/google-api-php-client/wiki/OAuth2
+
+Report a defect or feature request here:
+  http://code.google.com/p/google-api-php-client/issues/entry
+
+Subscribe to project updates in your feed reader:
+  http://code.google.com/feeds/p/google-api-php-client/updates/basic
+
+Supported sample applications:
+  http://code.google.com/p/google-api-php-client/wiki/Samples
+
+== Basic Example
+  <?php
+  require_once 'path/to/src/Google_Client.php';
+  require_once 'path/to/src/contrib/apiBooksService.php';
+
+  $client = new Google_Client();
+  $service = new Google_BooksService($client);
+
+  $optParams = array('filter' => 'free-ebooks');
+  $results = $service->volumes->listVolumes('Henry David Thoreau', $optParams);
+
+  foreach ($results['items'] as $item) {
+    print($item['volumeInfo']['title'] . '<br>');
+  }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google_Client.php b/apps/files_external/3rdparty/google-api-php-client/src/Google_Client.php
new file mode 100644
index 0000000000000000000000000000000000000000..498d3a8e9dd284267226e541b1fdc30d02aa16d8
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google_Client.php
@@ -0,0 +1,462 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Check for the required json and curl extensions, the Google APIs PHP Client
+// won't function without them.
+if (! function_exists('curl_init')) {
+  throw new Exception('Google PHP API Client requires the CURL PHP extension');
+}
+
+if (! function_exists('json_decode')) {
+  throw new Exception('Google PHP API Client requires the JSON PHP extension');
+}
+
+if (! function_exists('http_build_query')) {
+  throw new Exception('Google PHP API Client requires http_build_query()');
+}
+
+if (! ini_get('date.timezone') && function_exists('date_default_timezone_set')) {
+  date_default_timezone_set('UTC');
+}
+
+// hack around with the include paths a bit so the library 'just works'
+set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
+
+require_once "config.php";
+// If a local configuration file is found, merge it's values with the default configuration
+if (file_exists(dirname(__FILE__)  . '/local_config.php')) {
+  $defaultConfig = $apiConfig;
+  require_once (dirname(__FILE__)  . '/local_config.php');
+  $apiConfig = array_merge($defaultConfig, $apiConfig);
+}
+
+// Include the top level classes, they each include their own dependencies
+require_once 'service/Google_Model.php';
+require_once 'service/Google_Service.php';
+require_once 'service/Google_ServiceResource.php';
+require_once 'auth/Google_AssertionCredentials.php';
+require_once 'auth/Google_Signer.php';
+require_once 'auth/Google_P12Signer.php';
+require_once 'service/Google_BatchRequest.php';
+require_once 'external/URITemplateParser.php';
+require_once 'auth/Google_Auth.php';
+require_once 'cache/Google_Cache.php';
+require_once 'io/Google_IO.php';
+require_once('service/Google_MediaFileUpload.php');
+
+/**
+ * The Google API Client
+ * http://code.google.com/p/google-api-php-client/
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_Client {
+  /**
+   * @static
+   * @var Google_Auth $auth
+   */
+  static $auth;
+
+  /**
+   * @static
+   * @var Google_IO $io
+   */
+  static $io;
+
+  /**
+   * @static
+   * @var Google_Cache $cache
+   */
+  static $cache;
+
+  /**
+   * @static
+   * @var boolean $useBatch
+   */
+  static $useBatch = false;
+
+  /** @var array $scopes */
+  protected $scopes = array();
+
+  /** @var bool $useObjects */
+  protected $useObjects = false;
+
+  // definitions of services that are discovered.
+  protected $services = array();
+
+  // Used to track authenticated state, can't discover services after doing authenticate()
+  private $authenticated = false;
+
+  public function __construct($config = array()) {
+    global $apiConfig;
+    $apiConfig = array_merge($apiConfig, $config);
+    self::$cache = new $apiConfig['cacheClass']();
+    self::$auth = new $apiConfig['authClass']();
+    self::$io = new $apiConfig['ioClass']();
+  }
+
+  /**
+   * Add a service
+   */
+  public function addService($service, $version = false) {
+    global $apiConfig;
+    if ($this->authenticated) {
+      throw new Google_Exception('Cant add services after having authenticated');
+    }
+    $this->services[$service] = array();
+    if (isset($apiConfig['services'][$service])) {
+      // Merge the service descriptor with the default values
+      $this->services[$service] = array_merge($this->services[$service], $apiConfig['services'][$service]);
+    }
+  }
+
+  public function authenticate($code = null) {
+    $service = $this->prepareService();
+    $this->authenticated = true;
+    return self::$auth->authenticate($service, $code);
+  }
+
+  /**
+   * @return array
+   * @visible For Testing
+   */
+  public function prepareService() {
+    $service = array();
+    $scopes = array();
+    if ($this->scopes) {
+      $scopes = $this->scopes;
+    } else {
+      foreach ($this->services as $key => $val) {
+        if (isset($val['scope'])) {
+          if (is_array($val['scope'])) {
+            $scopes = array_merge($val['scope'], $scopes);
+          } else {
+            $scopes[] = $val['scope'];
+          }
+        } else {
+          $scopes[] = 'https://www.googleapis.com/auth/' . $key;
+        }
+        unset($val['discoveryURI']);
+        unset($val['scope']);
+        $service = array_merge($service, $val);
+      }
+    }
+    $service['scope'] = implode(' ', $scopes);
+    return $service;
+  }
+
+  /**
+   * Set the OAuth 2.0 access token using the string that resulted from calling authenticate()
+   * or Google_Client#getAccessToken().
+   * @param string $accessToken JSON encoded string containing in the following format:
+   * {"access_token":"TOKEN", "refresh_token":"TOKEN", "token_type":"Bearer",
+   *  "expires_in":3600, "id_token":"TOKEN", "created":1320790426}
+   */
+  public function setAccessToken($accessToken) {
+    if ($accessToken == null || 'null' == $accessToken) {
+      $accessToken = null;
+    }
+    self::$auth->setAccessToken($accessToken);
+  }
+
+  /**
+   * Set the type of Auth class the client should use.
+   * @param string $authClassName
+   */
+  public function setAuthClass($authClassName) {
+    self::$auth = new $authClassName();
+  }
+
+  /**
+   * Construct the OAuth 2.0 authorization request URI.
+   * @return string
+   */
+  public function createAuthUrl() {
+    $service = $this->prepareService();
+    return self::$auth->createAuthUrl($service['scope']);
+  }
+
+  /**
+   * Get the OAuth 2.0 access token.
+   * @return string $accessToken JSON encoded string in the following format:
+   * {"access_token":"TOKEN", "refresh_token":"TOKEN", "token_type":"Bearer",
+   *  "expires_in":3600,"id_token":"TOKEN", "created":1320790426}
+   */
+  public function getAccessToken() {
+    $token = self::$auth->getAccessToken();
+    return (null == $token || 'null' == $token) ? null : $token;
+  }
+
+  /**
+   * Returns if the access_token is expired.
+   * @return bool Returns True if the access_token is expired.
+   */
+  public function isAccessTokenExpired() {
+    return self::$auth->isAccessTokenExpired();
+  }
+
+  /**
+   * Set the developer key to use, these are obtained through the API Console.
+   * @see http://code.google.com/apis/console-help/#generatingdevkeys
+   * @param string $developerKey
+   */
+  public function setDeveloperKey($developerKey) {
+    self::$auth->setDeveloperKey($developerKey);
+  }
+
+  /**
+   * Set OAuth 2.0 "state" parameter to achieve per-request customization.
+   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-22#section-3.1.2.2
+   * @param string $state
+   */
+  public function setState($state) {
+    self::$auth->setState($state);
+  }
+
+  /**
+   * @param string $accessType Possible values for access_type include:
+   *  {@code "offline"} to request offline access from the user. (This is the default value)
+   *  {@code "online"} to request online access from the user.
+   */
+  public function setAccessType($accessType) {
+    self::$auth->setAccessType($accessType);
+  }
+
+  /**
+   * @param string $approvalPrompt Possible values for approval_prompt include:
+   *  {@code "force"} to force the approval UI to appear. (This is the default value)
+   *  {@code "auto"} to request auto-approval when possible.
+   */
+  public function setApprovalPrompt($approvalPrompt) {
+    self::$auth->setApprovalPrompt($approvalPrompt);
+  }
+
+  /**
+   * Set the application name, this is included in the User-Agent HTTP header.
+   * @param string $applicationName
+   */
+  public function setApplicationName($applicationName) {
+    global $apiConfig;
+    $apiConfig['application_name'] = $applicationName;
+  }
+
+  /**
+   * Set the OAuth 2.0 Client ID.
+   * @param string $clientId
+   */
+  public function setClientId($clientId) {
+    global $apiConfig;
+    $apiConfig['oauth2_client_id'] = $clientId;
+    self::$auth->clientId = $clientId;
+  }
+
+  /**
+   * Get the OAuth 2.0 Client ID.
+   */
+  public function getClientId() {
+    return self::$auth->clientId;
+  }
+
+  /**
+   * Set the OAuth 2.0 Client Secret.
+   * @param string $clientSecret
+   */
+  public function setClientSecret($clientSecret) {
+    global $apiConfig;
+    $apiConfig['oauth2_client_secret'] = $clientSecret;
+    self::$auth->clientSecret = $clientSecret;
+  }
+
+  /**
+   * Get the OAuth 2.0 Client Secret.
+   */
+  public function getClientSecret() {
+    return self::$auth->clientSecret;
+  }
+
+  /**
+   * Set the OAuth 2.0 Redirect URI.
+   * @param string $redirectUri
+   */
+  public function setRedirectUri($redirectUri) {
+    global $apiConfig;
+    $apiConfig['oauth2_redirect_uri'] = $redirectUri;
+    self::$auth->redirectUri = $redirectUri;
+  }
+
+  /**
+   * Get the OAuth 2.0 Redirect URI.
+   */
+  public function getRedirectUri() {
+    return self::$auth->redirectUri;
+  }
+
+  /**
+   * Fetches a fresh OAuth 2.0 access token with the given refresh token.
+   * @param string $refreshToken
+   * @return void
+   */
+  public function refreshToken($refreshToken) {
+    self::$auth->refreshToken($refreshToken);
+  }
+
+  /**
+   * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
+   * token, if a token isn't provided.
+   * @throws Google_AuthException
+   * @param string|null $token The token (access token or a refresh token) that should be revoked.
+   * @return boolean Returns True if the revocation was successful, otherwise False.
+   */
+  public function revokeToken($token = null) {
+    self::$auth->revokeToken($token);
+  }
+
+  /**
+   * Verify an id_token. This method will verify the current id_token, if one
+   * isn't provided.
+   * @throws Google_AuthException
+   * @param string|null $token The token (id_token) that should be verified.
+   * @return Google_LoginTicket Returns an apiLoginTicket if the verification was
+   * successful.
+   */
+  public function verifyIdToken($token = null) {
+    return self::$auth->verifyIdToken($token);
+  }
+
+  /**
+   * @param Google_AssertionCredentials $creds
+   * @return void
+   */
+  public function setAssertionCredentials(Google_AssertionCredentials $creds) {
+    self::$auth->setAssertionCredentials($creds);
+  }
+
+  /**
+   * This function allows you to overrule the automatically generated scopes,
+   * so that you can ask for more or less permission in the auth flow
+   * Set this before you call authenticate() though!
+   * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.me', 'https://www.googleapis.com/auth/moderator')
+   */
+  public function setScopes($scopes) {
+    $this->scopes = is_string($scopes) ? explode(" ", $scopes) : $scopes;
+  }
+
+  /**
+   * Returns the list of scopes set on the client
+   * @return array the list of scopes
+   *
+   */
+  public function getScopes() {
+     return $this->scopes;
+  }
+
+  /**
+   * Declare if objects should be returned by the api service classes.
+   *
+   * @param boolean $useObjects True if objects should be returned by the service classes.
+   * False if associative arrays should be returned (default behavior).
+   * @experimental
+   */
+  public function setUseObjects($useObjects) {
+    global $apiConfig;
+    $apiConfig['use_objects'] = $useObjects;
+  }
+
+  /**
+   * Declare if objects should be returned by the api service classes.
+   *
+   * @param boolean $useBatch True if the experimental batch support should
+   * be enabled. Defaults to False.
+   * @experimental
+   */
+  public function setUseBatch($useBatch) {
+    self::$useBatch = $useBatch;
+  }
+
+  /**
+   * @static
+   * @return Google_Auth the implementation of apiAuth.
+   */
+  public static function getAuth() {
+    return Google_Client::$auth;
+  }
+
+  /**
+   * @static
+   * @return Google_IO the implementation of apiIo.
+   */
+  public static function getIo() {
+    return Google_Client::$io;
+  }
+
+  /**
+   * @return Google_Cache the implementation of apiCache.
+   */
+  public function getCache() {
+    return Google_Client::$cache;
+  }
+}
+
+// Exceptions that the Google PHP API Library can throw
+class Google_Exception extends Exception {}
+class Google_AuthException extends Google_Exception {}
+class Google_CacheException extends Google_Exception {}
+class Google_IOException extends Google_Exception {}
+class Google_ServiceException extends Google_Exception {
+  /**
+   * Optional list of errors returned in a JSON body of an HTTP error response.
+   */
+  protected $errors = array();
+
+  /**
+   * Override default constructor to add ability to set $errors.
+   *
+   * @param string $message
+   * @param int $code
+   * @param Exception|null $previous
+   * @param [{string, string}] errors List of errors returned in an HTTP
+   * response.  Defaults to [].
+   */
+  public function __construct($message, $code = 0, Exception $previous = null,
+                              $errors = array()) {
+    if(version_compare(PHP_VERSION, '5.3.0') >= 0) {
+      parent::__construct($message, $code, $previous);
+    } else {
+      parent::__construct($message, $code);
+    }
+
+    $this->errors = $errors;
+  }
+
+  /**
+   * An example of the possible errors returned.
+   *
+   * {
+   *   "domain": "global",
+   *   "reason": "authError",
+   *   "message": "Invalid Credentials",
+   *   "locationType": "header",
+   *   "location": "Authorization",
+   * }
+   *
+   * @return [{string, string}] List of errors return in an HTTP response or [].
+   */
+  public function getErrors() {
+    return $this->errors;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AssertionCredentials.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AssertionCredentials.php
new file mode 100644
index 0000000000000000000000000000000000000000..d9b4394ba38fa6c71831e0b0e6f5fca285bd5c09
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AssertionCredentials.php
@@ -0,0 +1,104 @@
+<?php
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Credentials object used for OAuth 2.0 Signed JWT assertion grants.
+ *
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_AssertionCredentials {
+  const MAX_TOKEN_LIFETIME_SECS = 3600;
+
+  public $serviceAccountName;
+  public $scopes;
+  public $privateKey;
+  public $privateKeyPassword;
+  public $assertionType;
+  public $sub;
+  /**
+   * @deprecated
+   * @link http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-06
+   */
+  public $prn;
+
+  /**
+   * @param $serviceAccountName
+   * @param $scopes array List of scopes
+   * @param $privateKey
+   * @param string $privateKeyPassword
+   * @param string $assertionType
+   * @param bool|string $sub The email address of the user for which the
+   *               application is requesting delegated access.
+   *
+   */
+  public function __construct(
+      $serviceAccountName,
+      $scopes,
+      $privateKey,
+      $privateKeyPassword = 'notasecret',
+      $assertionType = 'http://oauth.net/grant_type/jwt/1.0/bearer',
+      $sub = false) {
+    $this->serviceAccountName = $serviceAccountName;
+    $this->scopes = is_string($scopes) ? $scopes : implode(' ', $scopes);
+    $this->privateKey = $privateKey;
+    $this->privateKeyPassword = $privateKeyPassword;
+    $this->assertionType = $assertionType;
+    $this->sub = $sub;
+    $this->prn = $sub;
+  }
+
+  public function generateAssertion() {
+    $now = time();
+
+    $jwtParams = array(
+          'aud' => Google_OAuth2::OAUTH2_TOKEN_URI,
+          'scope' => $this->scopes,
+          'iat' => $now,
+          'exp' => $now + self::MAX_TOKEN_LIFETIME_SECS,
+          'iss' => $this->serviceAccountName,
+    );
+
+    if ($this->sub !== false) {
+      $jwtParams['sub'] = $this->sub;
+    } else if ($this->prn !== false) {
+      $jwtParams['prn'] = $this->prn;
+    }
+
+    return $this->makeSignedJwt($jwtParams);
+  }
+
+  /**
+   * Creates a signed JWT.
+   * @param array $payload
+   * @return string The signed JWT.
+   */
+  private function makeSignedJwt($payload) {
+    $header = array('typ' => 'JWT', 'alg' => 'RS256');
+
+    $segments = array(
+      Google_Utils::urlSafeB64Encode(json_encode($header)),
+      Google_Utils::urlSafeB64Encode(json_encode($payload))
+    );
+
+    $signingInput = implode('.', $segments);
+    $signer = new Google_P12Signer($this->privateKey, $this->privateKeyPassword);
+    $signature = $signer->sign($signingInput);
+    $segments[] = Google_Utils::urlSafeB64Encode($signature);
+
+    return implode(".", $segments);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Auth.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Auth.php
new file mode 100644
index 0000000000000000000000000000000000000000..010782d4a60ed91eeb4f113cb129389c8d8f21f5
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Auth.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google_AuthNone.php";
+require_once "Google_OAuth2.php";
+
+/**
+ * Abstract class for the Authentication in the API client
+ * @author Chris Chabot <chabotc@google.com>
+ *
+ */
+abstract class Google_Auth {
+  abstract public function authenticate($service);
+  abstract public function sign(Google_HttpRequest $request);
+  abstract public function createAuthUrl($scope);
+
+  abstract public function getAccessToken();
+  abstract public function setAccessToken($accessToken);
+  abstract public function setDeveloperKey($developerKey);
+  abstract public function refreshToken($refreshToken);
+  abstract public function revokeToken();
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AuthNone.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AuthNone.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ca6bc2b0db00d2f3ed1db06b7aa78bfd454fae9
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AuthNone.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Do-nothing authentication implementation, use this if you want to make un-authenticated calls
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_AuthNone extends Google_Auth {
+  public $key = null;
+
+  public function __construct() {
+    global $apiConfig;
+    if (!empty($apiConfig['developer_key'])) {
+      $this->setDeveloperKey($apiConfig['developer_key']);
+    }
+  }
+
+  public function setDeveloperKey($key) {$this->key = $key;}
+  public function authenticate($service) {/*noop*/}
+  public function setAccessToken($accessToken) {/* noop*/}
+  public function getAccessToken() {return null;}
+  public function createAuthUrl($scope) {return null;}
+  public function refreshToken($refreshToken) {/* noop*/}
+  public function revokeToken() {/* noop*/}
+
+  public function sign(Google_HttpRequest $request) {
+    if ($this->key) {
+      $request->setUrl($request->getUrl() . ((strpos($request->getUrl(), '?') === false) ? '?' : '&')
+          . 'key='.urlencode($this->key));
+    }
+    return $request;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_LoginTicket.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_LoginTicket.php
new file mode 100644
index 0000000000000000000000000000000000000000..c0ce614232bd63500bc599895cda11607b823b52
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_LoginTicket.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Class to hold information about an authenticated login.
+ *
+ * @author Brian Eaton <beaton@google.com>
+ */
+class Google_LoginTicket {
+  const USER_ATTR = "id";
+
+  // Information from id token envelope.
+  private $envelope;
+
+  // Information from id token payload.
+  private $payload;
+
+  /**
+   * Creates a user based on the supplied token.
+   *
+   * @param string $envelope Header from a verified authentication token.
+   * @param string $payload Information from a verified authentication token.
+   */
+  public function __construct($envelope, $payload) {
+    $this->envelope = $envelope;
+    $this->payload = $payload;
+  }
+
+  /**
+   * Returns the numeric identifier for the user.
+   * @throws Google_AuthException
+   * @return
+   */
+  public function getUserId() {
+    if (array_key_exists(self::USER_ATTR, $this->payload)) {
+      return $this->payload[self::USER_ATTR];
+    }
+    throw new Google_AuthException("No user_id in token");
+  }
+
+  /**
+   * Returns attributes from the login ticket.  This can contain
+   * various information about the user session.
+   * @return array
+   */
+  public function getAttributes() {
+    return array("envelope" => $this->envelope, "payload" => $this->payload);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_OAuth2.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_OAuth2.php
new file mode 100644
index 0000000000000000000000000000000000000000..a07d4365a7a6ce33e1f77371f1cbc505307393e4
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_OAuth2.php
@@ -0,0 +1,445 @@
+<?php
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google_Verifier.php";
+require_once "Google_LoginTicket.php";
+require_once "service/Google_Utils.php";
+
+/**
+ * Authentication class that deals with the OAuth 2 web-server authentication flow
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_OAuth2 extends Google_Auth {
+  public $clientId;
+  public $clientSecret;
+  public $developerKey;
+  public $token;
+  public $redirectUri;
+  public $state;
+  public $accessType = 'offline';
+  public $approvalPrompt = 'force';
+
+  /** @var Google_AssertionCredentials $assertionCredentials */
+  public $assertionCredentials;
+
+  const OAUTH2_REVOKE_URI = 'https://accounts.google.com/o/oauth2/revoke';
+  const OAUTH2_TOKEN_URI = 'https://accounts.google.com/o/oauth2/token';
+  const OAUTH2_AUTH_URL = 'https://accounts.google.com/o/oauth2/auth';
+  const OAUTH2_FEDERATED_SIGNON_CERTS_URL = 'https://www.googleapis.com/oauth2/v1/certs';
+  const CLOCK_SKEW_SECS = 300; // five minutes in seconds
+  const AUTH_TOKEN_LIFETIME_SECS = 300; // five minutes in seconds
+  const MAX_TOKEN_LIFETIME_SECS = 86400; // one day in seconds
+
+  /**
+   * Instantiates the class, but does not initiate the login flow, leaving it
+   * to the discretion of the caller (which is done by calling authenticate()).
+   */
+  public function __construct() {
+    global $apiConfig;
+
+    if (! empty($apiConfig['developer_key'])) {
+      $this->developerKey = $apiConfig['developer_key'];
+    }
+
+    if (! empty($apiConfig['oauth2_client_id'])) {
+      $this->clientId = $apiConfig['oauth2_client_id'];
+    }
+
+    if (! empty($apiConfig['oauth2_client_secret'])) {
+      $this->clientSecret = $apiConfig['oauth2_client_secret'];
+    }
+
+    if (! empty($apiConfig['oauth2_redirect_uri'])) {
+      $this->redirectUri = $apiConfig['oauth2_redirect_uri'];
+    }
+
+    if (! empty($apiConfig['oauth2_access_type'])) {
+      $this->accessType = $apiConfig['oauth2_access_type'];
+    }
+
+    if (! empty($apiConfig['oauth2_approval_prompt'])) {
+      $this->approvalPrompt = $apiConfig['oauth2_approval_prompt'];
+    }
+
+  }
+
+  /**
+   * @param $service
+   * @param string|null $code
+   * @throws Google_AuthException
+   * @return string
+   */
+  public function authenticate($service, $code = null) {
+    if (!$code && isset($_GET['code'])) {
+      $code = $_GET['code'];
+    }
+
+    if ($code) {
+      // We got here from the redirect from a successful authorization grant, fetch the access token
+      $request = Google_Client::$io->makeRequest(new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), array(
+          'code' => $code,
+          'grant_type' => 'authorization_code',
+          'redirect_uri' => $this->redirectUri,
+          'client_id' => $this->clientId,
+          'client_secret' => $this->clientSecret
+      )));
+
+      if ($request->getResponseHttpCode() == 200) {
+        $this->setAccessToken($request->getResponseBody());
+        $this->token['created'] = time();
+        return $this->getAccessToken();
+      } else {
+        $response = $request->getResponseBody();
+        $decodedResponse = json_decode($response, true);
+        if ($decodedResponse != null && $decodedResponse['error']) {
+          $response = $decodedResponse['error'];
+        }
+        throw new Google_AuthException("Error fetching OAuth2 access token, message: '$response'", $request->getResponseHttpCode());
+      }
+    }
+
+    $authUrl = $this->createAuthUrl($service['scope']);
+    header('Location: ' . $authUrl);
+    return true;
+  }
+
+  /**
+   * Create a URL to obtain user authorization.
+   * The authorization endpoint allows the user to first
+   * authenticate, and then grant/deny the access request.
+   * @param string $scope The scope is expressed as a list of space-delimited strings.
+   * @return string
+   */
+  public function createAuthUrl($scope) {
+    $params = array(
+        'response_type=code',
+        'redirect_uri=' . urlencode($this->redirectUri),
+        'client_id=' . urlencode($this->clientId),
+        'scope=' . urlencode($scope),
+        'access_type=' . urlencode($this->accessType),
+        'approval_prompt=' . urlencode($this->approvalPrompt),
+    );
+
+    if (isset($this->state)) {
+      $params[] = 'state=' . urlencode($this->state);
+    }
+    $params = implode('&', $params);
+    return self::OAUTH2_AUTH_URL . "?$params";
+  }
+
+  /**
+   * @param string $token
+   * @throws Google_AuthException
+   */
+  public function setAccessToken($token) {
+    $token = json_decode($token, true);
+    if ($token == null) {
+      throw new Google_AuthException('Could not json decode the token');
+    }
+    if (! isset($token['access_token'])) {
+      throw new Google_AuthException("Invalid token format");
+    }
+    $this->token = $token;
+  }
+
+  public function getAccessToken() {
+    return json_encode($this->token);
+  }
+
+  public function setDeveloperKey($developerKey) {
+    $this->developerKey = $developerKey;
+  }
+
+  public function setState($state) {
+    $this->state = $state;
+  }
+
+  public function setAccessType($accessType) {
+    $this->accessType = $accessType;
+  }
+
+  public function setApprovalPrompt($approvalPrompt) {
+    $this->approvalPrompt = $approvalPrompt;
+  }
+
+  public function setAssertionCredentials(Google_AssertionCredentials $creds) {
+    $this->assertionCredentials = $creds;
+  }
+
+  /**
+   * Include an accessToken in a given apiHttpRequest.
+   * @param Google_HttpRequest $request
+   * @return Google_HttpRequest
+   * @throws Google_AuthException
+   */
+  public function sign(Google_HttpRequest $request) {
+    // add the developer key to the request before signing it
+    if ($this->developerKey) {
+      $requestUrl = $request->getUrl();
+      $requestUrl .= (strpos($request->getUrl(), '?') === false) ? '?' : '&';
+      $requestUrl .=  'key=' . urlencode($this->developerKey);
+      $request->setUrl($requestUrl);
+    }
+
+    // Cannot sign the request without an OAuth access token.
+    if (null == $this->token && null == $this->assertionCredentials) {
+      return $request;
+    }
+
+    // Check if the token is set to expire in the next 30 seconds
+    // (or has already expired).
+    if ($this->isAccessTokenExpired()) {
+      if ($this->assertionCredentials) {
+        $this->refreshTokenWithAssertion();
+      } else {
+        if (! array_key_exists('refresh_token', $this->token)) {
+            throw new Google_AuthException("The OAuth 2.0 access token has expired, "
+                . "and a refresh token is not available. Refresh tokens are not "
+                . "returned for responses that were auto-approved.");
+        }
+        $this->refreshToken($this->token['refresh_token']);
+      }
+    }
+
+    // Add the OAuth2 header to the request
+    $request->setRequestHeaders(
+        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+    );
+
+    return $request;
+  }
+
+  /**
+   * Fetches a fresh access token with the given refresh token.
+   * @param string $refreshToken
+   * @return void
+   */
+  public function refreshToken($refreshToken) {
+    $this->refreshTokenRequest(array(
+        'client_id' => $this->clientId,
+        'client_secret' => $this->clientSecret,
+        'refresh_token' => $refreshToken,
+        'grant_type' => 'refresh_token'
+    ));
+  }
+
+  /**
+   * Fetches a fresh access token with a given assertion token.
+   * @param Google_AssertionCredentials $assertionCredentials optional.
+   * @return void
+   */
+  public function refreshTokenWithAssertion($assertionCredentials = null) {
+    if (!$assertionCredentials) {
+      $assertionCredentials = $this->assertionCredentials;
+    }
+
+    $this->refreshTokenRequest(array(
+        'grant_type' => 'assertion',
+        'assertion_type' => $assertionCredentials->assertionType,
+        'assertion' => $assertionCredentials->generateAssertion(),
+    ));
+  }
+
+  private function refreshTokenRequest($params) {
+    $http = new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), $params);
+    $request = Google_Client::$io->makeRequest($http);
+
+    $code = $request->getResponseHttpCode();
+    $body = $request->getResponseBody();
+    if (200 == $code) {
+      $token = json_decode($body, true);
+      if ($token == null) {
+        throw new Google_AuthException("Could not json decode the access token");
+      }
+
+      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+        throw new Google_AuthException("Invalid token format");
+      }
+
+      $this->token['access_token'] = $token['access_token'];
+      $this->token['expires_in'] = $token['expires_in'];
+      $this->token['created'] = time();
+    } else {
+      throw new Google_AuthException("Error refreshing the OAuth2 token, message: '$body'", $code);
+    }
+  }
+
+    /**
+     * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
+     * token, if a token isn't provided.
+     * @throws Google_AuthException
+     * @param string|null $token The token (access token or a refresh token) that should be revoked.
+     * @return boolean Returns True if the revocation was successful, otherwise False.
+     */
+  public function revokeToken($token = null) {
+    if (!$token) {
+      $token = $this->token['access_token'];
+    }
+    $request = new Google_HttpRequest(self::OAUTH2_REVOKE_URI, 'POST', array(), "token=$token");
+    $response = Google_Client::$io->makeRequest($request);
+    $code = $response->getResponseHttpCode();
+    if ($code == 200) {
+      $this->token = null;
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns if the access_token is expired.
+   * @return bool Returns True if the access_token is expired.
+   */
+  public function isAccessTokenExpired() {
+    if (null == $this->token) {
+      return true;
+    }
+
+    // If the token is set to expire in the next 30 seconds.
+    $expired = ($this->token['created']
+        + ($this->token['expires_in'] - 30)) < time();
+
+    return $expired;
+  }
+
+  // Gets federated sign-on certificates to use for verifying identity tokens.
+  // Returns certs as array structure, where keys are key ids, and values
+  // are PEM encoded certificates.
+  private function getFederatedSignOnCerts() {
+    // This relies on makeRequest caching certificate responses.
+    $request = Google_Client::$io->makeRequest(new Google_HttpRequest(
+        self::OAUTH2_FEDERATED_SIGNON_CERTS_URL));
+    if ($request->getResponseHttpCode() == 200) {
+      $certs = json_decode($request->getResponseBody(), true);
+      if ($certs) {
+        return $certs;
+      }
+    }
+    throw new Google_AuthException(
+        "Failed to retrieve verification certificates: '" .
+            $request->getResponseBody() . "'.",
+        $request->getResponseHttpCode());
+  }
+
+  /**
+   * Verifies an id token and returns the authenticated apiLoginTicket.
+   * Throws an exception if the id token is not valid.
+   * The audience parameter can be used to control which id tokens are
+   * accepted.  By default, the id token must have been issued to this OAuth2 client.
+   *
+   * @param $id_token
+   * @param $audience
+   * @return Google_LoginTicket
+   */
+  public function verifyIdToken($id_token = null, $audience = null) {
+    if (!$id_token) {
+      $id_token = $this->token['id_token'];
+    }
+
+    $certs = $this->getFederatedSignonCerts();
+    if (!$audience) {
+      $audience = $this->clientId;
+    }
+    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience);
+  }
+
+  // Verifies the id token, returns the verified token contents.
+  // Visible for testing.
+  function verifySignedJwtWithCerts($jwt, $certs, $required_audience) {
+    $segments = explode(".", $jwt);
+    if (count($segments) != 3) {
+      throw new Google_AuthException("Wrong number of segments in token: $jwt");
+    }
+    $signed = $segments[0] . "." . $segments[1];
+    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
+
+    // Parse envelope.
+    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
+    if (!$envelope) {
+      throw new Google_AuthException("Can't parse token envelope: " . $segments[0]);
+    }
+
+    // Parse token
+    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
+    $payload = json_decode($json_body, true);
+    if (!$payload) {
+      throw new Google_AuthException("Can't parse token payload: " . $segments[1]);
+    }
+
+    // Check signature
+    $verified = false;
+    foreach ($certs as $keyName => $pem) {
+      $public_key = new Google_PemVerifier($pem);
+      if ($public_key->verify($signed, $signature)) {
+        $verified = true;
+        break;
+      }
+    }
+
+    if (!$verified) {
+      throw new Google_AuthException("Invalid token signature: $jwt");
+    }
+
+    // Check issued-at timestamp
+    $iat = 0;
+    if (array_key_exists("iat", $payload)) {
+      $iat = $payload["iat"];
+    }
+    if (!$iat) {
+      throw new Google_AuthException("No issue time in token: $json_body");
+    }
+    $earliest = $iat - self::CLOCK_SKEW_SECS;
+
+    // Check expiration timestamp
+    $now = time();
+    $exp = 0;
+    if (array_key_exists("exp", $payload)) {
+      $exp = $payload["exp"];
+    }
+    if (!$exp) {
+      throw new Google_AuthException("No expiration time in token: $json_body");
+    }
+    if ($exp >= $now + self::MAX_TOKEN_LIFETIME_SECS) {
+      throw new Google_AuthException(
+          "Expiration time too far in future: $json_body");
+    }
+
+    $latest = $exp + self::CLOCK_SKEW_SECS;
+    if ($now < $earliest) {
+      throw new Google_AuthException(
+          "Token used too early, $now < $earliest: $json_body");
+    }
+    if ($now > $latest) {
+      throw new Google_AuthException(
+          "Token used too late, $now > $latest: $json_body");
+    }
+
+    // TODO(beaton): check issuer field?
+
+    // Check audience
+    $aud = $payload["aud"];
+    if ($aud != $required_audience) {
+      throw new Google_AuthException("Wrong recipient, $aud != $required_audience: $json_body");
+    }
+
+    // All good.
+    return new Google_LoginTicket($envelope, $payload);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_P12Signer.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_P12Signer.php
new file mode 100644
index 0000000000000000000000000000000000000000..1bed5909913686db299bf20a97abb4c698a42bcc
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_P12Signer.php
@@ -0,0 +1,70 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Signs data.
+ *
+ * Only used for testing.
+ *
+ * @author Brian Eaton <beaton@google.com>
+ */
+class Google_P12Signer extends Google_Signer {
+  // OpenSSL private key resource
+  private $privateKey;
+
+  // Creates a new signer from a .p12 file.
+  function __construct($p12, $password) {
+    if (!function_exists('openssl_x509_read')) {
+      throw new Exception(
+          'The Google PHP API library needs the openssl PHP extension');
+    }
+
+    // This throws on error
+    $certs = array();
+    if (!openssl_pkcs12_read($p12, $certs, $password)) {
+      throw new Google_AuthException("Unable to parse the p12 file.  " .
+          "Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
+          openssl_error_string());
+    }
+    // TODO(beaton): is this part of the contract for the openssl_pkcs12_read
+    // method?  What happens if there are multiple private keys?  Do we care?
+    if (!array_key_exists("pkey", $certs) || !$certs["pkey"]) {
+      throw new Google_AuthException("No private key found in p12 file.");
+    }
+    $this->privateKey = openssl_pkey_get_private($certs["pkey"]);
+    if (!$this->privateKey) {
+      throw new Google_AuthException("Unable to load private key in ");
+    }
+  }
+
+  function __destruct() {
+    if ($this->privateKey) {
+      openssl_pkey_free($this->privateKey);
+    }
+  }
+
+  function sign($data) {
+    if(version_compare(PHP_VERSION, '5.3.0') < 0) {
+      throw new Google_AuthException(
+        "PHP 5.3.0 or higher is required to use service accounts.");
+    }
+    if (!openssl_sign($data, $signature, $this->privateKey, "sha256")) {
+      throw new Google_AuthException("Unable to sign data");
+    }
+    return $signature;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_PemVerifier.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_PemVerifier.php
new file mode 100644
index 0000000000000000000000000000000000000000..6c1c85fa20e1161cd7b225c0a55a2abe70e361a1
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_PemVerifier.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Verifies signatures using PEM encoded certificates.
+ *
+ * @author Brian Eaton <beaton@google.com>
+ */
+class Google_PemVerifier extends Google_Verifier {
+  private $publicKey;
+
+  /**
+   * Constructs a verifier from the supplied PEM-encoded certificate.
+   *
+   * $pem: a PEM encoded certificate (not a file).
+   * @param $pem
+   * @throws Google_AuthException
+   * @throws Google_Exception
+   */
+  function __construct($pem) {
+    if (!function_exists('openssl_x509_read')) {
+      throw new Google_Exception('Google API PHP client needs the openssl PHP extension');
+    }
+    $this->publicKey = openssl_x509_read($pem);
+    if (!$this->publicKey) {
+      throw new Google_AuthException("Unable to parse PEM: $pem");
+    }
+  }
+
+  function __destruct() {
+    if ($this->publicKey) {
+      openssl_x509_free($this->publicKey);
+    }
+  }
+
+  /**
+   * Verifies the signature on data.
+   *
+   * Returns true if the signature is valid, false otherwise.
+   * @param $data
+   * @param $signature
+   * @throws Google_AuthException
+   * @return bool
+   */
+  function verify($data, $signature) {
+    $status = openssl_verify($data, $signature, $this->publicKey, "sha256");
+    if ($status === -1) {
+      throw new Google_AuthException('Signature verification error: ' . openssl_error_string());
+    }
+    return $status === 1;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Signer.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Signer.php
new file mode 100644
index 0000000000000000000000000000000000000000..7892baac8dffa65fb64f23ff8ba474aa8e28045e
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Signer.php
@@ -0,0 +1,30 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google_P12Signer.php";
+
+/**
+ * Signs data.
+ *
+ * @author Brian Eaton <beaton@google.com>
+ */
+abstract class Google_Signer {
+  /**
+   * Signs data, returns the signature as binary data.
+   */
+  abstract public function sign($data);
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Verifier.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Verifier.php
new file mode 100644
index 0000000000000000000000000000000000000000..2839a371df18e51e0181b74db024b98af8c910a6
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Verifier.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google_PemVerifier.php";
+
+/**
+ * Verifies signatures.
+ *
+ * @author Brian Eaton <beaton@google.com>
+ */
+abstract class Google_Verifier {
+  /**
+   * Checks a signature, returns true if the signature is correct,
+   * false otherwise.
+   */
+  abstract public function verify($data, $signature);
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_ApcCache.php b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_ApcCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..3523c98dccab3172b57a60fd3727432711454ebd
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_ApcCache.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A persistent storage class based on the APC cache, which is not
+ * really very persistent, as soon as you restart your web server
+ * the storage will be wiped, however for debugging and/or speed
+ * it can be useful, kinda, and cache is a lot cheaper then storage.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+class googleApcCache extends Google_Cache {
+
+  public function __construct() {
+    if (! function_exists('apc_add')) {
+      throw new Google_CacheException("Apc functions not available");
+    }
+  }
+
+  private function isLocked($key) {
+    if ((@apc_fetch($key . '.lock')) === false) {
+      return false;
+    }
+    return true;
+  }
+
+  private function createLock($key) {
+    // the interesting thing is that this could fail if the lock was created in the meantime..
+    // but we'll ignore that out of convenience
+    @apc_add($key . '.lock', '', 5);
+  }
+
+  private function removeLock($key) {
+    // suppress all warnings, if some other process removed it that's ok too
+    @apc_delete($key . '.lock');
+  }
+
+  private function waitForLock($key) {
+    // 20 x 250 = 5 seconds
+    $tries = 20;
+    $cnt = 0;
+    do {
+      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
+      usleep(250);
+      $cnt ++;
+    } while ($cnt <= $tries && $this->isLocked($key));
+    if ($this->isLocked($key)) {
+      // 5 seconds passed, assume the owning process died off and remove it
+      $this->removeLock($key);
+    }
+  }
+
+   /**
+   * @inheritDoc
+   */
+  public function get($key, $expiration = false) {
+
+    if (($ret = @apc_fetch($key)) === false) {
+      return false;
+    }
+    if (!$expiration || (time() - $ret['time'] > $expiration)) {
+      $this->delete($key);
+      return false;
+    }
+    return unserialize($ret['data']);
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function set($key, $value) {
+    if (@apc_store($key, array('time' => time(), 'data' => serialize($value))) == false) {
+      throw new Google_CacheException("Couldn't store data");
+    }
+  }
+
+  /**
+   * @inheritDoc
+   * @param String $key
+   */
+  public function delete($key) {
+    @apc_delete($key);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_Cache.php b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_Cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..809c55e2b154d8d5f1c50eb3d3bd372efb81b44a
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_Cache.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google_FileCache.php";
+require_once "Google_MemcacheCache.php";
+
+/**
+ * Abstract storage class
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+abstract class Google_Cache {
+
+  /**
+   * Retrieves the data for the given key, or false if they
+   * key is unknown or expired
+   *
+   * @param String $key The key who's data to retrieve
+   * @param boolean|int $expiration Expiration time in seconds
+   *
+   */
+  abstract function get($key, $expiration = false);
+
+  /**
+   * Store the key => $value set. The $value is serialized
+   * by this function so can be of any type
+   *
+   * @param string $key Key of the data
+   * @param string $value data
+   */
+  abstract function set($key, $value);
+
+  /**
+   * Removes the key/data pair for the given $key
+   *
+   * @param String $key
+   */
+  abstract function delete($key);
+}
+
+
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_FileCache.php b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_FileCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..1e32859a48bd25ed306796eacbdcd3c380944285
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_FileCache.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * This class implements a basic on disk storage. While that does
+ * work quite well it's not the most elegant and scalable solution.
+ * It will also get you into a heap of trouble when you try to run
+ * this in a clustered environment. In those cases please use the
+ * MySql back-end
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+class Google_FileCache extends Google_Cache {
+  private $path;
+
+  public function __construct() {
+    global $apiConfig;
+    $this->path = $apiConfig['ioFileCache_directory'];
+  }
+
+  private function isLocked($storageFile) {
+    // our lock file convention is simple: /the/file/path.lock
+    return file_exists($storageFile . '.lock');
+  }
+
+  private function createLock($storageFile) {
+    $storageDir = dirname($storageFile);
+    if (! is_dir($storageDir)) {
+      // @codeCoverageIgnoreStart
+      if (! @mkdir($storageDir, 0755, true)) {
+        // make sure the failure isn't because of a concurrency issue
+        if (! is_dir($storageDir)) {
+          throw new Google_CacheException("Could not create storage directory: $storageDir");
+        }
+      }
+      // @codeCoverageIgnoreEnd
+    }
+    @touch($storageFile . '.lock');
+  }
+
+  private function removeLock($storageFile) {
+    // suppress all warnings, if some other process removed it that's ok too
+    @unlink($storageFile . '.lock');
+  }
+
+  private function waitForLock($storageFile) {
+    // 20 x 250 = 5 seconds
+    $tries = 20;
+    $cnt = 0;
+    do {
+      // make sure PHP picks up on file changes. This is an expensive action but really can't be avoided
+      clearstatcache();
+      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
+      usleep(250);
+      $cnt ++;
+    } while ($cnt <= $tries && $this->isLocked($storageFile));
+    if ($this->isLocked($storageFile)) {
+      // 5 seconds passed, assume the owning process died off and remove it
+      $this->removeLock($storageFile);
+    }
+  }
+
+  private function getCacheDir($hash) {
+    // use the first 2 characters of the hash as a directory prefix
+    // this should prevent slowdowns due to huge directory listings
+    // and thus give some basic amount of scalability
+    return $this->path . '/' . substr($hash, 0, 2);
+  }
+
+  private function getCacheFile($hash) {
+    return $this->getCacheDir($hash) . '/' . $hash;
+  }
+
+  public function get($key, $expiration = false) {
+    $storageFile = $this->getCacheFile(md5($key));
+    // See if this storage file is locked, if so we wait up to 5 seconds for the lock owning process to
+    // complete it's work. If the lock is not released within that time frame, it's cleaned up.
+    // This should give us a fair amount of 'Cache Stampeding' protection
+    if ($this->isLocked($storageFile)) {
+      $this->waitForLock($storageFile);
+    }
+    if (file_exists($storageFile) && is_readable($storageFile)) {
+      $now = time();
+      if (! $expiration || (($mtime = @filemtime($storageFile)) !== false && ($now - $mtime) < $expiration)) {
+        if (($data = @file_get_contents($storageFile)) !== false) {
+          $data = unserialize($data);
+          return $data;
+        }
+      }
+    }
+    return false;
+  }
+
+  public function set($key, $value) {
+    $storageDir = $this->getCacheDir(md5($key));
+    $storageFile = $this->getCacheFile(md5($key));
+    if ($this->isLocked($storageFile)) {
+      // some other process is writing to this file too, wait until it's done to prevent hiccups
+      $this->waitForLock($storageFile);
+    }
+    if (! is_dir($storageDir)) {
+      if (! @mkdir($storageDir, 0755, true)) {
+        throw new Google_CacheException("Could not create storage directory: $storageDir");
+      }
+    }
+    // we serialize the whole request object, since we don't only want the
+    // responseContent but also the postBody used, headers, size, etc
+    $data = serialize($value);
+    $this->createLock($storageFile);
+    if (! @file_put_contents($storageFile, $data)) {
+      $this->removeLock($storageFile);
+      throw new Google_CacheException("Could not store data in the file");
+    }
+    $this->removeLock($storageFile);
+  }
+
+  public function delete($key) {
+    $file = $this->getCacheFile(md5($key));
+    if (! @unlink($file)) {
+      throw new Google_CacheException("Cache file could not be deleted");
+    }
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_MemcacheCache.php b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_MemcacheCache.php
new file mode 100644
index 0000000000000000000000000000000000000000..22493f8b1ecd3987da10f1ae4c1238b1e350b712
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_MemcacheCache.php
@@ -0,0 +1,130 @@
+<?php
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A persistent storage class based on the memcache, which is not
+ * really very persistent, as soon as you restart your memcache daemon
+ * the storage will be wiped, however for debugging and/or speed
+ * it can be useful, kinda, and cache is a lot cheaper then storage.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+class Google_MemcacheCache extends Google_Cache {
+  private $connection = false;
+
+  public function __construct() {
+    global $apiConfig;
+    if (! function_exists('memcache_connect')) {
+      throw new Google_CacheException("Memcache functions not available");
+    }
+    $this->host = $apiConfig['ioMemCacheCache_host'];
+    $this->port = $apiConfig['ioMemCacheCache_port'];
+    if (empty($this->host) || empty($this->port)) {
+      throw new Google_CacheException("You need to supply a valid memcache host and port");
+    }
+  }
+
+  private function isLocked($key) {
+    $this->check();
+    if ((@memcache_get($this->connection, $key . '.lock')) === false) {
+      return false;
+    }
+    return true;
+  }
+
+  private function createLock($key) {
+    $this->check();
+    // the interesting thing is that this could fail if the lock was created in the meantime..
+    // but we'll ignore that out of convenience
+    @memcache_add($this->connection, $key . '.lock', '', 0, 5);
+  }
+
+  private function removeLock($key) {
+    $this->check();
+    // suppress all warnings, if some other process removed it that's ok too
+    @memcache_delete($this->connection, $key . '.lock');
+  }
+
+  private function waitForLock($key) {
+    $this->check();
+    // 20 x 250 = 5 seconds
+    $tries = 20;
+    $cnt = 0;
+    do {
+      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
+      usleep(250);
+      $cnt ++;
+    } while ($cnt <= $tries && $this->isLocked($key));
+    if ($this->isLocked($key)) {
+      // 5 seconds passed, assume the owning process died off and remove it
+      $this->removeLock($key);
+    }
+  }
+
+  // I prefer lazy initialization since the cache isn't used every request
+  // so this potentially saves a lot of overhead
+  private function connect() {
+    if (! $this->connection = @memcache_pconnect($this->host, $this->port)) {
+      throw new Google_CacheException("Couldn't connect to memcache server");
+    }
+  }
+
+  private function check() {
+    if (! $this->connection) {
+      $this->connect();
+    }
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function get($key, $expiration = false) {
+    $this->check();
+    if (($ret = @memcache_get($this->connection, $key)) === false) {
+      return false;
+    }
+    if (! $expiration || (time() - $ret['time'] > $expiration)) {
+      $this->delete($key);
+      return false;
+    }
+    return $ret['data'];
+  }
+
+  /**
+   * @inheritDoc
+   * @param string $key
+   * @param string $value
+   * @throws Google_CacheException
+   */
+  public function set($key, $value) {
+    $this->check();
+    // we store it with the cache_time default expiration so objects will at least get cleaned eventually.
+    if (@memcache_set($this->connection, $key, array('time' => time(),
+        'data' => $value), false) == false) {
+      throw new Google_CacheException("Couldn't store data in cache");
+    }
+  }
+
+  /**
+   * @inheritDoc
+   * @param String $key
+   */
+  public function delete($key) {
+    $this->check();
+    @memcache_delete($this->connection, $key);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/config.php b/apps/files_external/3rdparty/google-api-php-client/src/config.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3a57138d05b3d84aec96137feeed73b7d947b83
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/config.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+global $apiConfig;
+$apiConfig = array(
+    // True if objects should be returned by the service classes.
+    // False if associative arrays should be returned (default behavior).
+    'use_objects' => false,
+  
+    // The application_name is included in the User-Agent HTTP header.
+    'application_name' => '',
+
+    // OAuth2 Settings, you can get these keys at https://code.google.com/apis/console
+    'oauth2_client_id' => '',
+    'oauth2_client_secret' => '',
+    'oauth2_redirect_uri' => '',
+
+    // The developer key, you get this at https://code.google.com/apis/console
+    'developer_key' => '',
+  
+    // Site name to show in the Google's OAuth 1 authentication screen.
+    'site_name' => 'www.example.org',
+
+    // Which Authentication, Storage and HTTP IO classes to use.
+    'authClass'    => 'Google_OAuth2',
+    'ioClass'      => 'Google_CurlIO',
+    'cacheClass'   => 'Google_FileCache',
+
+    // Don't change these unless you're working against a special development or testing environment.
+    'basePath' => 'https://www.googleapis.com',
+
+    // IO Class dependent configuration, you only have to configure the values
+    // for the class that was configured as the ioClass above
+    'ioFileCache_directory'  =>
+        (function_exists('sys_get_temp_dir') ?
+            sys_get_temp_dir() . '/Google_Client' :
+        '/tmp/Google_Client'),
+
+    // Definition of service specific values like scopes, oauth token URLs, etc
+    'services' => array(
+      'analytics' => array('scope' => 'https://www.googleapis.com/auth/analytics.readonly'),
+      'calendar' => array(
+          'scope' => array(
+              "https://www.googleapis.com/auth/calendar",
+              "https://www.googleapis.com/auth/calendar.readonly",
+          )
+      ),
+      'books' => array('scope' => 'https://www.googleapis.com/auth/books'),
+      'latitude' => array(
+          'scope' => array(
+              'https://www.googleapis.com/auth/latitude.all.best',
+              'https://www.googleapis.com/auth/latitude.all.city',
+          )
+      ),
+      'moderator' => array('scope' => 'https://www.googleapis.com/auth/moderator'),
+      'oauth2' => array(
+          'scope' => array(
+              'https://www.googleapis.com/auth/userinfo.profile',
+              'https://www.googleapis.com/auth/userinfo.email',
+          )
+      ),
+      'plus' => array('scope' => 'https://www.googleapis.com/auth/plus.login'),
+      'siteVerification' => array('scope' => 'https://www.googleapis.com/auth/siteverification'),
+      'tasks' => array('scope' => 'https://www.googleapis.com/auth/tasks'),
+      'urlshortener' => array('scope' => 'https://www.googleapis.com/auth/urlshortener')
+    )
+);
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/contrib/Google_DriveService.php b/apps/files_external/3rdparty/google-api-php-client/src/contrib/Google_DriveService.php
new file mode 100644
index 0000000000000000000000000000000000000000..896e8b93826fc53d3cf540b402966d6d8cc3cd1c
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/contrib/Google_DriveService.php
@@ -0,0 +1,3143 @@
+<?php
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+
+  /**
+   * The "about" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $about = $driveService->about;
+   *  </code>
+   */
+  class Google_AboutServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Gets the information about the current user along with Drive API settings (about.get)
+     *
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool includeSubscribed When calculating the number of remaining change IDs, whether to include shared files and public files the user has opened. When set to false, this counts only change IDs for owned files and any shared or public files that the user has explictly added to a folder in Drive.
+     * @opt_param string maxChangeIdCount Maximum number of remaining change IDs to count
+     * @opt_param string startChangeId Change ID to start counting from when calculating number of remaining change IDs
+     * @return Google_About
+     */
+    public function get($optParams = array()) {
+      $params = array();
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_About($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "apps" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $apps = $driveService->apps;
+   *  </code>
+   */
+  class Google_AppsServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Gets a specific app. (apps.get)
+     *
+     * @param string $appId The ID of the app.
+     * @param array $optParams Optional parameters.
+     * @return Google_App
+     */
+    public function get($appId, $optParams = array()) {
+      $params = array('appId' => $appId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_App($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists a user's installed apps. (apps.list)
+     *
+     * @param array $optParams Optional parameters.
+     * @return Google_AppList
+     */
+    public function listApps($optParams = array()) {
+      $params = array();
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_AppList($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "changes" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $changes = $driveService->changes;
+   *  </code>
+   */
+  class Google_ChangesServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Gets a specific change. (changes.get)
+     *
+     * @param string $changeId The ID of the change.
+     * @param array $optParams Optional parameters.
+     * @return Google_Change
+     */
+    public function get($changeId, $optParams = array()) {
+      $params = array('changeId' => $changeId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_Change($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists the changes for a user. (changes.list)
+     *
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool includeDeleted Whether to include deleted items.
+     * @opt_param bool includeSubscribed Whether to include shared files and public files the user has opened. When set to false, the list will include owned files plus any shared or public files the user has explictly added to a folder in Drive.
+     * @opt_param int maxResults Maximum number of changes to return.
+     * @opt_param string pageToken Page token for changes.
+     * @opt_param string startChangeId Change ID to start listing changes from.
+     * @return Google_ChangeList
+     */
+    public function listChanges($optParams = array()) {
+      $params = array();
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_ChangeList($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "children" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $children = $driveService->children;
+   *  </code>
+   */
+  class Google_ChildrenServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Removes a child from a folder. (children.delete)
+     *
+     * @param string $folderId The ID of the folder.
+     * @param string $childId The ID of the child.
+     * @param array $optParams Optional parameters.
+     */
+    public function delete($folderId, $childId, $optParams = array()) {
+      $params = array('folderId' => $folderId, 'childId' => $childId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a specific child reference. (children.get)
+     *
+     * @param string $folderId The ID of the folder.
+     * @param string $childId The ID of the child.
+     * @param array $optParams Optional parameters.
+     * @return Google_ChildReference
+     */
+    public function get($folderId, $childId, $optParams = array()) {
+      $params = array('folderId' => $folderId, 'childId' => $childId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_ChildReference($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Inserts a file into a folder. (children.insert)
+     *
+     * @param string $folderId The ID of the folder.
+     * @param Google_ChildReference $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_ChildReference
+     */
+    public function insert($folderId, Google_ChildReference $postBody, $optParams = array()) {
+      $params = array('folderId' => $folderId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('insert', array($params));
+      if ($this->useObjects()) {
+        return new Google_ChildReference($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists a folder's children. (children.list)
+     *
+     * @param string $folderId The ID of the folder.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param int maxResults Maximum number of children to return.
+     * @opt_param string pageToken Page token for children.
+     * @opt_param string q Query string for searching children.
+     * @return Google_ChildList
+     */
+    public function listChildren($folderId, $optParams = array()) {
+      $params = array('folderId' => $folderId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_ChildList($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "comments" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $comments = $driveService->comments;
+   *  </code>
+   */
+  class Google_CommentsServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Deletes a comment. (comments.delete)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param array $optParams Optional parameters.
+     */
+    public function delete($fileId, $commentId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a comment by ID. (comments.get)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool includeDeleted If set, this will succeed when retrieving a deleted comment, and will include any deleted replies.
+     * @return Google_Comment
+     */
+    public function get($fileId, $commentId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_Comment($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Creates a new comment on the given file. (comments.insert)
+     *
+     * @param string $fileId The ID of the file.
+     * @param Google_Comment $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_Comment
+     */
+    public function insert($fileId, Google_Comment $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('insert', array($params));
+      if ($this->useObjects()) {
+        return new Google_Comment($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists a file's comments. (comments.list)
+     *
+     * @param string $fileId The ID of the file.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool includeDeleted If set, all comments and replies, including deleted comments and replies (with content stripped) will be returned.
+     * @opt_param int maxResults The maximum number of discussions to include in the response, used for paging.
+     * @opt_param string pageToken The continuation token, used to page through large result sets. To get the next page of results, set this parameter to the value of "nextPageToken" from the previous response.
+     * @opt_param string updatedMin Only discussions that were updated after this timestamp will be returned. Formatted as an RFC 3339 timestamp.
+     * @return Google_CommentList
+     */
+    public function listComments($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_CommentList($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates an existing comment. This method supports patch semantics. (comments.patch)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param Google_Comment $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_Comment
+     */
+    public function patch($fileId, $commentId, Google_Comment $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('patch', array($params));
+      if ($this->useObjects()) {
+        return new Google_Comment($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates an existing comment. (comments.update)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param Google_Comment $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_Comment
+     */
+    public function update($fileId, $commentId, Google_Comment $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('update', array($params));
+      if ($this->useObjects()) {
+        return new Google_Comment($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "files" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $files = $driveService->files;
+   *  </code>
+   */
+  class Google_FilesServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Creates a copy of the specified file. (files.copy)
+     *
+     * @param string $fileId The ID of the file to copy.
+     * @param Google_DriveFile $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
+     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+     * @opt_param bool pinned Whether to pin the head revision of the new copy.
+     * @opt_param string timedTextLanguage The language of the timed text.
+     * @opt_param string timedTextTrackName The timed text track name.
+     * @return Google_DriveFile
+     */
+    public function copy($fileId, Google_DriveFile $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('copy', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Permanently deletes a file by ID. Skips the trash. (files.delete)
+     *
+     * @param string $fileId The ID of the file to delete.
+     * @param array $optParams Optional parameters.
+     */
+    public function delete($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a file's metadata by ID. (files.get)
+     *
+     * @param string $fileId The ID for the file in question.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param string projection This parameter is deprecated and has no function.
+     * @opt_param bool updateViewedDate Whether to update the view date after successfully retrieving the file.
+     * @return Google_DriveFile
+     */
+    public function get($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Insert a new file. (files.insert)
+     *
+     * @param Google_DriveFile $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
+     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+     * @opt_param bool pinned Whether to pin the head revision of the uploaded file.
+     * @opt_param string timedTextLanguage The language of the timed text.
+     * @opt_param string timedTextTrackName The timed text track name.
+     * @opt_param bool useContentAsIndexableText Whether to use the content as indexable text.
+     * @return Google_DriveFile
+     */
+    public function insert(Google_DriveFile $postBody, $optParams = array()) {
+      $params = array('postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('insert', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists the user's files. (files.list)
+     *
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param int maxResults Maximum number of files to return.
+     * @opt_param string pageToken Page token for files.
+     * @opt_param string projection This parameter is deprecated and has no function.
+     * @opt_param string q Query string for searching files.
+     * @return Google_FileList
+     */
+    public function listFiles($optParams = array()) {
+      $params = array();
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_FileList($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates file metadata and/or content. This method supports patch semantics. (files.patch)
+     *
+     * @param string $fileId The ID of the file to update.
+     * @param Google_DriveFile $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
+     * @opt_param bool newRevision Whether a blob upload should create a new revision. If not set or false, the blob data in the current head revision is replaced. If true, a new blob is created as head revision, and previous revisions are preserved (causing increased use of the user's data storage quota).
+     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+     * @opt_param bool pinned Whether to pin the new revision.
+     * @opt_param bool setModifiedDate Whether to set the modified date with the supplied modified date.
+     * @opt_param string timedTextLanguage The language of the timed text.
+     * @opt_param string timedTextTrackName The timed text track name.
+     * @opt_param bool updateViewedDate Whether to update the view date after successfully updating the file.
+     * @opt_param bool useContentAsIndexableText Whether to use the content as indexable text.
+     * @return Google_DriveFile
+     */
+    public function patch($fileId, Google_DriveFile $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('patch', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Set the file's updated time to the current server time. (files.touch)
+     *
+     * @param string $fileId The ID of the file to update.
+     * @param array $optParams Optional parameters.
+     * @return Google_DriveFile
+     */
+    public function touch($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('touch', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Moves a file to the trash. (files.trash)
+     *
+     * @param string $fileId The ID of the file to trash.
+     * @param array $optParams Optional parameters.
+     * @return Google_DriveFile
+     */
+    public function trash($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('trash', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Restores a file from the trash. (files.untrash)
+     *
+     * @param string $fileId The ID of the file to untrash.
+     * @param array $optParams Optional parameters.
+     * @return Google_DriveFile
+     */
+    public function untrash($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('untrash', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates file metadata and/or content. (files.update)
+     *
+     * @param string $fileId The ID of the file to update.
+     * @param Google_DriveFile $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
+     * @opt_param bool newRevision Whether a blob upload should create a new revision. If not set or false, the blob data in the current head revision is replaced. If true, a new blob is created as head revision, and previous revisions are preserved (causing increased use of the user's data storage quota).
+     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+     * @opt_param bool pinned Whether to pin the new revision.
+     * @opt_param bool setModifiedDate Whether to set the modified date with the supplied modified date.
+     * @opt_param string timedTextLanguage The language of the timed text.
+     * @opt_param string timedTextTrackName The timed text track name.
+     * @opt_param bool updateViewedDate Whether to update the view date after successfully updating the file.
+     * @opt_param bool useContentAsIndexableText Whether to use the content as indexable text.
+     * @return Google_DriveFile
+     */
+    public function update($fileId, Google_DriveFile $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('update', array($params));
+      if ($this->useObjects()) {
+        return new Google_DriveFile($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "parents" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $parents = $driveService->parents;
+   *  </code>
+   */
+  class Google_ParentsServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Removes a parent from a file. (parents.delete)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $parentId The ID of the parent.
+     * @param array $optParams Optional parameters.
+     */
+    public function delete($fileId, $parentId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'parentId' => $parentId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a specific parent reference. (parents.get)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $parentId The ID of the parent.
+     * @param array $optParams Optional parameters.
+     * @return Google_ParentReference
+     */
+    public function get($fileId, $parentId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'parentId' => $parentId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_ParentReference($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Adds a parent folder for a file. (parents.insert)
+     *
+     * @param string $fileId The ID of the file.
+     * @param Google_ParentReference $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_ParentReference
+     */
+    public function insert($fileId, Google_ParentReference $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('insert', array($params));
+      if ($this->useObjects()) {
+        return new Google_ParentReference($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists a file's parents. (parents.list)
+     *
+     * @param string $fileId The ID of the file.
+     * @param array $optParams Optional parameters.
+     * @return Google_ParentList
+     */
+    public function listParents($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_ParentList($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "permissions" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $permissions = $driveService->permissions;
+   *  </code>
+   */
+  class Google_PermissionsServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Deletes a permission from a file. (permissions.delete)
+     *
+     * @param string $fileId The ID for the file.
+     * @param string $permissionId The ID for the permission.
+     * @param array $optParams Optional parameters.
+     */
+    public function delete($fileId, $permissionId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a permission by ID. (permissions.get)
+     *
+     * @param string $fileId The ID for the file.
+     * @param string $permissionId The ID for the permission.
+     * @param array $optParams Optional parameters.
+     * @return Google_Permission
+     */
+    public function get($fileId, $permissionId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_Permission($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Inserts a permission for a file. (permissions.insert)
+     *
+     * @param string $fileId The ID for the file.
+     * @param Google_Permission $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param string emailMessage A custom message to include in notification emails.
+     * @opt_param bool sendNotificationEmails Whether to send notification emails when sharing to users or groups.
+     * @return Google_Permission
+     */
+    public function insert($fileId, Google_Permission $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('insert', array($params));
+      if ($this->useObjects()) {
+        return new Google_Permission($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists a file's permissions. (permissions.list)
+     *
+     * @param string $fileId The ID for the file.
+     * @param array $optParams Optional parameters.
+     * @return Google_PermissionList
+     */
+    public function listPermissions($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_PermissionList($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates a permission. This method supports patch semantics. (permissions.patch)
+     *
+     * @param string $fileId The ID for the file.
+     * @param string $permissionId The ID for the permission.
+     * @param Google_Permission $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool transferOwnership Whether changing a role to 'owner' should also downgrade the current owners to writers.
+     * @return Google_Permission
+     */
+    public function patch($fileId, $permissionId, Google_Permission $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'permissionId' => $permissionId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('patch', array($params));
+      if ($this->useObjects()) {
+        return new Google_Permission($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates a permission. (permissions.update)
+     *
+     * @param string $fileId The ID for the file.
+     * @param string $permissionId The ID for the permission.
+     * @param Google_Permission $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool transferOwnership Whether changing a role to 'owner' should also downgrade the current owners to writers.
+     * @return Google_Permission
+     */
+    public function update($fileId, $permissionId, Google_Permission $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'permissionId' => $permissionId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('update', array($params));
+      if ($this->useObjects()) {
+        return new Google_Permission($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "properties" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $properties = $driveService->properties;
+   *  </code>
+   */
+  class Google_PropertiesServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Deletes a property. (properties.delete)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $propertyKey The key of the property.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param string visibility The visibility of the property.
+     */
+    public function delete($fileId, $propertyKey, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a property by its key. (properties.get)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $propertyKey The key of the property.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param string visibility The visibility of the property.
+     * @return Google_Property
+     */
+    public function get($fileId, $propertyKey, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_Property($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Adds a property to a file. (properties.insert)
+     *
+     * @param string $fileId The ID of the file.
+     * @param Google_Property $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_Property
+     */
+    public function insert($fileId, Google_Property $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('insert', array($params));
+      if ($this->useObjects()) {
+        return new Google_Property($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists a file's properties. (properties.list)
+     *
+     * @param string $fileId The ID of the file.
+     * @param array $optParams Optional parameters.
+     * @return Google_PropertyList
+     */
+    public function listProperties($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_PropertyList($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates a property. This method supports patch semantics. (properties.patch)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $propertyKey The key of the property.
+     * @param Google_Property $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param string visibility The visibility of the property.
+     * @return Google_Property
+     */
+    public function patch($fileId, $propertyKey, Google_Property $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('patch', array($params));
+      if ($this->useObjects()) {
+        return new Google_Property($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates a property. (properties.update)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $propertyKey The key of the property.
+     * @param Google_Property $postBody
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param string visibility The visibility of the property.
+     * @return Google_Property
+     */
+    public function update($fileId, $propertyKey, Google_Property $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('update', array($params));
+      if ($this->useObjects()) {
+        return new Google_Property($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "replies" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $replies = $driveService->replies;
+   *  </code>
+   */
+  class Google_RepliesServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Deletes a reply. (replies.delete)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param string $replyId The ID of the reply.
+     * @param array $optParams Optional parameters.
+     */
+    public function delete($fileId, $commentId, $replyId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a reply. (replies.get)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param string $replyId The ID of the reply.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool includeDeleted If set, this will succeed when retrieving a deleted reply.
+     * @return Google_CommentReply
+     */
+    public function get($fileId, $commentId, $replyId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_CommentReply($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Creates a new reply to the given comment. (replies.insert)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param Google_CommentReply $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_CommentReply
+     */
+    public function insert($fileId, $commentId, Google_CommentReply $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('insert', array($params));
+      if ($this->useObjects()) {
+        return new Google_CommentReply($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists all of the replies to a comment. (replies.list)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param array $optParams Optional parameters.
+     *
+     * @opt_param bool includeDeleted If set, all replies, including deleted replies (with content stripped) will be returned.
+     * @opt_param int maxResults The maximum number of replies to include in the response, used for paging.
+     * @opt_param string pageToken The continuation token, used to page through large result sets. To get the next page of results, set this parameter to the value of "nextPageToken" from the previous response.
+     * @return Google_CommentReplyList
+     */
+    public function listReplies($fileId, $commentId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_CommentReplyList($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates an existing reply. This method supports patch semantics. (replies.patch)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param string $replyId The ID of the reply.
+     * @param Google_CommentReply $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_CommentReply
+     */
+    public function patch($fileId, $commentId, $replyId, Google_CommentReply $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('patch', array($params));
+      if ($this->useObjects()) {
+        return new Google_CommentReply($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates an existing reply. (replies.update)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $commentId The ID of the comment.
+     * @param string $replyId The ID of the reply.
+     * @param Google_CommentReply $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_CommentReply
+     */
+    public function update($fileId, $commentId, $replyId, Google_CommentReply $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('update', array($params));
+      if ($this->useObjects()) {
+        return new Google_CommentReply($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+  /**
+   * The "revisions" collection of methods.
+   * Typical usage is:
+   *  <code>
+   *   $driveService = new Google_DriveService(...);
+   *   $revisions = $driveService->revisions;
+   *  </code>
+   */
+  class Google_RevisionsServiceResource extends Google_ServiceResource {
+
+
+    /**
+     * Removes a revision. (revisions.delete)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $revisionId The ID of the revision.
+     * @param array $optParams Optional parameters.
+     */
+    public function delete($fileId, $revisionId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('delete', array($params));
+      return $data;
+    }
+    /**
+     * Gets a specific revision. (revisions.get)
+     *
+     * @param string $fileId The ID of the file.
+     * @param string $revisionId The ID of the revision.
+     * @param array $optParams Optional parameters.
+     * @return Google_Revision
+     */
+    public function get($fileId, $revisionId, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('get', array($params));
+      if ($this->useObjects()) {
+        return new Google_Revision($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Lists a file's revisions. (revisions.list)
+     *
+     * @param string $fileId The ID of the file.
+     * @param array $optParams Optional parameters.
+     * @return Google_RevisionList
+     */
+    public function listRevisions($fileId, $optParams = array()) {
+      $params = array('fileId' => $fileId);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('list', array($params));
+      if ($this->useObjects()) {
+        return new Google_RevisionList($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates a revision. This method supports patch semantics. (revisions.patch)
+     *
+     * @param string $fileId The ID for the file.
+     * @param string $revisionId The ID for the revision.
+     * @param Google_Revision $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_Revision
+     */
+    public function patch($fileId, $revisionId, Google_Revision $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'revisionId' => $revisionId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('patch', array($params));
+      if ($this->useObjects()) {
+        return new Google_Revision($data);
+      } else {
+        return $data;
+      }
+    }
+    /**
+     * Updates a revision. (revisions.update)
+     *
+     * @param string $fileId The ID for the file.
+     * @param string $revisionId The ID for the revision.
+     * @param Google_Revision $postBody
+     * @param array $optParams Optional parameters.
+     * @return Google_Revision
+     */
+    public function update($fileId, $revisionId, Google_Revision $postBody, $optParams = array()) {
+      $params = array('fileId' => $fileId, 'revisionId' => $revisionId, 'postBody' => $postBody);
+      $params = array_merge($params, $optParams);
+      $data = $this->__call('update', array($params));
+      if ($this->useObjects()) {
+        return new Google_Revision($data);
+      } else {
+        return $data;
+      }
+    }
+  }
+
+/**
+ * Service definition for Google_Drive (v2).
+ *
+ * <p>
+ * The API to interact with Drive.
+ * </p>
+ *
+ * <p>
+ * For more information about this service, see the
+ * <a href="https://developers.google.com/drive/" target="_blank">API Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_DriveService extends Google_Service {
+  public $about;
+  public $apps;
+  public $changes;
+  public $children;
+  public $comments;
+  public $files;
+  public $parents;
+  public $permissions;
+  public $properties;
+  public $replies;
+  public $revisions;
+  /**
+   * Constructs the internal representation of the Drive service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client) {
+    $this->servicePath = 'drive/v2/';
+    $this->version = 'v2';
+    $this->serviceName = 'drive';
+
+    $client->addService($this->serviceName, $this->version);
+    $this->about = new Google_AboutServiceResource($this, $this->serviceName, 'about', json_decode('{"methods": {"get": {"id": "drive.about.get", "path": "about", "httpMethod": "GET", "parameters": {"includeSubscribed": {"type": "boolean", "default": "true", "location": "query"}, "maxChangeIdCount": {"type": "string", "default": "1", "format": "int64", "location": "query"}, "startChangeId": {"type": "string", "format": "int64", "location": "query"}}, "response": {"$ref": "About"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}}}', true));
+    $this->apps = new Google_AppsServiceResource($this, $this->serviceName, 'apps', json_decode('{"methods": {"get": {"id": "drive.apps.get", "path": "apps/{appId}", "httpMethod": "GET", "parameters": {"appId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "App"}, "scopes": ["https://www.googleapis.com/auth/drive.apps.readonly"]}, "list": {"id": "drive.apps.list", "path": "apps", "httpMethod": "GET", "response": {"$ref": "AppList"}, "scopes": ["https://www.googleapis.com/auth/drive.apps.readonly"]}}}', true));
+    $this->changes = new Google_ChangesServiceResource($this, $this->serviceName, 'changes', json_decode('{"methods": {"get": {"id": "drive.changes.get", "path": "changes/{changeId}", "httpMethod": "GET", "parameters": {"changeId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Change"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "list": {"id": "drive.changes.list", "path": "changes", "httpMethod": "GET", "parameters": {"includeDeleted": {"type": "boolean", "default": "true", "location": "query"}, "includeSubscribed": {"type": "boolean", "default": "true", "location": "query"}, "maxResults": {"type": "integer", "default": "100", "format": "int32", "minimum": "0", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "startChangeId": {"type": "string", "format": "int64", "location": "query"}}, "response": {"$ref": "ChangeList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"], "supportsSubscription": true}}}', true));
+    $this->children = new Google_ChildrenServiceResource($this, $this->serviceName, 'children', json_decode('{"methods": {"delete": {"id": "drive.children.delete", "path": "files/{folderId}/children/{childId}", "httpMethod": "DELETE", "parameters": {"childId": {"type": "string", "required": true, "location": "path"}, "folderId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.children.get", "path": "files/{folderId}/children/{childId}", "httpMethod": "GET", "parameters": {"childId": {"type": "string", "required": true, "location": "path"}, "folderId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "ChildReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.children.insert", "path": "files/{folderId}/children", "httpMethod": "POST", "parameters": {"folderId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "ChildReference"}, "response": {"$ref": "ChildReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.children.list", "path": "files/{folderId}/children", "httpMethod": "GET", "parameters": {"folderId": {"type": "string", "required": true, "location": "path"}, "maxResults": {"type": "integer", "default": "100", "format": "int32", "minimum": "0", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "q": {"type": "string", "location": "query"}}, "response": {"$ref": "ChildList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}}}', true));
+    $this->comments = new Google_CommentsServiceResource($this, $this->serviceName, 'comments', json_decode('{"methods": {"delete": {"id": "drive.comments.delete", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "DELETE", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "get": {"id": "drive.comments.get", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "GET", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.comments.insert", "path": "files/{fileId}/comments", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Comment"}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "list": {"id": "drive.comments.list", "path": "files/{fileId}/comments", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}, "maxResults": {"type": "integer", "default": "20", "format": "int32", "minimum": "0", "maximum": "100", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "updatedMin": {"type": "string", "location": "query"}}, "response": {"$ref": "CommentList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.comments.patch", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "PATCH", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Comment"}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.comments.update", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "PUT", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Comment"}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
+    $this->files = new Google_FilesServiceResource($this, $this->serviceName, 'files', json_decode('{"methods": {"copy": {"id": "drive.files.copy", "path": "files/{fileId}/copy", "httpMethod": "POST", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "delete": {"id": "drive.files.delete", "path": "files/{fileId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.files.get", "path": "files/{fileId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "projection": {"type": "string", "enum": ["BASIC", "FULL"], "location": "query"}, "updateViewedDate": {"type": "boolean", "default": "false", "location": "query"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"], "supportsSubscription": true}, "insert": {"id": "drive.files.insert", "path": "files", "httpMethod": "POST", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}, "useContentAsIndexableText": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["*/*"], "maxSize": "10GB", "protocols": {"simple": {"multipart": true, "path": "/upload/drive/v2/files"}, "resumable": {"multipart": true, "path": "/resumable/upload/drive/v2/files"}}}, "supportsSubscription": true}, "list": {"id": "drive.files.list", "path": "files", "httpMethod": "GET", "parameters": {"maxResults": {"type": "integer", "default": "100", "format": "int32", "minimum": "0", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "projection": {"type": "string", "enum": ["BASIC", "FULL"], "location": "query"}, "q": {"type": "string", "location": "query"}}, "response": {"$ref": "FileList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.files.patch", "path": "files/{fileId}", "httpMethod": "PATCH", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "newRevision": {"type": "boolean", "default": "true", "location": "query"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "setModifiedDate": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}, "updateViewedDate": {"type": "boolean", "default": "true", "location": "query"}, "useContentAsIndexableText": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.scripts"]}, "touch": {"id": "drive.files.touch", "path": "files/{fileId}/touch", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "trash": {"id": "drive.files.trash", "path": "files/{fileId}/trash", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "untrash": {"id": "drive.files.untrash", "path": "files/{fileId}/untrash", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.files.update", "path": "files/{fileId}", "httpMethod": "PUT", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "newRevision": {"type": "boolean", "default": "true", "location": "query"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "setModifiedDate": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}, "updateViewedDate": {"type": "boolean", "default": "true", "location": "query"}, "useContentAsIndexableText": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.scripts"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["*/*"], "maxSize": "10GB", "protocols": {"simple": {"multipart": true, "path": "/upload/drive/v2/files/{fileId}"}, "resumable": {"multipart": true, "path": "/resumable/upload/drive/v2/files/{fileId}"}}}}}}', true));
+    $this->parents = new Google_ParentsServiceResource($this, $this->serviceName, 'parents', json_decode('{"methods": {"delete": {"id": "drive.parents.delete", "path": "files/{fileId}/parents/{parentId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "parentId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.parents.get", "path": "files/{fileId}/parents/{parentId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "parentId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "ParentReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.parents.insert", "path": "files/{fileId}/parents", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "ParentReference"}, "response": {"$ref": "ParentReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.parents.list", "path": "files/{fileId}/parents", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "ParentList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}}}', true));
+    $this->permissions = new Google_PermissionsServiceResource($this, $this->serviceName, 'permissions', json_decode('{"methods": {"delete": {"id": "drive.permissions.delete", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.permissions.get", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.permissions.insert", "path": "files/{fileId}/permissions", "httpMethod": "POST", "parameters": {"emailMessage": {"type": "string", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "sendNotificationEmails": {"type": "boolean", "default": "true", "location": "query"}}, "request": {"$ref": "Permission"}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.permissions.list", "path": "files/{fileId}/permissions", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "PermissionList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.permissions.patch", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "PATCH", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}, "transferOwnership": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "Permission"}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.permissions.update", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "PUT", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}, "transferOwnership": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "Permission"}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
+    $this->properties = new Google_PropertiesServiceResource($this, $this->serviceName, 'properties', json_decode('{"methods": {"delete": {"id": "drive.properties.delete", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.properties.get", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.properties.insert", "path": "files/{fileId}/properties", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Property"}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.properties.list", "path": "files/{fileId}/properties", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "PropertyList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.properties.patch", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "PATCH", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "request": {"$ref": "Property"}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.properties.update", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "PUT", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "request": {"$ref": "Property"}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
+    $this->replies = new Google_RepliesServiceResource($this, $this->serviceName, 'replies', json_decode('{"methods": {"delete": {"id": "drive.replies.delete", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "DELETE", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.replies.get", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "GET", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.replies.insert", "path": "files/{fileId}/comments/{commentId}/replies", "httpMethod": "POST", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "CommentReply"}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.replies.list", "path": "files/{fileId}/comments/{commentId}/replies", "httpMethod": "GET", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}, "maxResults": {"type": "integer", "default": "20", "format": "int32", "minimum": "0", "maximum": "100", "location": "query"}, "pageToken": {"type": "string", "location": "query"}}, "response": {"$ref": "CommentReplyList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.replies.patch", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "PATCH", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "CommentReply"}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.replies.update", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "PUT", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "CommentReply"}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
+    $this->revisions = new Google_RevisionsServiceResource($this, $this->serviceName, 'revisions', json_decode('{"methods": {"delete": {"id": "drive.revisions.delete", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.revisions.get", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Revision"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "list": {"id": "drive.revisions.list", "path": "files/{fileId}/revisions", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "RevisionList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.revisions.patch", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "PATCH", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Revision"}, "response": {"$ref": "Revision"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.revisions.update", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "PUT", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Revision"}, "response": {"$ref": "Revision"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
+
+  }
+}
+
+
+
+class Google_About extends Google_Model {
+  protected $__additionalRoleInfoType = 'Google_AboutAdditionalRoleInfo';
+  protected $__additionalRoleInfoDataType = 'array';
+  public $additionalRoleInfo;
+  public $domainSharingPolicy;
+  public $etag;
+  protected $__exportFormatsType = 'Google_AboutExportFormats';
+  protected $__exportFormatsDataType = 'array';
+  public $exportFormats;
+  protected $__featuresType = 'Google_AboutFeatures';
+  protected $__featuresDataType = 'array';
+  public $features;
+  protected $__importFormatsType = 'Google_AboutImportFormats';
+  protected $__importFormatsDataType = 'array';
+  public $importFormats;
+  public $isCurrentAppInstalled;
+  public $kind;
+  public $largestChangeId;
+  protected $__maxUploadSizesType = 'Google_AboutMaxUploadSizes';
+  protected $__maxUploadSizesDataType = 'array';
+  public $maxUploadSizes;
+  public $name;
+  public $permissionId;
+  public $quotaBytesTotal;
+  public $quotaBytesUsed;
+  public $quotaBytesUsedAggregate;
+  public $quotaBytesUsedInTrash;
+  public $remainingChangeIds;
+  public $rootFolderId;
+  public $selfLink;
+  protected $__userType = 'Google_User';
+  protected $__userDataType = '';
+  public $user;
+  public function setAdditionalRoleInfo(/* array(Google_AboutAdditionalRoleInfo) */ $additionalRoleInfo) {
+    $this->assertIsArray($additionalRoleInfo, 'Google_AboutAdditionalRoleInfo', __METHOD__);
+    $this->additionalRoleInfo = $additionalRoleInfo;
+  }
+  public function getAdditionalRoleInfo() {
+    return $this->additionalRoleInfo;
+  }
+  public function setDomainSharingPolicy($domainSharingPolicy) {
+    $this->domainSharingPolicy = $domainSharingPolicy;
+  }
+  public function getDomainSharingPolicy() {
+    return $this->domainSharingPolicy;
+  }
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setExportFormats(/* array(Google_AboutExportFormats) */ $exportFormats) {
+    $this->assertIsArray($exportFormats, 'Google_AboutExportFormats', __METHOD__);
+    $this->exportFormats = $exportFormats;
+  }
+  public function getExportFormats() {
+    return $this->exportFormats;
+  }
+  public function setFeatures(/* array(Google_AboutFeatures) */ $features) {
+    $this->assertIsArray($features, 'Google_AboutFeatures', __METHOD__);
+    $this->features = $features;
+  }
+  public function getFeatures() {
+    return $this->features;
+  }
+  public function setImportFormats(/* array(Google_AboutImportFormats) */ $importFormats) {
+    $this->assertIsArray($importFormats, 'Google_AboutImportFormats', __METHOD__);
+    $this->importFormats = $importFormats;
+  }
+  public function getImportFormats() {
+    return $this->importFormats;
+  }
+  public function setIsCurrentAppInstalled($isCurrentAppInstalled) {
+    $this->isCurrentAppInstalled = $isCurrentAppInstalled;
+  }
+  public function getIsCurrentAppInstalled() {
+    return $this->isCurrentAppInstalled;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setLargestChangeId($largestChangeId) {
+    $this->largestChangeId = $largestChangeId;
+  }
+  public function getLargestChangeId() {
+    return $this->largestChangeId;
+  }
+  public function setMaxUploadSizes(/* array(Google_AboutMaxUploadSizes) */ $maxUploadSizes) {
+    $this->assertIsArray($maxUploadSizes, 'Google_AboutMaxUploadSizes', __METHOD__);
+    $this->maxUploadSizes = $maxUploadSizes;
+  }
+  public function getMaxUploadSizes() {
+    return $this->maxUploadSizes;
+  }
+  public function setName($name) {
+    $this->name = $name;
+  }
+  public function getName() {
+    return $this->name;
+  }
+  public function setPermissionId($permissionId) {
+    $this->permissionId = $permissionId;
+  }
+  public function getPermissionId() {
+    return $this->permissionId;
+  }
+  public function setQuotaBytesTotal($quotaBytesTotal) {
+    $this->quotaBytesTotal = $quotaBytesTotal;
+  }
+  public function getQuotaBytesTotal() {
+    return $this->quotaBytesTotal;
+  }
+  public function setQuotaBytesUsed($quotaBytesUsed) {
+    $this->quotaBytesUsed = $quotaBytesUsed;
+  }
+  public function getQuotaBytesUsed() {
+    return $this->quotaBytesUsed;
+  }
+  public function setQuotaBytesUsedAggregate($quotaBytesUsedAggregate) {
+    $this->quotaBytesUsedAggregate = $quotaBytesUsedAggregate;
+  }
+  public function getQuotaBytesUsedAggregate() {
+    return $this->quotaBytesUsedAggregate;
+  }
+  public function setQuotaBytesUsedInTrash($quotaBytesUsedInTrash) {
+    $this->quotaBytesUsedInTrash = $quotaBytesUsedInTrash;
+  }
+  public function getQuotaBytesUsedInTrash() {
+    return $this->quotaBytesUsedInTrash;
+  }
+  public function setRemainingChangeIds($remainingChangeIds) {
+    $this->remainingChangeIds = $remainingChangeIds;
+  }
+  public function getRemainingChangeIds() {
+    return $this->remainingChangeIds;
+  }
+  public function setRootFolderId($rootFolderId) {
+    $this->rootFolderId = $rootFolderId;
+  }
+  public function getRootFolderId() {
+    return $this->rootFolderId;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+  public function setUser(Google_User $user) {
+    $this->user = $user;
+  }
+  public function getUser() {
+    return $this->user;
+  }
+}
+
+class Google_AboutAdditionalRoleInfo extends Google_Model {
+  protected $__roleSetsType = 'Google_AboutAdditionalRoleInfoRoleSets';
+  protected $__roleSetsDataType = 'array';
+  public $roleSets;
+  public $type;
+  public function setRoleSets(/* array(Google_AboutAdditionalRoleInfoRoleSets) */ $roleSets) {
+    $this->assertIsArray($roleSets, 'Google_AboutAdditionalRoleInfoRoleSets', __METHOD__);
+    $this->roleSets = $roleSets;
+  }
+  public function getRoleSets() {
+    return $this->roleSets;
+  }
+  public function setType($type) {
+    $this->type = $type;
+  }
+  public function getType() {
+    return $this->type;
+  }
+}
+
+class Google_AboutAdditionalRoleInfoRoleSets extends Google_Model {
+  public $additionalRoles;
+  public $primaryRole;
+  public function setAdditionalRoles(/* array(Google_string) */ $additionalRoles) {
+    $this->assertIsArray($additionalRoles, 'Google_string', __METHOD__);
+    $this->additionalRoles = $additionalRoles;
+  }
+  public function getAdditionalRoles() {
+    return $this->additionalRoles;
+  }
+  public function setPrimaryRole($primaryRole) {
+    $this->primaryRole = $primaryRole;
+  }
+  public function getPrimaryRole() {
+    return $this->primaryRole;
+  }
+}
+
+class Google_AboutExportFormats extends Google_Model {
+  public $source;
+  public $targets;
+  public function setSource($source) {
+    $this->source = $source;
+  }
+  public function getSource() {
+    return $this->source;
+  }
+  public function setTargets(/* array(Google_string) */ $targets) {
+    $this->assertIsArray($targets, 'Google_string', __METHOD__);
+    $this->targets = $targets;
+  }
+  public function getTargets() {
+    return $this->targets;
+  }
+}
+
+class Google_AboutFeatures extends Google_Model {
+  public $featureName;
+  public $featureRate;
+  public function setFeatureName($featureName) {
+    $this->featureName = $featureName;
+  }
+  public function getFeatureName() {
+    return $this->featureName;
+  }
+  public function setFeatureRate($featureRate) {
+    $this->featureRate = $featureRate;
+  }
+  public function getFeatureRate() {
+    return $this->featureRate;
+  }
+}
+
+class Google_AboutImportFormats extends Google_Model {
+  public $source;
+  public $targets;
+  public function setSource($source) {
+    $this->source = $source;
+  }
+  public function getSource() {
+    return $this->source;
+  }
+  public function setTargets(/* array(Google_string) */ $targets) {
+    $this->assertIsArray($targets, 'Google_string', __METHOD__);
+    $this->targets = $targets;
+  }
+  public function getTargets() {
+    return $this->targets;
+  }
+}
+
+class Google_AboutMaxUploadSizes extends Google_Model {
+  public $size;
+  public $type;
+  public function setSize($size) {
+    $this->size = $size;
+  }
+  public function getSize() {
+    return $this->size;
+  }
+  public function setType($type) {
+    $this->type = $type;
+  }
+  public function getType() {
+    return $this->type;
+  }
+}
+
+class Google_App extends Google_Model {
+  public $authorized;
+  protected $__iconsType = 'Google_AppIcons';
+  protected $__iconsDataType = 'array';
+  public $icons;
+  public $id;
+  public $installed;
+  public $kind;
+  public $name;
+  public $objectType;
+  public $primaryFileExtensions;
+  public $primaryMimeTypes;
+  public $productUrl;
+  public $secondaryFileExtensions;
+  public $secondaryMimeTypes;
+  public $supportsCreate;
+  public $supportsImport;
+  public $useByDefault;
+  public function setAuthorized($authorized) {
+    $this->authorized = $authorized;
+  }
+  public function getAuthorized() {
+    return $this->authorized;
+  }
+  public function setIcons(/* array(Google_AppIcons) */ $icons) {
+    $this->assertIsArray($icons, 'Google_AppIcons', __METHOD__);
+    $this->icons = $icons;
+  }
+  public function getIcons() {
+    return $this->icons;
+  }
+  public function setId($id) {
+    $this->id = $id;
+  }
+  public function getId() {
+    return $this->id;
+  }
+  public function setInstalled($installed) {
+    $this->installed = $installed;
+  }
+  public function getInstalled() {
+    return $this->installed;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setName($name) {
+    $this->name = $name;
+  }
+  public function getName() {
+    return $this->name;
+  }
+  public function setObjectType($objectType) {
+    $this->objectType = $objectType;
+  }
+  public function getObjectType() {
+    return $this->objectType;
+  }
+  public function setPrimaryFileExtensions(/* array(Google_string) */ $primaryFileExtensions) {
+    $this->assertIsArray($primaryFileExtensions, 'Google_string', __METHOD__);
+    $this->primaryFileExtensions = $primaryFileExtensions;
+  }
+  public function getPrimaryFileExtensions() {
+    return $this->primaryFileExtensions;
+  }
+  public function setPrimaryMimeTypes(/* array(Google_string) */ $primaryMimeTypes) {
+    $this->assertIsArray($primaryMimeTypes, 'Google_string', __METHOD__);
+    $this->primaryMimeTypes = $primaryMimeTypes;
+  }
+  public function getPrimaryMimeTypes() {
+    return $this->primaryMimeTypes;
+  }
+  public function setProductUrl($productUrl) {
+    $this->productUrl = $productUrl;
+  }
+  public function getProductUrl() {
+    return $this->productUrl;
+  }
+  public function setSecondaryFileExtensions(/* array(Google_string) */ $secondaryFileExtensions) {
+    $this->assertIsArray($secondaryFileExtensions, 'Google_string', __METHOD__);
+    $this->secondaryFileExtensions = $secondaryFileExtensions;
+  }
+  public function getSecondaryFileExtensions() {
+    return $this->secondaryFileExtensions;
+  }
+  public function setSecondaryMimeTypes(/* array(Google_string) */ $secondaryMimeTypes) {
+    $this->assertIsArray($secondaryMimeTypes, 'Google_string', __METHOD__);
+    $this->secondaryMimeTypes = $secondaryMimeTypes;
+  }
+  public function getSecondaryMimeTypes() {
+    return $this->secondaryMimeTypes;
+  }
+  public function setSupportsCreate($supportsCreate) {
+    $this->supportsCreate = $supportsCreate;
+  }
+  public function getSupportsCreate() {
+    return $this->supportsCreate;
+  }
+  public function setSupportsImport($supportsImport) {
+    $this->supportsImport = $supportsImport;
+  }
+  public function getSupportsImport() {
+    return $this->supportsImport;
+  }
+  public function setUseByDefault($useByDefault) {
+    $this->useByDefault = $useByDefault;
+  }
+  public function getUseByDefault() {
+    return $this->useByDefault;
+  }
+}
+
+class Google_AppIcons extends Google_Model {
+  public $category;
+  public $iconUrl;
+  public $size;
+  public function setCategory($category) {
+    $this->category = $category;
+  }
+  public function getCategory() {
+    return $this->category;
+  }
+  public function setIconUrl($iconUrl) {
+    $this->iconUrl = $iconUrl;
+  }
+  public function getIconUrl() {
+    return $this->iconUrl;
+  }
+  public function setSize($size) {
+    $this->size = $size;
+  }
+  public function getSize() {
+    return $this->size;
+  }
+}
+
+class Google_AppList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_App';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_App) */ $items) {
+    $this->assertIsArray($items, 'Google_App', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_Change extends Google_Model {
+  public $deleted;
+  protected $__fileType = 'Google_DriveFile';
+  protected $__fileDataType = '';
+  public $file;
+  public $fileId;
+  public $id;
+  public $kind;
+  public $selfLink;
+  public function setDeleted($deleted) {
+    $this->deleted = $deleted;
+  }
+  public function getDeleted() {
+    return $this->deleted;
+  }
+  public function setFile(Google_DriveFile $file) {
+    $this->file = $file;
+  }
+  public function getFile() {
+    return $this->file;
+  }
+  public function setFileId($fileId) {
+    $this->fileId = $fileId;
+  }
+  public function getFileId() {
+    return $this->fileId;
+  }
+  public function setId($id) {
+    $this->id = $id;
+  }
+  public function getId() {
+    return $this->id;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_ChangeList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_Change';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $largestChangeId;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_Change) */ $items) {
+    $this->assertIsArray($items, 'Google_Change', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setLargestChangeId($largestChangeId) {
+    $this->largestChangeId = $largestChangeId;
+  }
+  public function getLargestChangeId() {
+    return $this->largestChangeId;
+  }
+  public function setNextLink($nextLink) {
+    $this->nextLink = $nextLink;
+  }
+  public function getNextLink() {
+    return $this->nextLink;
+  }
+  public function setNextPageToken($nextPageToken) {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken() {
+    return $this->nextPageToken;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_ChildList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_ChildReference';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_ChildReference) */ $items) {
+    $this->assertIsArray($items, 'Google_ChildReference', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setNextLink($nextLink) {
+    $this->nextLink = $nextLink;
+  }
+  public function getNextLink() {
+    return $this->nextLink;
+  }
+  public function setNextPageToken($nextPageToken) {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken() {
+    return $this->nextPageToken;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_ChildReference extends Google_Model {
+  public $childLink;
+  public $id;
+  public $kind;
+  public $selfLink;
+  public function setChildLink($childLink) {
+    $this->childLink = $childLink;
+  }
+  public function getChildLink() {
+    return $this->childLink;
+  }
+  public function setId($id) {
+    $this->id = $id;
+  }
+  public function getId() {
+    return $this->id;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_Comment extends Google_Model {
+  public $anchor;
+  protected $__authorType = 'Google_User';
+  protected $__authorDataType = '';
+  public $author;
+  public $commentId;
+  public $content;
+  protected $__contextType = 'Google_CommentContext';
+  protected $__contextDataType = '';
+  public $context;
+  public $createdDate;
+  public $deleted;
+  public $fileId;
+  public $fileTitle;
+  public $htmlContent;
+  public $kind;
+  public $modifiedDate;
+  protected $__repliesType = 'Google_CommentReply';
+  protected $__repliesDataType = 'array';
+  public $replies;
+  public $selfLink;
+  public $status;
+  public function setAnchor($anchor) {
+    $this->anchor = $anchor;
+  }
+  public function getAnchor() {
+    return $this->anchor;
+  }
+  public function setAuthor(Google_User $author) {
+    $this->author = $author;
+  }
+  public function getAuthor() {
+    return $this->author;
+  }
+  public function setCommentId($commentId) {
+    $this->commentId = $commentId;
+  }
+  public function getCommentId() {
+    return $this->commentId;
+  }
+  public function setContent($content) {
+    $this->content = $content;
+  }
+  public function getContent() {
+    return $this->content;
+  }
+  public function setContext(Google_CommentContext $context) {
+    $this->context = $context;
+  }
+  public function getContext() {
+    return $this->context;
+  }
+  public function setCreatedDate($createdDate) {
+    $this->createdDate = $createdDate;
+  }
+  public function getCreatedDate() {
+    return $this->createdDate;
+  }
+  public function setDeleted($deleted) {
+    $this->deleted = $deleted;
+  }
+  public function getDeleted() {
+    return $this->deleted;
+  }
+  public function setFileId($fileId) {
+    $this->fileId = $fileId;
+  }
+  public function getFileId() {
+    return $this->fileId;
+  }
+  public function setFileTitle($fileTitle) {
+    $this->fileTitle = $fileTitle;
+  }
+  public function getFileTitle() {
+    return $this->fileTitle;
+  }
+  public function setHtmlContent($htmlContent) {
+    $this->htmlContent = $htmlContent;
+  }
+  public function getHtmlContent() {
+    return $this->htmlContent;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setModifiedDate($modifiedDate) {
+    $this->modifiedDate = $modifiedDate;
+  }
+  public function getModifiedDate() {
+    return $this->modifiedDate;
+  }
+  public function setReplies(/* array(Google_CommentReply) */ $replies) {
+    $this->assertIsArray($replies, 'Google_CommentReply', __METHOD__);
+    $this->replies = $replies;
+  }
+  public function getReplies() {
+    return $this->replies;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+  public function setStatus($status) {
+    $this->status = $status;
+  }
+  public function getStatus() {
+    return $this->status;
+  }
+}
+
+class Google_CommentContext extends Google_Model {
+  public $type;
+  public $value;
+  public function setType($type) {
+    $this->type = $type;
+  }
+  public function getType() {
+    return $this->type;
+  }
+  public function setValue($value) {
+    $this->value = $value;
+  }
+  public function getValue() {
+    return $this->value;
+  }
+}
+
+class Google_CommentList extends Google_Model {
+  protected $__itemsType = 'Google_Comment';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $nextPageToken;
+  public function setItems(/* array(Google_Comment) */ $items) {
+    $this->assertIsArray($items, 'Google_Comment', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setNextPageToken($nextPageToken) {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken() {
+    return $this->nextPageToken;
+  }
+}
+
+class Google_CommentReply extends Google_Model {
+  protected $__authorType = 'Google_User';
+  protected $__authorDataType = '';
+  public $author;
+  public $content;
+  public $createdDate;
+  public $deleted;
+  public $htmlContent;
+  public $kind;
+  public $modifiedDate;
+  public $replyId;
+  public $verb;
+  public function setAuthor(Google_User $author) {
+    $this->author = $author;
+  }
+  public function getAuthor() {
+    return $this->author;
+  }
+  public function setContent($content) {
+    $this->content = $content;
+  }
+  public function getContent() {
+    return $this->content;
+  }
+  public function setCreatedDate($createdDate) {
+    $this->createdDate = $createdDate;
+  }
+  public function getCreatedDate() {
+    return $this->createdDate;
+  }
+  public function setDeleted($deleted) {
+    $this->deleted = $deleted;
+  }
+  public function getDeleted() {
+    return $this->deleted;
+  }
+  public function setHtmlContent($htmlContent) {
+    $this->htmlContent = $htmlContent;
+  }
+  public function getHtmlContent() {
+    return $this->htmlContent;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setModifiedDate($modifiedDate) {
+    $this->modifiedDate = $modifiedDate;
+  }
+  public function getModifiedDate() {
+    return $this->modifiedDate;
+  }
+  public function setReplyId($replyId) {
+    $this->replyId = $replyId;
+  }
+  public function getReplyId() {
+    return $this->replyId;
+  }
+  public function setVerb($verb) {
+    $this->verb = $verb;
+  }
+  public function getVerb() {
+    return $this->verb;
+  }
+}
+
+class Google_CommentReplyList extends Google_Model {
+  protected $__itemsType = 'Google_CommentReply';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $nextPageToken;
+  public function setItems(/* array(Google_CommentReply) */ $items) {
+    $this->assertIsArray($items, 'Google_CommentReply', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setNextPageToken($nextPageToken) {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken() {
+    return $this->nextPageToken;
+  }
+}
+
+class Google_DriveFile extends Google_Model {
+  public $alternateLink;
+  public $appDataContents;
+  public $createdDate;
+  public $description;
+  public $downloadUrl;
+  public $editable;
+  public $embedLink;
+  public $etag;
+  public $explicitlyTrashed;
+  public $exportLinks;
+  public $fileExtension;
+  public $fileSize;
+  public $iconLink;
+  public $id;
+  protected $__imageMediaMetadataType = 'Google_DriveFileImageMediaMetadata';
+  protected $__imageMediaMetadataDataType = '';
+  public $imageMediaMetadata;
+  protected $__indexableTextType = 'Google_DriveFileIndexableText';
+  protected $__indexableTextDataType = '';
+  public $indexableText;
+  public $kind;
+  protected $__labelsType = 'Google_DriveFileLabels';
+  protected $__labelsDataType = '';
+  public $labels;
+  protected $__lastModifyingUserType = 'Google_User';
+  protected $__lastModifyingUserDataType = '';
+  public $lastModifyingUser;
+  public $lastModifyingUserName;
+  public $lastViewedByMeDate;
+  public $md5Checksum;
+  public $mimeType;
+  public $modifiedByMeDate;
+  public $modifiedDate;
+  public $originalFilename;
+  public $ownerNames;
+  protected $__ownersType = 'Google_User';
+  protected $__ownersDataType = 'array';
+  public $owners;
+  protected $__parentsType = 'Google_ParentReference';
+  protected $__parentsDataType = 'array';
+  public $parents;
+  public $quotaBytesUsed;
+  public $selfLink;
+  public $shared;
+  public $sharedWithMeDate;
+  protected $__thumbnailType = 'Google_DriveFileThumbnail';
+  protected $__thumbnailDataType = '';
+  public $thumbnail;
+  public $thumbnailLink;
+  public $title;
+  protected $__userPermissionType = 'Google_Permission';
+  protected $__userPermissionDataType = '';
+  public $userPermission;
+  public $webContentLink;
+  public $webViewLink;
+  public $writersCanShare;
+  public function setAlternateLink($alternateLink) {
+    $this->alternateLink = $alternateLink;
+  }
+  public function getAlternateLink() {
+    return $this->alternateLink;
+  }
+  public function setAppDataContents($appDataContents) {
+    $this->appDataContents = $appDataContents;
+  }
+  public function getAppDataContents() {
+    return $this->appDataContents;
+  }
+  public function setCreatedDate($createdDate) {
+    $this->createdDate = $createdDate;
+  }
+  public function getCreatedDate() {
+    return $this->createdDate;
+  }
+  public function setDescription($description) {
+    $this->description = $description;
+  }
+  public function getDescription() {
+    return $this->description;
+  }
+  public function setDownloadUrl($downloadUrl) {
+    $this->downloadUrl = $downloadUrl;
+  }
+  public function getDownloadUrl() {
+    return $this->downloadUrl;
+  }
+  public function setEditable($editable) {
+    $this->editable = $editable;
+  }
+  public function getEditable() {
+    return $this->editable;
+  }
+  public function setEmbedLink($embedLink) {
+    $this->embedLink = $embedLink;
+  }
+  public function getEmbedLink() {
+    return $this->embedLink;
+  }
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setExplicitlyTrashed($explicitlyTrashed) {
+    $this->explicitlyTrashed = $explicitlyTrashed;
+  }
+  public function getExplicitlyTrashed() {
+    return $this->explicitlyTrashed;
+  }
+  public function setExportLinks($exportLinks) {
+    $this->exportLinks = $exportLinks;
+  }
+  public function getExportLinks() {
+    return $this->exportLinks;
+  }
+  public function setFileExtension($fileExtension) {
+    $this->fileExtension = $fileExtension;
+  }
+  public function getFileExtension() {
+    return $this->fileExtension;
+  }
+  public function setFileSize($fileSize) {
+    $this->fileSize = $fileSize;
+  }
+  public function getFileSize() {
+    return $this->fileSize;
+  }
+  public function setIconLink($iconLink) {
+    $this->iconLink = $iconLink;
+  }
+  public function getIconLink() {
+    return $this->iconLink;
+  }
+  public function setId($id) {
+    $this->id = $id;
+  }
+  public function getId() {
+    return $this->id;
+  }
+  public function setImageMediaMetadata(Google_DriveFileImageMediaMetadata $imageMediaMetadata) {
+    $this->imageMediaMetadata = $imageMediaMetadata;
+  }
+  public function getImageMediaMetadata() {
+    return $this->imageMediaMetadata;
+  }
+  public function setIndexableText(Google_DriveFileIndexableText $indexableText) {
+    $this->indexableText = $indexableText;
+  }
+  public function getIndexableText() {
+    return $this->indexableText;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setLabels(Google_DriveFileLabels $labels) {
+    $this->labels = $labels;
+  }
+  public function getLabels() {
+    return $this->labels;
+  }
+  public function setLastModifyingUser(Google_User $lastModifyingUser) {
+    $this->lastModifyingUser = $lastModifyingUser;
+  }
+  public function getLastModifyingUser() {
+    return $this->lastModifyingUser;
+  }
+  public function setLastModifyingUserName($lastModifyingUserName) {
+    $this->lastModifyingUserName = $lastModifyingUserName;
+  }
+  public function getLastModifyingUserName() {
+    return $this->lastModifyingUserName;
+  }
+  public function setLastViewedByMeDate($lastViewedByMeDate) {
+    $this->lastViewedByMeDate = $lastViewedByMeDate;
+  }
+  public function getLastViewedByMeDate() {
+    return $this->lastViewedByMeDate;
+  }
+  public function setMd5Checksum($md5Checksum) {
+    $this->md5Checksum = $md5Checksum;
+  }
+  public function getMd5Checksum() {
+    return $this->md5Checksum;
+  }
+  public function setMimeType($mimeType) {
+    $this->mimeType = $mimeType;
+  }
+  public function getMimeType() {
+    return $this->mimeType;
+  }
+  public function setModifiedByMeDate($modifiedByMeDate) {
+    $this->modifiedByMeDate = $modifiedByMeDate;
+  }
+  public function getModifiedByMeDate() {
+    return $this->modifiedByMeDate;
+  }
+  public function setModifiedDate($modifiedDate) {
+    $this->modifiedDate = $modifiedDate;
+  }
+  public function getModifiedDate() {
+    return $this->modifiedDate;
+  }
+  public function setOriginalFilename($originalFilename) {
+    $this->originalFilename = $originalFilename;
+  }
+  public function getOriginalFilename() {
+    return $this->originalFilename;
+  }
+  public function setOwnerNames(/* array(Google_string) */ $ownerNames) {
+    $this->assertIsArray($ownerNames, 'Google_string', __METHOD__);
+    $this->ownerNames = $ownerNames;
+  }
+  public function getOwnerNames() {
+    return $this->ownerNames;
+  }
+  public function setOwners(/* array(Google_User) */ $owners) {
+    $this->assertIsArray($owners, 'Google_User', __METHOD__);
+    $this->owners = $owners;
+  }
+  public function getOwners() {
+    return $this->owners;
+  }
+  public function setParents(/* array(Google_ParentReference) */ $parents) {
+    $this->assertIsArray($parents, 'Google_ParentReference', __METHOD__);
+    $this->parents = $parents;
+  }
+  public function getParents() {
+    return $this->parents;
+  }
+  public function setQuotaBytesUsed($quotaBytesUsed) {
+    $this->quotaBytesUsed = $quotaBytesUsed;
+  }
+  public function getQuotaBytesUsed() {
+    return $this->quotaBytesUsed;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+  public function setShared($shared) {
+    $this->shared = $shared;
+  }
+  public function getShared() {
+    return $this->shared;
+  }
+  public function setSharedWithMeDate($sharedWithMeDate) {
+    $this->sharedWithMeDate = $sharedWithMeDate;
+  }
+  public function getSharedWithMeDate() {
+    return $this->sharedWithMeDate;
+  }
+  public function setThumbnail(Google_DriveFileThumbnail $thumbnail) {
+    $this->thumbnail = $thumbnail;
+  }
+  public function getThumbnail() {
+    return $this->thumbnail;
+  }
+  public function setThumbnailLink($thumbnailLink) {
+    $this->thumbnailLink = $thumbnailLink;
+  }
+  public function getThumbnailLink() {
+    return $this->thumbnailLink;
+  }
+  public function setTitle($title) {
+    $this->title = $title;
+  }
+  public function getTitle() {
+    return $this->title;
+  }
+  public function setUserPermission(Google_Permission $userPermission) {
+    $this->userPermission = $userPermission;
+  }
+  public function getUserPermission() {
+    return $this->userPermission;
+  }
+  public function setWebContentLink($webContentLink) {
+    $this->webContentLink = $webContentLink;
+  }
+  public function getWebContentLink() {
+    return $this->webContentLink;
+  }
+  public function setWebViewLink($webViewLink) {
+    $this->webViewLink = $webViewLink;
+  }
+  public function getWebViewLink() {
+    return $this->webViewLink;
+  }
+  public function setWritersCanShare($writersCanShare) {
+    $this->writersCanShare = $writersCanShare;
+  }
+  public function getWritersCanShare() {
+    return $this->writersCanShare;
+  }
+}
+
+class Google_DriveFileImageMediaMetadata extends Google_Model {
+  public $aperture;
+  public $cameraMake;
+  public $cameraModel;
+  public $colorSpace;
+  public $date;
+  public $exposureBias;
+  public $exposureMode;
+  public $exposureTime;
+  public $flashUsed;
+  public $focalLength;
+  public $height;
+  public $isoSpeed;
+  public $lens;
+  protected $__locationType = 'Google_DriveFileImageMediaMetadataLocation';
+  protected $__locationDataType = '';
+  public $location;
+  public $maxApertureValue;
+  public $meteringMode;
+  public $rotation;
+  public $sensor;
+  public $subjectDistance;
+  public $whiteBalance;
+  public $width;
+  public function setAperture($aperture) {
+    $this->aperture = $aperture;
+  }
+  public function getAperture() {
+    return $this->aperture;
+  }
+  public function setCameraMake($cameraMake) {
+    $this->cameraMake = $cameraMake;
+  }
+  public function getCameraMake() {
+    return $this->cameraMake;
+  }
+  public function setCameraModel($cameraModel) {
+    $this->cameraModel = $cameraModel;
+  }
+  public function getCameraModel() {
+    return $this->cameraModel;
+  }
+  public function setColorSpace($colorSpace) {
+    $this->colorSpace = $colorSpace;
+  }
+  public function getColorSpace() {
+    return $this->colorSpace;
+  }
+  public function setDate($date) {
+    $this->date = $date;
+  }
+  public function getDate() {
+    return $this->date;
+  }
+  public function setExposureBias($exposureBias) {
+    $this->exposureBias = $exposureBias;
+  }
+  public function getExposureBias() {
+    return $this->exposureBias;
+  }
+  public function setExposureMode($exposureMode) {
+    $this->exposureMode = $exposureMode;
+  }
+  public function getExposureMode() {
+    return $this->exposureMode;
+  }
+  public function setExposureTime($exposureTime) {
+    $this->exposureTime = $exposureTime;
+  }
+  public function getExposureTime() {
+    return $this->exposureTime;
+  }
+  public function setFlashUsed($flashUsed) {
+    $this->flashUsed = $flashUsed;
+  }
+  public function getFlashUsed() {
+    return $this->flashUsed;
+  }
+  public function setFocalLength($focalLength) {
+    $this->focalLength = $focalLength;
+  }
+  public function getFocalLength() {
+    return $this->focalLength;
+  }
+  public function setHeight($height) {
+    $this->height = $height;
+  }
+  public function getHeight() {
+    return $this->height;
+  }
+  public function setIsoSpeed($isoSpeed) {
+    $this->isoSpeed = $isoSpeed;
+  }
+  public function getIsoSpeed() {
+    return $this->isoSpeed;
+  }
+  public function setLens($lens) {
+    $this->lens = $lens;
+  }
+  public function getLens() {
+    return $this->lens;
+  }
+  public function setLocation(Google_DriveFileImageMediaMetadataLocation $location) {
+    $this->location = $location;
+  }
+  public function getLocation() {
+    return $this->location;
+  }
+  public function setMaxApertureValue($maxApertureValue) {
+    $this->maxApertureValue = $maxApertureValue;
+  }
+  public function getMaxApertureValue() {
+    return $this->maxApertureValue;
+  }
+  public function setMeteringMode($meteringMode) {
+    $this->meteringMode = $meteringMode;
+  }
+  public function getMeteringMode() {
+    return $this->meteringMode;
+  }
+  public function setRotation($rotation) {
+    $this->rotation = $rotation;
+  }
+  public function getRotation() {
+    return $this->rotation;
+  }
+  public function setSensor($sensor) {
+    $this->sensor = $sensor;
+  }
+  public function getSensor() {
+    return $this->sensor;
+  }
+  public function setSubjectDistance($subjectDistance) {
+    $this->subjectDistance = $subjectDistance;
+  }
+  public function getSubjectDistance() {
+    return $this->subjectDistance;
+  }
+  public function setWhiteBalance($whiteBalance) {
+    $this->whiteBalance = $whiteBalance;
+  }
+  public function getWhiteBalance() {
+    return $this->whiteBalance;
+  }
+  public function setWidth($width) {
+    $this->width = $width;
+  }
+  public function getWidth() {
+    return $this->width;
+  }
+}
+
+class Google_DriveFileImageMediaMetadataLocation extends Google_Model {
+  public $altitude;
+  public $latitude;
+  public $longitude;
+  public function setAltitude($altitude) {
+    $this->altitude = $altitude;
+  }
+  public function getAltitude() {
+    return $this->altitude;
+  }
+  public function setLatitude($latitude) {
+    $this->latitude = $latitude;
+  }
+  public function getLatitude() {
+    return $this->latitude;
+  }
+  public function setLongitude($longitude) {
+    $this->longitude = $longitude;
+  }
+  public function getLongitude() {
+    return $this->longitude;
+  }
+}
+
+class Google_DriveFileIndexableText extends Google_Model {
+  public $text;
+  public function setText($text) {
+    $this->text = $text;
+  }
+  public function getText() {
+    return $this->text;
+  }
+}
+
+class Google_DriveFileLabels extends Google_Model {
+  public $hidden;
+  public $restricted;
+  public $starred;
+  public $trashed;
+  public $viewed;
+  public function setHidden($hidden) {
+    $this->hidden = $hidden;
+  }
+  public function getHidden() {
+    return $this->hidden;
+  }
+  public function setRestricted($restricted) {
+    $this->restricted = $restricted;
+  }
+  public function getRestricted() {
+    return $this->restricted;
+  }
+  public function setStarred($starred) {
+    $this->starred = $starred;
+  }
+  public function getStarred() {
+    return $this->starred;
+  }
+  public function setTrashed($trashed) {
+    $this->trashed = $trashed;
+  }
+  public function getTrashed() {
+    return $this->trashed;
+  }
+  public function setViewed($viewed) {
+    $this->viewed = $viewed;
+  }
+  public function getViewed() {
+    return $this->viewed;
+  }
+}
+
+class Google_DriveFileThumbnail extends Google_Model {
+  public $image;
+  public $mimeType;
+  public function setImage($image) {
+    $this->image = $image;
+  }
+  public function getImage() {
+    return $this->image;
+  }
+  public function setMimeType($mimeType) {
+    $this->mimeType = $mimeType;
+  }
+  public function getMimeType() {
+    return $this->mimeType;
+  }
+}
+
+class Google_FileList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_DriveFile';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_DriveFile) */ $items) {
+    $this->assertIsArray($items, 'Google_DriveFile', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setNextLink($nextLink) {
+    $this->nextLink = $nextLink;
+  }
+  public function getNextLink() {
+    return $this->nextLink;
+  }
+  public function setNextPageToken($nextPageToken) {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken() {
+    return $this->nextPageToken;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_ParentList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_ParentReference';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_ParentReference) */ $items) {
+    $this->assertIsArray($items, 'Google_ParentReference', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_ParentReference extends Google_Model {
+  public $id;
+  public $isRoot;
+  public $kind;
+  public $parentLink;
+  public $selfLink;
+  public function setId($id) {
+    $this->id = $id;
+  }
+  public function getId() {
+    return $this->id;
+  }
+  public function setIsRoot($isRoot) {
+    $this->isRoot = $isRoot;
+  }
+  public function getIsRoot() {
+    return $this->isRoot;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setParentLink($parentLink) {
+    $this->parentLink = $parentLink;
+  }
+  public function getParentLink() {
+    return $this->parentLink;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_Permission extends Google_Model {
+  public $additionalRoles;
+  public $authKey;
+  public $etag;
+  public $id;
+  public $kind;
+  public $name;
+  public $photoLink;
+  public $role;
+  public $selfLink;
+  public $type;
+  public $value;
+  public $withLink;
+  public function setAdditionalRoles(/* array(Google_string) */ $additionalRoles) {
+    $this->assertIsArray($additionalRoles, 'Google_string', __METHOD__);
+    $this->additionalRoles = $additionalRoles;
+  }
+  public function getAdditionalRoles() {
+    return $this->additionalRoles;
+  }
+  public function setAuthKey($authKey) {
+    $this->authKey = $authKey;
+  }
+  public function getAuthKey() {
+    return $this->authKey;
+  }
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setId($id) {
+    $this->id = $id;
+  }
+  public function getId() {
+    return $this->id;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setName($name) {
+    $this->name = $name;
+  }
+  public function getName() {
+    return $this->name;
+  }
+  public function setPhotoLink($photoLink) {
+    $this->photoLink = $photoLink;
+  }
+  public function getPhotoLink() {
+    return $this->photoLink;
+  }
+  public function setRole($role) {
+    $this->role = $role;
+  }
+  public function getRole() {
+    return $this->role;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+  public function setType($type) {
+    $this->type = $type;
+  }
+  public function getType() {
+    return $this->type;
+  }
+  public function setValue($value) {
+    $this->value = $value;
+  }
+  public function getValue() {
+    return $this->value;
+  }
+  public function setWithLink($withLink) {
+    $this->withLink = $withLink;
+  }
+  public function getWithLink() {
+    return $this->withLink;
+  }
+}
+
+class Google_PermissionList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_Permission';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_Permission) */ $items) {
+    $this->assertIsArray($items, 'Google_Permission', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_Property extends Google_Model {
+  public $etag;
+  public $key;
+  public $kind;
+  public $selfLink;
+  public $value;
+  public $visibility;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setKey($key) {
+    $this->key = $key;
+  }
+  public function getKey() {
+    return $this->key;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+  public function setValue($value) {
+    $this->value = $value;
+  }
+  public function getValue() {
+    return $this->value;
+  }
+  public function setVisibility($visibility) {
+    $this->visibility = $visibility;
+  }
+  public function getVisibility() {
+    return $this->visibility;
+  }
+}
+
+class Google_PropertyList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_Property';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_Property) */ $items) {
+    $this->assertIsArray($items, 'Google_Property', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_Revision extends Google_Model {
+  public $downloadUrl;
+  public $etag;
+  public $exportLinks;
+  public $fileSize;
+  public $id;
+  public $kind;
+  protected $__lastModifyingUserType = 'Google_User';
+  protected $__lastModifyingUserDataType = '';
+  public $lastModifyingUser;
+  public $lastModifyingUserName;
+  public $md5Checksum;
+  public $mimeType;
+  public $modifiedDate;
+  public $originalFilename;
+  public $pinned;
+  public $publishAuto;
+  public $published;
+  public $publishedLink;
+  public $publishedOutsideDomain;
+  public $selfLink;
+  public function setDownloadUrl($downloadUrl) {
+    $this->downloadUrl = $downloadUrl;
+  }
+  public function getDownloadUrl() {
+    return $this->downloadUrl;
+  }
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setExportLinks($exportLinks) {
+    $this->exportLinks = $exportLinks;
+  }
+  public function getExportLinks() {
+    return $this->exportLinks;
+  }
+  public function setFileSize($fileSize) {
+    $this->fileSize = $fileSize;
+  }
+  public function getFileSize() {
+    return $this->fileSize;
+  }
+  public function setId($id) {
+    $this->id = $id;
+  }
+  public function getId() {
+    return $this->id;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setLastModifyingUser(Google_User $lastModifyingUser) {
+    $this->lastModifyingUser = $lastModifyingUser;
+  }
+  public function getLastModifyingUser() {
+    return $this->lastModifyingUser;
+  }
+  public function setLastModifyingUserName($lastModifyingUserName) {
+    $this->lastModifyingUserName = $lastModifyingUserName;
+  }
+  public function getLastModifyingUserName() {
+    return $this->lastModifyingUserName;
+  }
+  public function setMd5Checksum($md5Checksum) {
+    $this->md5Checksum = $md5Checksum;
+  }
+  public function getMd5Checksum() {
+    return $this->md5Checksum;
+  }
+  public function setMimeType($mimeType) {
+    $this->mimeType = $mimeType;
+  }
+  public function getMimeType() {
+    return $this->mimeType;
+  }
+  public function setModifiedDate($modifiedDate) {
+    $this->modifiedDate = $modifiedDate;
+  }
+  public function getModifiedDate() {
+    return $this->modifiedDate;
+  }
+  public function setOriginalFilename($originalFilename) {
+    $this->originalFilename = $originalFilename;
+  }
+  public function getOriginalFilename() {
+    return $this->originalFilename;
+  }
+  public function setPinned($pinned) {
+    $this->pinned = $pinned;
+  }
+  public function getPinned() {
+    return $this->pinned;
+  }
+  public function setPublishAuto($publishAuto) {
+    $this->publishAuto = $publishAuto;
+  }
+  public function getPublishAuto() {
+    return $this->publishAuto;
+  }
+  public function setPublished($published) {
+    $this->published = $published;
+  }
+  public function getPublished() {
+    return $this->published;
+  }
+  public function setPublishedLink($publishedLink) {
+    $this->publishedLink = $publishedLink;
+  }
+  public function getPublishedLink() {
+    return $this->publishedLink;
+  }
+  public function setPublishedOutsideDomain($publishedOutsideDomain) {
+    $this->publishedOutsideDomain = $publishedOutsideDomain;
+  }
+  public function getPublishedOutsideDomain() {
+    return $this->publishedOutsideDomain;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_RevisionList extends Google_Model {
+  public $etag;
+  protected $__itemsType = 'Google_Revision';
+  protected $__itemsDataType = 'array';
+  public $items;
+  public $kind;
+  public $selfLink;
+  public function setEtag($etag) {
+    $this->etag = $etag;
+  }
+  public function getEtag() {
+    return $this->etag;
+  }
+  public function setItems(/* array(Google_Revision) */ $items) {
+    $this->assertIsArray($items, 'Google_Revision', __METHOD__);
+    $this->items = $items;
+  }
+  public function getItems() {
+    return $this->items;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setSelfLink($selfLink) {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink() {
+    return $this->selfLink;
+  }
+}
+
+class Google_User extends Google_Model {
+  public $displayName;
+  public $isAuthenticatedUser;
+  public $kind;
+  public $permissionId;
+  protected $__pictureType = 'Google_UserPicture';
+  protected $__pictureDataType = '';
+  public $picture;
+  public function setDisplayName($displayName) {
+    $this->displayName = $displayName;
+  }
+  public function getDisplayName() {
+    return $this->displayName;
+  }
+  public function setIsAuthenticatedUser($isAuthenticatedUser) {
+    $this->isAuthenticatedUser = $isAuthenticatedUser;
+  }
+  public function getIsAuthenticatedUser() {
+    return $this->isAuthenticatedUser;
+  }
+  public function setKind($kind) {
+    $this->kind = $kind;
+  }
+  public function getKind() {
+    return $this->kind;
+  }
+  public function setPermissionId($permissionId) {
+    $this->permissionId = $permissionId;
+  }
+  public function getPermissionId() {
+    return $this->permissionId;
+  }
+  public function setPicture(Google_UserPicture $picture) {
+    $this->picture = $picture;
+  }
+  public function getPicture() {
+    return $this->picture;
+  }
+}
+
+class Google_UserPicture extends Google_Model {
+  public $url;
+  public function setUrl($url) {
+    $this->url = $url;
+  }
+  public function getUrl() {
+    return $this->url;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php b/apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..594adbb15e24abe333f8d681ed2b6ea360e40280
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
@@ -0,0 +1,209 @@
+<?php
+/*
+Copyright (c) 2010 Kevin M Burns Jr, http://kevburnsjr.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+/**
+ * A URI Template Parser which is used by the apiREST class to resolve the REST requests
+ * Blogpost: http://lab.kevburnsjr.com/php-uri-template-parser
+ * Source: http://github.com/KevBurnsJr/php-uri-template-parser
+ */
+class URI_Template_Parser {
+
+  public static $operators = array('+', ';', '?', '/', '.');
+  public static $reserved_operators = array('|', '!', '@');
+  public static $explode_modifiers = array('+', '*');
+  public static $partial_modifiers = array(':', '^');
+
+  public static $gen_delims = array(':', '/', '?', '#', '[', ']', '@');
+  public static $gen_delims_pct = array('%3A', '%2F', '%3F', '%23', '%5B', '%5D', '%40');
+  public static $sub_delims = array('!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=');
+  public static $sub_delims_pct = array('%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C', '%3B', '%3D');
+  public static $reserved;
+  public static $reserved_pct;
+
+  public function __construct($template) {
+    self::$reserved = array_merge(self::$gen_delims, self::$sub_delims);
+    self::$reserved_pct = array_merge(self::$gen_delims_pct, self::$sub_delims_pct);
+    $this->template = $template;
+  }
+
+  public function expand($data) {
+    // Modification to make this a bit more performant (since gettype is very slow)
+    if (! is_array($data)) {
+      $data = (array)$data;
+    }
+    /*
+    // Original code, which uses a slow gettype() statement, kept in place for if the assumption that is_array always works here is incorrect
+    switch (gettype($data)) {
+      case "boolean":
+      case "integer":
+      case "double":
+      case "string":
+      case "object":
+        $data = (array)$data;
+        break;
+    }
+*/
+
+    // Resolve template vars
+    preg_match_all('/\{([^\}]*)\}/', $this->template, $em);
+
+    foreach ($em[1] as $i => $bare_expression) {
+      preg_match('/^([\+\;\?\/\.]{1})?(.*)$/', $bare_expression, $lm);
+      $exp = new StdClass();
+      $exp->expression = $em[0][$i];
+      $exp->operator = $lm[1];
+      $exp->variable_list = $lm[2];
+      $exp->varspecs = explode(',', $exp->variable_list);
+      $exp->vars = array();
+      foreach ($exp->varspecs as $varspec) {
+        preg_match('/^([a-zA-Z0-9_]+)([\*\+]{1})?([\:\^][0-9-]+)?(\=[^,]+)?$/', $varspec, $vm);
+        $var = new StdClass();
+        $var->name = $vm[1];
+        $var->modifier = isset($vm[2]) && $vm[2] ? $vm[2] : null;
+        $var->modifier = isset($vm[3]) && $vm[3] ? $vm[3] : $var->modifier;
+        $var->default = isset($vm[4]) ? substr($vm[4], 1) : null;
+        $exp->vars[] = $var;
+      }
+
+      // Add processing flags
+      $exp->reserved = false;
+      $exp->prefix = '';
+      $exp->delimiter = ',';
+      switch ($exp->operator) {
+        case '+':
+          $exp->reserved = 'true';
+          break;
+        case ';':
+          $exp->prefix = ';';
+          $exp->delimiter = ';';
+          break;
+        case '?':
+          $exp->prefix = '?';
+          $exp->delimiter = '&';
+          break;
+        case '/':
+          $exp->prefix = '/';
+          $exp->delimiter = '/';
+          break;
+        case '.':
+          $exp->prefix = '.';
+          $exp->delimiter = '.';
+          break;
+      }
+      $expressions[] = $exp;
+    }
+
+    // Expansion
+    $this->expansion = $this->template;
+
+    foreach ($expressions as $exp) {
+      $part = $exp->prefix;
+      $exp->one_var_defined = false;
+      foreach ($exp->vars as $var) {
+        $val = '';
+        if ($exp->one_var_defined && isset($data[$var->name])) {
+          $part .= $exp->delimiter;
+        }
+        // Variable present
+        if (isset($data[$var->name])) {
+          $exp->one_var_defined = true;
+          $var->data = $data[$var->name];
+
+          $val = self::val_from_var($var, $exp);
+
+        // Variable missing
+        } else {
+          if ($var->default) {
+            $exp->one_var_defined = true;
+            $val = $var->default;
+          }
+        }
+        $part .= $val;
+      }
+      if (! $exp->one_var_defined) $part = '';
+      $this->expansion = str_replace($exp->expression, $part, $this->expansion);
+    }
+
+    return $this->expansion;
+  }
+
+  private function val_from_var($var, $exp) {
+    $val = '';
+    if (is_array($var->data)) {
+      $i = 0;
+      if ($exp->operator == '?' && ! $var->modifier) {
+        $val .= $var->name . '=';
+      }
+      foreach ($var->data as $k => $v) {
+        $del = $var->modifier ? $exp->delimiter : ',';
+        $ek = rawurlencode($k);
+        $ev = rawurlencode($v);
+
+        // Array
+        if ($k !== $i) {
+          if ($var->modifier == '+') {
+            $val .= $var->name . '.';
+          }
+          if ($exp->operator == '?' && $var->modifier || $exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+') {
+            $val .= $ek . '=';
+          } else {
+            $val .= $ek . $del;
+          }
+
+        // List
+        } else {
+          if ($var->modifier == '+') {
+            if ($exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+' || $exp->operator == '?' && $var->modifier == '+') {
+              $val .= $var->name . '=';
+            } else {
+              $val .= $var->name . '.';
+            }
+          }
+        }
+        $val .= $ev . $del;
+        $i ++;
+      }
+      $val = trim($val, $del);
+
+    // Strings, numbers, etc.
+    } else {
+      if ($exp->operator == '?') {
+        $val = $var->name . (isset($var->data) ? '=' : '');
+      } else if ($exp->operator == ';') {
+        $val = $var->name . ($var->data ? '=' : '');
+      }
+      $val .= rawurlencode($var->data);
+      if ($exp->operator == '+') {
+        $val = str_replace(self::$reserved_pct, self::$reserved, $val);
+      }
+    }
+    return $val;
+  }
+
+  public function match($uri) {}
+
+  public function __toString() {
+    return $this->template;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CacheParser.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CacheParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f5accfefe9720a79ff7b7a7fd6063de8a0ae7d3
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CacheParser.php
@@ -0,0 +1,173 @@
+<?php
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Implement the caching directives specified in rfc2616. This
+ * implementation is guided by the guidance offered in rfc2616-sec13.
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_CacheParser {
+  public static $CACHEABLE_HTTP_METHODS = array('GET', 'HEAD');
+  public static $CACHEABLE_STATUS_CODES = array('200', '203', '300', '301');
+
+  private function __construct() {}
+
+  /**
+   * Check if an HTTP request can be cached by a private local cache.
+   *
+   * @static
+   * @param Google_HttpRequest $resp
+   * @return bool True if the request is cacheable.
+   * False if the request is uncacheable.
+   */
+  public static function isRequestCacheable (Google_HttpRequest $resp) {
+    $method = $resp->getRequestMethod();
+    if (! in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
+      return false;
+    }
+
+    // Don't cache authorized requests/responses.
+    // [rfc2616-14.8] When a shared cache receives a request containing an
+    // Authorization field, it MUST NOT return the corresponding response
+    // as a reply to any other request...
+    if ($resp->getRequestHeader("authorization")) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Check if an HTTP response can be cached by a private local cache.
+   *
+   * @static
+   * @param Google_HttpRequest $resp
+   * @return bool True if the response is cacheable.
+   * False if the response is un-cacheable.
+   */
+  public static function isResponseCacheable (Google_HttpRequest $resp) {
+    // First, check if the HTTP request was cacheable before inspecting the
+    // HTTP response.
+    if (false == self::isRequestCacheable($resp)) {
+      return false;
+    }
+
+    $code = $resp->getResponseHttpCode();
+    if (! in_array($code, self::$CACHEABLE_STATUS_CODES)) {
+      return false;
+    }
+
+    // The resource is uncacheable if the resource is already expired and
+    // the resource doesn't have an ETag for revalidation.
+    $etag = $resp->getResponseHeader("etag");
+    if (self::isExpired($resp) && $etag == false) {
+      return false;
+    }
+
+    // [rfc2616-14.9.2]  If [no-store is] sent in a response, a cache MUST NOT
+    // store any part of either this response or the request that elicited it.
+    $cacheControl = $resp->getParsedCacheControl();
+    if (isset($cacheControl['no-store'])) {
+      return false;
+    }
+
+    // Pragma: no-cache is an http request directive, but is occasionally
+    // used as a response header incorrectly.
+    $pragma = $resp->getResponseHeader('pragma');
+    if ($pragma == 'no-cache' || strpos($pragma, 'no-cache') !== false) {
+      return false;
+    }
+
+    // [rfc2616-14.44] Vary: * is extremely difficult to cache. "It implies that
+    // a cache cannot determine from the request headers of a subsequent request
+    // whether this response is the appropriate representation."
+    // Given this, we deem responses with the Vary header as uncacheable.
+    $vary = $resp->getResponseHeader('vary');
+    if ($vary) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * @static
+   * @param Google_HttpRequest $resp
+   * @return bool True if the HTTP response is considered to be expired.
+   * False if it is considered to be fresh.
+   */
+  public static function isExpired(Google_HttpRequest $resp) {
+    // HTTP/1.1 clients and caches MUST treat other invalid date formats,
+    // especially including the value â€œ0â€, as in the past.
+    $parsedExpires = false;
+    $responseHeaders = $resp->getResponseHeaders();
+    if (isset($responseHeaders['expires'])) {
+      $rawExpires = $responseHeaders['expires'];
+      // Check for a malformed expires header first.
+      if (empty($rawExpires) || (is_numeric($rawExpires) && $rawExpires <= 0)) {
+        return true;
+      }
+
+      // See if we can parse the expires header.
+      $parsedExpires = strtotime($rawExpires);
+      if (false == $parsedExpires || $parsedExpires <= 0) {
+        return true;
+      }
+    }
+
+    // Calculate the freshness of an http response.
+    $freshnessLifetime = false;
+    $cacheControl = $resp->getParsedCacheControl();
+    if (isset($cacheControl['max-age'])) {
+      $freshnessLifetime = $cacheControl['max-age'];
+    }
+
+    $rawDate = $resp->getResponseHeader('date');
+    $parsedDate = strtotime($rawDate);
+
+    if (empty($rawDate) || false == $parsedDate) {
+      $parsedDate = time();
+    }
+    if (false == $freshnessLifetime && isset($responseHeaders['expires'])) {
+      $freshnessLifetime = $parsedExpires - $parsedDate;
+    }
+
+    if (false == $freshnessLifetime) {
+      return true;
+    }
+
+    // Calculate the age of an http response.
+    $age = max(0, time() - $parsedDate);
+    if (isset($responseHeaders['age'])) {
+      $age = max($age, strtotime($responseHeaders['age']));
+    }
+
+    return $freshnessLifetime <= $age;
+  }
+
+  /**
+   * Determine if a cache entry should be revalidated with by the origin.
+   *
+   * @param Google_HttpRequest $response
+   * @return bool True if the entry is expired, else return false.
+   */
+  public static function mustRevalidate(Google_HttpRequest $response) {
+    // [13.3] When a cache has a stale entry that it would like to use as a
+    // response to a client's request, it first has to check with the origin
+    // server to see if its cached entry is still usable.
+    return self::isExpired($response);
+  }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CurlIO.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CurlIO.php
new file mode 100644
index 0000000000000000000000000000000000000000..65352f29882d5286522a42d371ea9922fc0446a9
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CurlIO.php
@@ -0,0 +1,278 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Curl based implementation of apiIO.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ */
+
+require_once 'Google_CacheParser.php';
+
+class Google_CurlIO implements Google_IO {
+  const CONNECTION_ESTABLISHED = "HTTP/1.0 200 Connection established\r\n\r\n";
+  const FORM_URLENCODED = 'application/x-www-form-urlencoded';
+
+  private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
+  private static $HOP_BY_HOP = array(
+      'connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization',
+      'te', 'trailers', 'transfer-encoding', 'upgrade');
+
+  private $curlParams = array (
+      CURLOPT_RETURNTRANSFER => true,
+      CURLOPT_FOLLOWLOCATION => 0,
+      CURLOPT_FAILONERROR => false,
+      CURLOPT_SSL_VERIFYPEER => true,
+      CURLOPT_HEADER => true,
+      CURLOPT_VERBOSE => false,
+  );
+
+  /**
+   * Perform an authenticated / signed apiHttpRequest.
+   * This function takes the apiHttpRequest, calls apiAuth->sign on it
+   * (which can modify the request in what ever way fits the auth mechanism)
+   * and then calls apiCurlIO::makeRequest on the signed request
+   *
+   * @param Google_HttpRequest $request
+   * @return Google_HttpRequest The resulting HTTP response including the
+   * responseHttpCode, responseHeaders and responseBody.
+   */
+  public function authenticatedRequest(Google_HttpRequest $request) {
+    $request = Google_Client::$auth->sign($request);
+    return $this->makeRequest($request);
+  }
+
+  /**
+   * Execute a apiHttpRequest
+   *
+   * @param Google_HttpRequest $request the http request to be executed
+   * @return Google_HttpRequest http request with the response http code, response
+   * headers and response body filled in
+   * @throws Google_IOException on curl or IO error
+   */
+  public function makeRequest(Google_HttpRequest $request) {
+    // First, check to see if we have a valid cached version.
+    $cached = $this->getCachedRequest($request);
+    if ($cached !== false) {
+      if (Google_CacheParser::mustRevalidate($cached)) {
+        $addHeaders = array();
+        if ($cached->getResponseHeader('etag')) {
+          // [13.3.4] If an entity tag has been provided by the origin server,
+          // we must use that entity tag in any cache-conditional request.
+          $addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
+        } elseif ($cached->getResponseHeader('date')) {
+          $addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
+        }
+
+        $request->setRequestHeaders($addHeaders);
+      } else {
+        // No need to revalidate the request, return it directly
+        return $cached;
+      }
+    }
+
+    if (array_key_exists($request->getRequestMethod(),
+          self::$ENTITY_HTTP_METHODS)) {
+      $request = $this->processEntityRequest($request);
+    }
+
+    $ch = curl_init();
+    curl_setopt_array($ch, $this->curlParams);
+    curl_setopt($ch, CURLOPT_URL, $request->getUrl());
+    if ($request->getPostBody()) {
+      curl_setopt($ch, CURLOPT_POSTFIELDS, $request->getPostBody());
+    }
+
+    $requestHeaders = $request->getRequestHeaders();
+    if ($requestHeaders && is_array($requestHeaders)) {
+      $parsed = array();
+      foreach ($requestHeaders as $k => $v) {
+        $parsed[] = "$k: $v";
+      }
+      curl_setopt($ch, CURLOPT_HTTPHEADER, $parsed);
+    }
+
+    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
+    curl_setopt($ch, CURLOPT_USERAGENT, $request->getUserAgent());
+    $respData = curl_exec($ch);
+
+    // Retry if certificates are missing.
+    if (curl_errno($ch) == CURLE_SSL_CACERT) {
+      error_log('SSL certificate problem, verify that the CA cert is OK.'
+        . ' Retrying with the CA cert bundle from google-api-php-client.');
+      curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
+      $respData = curl_exec($ch);
+    }
+
+    $respHeaderSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+    $respHttpCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    $curlErrorNum = curl_errno($ch);
+    $curlError = curl_error($ch);
+    curl_close($ch);
+    if ($curlErrorNum != CURLE_OK) {
+      throw new Google_IOException("HTTP Error: ($respHttpCode) $curlError");
+    }
+
+    // Parse out the raw response into usable bits
+    list($responseHeaders, $responseBody) =
+          self::parseHttpResponse($respData, $respHeaderSize);
+
+    if ($respHttpCode == 304 && $cached) {
+      // If the server responded NOT_MODIFIED, return the cached request.
+      if (isset($responseHeaders['connection'])) {
+        $hopByHop = array_merge(
+          self::$HOP_BY_HOP,
+          explode(',', $responseHeaders['connection'])
+        );
+
+        $endToEnd = array();
+        foreach($hopByHop as $key) {
+          if (isset($responseHeaders[$key])) {
+            $endToEnd[$key] = $responseHeaders[$key];
+          }
+        }
+        $cached->setResponseHeaders($endToEnd);
+      }
+      return $cached;
+    }
+
+    // Fill in the apiHttpRequest with the response values
+    $request->setResponseHttpCode($respHttpCode);
+    $request->setResponseHeaders($responseHeaders);
+    $request->setResponseBody($responseBody);
+    // Store the request in cache (the function checks to see if the request
+    // can actually be cached)
+    $this->setCachedRequest($request);
+    // And finally return it
+    return $request;
+  }
+
+  /**
+   * @visible for testing.
+   * Cache the response to an HTTP request if it is cacheable.
+   * @param Google_HttpRequest $request
+   * @return bool Returns true if the insertion was successful.
+   * Otherwise, return false.
+   */
+  public function setCachedRequest(Google_HttpRequest $request) {
+    // Determine if the request is cacheable.
+    if (Google_CacheParser::isResponseCacheable($request)) {
+      Google_Client::$cache->set($request->getCacheKey(), $request);
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * @visible for testing.
+   * @param Google_HttpRequest $request
+   * @return Google_HttpRequest|bool Returns the cached object or
+   * false if the operation was unsuccessful.
+   */
+  public function getCachedRequest(Google_HttpRequest $request) {
+    if (false == Google_CacheParser::isRequestCacheable($request)) {
+      false;
+    }
+
+    return Google_Client::$cache->get($request->getCacheKey());
+  }
+
+  /**
+   * @param $respData
+   * @param $headerSize
+   * @return array
+   */
+  public static function parseHttpResponse($respData, $headerSize) {
+    if (stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
+      $respData = str_ireplace(self::CONNECTION_ESTABLISHED, '', $respData);
+    }
+
+    if ($headerSize) {
+      $responseBody = substr($respData, $headerSize);
+      $responseHeaders = substr($respData, 0, $headerSize);
+    } else {
+      list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
+    }
+
+    $responseHeaders = self::parseResponseHeaders($responseHeaders);
+    return array($responseHeaders, $responseBody);
+  }
+
+  public static function parseResponseHeaders($rawHeaders) {
+    $responseHeaders = array();
+
+    $responseHeaderLines = explode("\r\n", $rawHeaders);
+    foreach ($responseHeaderLines as $headerLine) {
+      if ($headerLine && strpos($headerLine, ':') !== false) {
+        list($header, $value) = explode(': ', $headerLine, 2);
+        $header = strtolower($header);
+        if (isset($responseHeaders[$header])) {
+          $responseHeaders[$header] .= "\n" . $value;
+        } else {
+          $responseHeaders[$header] = $value;
+        }
+      }
+    }
+    return $responseHeaders;
+  }
+
+  /**
+   * @visible for testing
+   * Process an http request that contains an enclosed entity.
+   * @param Google_HttpRequest $request
+   * @return Google_HttpRequest Processed request with the enclosed entity.
+   */
+  public function processEntityRequest(Google_HttpRequest $request) {
+    $postBody = $request->getPostBody();
+    $contentType = $request->getRequestHeader("content-type");
+
+    // Set the default content-type as application/x-www-form-urlencoded.
+    if (false == $contentType) {
+      $contentType = self::FORM_URLENCODED;
+      $request->setRequestHeaders(array('content-type' => $contentType));
+    }
+
+    // Force the payload to match the content-type asserted in the header.
+    if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
+      $postBody = http_build_query($postBody, '', '&');
+      $request->setPostBody($postBody);
+    }
+
+    // Make sure the content-length header is set.
+    if (!$postBody || is_string($postBody)) {
+      $postsLength = strlen($postBody);
+      $request->setRequestHeaders(array('content-length' => $postsLength));
+    }
+
+    return $request;
+  }
+
+  /**
+   * Set options that update cURL's default behavior.
+   * The list of accepted options are:
+   * {@link http://php.net/manual/en/function.curl-setopt.php]
+   *
+   * @param array $optCurlParams Multiple options used by a cURL session.
+   */
+  public function setOptions($optCurlParams) {
+    foreach ($optCurlParams as $key => $val) {
+      $this->curlParams[$key] = $val;
+    }
+  }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_HttpRequest.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_HttpRequest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b98eae5400891cca40f921616cdf46e7deba66b1
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_HttpRequest.php
@@ -0,0 +1,304 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * HTTP Request to be executed by apiIO classes. Upon execution, the
+ * responseHttpCode, responseHeaders and responseBody will be filled in.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_HttpRequest {
+  const USER_AGENT_SUFFIX = "google-api-php-client/0.6.0";
+  private $batchHeaders = array(
+    'Content-Type' => 'application/http',
+    'Content-Transfer-Encoding' => 'binary',
+    'MIME-Version' => '1.0',
+    'Content-Length' => ''
+  );
+
+  protected $url;
+  protected $requestMethod;
+  protected $requestHeaders;
+  protected $postBody;
+  protected $userAgent;
+
+  protected $responseHttpCode;
+  protected $responseHeaders;
+  protected $responseBody;
+  
+  public $accessKey;
+
+  public function __construct($url, $method = 'GET', $headers = array(), $postBody = null) {
+    $this->setUrl($url);
+    $this->setRequestMethod($method);
+    $this->setRequestHeaders($headers);
+    $this->setPostBody($postBody);
+
+    global $apiConfig;
+    if (empty($apiConfig['application_name'])) {
+      $this->userAgent = self::USER_AGENT_SUFFIX;
+    } else {
+      $this->userAgent = $apiConfig['application_name'] . " " . self::USER_AGENT_SUFFIX;
+    }
+  }
+
+  /**
+   * Misc function that returns the base url component of the $url
+   * used by the OAuth signing class to calculate the base string
+   * @return string The base url component of the $url.
+   * @see http://oauth.net/core/1.0a/#anchor13
+   */
+  public function getBaseUrl() {
+    if ($pos = strpos($this->url, '?')) {
+      return substr($this->url, 0, $pos);
+    }
+    return $this->url;
+  }
+
+  /**
+   * Misc function that returns an array of the query parameters of the current
+   * url used by the OAuth signing class to calculate the signature
+   * @return array Query parameters in the query string.
+   */
+  public function getQueryParams() {
+    if ($pos = strpos($this->url, '?')) {
+      $queryStr = substr($this->url, $pos + 1);
+      $params = array();
+      parse_str($queryStr, $params);
+      return $params;
+    }
+    return array();
+  }
+
+  /**
+   * @return string HTTP Response Code.
+   */
+  public function getResponseHttpCode() {
+    return (int) $this->responseHttpCode;
+  }
+
+  /**
+   * @param int $responseHttpCode HTTP Response Code.
+   */
+  public function setResponseHttpCode($responseHttpCode) {
+    $this->responseHttpCode = $responseHttpCode;
+  }
+
+  /**
+   * @return $responseHeaders (array) HTTP Response Headers.
+   */
+  public function getResponseHeaders() {
+    return $this->responseHeaders;
+  }
+
+  /**
+   * @return string HTTP Response Body
+   */
+  public function getResponseBody() {
+    return $this->responseBody;
+  }
+
+  /**
+   * @param array $headers The HTTP response headers
+   * to be normalized.
+   */
+  public function setResponseHeaders($headers) {
+    $headers = Google_Utils::normalize($headers);
+    if ($this->responseHeaders) {
+      $headers = array_merge($this->responseHeaders, $headers);
+    }
+
+    $this->responseHeaders = $headers;
+  }
+
+  /**
+   * @param string $key
+   * @return array|boolean Returns the requested HTTP header or
+   * false if unavailable.
+   */
+  public function getResponseHeader($key) {
+    return isset($this->responseHeaders[$key])
+        ? $this->responseHeaders[$key]
+        : false;
+  }
+
+  /**
+   * @param string $responseBody The HTTP response body.
+   */
+  public function setResponseBody($responseBody) {
+    $this->responseBody = $responseBody;
+  }
+
+  /**
+   * @return string $url The request URL.
+   */
+
+  public function getUrl() {
+    return $this->url;
+  }
+
+  /**
+   * @return string $method HTTP Request Method.
+   */
+  public function getRequestMethod() {
+    return $this->requestMethod;
+  }
+
+  /**
+   * @return array $headers HTTP Request Headers.
+   */
+  public function getRequestHeaders() {
+    return $this->requestHeaders;
+  }
+
+  /**
+   * @param string $key
+   * @return array|boolean Returns the requested HTTP header or
+   * false if unavailable.
+   */
+  public function getRequestHeader($key) {
+    return isset($this->requestHeaders[$key])
+        ? $this->requestHeaders[$key]
+        : false;
+  }
+
+  /**
+   * @return string $postBody HTTP Request Body.
+   */
+  public function getPostBody() {
+    return $this->postBody;
+  }
+
+  /**
+   * @param string $url the url to set
+   */
+  public function setUrl($url) {
+    if (substr($url, 0, 4) == 'http') {
+      $this->url = $url;
+    } else {
+      // Force the path become relative.
+      if (substr($url, 0, 1) !== '/') {
+        $url = '/' . $url;
+      }
+      global $apiConfig;
+      $this->url = $apiConfig['basePath'] . $url;
+    }
+  }
+
+  /**
+   * @param string $method Set he HTTP Method and normalize
+   * it to upper-case, as required by HTTP.
+   *
+   */
+  public function setRequestMethod($method) {
+    $this->requestMethod = strtoupper($method);
+  }
+
+  /**
+   * @param array $headers The HTTP request headers
+   * to be set and normalized.
+   */
+  public function setRequestHeaders($headers) {
+    $headers = Google_Utils::normalize($headers);
+    if ($this->requestHeaders) {
+      $headers = array_merge($this->requestHeaders, $headers);
+    }
+    $this->requestHeaders = $headers;
+  }
+
+  /**
+   * @param string $postBody the postBody to set
+   */
+  public function setPostBody($postBody) {
+    $this->postBody = $postBody;
+  }
+
+  /**
+   * Set the User-Agent Header.
+   * @param string $userAgent The User-Agent.
+   */
+  public function setUserAgent($userAgent) {
+    $this->userAgent = $userAgent;
+  }
+
+  /**
+   * @return string The User-Agent.
+   */
+  public function getUserAgent() {
+    return $this->userAgent;
+  }
+
+  /**
+   * Returns a cache key depending on if this was an OAuth signed request
+   * in which case it will use the non-signed url and access key to make this
+   * cache key unique per authenticated user, else use the plain request url
+   * @return string The md5 hash of the request cache key.
+   */
+  public function getCacheKey() {
+    $key = $this->getUrl();
+
+    if (isset($this->accessKey)) {
+      $key .= $this->accessKey;
+    }
+
+    if (isset($this->requestHeaders['authorization'])) {
+      $key .= $this->requestHeaders['authorization'];
+    }
+
+    return md5($key);
+  }
+
+  public function getParsedCacheControl() {
+    $parsed = array();
+    $rawCacheControl = $this->getResponseHeader('cache-control');
+    if ($rawCacheControl) {
+      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
+      parse_str($rawCacheControl, $parsed);
+    }
+
+    return $parsed;
+  }
+
+  /**
+   * @param string $id
+   * @return string A string representation of the HTTP Request.
+   */
+  public function toBatchString($id) {
+    $str = '';
+    foreach($this->batchHeaders as $key => $val) {
+      $str .= $key . ': ' . $val . "\n";
+    }
+
+    $str .= "Content-ID: $id\n";
+    $str .= "\n";
+
+    $path = parse_url($this->getUrl(), PHP_URL_PATH);
+    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+    foreach($this->getRequestHeaders() as $key => $val) {
+      $str .= $key . ': ' . $val . "\n";
+    }
+
+    if ($this->getPostBody()) {
+      $str .= "\n";
+      $str .= $this->getPostBody();
+    }
+
+    return $str;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_IO.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_IO.php
new file mode 100644
index 0000000000000000000000000000000000000000..5445e6990387ebffd1a8c7f4b8970ed12d87ea66
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_IO.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once 'io/Google_HttpRequest.php';
+require_once 'io/Google_CurlIO.php';
+require_once 'io/Google_REST.php';
+
+/**
+ * Abstract IO class
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+interface Google_IO {
+  /**
+   * An utility function that first calls $this->auth->sign($request) and then executes makeRequest()
+   * on that signed request. Used for when a request should be authenticated
+   * @param Google_HttpRequest $request
+   * @return Google_HttpRequest $request
+   */
+  public function authenticatedRequest(Google_HttpRequest $request);
+
+  /**
+   * Executes a apIHttpRequest and returns the resulting populated httpRequest
+   * @param Google_HttpRequest $request
+   * @return Google_HttpRequest $request
+   */
+  public function makeRequest(Google_HttpRequest $request);
+
+  /**
+   * Set options that update the transport implementation's behavior.
+   * @param $options
+   */
+  public function setOptions($options);
+
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_REST.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_REST.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0f3b3d564c885ac8eddfd81b4f4f8264532d991
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_REST.php
@@ -0,0 +1,128 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This class implements the RESTful transport of apiServiceRequest()'s
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_REST {
+  /**
+   * Executes a apiServiceRequest using a RESTful call by transforming it into
+   * an apiHttpRequest, and executed via apiIO::authenticatedRequest().
+   *
+   * @param Google_HttpRequest $req
+   * @return array decoded result
+   * @throws Google_ServiceException on server side error (ie: not authenticated,
+   *  invalid or malformed post body, invalid url)
+   */
+  static public function execute(Google_HttpRequest $req) {
+    $httpRequest = Google_Client::$io->makeRequest($req);
+    $decodedResponse = self::decodeHttpResponse($httpRequest);
+    $ret = isset($decodedResponse['data'])
+        ? $decodedResponse['data'] : $decodedResponse;
+    return $ret;
+  }
+
+  
+  /**
+   * Decode an HTTP Response.
+   * @static
+   * @throws Google_ServiceException
+   * @param Google_HttpRequest $response The http response to be decoded.
+   * @return mixed|null
+   */
+  public static function decodeHttpResponse($response) {
+    $code = $response->getResponseHttpCode();
+    $body = $response->getResponseBody();
+    $decoded = null;
+    
+    if ((intVal($code)) >= 300) {
+      $decoded = json_decode($body, true);
+      $err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
+      if ($decoded != null && isset($decoded['error']['message'])  && isset($decoded['error']['code'])) {
+        // if we're getting a json encoded error definition, use that instead of the raw response
+        // body for improved readability
+        $err .= ": ({$decoded['error']['code']}) {$decoded['error']['message']}";
+      } else {
+        $err .= ": ($code) $body";
+      }
+
+      throw new Google_ServiceException($err, $code, null, $decoded['error']['errors']);
+    }
+    
+    // Only attempt to decode the response, if the response code wasn't (204) 'no content'
+    if ($code != '204') {
+      $decoded = json_decode($body, true);
+      if ($decoded === null || $decoded === "") {
+        throw new Google_ServiceException("Invalid json in service response: $body");
+      }
+    }
+    return $decoded;
+  }
+
+  /**
+   * Parse/expand request parameters and create a fully qualified
+   * request uri.
+   * @static
+   * @param string $servicePath
+   * @param string $restPath
+   * @param array $params
+   * @return string $requestUrl
+   */
+  static function createRequestUri($servicePath, $restPath, $params) {
+    $requestUrl = $servicePath . $restPath;
+    $uriTemplateVars = array();
+    $queryVars = array();
+    foreach ($params as $paramName => $paramSpec) {
+      // Discovery v1.0 puts the canonical location under the 'location' field.
+      if (! isset($paramSpec['location'])) {
+        $paramSpec['location'] = $paramSpec['restParameterType'];
+      }
+
+      if ($paramSpec['type'] == 'boolean') {
+        $paramSpec['value'] = ($paramSpec['value']) ? 'true' : 'false';
+      }
+      if ($paramSpec['location'] == 'path') {
+        $uriTemplateVars[$paramName] = $paramSpec['value'];
+      } else {
+        if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
+          foreach ($paramSpec['value'] as $value) {
+            $queryVars[] = $paramName . '=' . rawurlencode($value);
+          }
+        } else {
+          $queryVars[] = $paramName . '=' . rawurlencode($paramSpec['value']);
+        }
+      }
+    }
+
+    if (count($uriTemplateVars)) {
+      $uriTemplateParser = new URI_Template_Parser($requestUrl);
+      $requestUrl = $uriTemplateParser->expand($uriTemplateVars);
+    }
+    //FIXME work around for the the uri template lib which url encodes
+    // the @'s & confuses our servers.
+    $requestUrl = str_replace('%40', '@', $requestUrl);
+
+    if (count($queryVars)) {
+      $requestUrl .= '?' . implode($queryVars, '&');
+    }
+
+    return $requestUrl;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem b/apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem
new file mode 100644
index 0000000000000000000000000000000000000000..da36ed1ba6de0a71d38a13188f82d89f440017bd
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem
@@ -0,0 +1,714 @@
+# Certifcate Authority certificates for validating SSL connections.
+#
+# This file contains PEM format certificates generated from
+# http://mxr.mozilla.org/seamonkey/source/security/nss/lib/ckfw/builtins/certdata.txt
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+Verisign/RSA Secure Server CA
+=============================
+
+-----BEGIN CERTIFICATE-----
+MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
+VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0
+MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV
+BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy
+dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ
+ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII
+0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI
+uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI
+hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3
+YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc
+1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
+-----END CERTIFICATE-----
+
+Thawte Personal Basic CA
+========================
+
+-----BEGIN CERTIFICATE-----
+MIIDITCCAoqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD
+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT
+ZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFBlcnNvbmFsIEJhc2lj
+IENBMSgwJgYJKoZIhvcNAQkBFhlwZXJzb25hbC1iYXNpY0B0aGF3dGUuY29tMB4X
+DTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgcsxCzAJBgNVBAYTAlpBMRUw
+EwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UE
+ChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
+dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQZXJzb25hbCBCYXNpYyBD
+QTEoMCYGCSqGSIb3DQEJARYZcGVyc29uYWwtYmFzaWNAdGhhd3RlLmNvbTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvLyTU23AUE+CFeZIlDWmWr5vQvoPR+53
+dXLdjUmbllegeNTKP1GzaQuRdhciB5dqxFGTS+CN7zeVoQxN2jSQHReJl+A1OFdK
+wPQIcOk8RHtQfmGakOMj04gRRif1CwcOu93RfyAKiLlWCy4cgNrx454p7xS9CkT7
+G1sY0b8jkyECAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQF
+AAOBgQAt4plrsD16iddZopQBHyvdEktTwq1/qqcAXJFAVyVKOKqEcLnZgA+le1z7
+c8a914phXAPjLSeoF+CEhULcXpvGt7Jtu3Sv5D/Lp7ew4F2+eIMllNLbgQ95B21P
+9DkVWlIBe94y1k049hJcBlDfBVu9FEuh3ym6O0GN92NWod8isQ==
+-----END CERTIFICATE-----
+
+Thawte Personal Premium CA
+==========================
+
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBzzELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD
+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT
+ZXJ2aWNlcyBEaXZpc2lvbjEjMCEGA1UEAxMaVGhhd3RlIFBlcnNvbmFsIFByZW1p
+dW0gQ0ExKjAoBgkqhkiG9w0BCQEWG3BlcnNvbmFsLXByZW1pdW1AdGhhd3RlLmNv
+bTAeFw05NjAxMDEwMDAwMDBaFw0yMDEyMzEyMzU5NTlaMIHPMQswCQYDVQQGEwJa
+QTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAY
+BgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9u
+IFNlcnZpY2VzIERpdmlzaW9uMSMwIQYDVQQDExpUaGF3dGUgUGVyc29uYWwgUHJl
+bWl1bSBDQTEqMCgGCSqGSIb3DQEJARYbcGVyc29uYWwtcHJlbWl1bUB0aGF3dGUu
+Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJZtn4B0TPuYwu8KHvE0Vs
+Bd/eJxZRNkERbGw77f4QfRKe5ZtCmv5gMcNmt3M6SK5O0DI3lIi1DbbZ8/JE2dWI
+Et12TfIa/G8jHnrx2JhFTgcQ7xZC0EN1bUre4qrJMf8fAHB8Zs8QJQi6+u4A6UYD
+ZicRFTuqW/KY3TZCstqIdQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBAUAA4GBAGk2ifc0KjNyL2071CKyuG+axTZmDhs8obF1Wub9NdP4qPIH
+b4Vnjt4rueIXsDqg8A6iAJrf8xQVbrvIhVqYgPn/vnQdPfP+MCXRNzRn+qVxeTBh
+KXLA4CxM+1bkOqhv5TJZUtt1KFBZDPgLGeSs2a+WjS9Q2wfD6h+rM+D1KzGJ
+-----END CERTIFICATE-----
+
+Thawte Personal Freemail CA
+===========================
+
+-----BEGIN CERTIFICATE-----
+MIIDLTCCApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYD
+VQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBT
+ZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3RlIFBlcnNvbmFsIEZyZWVt
+YWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0aGF3dGUu
+Y29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNVBAYT
+AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEa
+MBgGA1UEChMRVGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBG
+cmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVyc29uYWwtZnJlZW1haWxAdGhh
+d3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1GnX1LCUZFtx6UfY
+DFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6WZBrCFG5E
+rHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVq
+uzgkCGqYx7Hao5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQQFAAOBgQDH7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjP
+MPuoSpaKH2JCI4wXD/S6ZJwXrEcp352YXtJsYHFcoqzceePnbgBHH7UNKOgCneSa
+/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK/qarigd1iwzdUYRr5PjRznei
+gQ==
+-----END CERTIFICATE-----
+
+Thawte Server CA
+================
+
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+Thawte Premium Server CA
+========================
+
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+Equifax Secure CA
+=================
+
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority
+=======================================================
+
+-----BEGIN CERTIFICATE-----
+MIICPTCCAaYCEQDNun9W8N/kvFT+IqyzcqpVMA0GCSqGSIb3DQEBAgUAMF8xCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xh
+c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05
+NjAxMjkwMDAwMDBaFw0yODA4MDEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYD
+VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMSBQdWJsaWMgUHJp
+bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEA5Rm/baNWYS2ZSHH2Z965jeu3noaACpEO+jglr0aIguVzqKCbJF0N
+H8xlbgyw0FaEGIeaBpsQoXPftFg5a27B9hXVqKg/qhIGjTGsf7A01480Z4gJzRQR
+4k5FVmkfeAKA2txHkSm7NsljXMXg1y2He6G3MrB7MLoqLzGq7qNn2tsCAwEAATAN
+BgkqhkiG9w0BAQIFAAOBgQBMP7iLxmjf7kMzDl3ppssHhE16M/+SG/Q2rdiVIjZo
+EWx8QszznC7EBz8UsA9P/5CSdvnivErpj82ggAr3xSnxgiJduLHdgSOjeyUVRjB5
+FvjqBUuUfx3CHMjjt/QQQDwTw18fU+hI5Ia0e6E1sHslurjTjqs/OJ0ANACY89Fx
+lA==
+-----END CERTIFICATE-----
+
+Verisign Class 2 Public Primary Certification Authority
+=======================================================
+
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEC0b/EoXjaOR6+f/9YtFvgswDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAyIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQC2WoujDWojg4BrzzmH9CETMwZMJaLtVRKXxaeAufqDwSCg+i8VDXyh
+YGt+eSz6Bg86rvYbb7HS/y8oUl+DfUvEerf4Zh+AVPy3wo5ZShRXRtGak75BkQO7
+FYCTXOvnzAhsPz6zSvz/S2wj1VCCJkQZjiPDceoZJEcEnnW/yKYAHwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBAIobK/o5wXTXXtgZZKJYSi034DNHD6zt96rbHuSLBlxg
+J8pFUs4W7z8GZOeUaHxgMxURaa+dYo2jA1Rrpr7l7gUYYAS/QoD90KioHgE796Nc
+r6Pc5iaAIzy4RHT3Cq5Ji2F4zCS/iIqnDupzGUH9TQPwiNHleI2lKk/2lw0Xd8rY
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority - G2
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK
+VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm
+Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0J
+h9ZrbWB85a7FkCMMXErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2ul
+uIncrKTdcu1OofdPvAbT6shkdHvClUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68
+DzFc6PLZ
+-----END CERTIFICATE-----
+
+Verisign Class 2 Public Primary Certification Authority - G2
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
+jBJ7xUS0rg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G2
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+
+Verisign Class 4 Public Primary Certification Authority - G2
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEDKIjprS9esTR/h/xCA3JfgwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgNCBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQC68OTP+cSuhVS5B1f5j8V/aBH4xBewRNzjMHPVKmIquNDM
+HO0oW369atyzkSTKQWI8/AIBvxwWMZQFl3Zuoq29YRdsTjCG8FE3KlDHqGKB3FtK
+qsGgtG7rL+VXxbErQHDbWk2hjh+9Ax/YA9SPTJlxvOKCzFjomDqG04Y48wApHwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAIWMEsGnuVAVess+rLhDityq3RS6iYF+ATwj
+cSGIL4LcY/oCRaxFWdcqWERbt5+BO5JoPeI3JPV7bI92NZYJqFmduc4jq3TWg/0y
+cyfYaT5DdPauxYma51N86Xv2S/PBZYPejYqcPIiNOVn8qj8ijaHBZlCBckztImRP
+T8qAkbYp
+-----END CERTIFICATE-----
+
+Verisign Class 1 Public Primary Certification Authority - G3
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4
+nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO
+8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV
+ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb
+PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2
+6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr
+n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a
+qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4
+wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
+ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs
+pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4
+E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
+-----END CERTIFICATE-----
+
+Verisign Class 2 Public Primary Certification Authority - G3
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy
+aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp
+Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV
+BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
+Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g
+Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU
+J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO
+JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY
+wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o
+koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN
+qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E
+Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe
+xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u
+7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
+sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI
+sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
+cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Verisign Class 4 Public Primary Certification Authority - G3
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+Equifax Secure Global eBusiness CA
+==================================
+
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 1
+=============================
+
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 2
+=============================
+
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2Vj
+dXJlIGVCdXNpbmVzcyBDQS0yMB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0
+NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkVxdWlmYXggU2VjdXJlMSYwJAYD
+VQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn2Z0G
+vxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/
+BPO3QSQ5BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0C
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJl
+IGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTkw
+NjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9euSBIplBq
+y/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAAyGgq3oThr1jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy
+0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1
+E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUmV+GRMOrN
+-----END CERTIFICATE-----
+
+Thawte Time Stamping CA
+=======================
+
+-----BEGIN CERTIFICATE-----
+MIICoTCCAgqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBizELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzAN
+BgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAd
+BgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcNOTcwMTAxMDAwMDAwWhcN
+MjAxMjMxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4g
+Q2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsG
+A1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1l
+c3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYrWHhhRYZT
+6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u6TqFJBU820cEY8OexJQa
+Wt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522FOMjhdepQeBMpHmwKxqL
+8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMB
+Af8wDQYJKoZIhvcNAQEEBQADgYEAZ9viwuaHPUCDhjc1fR/OmsMMZiCouqoEiYbC
+9RAIDb/LogWK0E02PvTX72nGXuSwlG9KuefeW4i2e9vjJ+V2w/A1wcu1J5szedyQ
+pgCed/r8zSeUQhac0xxo7L9c3eWpexAKMnRUEzGLhQOEkbdYATAUOK8oyvyxUBkZ
+CayJSdM=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+Entrust.net Secure Server Certification Authority
+=================================================
+
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+Go Daddy Certification Authority Root Certificate Bundle
+========================================================
+
+-----BEGIN CERTIFICATE-----
+MIIE3jCCA8agAwIBAgICAwEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCVVMx
+ITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMTYw
+MTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMH
+QXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5j
+b20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j
+b20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTtwY6vj3D3H
+KrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqVTr9vcyOdQm
+VZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aLGbqGmu75RpR
+SgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo7RJlbmr2EkRT
+cDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgWJCJjPOq8lh8BJ
+6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAwEAAaOCATIwggEu
+MB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVHSMEGDAWgBTSxLDS
+kdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEAMDMGCCsGAQUFBwEB
+BCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWRkeS5jb20wRgYDVR0f
+BD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBv
+c2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVHSAAMDgwNgYIKwYBBQUH
+AgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTAO
+BgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBANKGwOy9+aG2Z+5mC6IG
+OgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPIUyIXvJxwqoJKSQ3kbTJSMU
+A2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL5CkKSkB2XIsKd83ASe8T+5o
+0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9p0iRFEUOOjZv2kWzRaJBydTX
+RE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsxuxN89txJx9OjxUUAiKEngHUuH
+qDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZEjYx8WnM25sgVjOuH0aBsXBTWV
+U+4=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIE+zCCBGSgAwIBAgICAQ0wDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1Zh
+bGlDZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIElu
+Yy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24g
+QXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAe
+BgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTA0MDYyOTE3MDYyMFoX
+DTI0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBE
+YWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3MgMiBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgC
+ggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+q
+N1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiO
+r18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lN
+f4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEH
+U1jPEX44dMX4/7VpkI+EdOqXG68CAQOjggHhMIIB3TAdBgNVHQ4EFgQU0sSw0pHU
+TBFxs2HLPaH+3ahq1OMwgdIGA1UdIwSByjCBx6GBwaSBvjCBuzEkMCIGA1UEBxMb
+VmFsaUNlcnQgVmFsaWRhdGlvbiBOZXR3b3JrMRcwFQYDVQQKEw5WYWxpQ2VydCwg
+SW5jLjE1MDMGA1UECxMsVmFsaUNlcnQgQ2xhc3MgMiBQb2xpY3kgVmFsaWRhdGlv
+biBBdXRob3JpdHkxITAfBgNVBAMTGGh0dHA6Ly93d3cudmFsaWNlcnQuY29tLzEg
+MB4GCSqGSIb3DQEJARYRaW5mb0B2YWxpY2VydC5jb22CAQEwDwYDVR0TAQH/BAUw
+AwEB/zAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmdv
+ZGFkZHkuY29tMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jZXJ0aWZpY2F0ZXMu
+Z29kYWRkeS5jb20vcmVwb3NpdG9yeS9yb290LmNybDBLBgNVHSAERDBCMEAGBFUd
+IAAwODA2BggrBgEFBQcCARYqaHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNv
+bS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOBgQC1
+QPmnHfbq/qQaQlpE9xXUhUaJwL6e4+PrxeNYiY+Sn1eocSxI0YGyeR+sBjUZsE4O
+WBsUs5iB0QQeyAfJg594RAoYC5jcdnplDQ1tgMQLARzLrUc+cb53S8wGd9D0Vmsf
+SxOaFIqII6hR8INMqzW/Rn453HWkrugp++85j09VZw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_BatchRequest.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_BatchRequest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3916b223a7edc8554b564205d9ad986d51a915a7
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_BatchRequest.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_BatchRequest {
+  /** @var string Multipart Boundary. */
+  private $boundary;
+
+  /** @var array service requests to be executed. */
+  private $requests = array();
+
+  public function __construct($boundary = false) {
+    $boundary = (false == $boundary) ? mt_rand() : $boundary;
+    $this->boundary = str_replace('"', '', $boundary);
+  }
+
+  public function add(Google_HttpRequest $request, $key = false) {
+    if (false == $key) {
+      $key = mt_rand();
+    }
+
+    $this->requests[$key] = $request;
+  }
+
+  public function execute() {
+    $body = '';
+
+    /** @var Google_HttpRequest $req */
+    foreach($this->requests as $key => $req) {
+      $body .= "--{$this->boundary}\n";
+      $body .= $req->toBatchString($key) . "\n";
+    }
+
+    $body = rtrim($body);
+    $body .= "\n--{$this->boundary}--";
+
+    global $apiConfig;
+    $url = $apiConfig['basePath'] . '/batch';
+    $httpRequest = new Google_HttpRequest($url, 'POST');
+    $httpRequest->setRequestHeaders(array(
+        'Content-Type' => 'multipart/mixed; boundary=' . $this->boundary));
+
+    $httpRequest->setPostBody($body);
+    $response = Google_Client::$io->makeRequest($httpRequest);
+
+    $response = $this->parseResponse($response);
+    return $response;
+  }
+
+  public function parseResponse(Google_HttpRequest $response) {
+    $contentType = $response->getResponseHeader('content-type');
+    $contentType = explode(';', $contentType);
+    $boundary = false;
+    foreach($contentType as $part) {
+      $part = (explode('=', $part, 2));
+      if (isset($part[0]) && 'boundary' == trim($part[0])) {
+        $boundary = $part[1];
+      }
+    }
+
+    $body = $response->getResponseBody();
+    if ($body) {
+      $body = str_replace("--$boundary--", "--$boundary", $body);
+      $parts = explode("--$boundary", $body);
+      $responses = array();
+
+      foreach($parts as $part) {
+        $part = trim($part);
+        if (!empty($part)) {
+          list($metaHeaders, $part) = explode("\r\n\r\n", $part, 2);
+          $metaHeaders = Google_CurlIO::parseResponseHeaders($metaHeaders);
+
+          $status = substr($part, 0, strpos($part, "\n"));
+          $status = explode(" ", $status);
+          $status = $status[1];
+
+          list($partHeaders, $partBody) = Google_CurlIO::parseHttpResponse($part, false);
+          $response = new Google_HttpRequest("");
+          $response->setResponseHttpCode($status);
+          $response->setResponseHeaders($partHeaders);
+          $response->setResponseBody($partBody);
+          $response = Google_REST::decodeHttpResponse($response);
+
+          // Need content id.
+          $responses[$metaHeaders['content-id']] = $response;
+        }
+      }
+
+      return $responses;
+    }
+
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_MediaFileUpload.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_MediaFileUpload.php
new file mode 100644
index 0000000000000000000000000000000000000000..c64e18851df2a13b7a40400b7997a5a2635d999a
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_MediaFileUpload.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_MediaFileUpload {
+  const UPLOAD_MEDIA_TYPE = 'media';
+  const UPLOAD_MULTIPART_TYPE = 'multipart';
+  const UPLOAD_RESUMABLE_TYPE = 'resumable';
+
+  /** @var string $mimeType */
+  public $mimeType;
+
+  /** @var string $data */
+  public $data;
+
+  /** @var bool $resumable */
+  public $resumable;
+
+  /** @var int $chunkSize */
+  public $chunkSize;
+
+  /** @var int $size */
+  public $size;
+
+  /** @var string $resumeUri */
+  public $resumeUri;
+
+  /** @var int $progress */
+  public $progress;
+
+  /**
+   * @param $mimeType string
+   * @param $data string The bytes you want to upload.
+   * @param $resumable bool
+   * @param bool $chunkSize File will be uploaded in chunks of this many bytes.
+   * only used if resumable=True
+   */
+  public function __construct($mimeType, $data, $resumable=false, $chunkSize=false) {
+    $this->mimeType = $mimeType;
+    $this->data = $data;
+    $this->size = strlen($this->data);
+    $this->resumable = $resumable;
+    if(!$chunkSize) {
+      $chunkSize = 256 * 1024;
+    }
+    $this->chunkSize = $chunkSize;
+    $this->progress = 0;
+  }
+
+  public function setFileSize($size) {
+    $this->size = $size;
+  }
+
+  /**
+   * @static
+   * @param $meta
+   * @param $params
+   * @return array|bool
+   */
+  public static function process($meta, &$params) {
+    $payload = array();
+    $meta = is_string($meta) ? json_decode($meta, true) : $meta;
+    $uploadType = self::getUploadType($meta, $payload, $params);
+    if (!$uploadType) {
+      // Process as a normal API request.
+      return false;
+    }
+
+    // Process as a media upload request.
+    $params['uploadType'] = array(
+        'type' => 'string',
+        'location' => 'query',
+        'value' => $uploadType,
+    );
+
+    $mimeType = isset($params['mimeType'])
+        ? $params['mimeType']['value']
+        : false;
+    unset($params['mimeType']);
+
+    if (!$mimeType) {
+      $mimeType = $payload['content-type'];
+    }
+
+    if (isset($params['file'])) {
+      // This is a standard file upload with curl.
+      $file = $params['file']['value'];
+      unset($params['file']);
+      return self::processFileUpload($file, $mimeType);
+    }
+
+    $data = isset($params['data'])
+        ? $params['data']['value']
+        : false;
+    unset($params['data']);
+
+    if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
+      $payload['content-type'] = $mimeType;
+      $payload['postBody'] = is_string($meta) ? $meta : json_encode($meta);
+
+    } elseif (self::UPLOAD_MEDIA_TYPE == $uploadType) {
+      // This is a simple media upload.
+      $payload['content-type'] = $mimeType;
+      $payload['postBody'] = $data;
+    }
+
+    elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
+      // This is a multipart/related upload.
+      $boundary = isset($params['boundary']['value']) ? $params['boundary']['value'] : mt_rand();
+      $boundary = str_replace('"', '', $boundary);
+      $payload['content-type'] = 'multipart/related; boundary=' . $boundary;
+      $related = "--$boundary\r\n";
+      $related .= "Content-Type: application/json; charset=UTF-8\r\n";
+      $related .= "\r\n" . json_encode($meta) . "\r\n";
+      $related .= "--$boundary\r\n";
+      $related .= "Content-Type: $mimeType\r\n";
+      $related .= "Content-Transfer-Encoding: base64\r\n";
+      $related .= "\r\n" . base64_encode($data) . "\r\n";
+      $related .= "--$boundary--";
+      $payload['postBody'] = $related;
+    }
+
+    return $payload;
+  }
+
+  /**
+   * Prepares a standard file upload via cURL.
+   * @param $file
+   * @param $mime
+   * @return array Includes the processed file name.
+   * @visible For testing.
+   */
+  public static function processFileUpload($file, $mime) {
+    if (!$file) return array();
+    if (substr($file, 0, 1) != '@') {
+      $file = '@' . $file;
+    }
+
+    // This is a standard file upload with curl.
+    $params = array('postBody' => array('file' => $file));
+    if ($mime) {
+      $params['content-type'] = $mime;
+    }
+
+    return $params;
+  }
+
+  /**
+   * Valid upload types:
+   * - resumable (UPLOAD_RESUMABLE_TYPE)
+   * - media (UPLOAD_MEDIA_TYPE)
+   * - multipart (UPLOAD_MULTIPART_TYPE)
+   * - none (false)
+   * @param $meta
+   * @param $payload
+   * @param $params
+   * @return bool|string
+   */
+  public static function getUploadType($meta, &$payload, &$params) {
+    if (isset($params['mediaUpload'])
+        && get_class($params['mediaUpload']['value']) == 'Google_MediaFileUpload') {
+      $upload = $params['mediaUpload']['value'];
+      unset($params['mediaUpload']);
+      $payload['content-type'] = $upload->mimeType;
+      if (isset($upload->resumable) && $upload->resumable) {
+        return self::UPLOAD_RESUMABLE_TYPE;
+      }
+    }
+
+    // Allow the developer to override the upload type.
+    if (isset($params['uploadType'])) {
+      return $params['uploadType']['value'];
+    }
+
+    $data = isset($params['data']['value'])
+        ? $params['data']['value'] : false;
+
+    if (false == $data && false == isset($params['file'])) {
+      // No upload data available.
+      return false;
+    }
+
+    if (isset($params['file'])) {
+      return self::UPLOAD_MEDIA_TYPE;
+    }
+
+    if (false == $meta) {
+      return self::UPLOAD_MEDIA_TYPE;
+    }
+
+    return self::UPLOAD_MULTIPART_TYPE;
+  }
+
+
+  public function nextChunk(Google_HttpRequest $req, $chunk=false) {
+    if (false == $this->resumeUri) {
+      $this->resumeUri = $this->getResumeUri($req);
+    }
+
+    if (false == $chunk) {
+      $chunk = substr($this->data, $this->progress, $this->chunkSize);
+    }
+
+    $lastBytePos = $this->progress + strlen($chunk) - 1;
+    $headers = array(
+      'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
+      'content-type' => $req->getRequestHeader('content-type'),
+      'content-length' => $this->chunkSize,
+      'expect' => '',
+    );
+
+    $httpRequest = new Google_HttpRequest($this->resumeUri, 'PUT', $headers, $chunk);
+    $response = Google_Client::$io->authenticatedRequest($httpRequest);
+    $code = $response->getResponseHttpCode();
+    if (308 == $code) {
+      $range = explode('-', $response->getResponseHeader('range'));
+      $this->progress = $range[1] + 1;
+      return false;
+    } else {
+      return Google_REST::decodeHttpResponse($response);
+    }
+  }
+
+  private function getResumeUri(Google_HttpRequest $httpRequest) {
+    $result = null;
+    $body = $httpRequest->getPostBody();
+    if ($body) {
+      $httpRequest->setRequestHeaders(array(
+        'content-type' => 'application/json; charset=UTF-8',
+        'content-length' => Google_Utils::getStrLen($body),
+        'x-upload-content-type' => $this->mimeType,
+        'x-upload-content-length' => $this->size,
+        'expect' => '',
+      ));
+    }
+
+    $response = Google_Client::$io->makeRequest($httpRequest);
+    $location = $response->getResponseHeader('location');
+    $code = $response->getResponseHttpCode();
+    if (200 == $code && true == $location) {
+      return $location;
+    }
+    throw new Google_Exception("Failed to start the resumable upload");
+  }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Model.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Model.php
new file mode 100644
index 0000000000000000000000000000000000000000..cb44cb257481b231c2f38203f460bd54576a5f91
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Model.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This class defines attributes, valid values, and usage which is generated from
+ * a given json schema. http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5
+ *
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_Model {
+  public function __construct( /* polymorphic */ ) {
+    if (func_num_args() ==  1 && is_array(func_get_arg(0))) {
+      // Initialize the model with the array's contents.
+      $array = func_get_arg(0);
+      $this->mapTypes($array);
+    }
+  }
+
+  /**
+   * Initialize this object's properties from an array.
+   *
+   * @param array $array Used to seed this object's properties.
+   * @return void
+   */
+  protected function mapTypes($array) {
+    foreach ($array as $key => $val) {
+      $this->$key = $val;
+
+      $keyTypeName = "__$key" . 'Type';
+      $keyDataType = "__$key" . 'DataType';
+      if ($this->useObjects() && property_exists($this, $keyTypeName)) {
+        if ($this->isAssociativeArray($val)) {
+          if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
+            foreach($val as $arrayKey => $arrayItem) {
+              $val[$arrayKey] = $this->createObjectFromName($keyTypeName, $arrayItem);
+            }
+            $this->$key = $val;
+          } else {
+            $this->$key = $this->createObjectFromName($keyTypeName, $val);
+          }
+        } else if (is_array($val)) {
+          $arrayObject = array();
+          foreach ($val as $arrayIndex => $arrayItem) {
+            $arrayObject[$arrayIndex] = $this->createObjectFromName($keyTypeName, $arrayItem);
+          }
+          $this->$key = $arrayObject;
+        }
+      }
+    }
+  }
+
+  /**
+   * Returns true only if the array is associative.
+   * @param array $array
+   * @return bool True if the array is associative.
+   */
+  protected function isAssociativeArray($array) {
+    if (!is_array($array)) {
+      return false;
+    }
+    $keys = array_keys($array);
+    foreach($keys as $key) {
+      if (is_string($key)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Given a variable name, discover its type.
+   *
+   * @param $name
+   * @param $item
+   * @return object The object from the item.
+   */
+  private function createObjectFromName($name, $item) {
+    $type = $this->$name;
+    return new $type($item);
+  }
+
+  protected function useObjects() {
+    global $apiConfig;
+    return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
+  }
+
+  /**
+   * Verify if $obj is an array.
+   * @throws Google_Exception Thrown if $obj isn't an array.
+   * @param array $obj Items that should be validated.
+   * @param string $type Array items should be of this type.
+   * @param string $method Method expecting an array as an argument.
+   */
+  public function assertIsArray($obj, $type, $method) {
+    if ($obj && !is_array($obj)) {
+      throw new Google_Exception("Incorrect parameter type passed to $method(), expected an"
+          . " array containing items of type $type.");
+    }
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Service.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Service.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f4731fb2f4b2d5a16925e61f89ef95b8746ddf6
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Service.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Google_Service {
+  public $version;
+  public $servicePath;
+  public $resource;
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_ServiceResource.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_ServiceResource.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb3af4db8090efa8e460d06094ed440a5222ee97
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_ServiceResource.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Implements the actual methods/resources of the discovered Google API using magic function
+ * calling overloading (__call()), which on call will see if the method name (plus.activities.list)
+ * is available in this service, and if so construct an apiHttpRequest representing it.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_ServiceResource {
+  // Valid query parameters that work, but don't appear in discovery.
+  private $stackParameters = array(
+      'alt' => array('type' => 'string', 'location' => 'query'),
+      'boundary' => array('type' => 'string', 'location' => 'query'),
+      'fields' => array('type' => 'string', 'location' => 'query'),
+      'trace' => array('type' => 'string', 'location' => 'query'),
+      'userIp' => array('type' => 'string', 'location' => 'query'),
+      'userip' => array('type' => 'string', 'location' => 'query'),
+      'quotaUser' => array('type' => 'string', 'location' => 'query'),
+      'file' => array('type' => 'complex', 'location' => 'body'),
+      'data' => array('type' => 'string', 'location' => 'body'),
+      'mimeType' => array('type' => 'string', 'location' => 'header'),
+      'uploadType' => array('type' => 'string', 'location' => 'query'),
+      'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
+  );
+
+  /** @var Google_Service $service */
+  private $service;
+
+  /** @var string $serviceName */
+  private $serviceName;
+
+  /** @var string $resourceName */
+  private $resourceName;
+
+  /** @var array $methods */
+  private $methods;
+
+  public function __construct($service, $serviceName, $resourceName, $resource) {
+    $this->service = $service;
+    $this->serviceName = $serviceName;
+    $this->resourceName = $resourceName;
+    $this->methods = isset($resource['methods']) ? $resource['methods'] : array($resourceName => $resource);
+  }
+
+  /**
+   * @param $name
+   * @param $arguments
+   * @return Google_HttpRequest|array
+   * @throws Google_Exception
+   */
+  public function __call($name, $arguments) {
+    if (! isset($this->methods[$name])) {
+      throw new Google_Exception("Unknown function: {$this->serviceName}->{$this->resourceName}->{$name}()");
+    }
+    $method = $this->methods[$name];
+    $parameters = $arguments[0];
+
+    // postBody is a special case since it's not defined in the discovery document as parameter, but we abuse the param entry for storing it
+    $postBody = null;
+    if (isset($parameters['postBody'])) {
+      if (is_object($parameters['postBody'])) {
+        $this->stripNull($parameters['postBody']);
+      }
+
+      // Some APIs require the postBody to be set under the data key.
+      if (is_array($parameters['postBody']) && 'latitude' == $this->serviceName) {
+        if (!isset($parameters['postBody']['data'])) {
+          $rawBody = $parameters['postBody'];
+          unset($parameters['postBody']);
+          $parameters['postBody']['data'] = $rawBody;
+        }
+      }
+
+      $postBody = is_array($parameters['postBody']) || is_object($parameters['postBody'])
+          ? json_encode($parameters['postBody'])
+          : $parameters['postBody'];
+      unset($parameters['postBody']);
+
+      if (isset($parameters['optParams'])) {
+        $optParams = $parameters['optParams'];
+        unset($parameters['optParams']);
+        $parameters = array_merge($parameters, $optParams);
+      }
+    }
+
+    if (!isset($method['parameters'])) {
+      $method['parameters'] = array();
+    }
+    
+    $method['parameters'] = array_merge($method['parameters'], $this->stackParameters);
+    foreach ($parameters as $key => $val) {
+      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
+        throw new Google_Exception("($name) unknown parameter: '$key'");
+      }
+    }
+    if (isset($method['parameters'])) {
+      foreach ($method['parameters'] as $paramName => $paramSpec) {
+        if (isset($paramSpec['required']) && $paramSpec['required'] && ! isset($parameters[$paramName])) {
+          throw new Google_Exception("($name) missing required param: '$paramName'");
+        }
+        if (isset($parameters[$paramName])) {
+          $value = $parameters[$paramName];
+          $parameters[$paramName] = $paramSpec;
+          $parameters[$paramName]['value'] = $value;
+          unset($parameters[$paramName]['required']);
+        } else {
+          unset($parameters[$paramName]);
+        }
+      }
+    }
+
+    // Discovery v1.0 puts the canonical method id under the 'id' field.
+    if (! isset($method['id'])) {
+      $method['id'] = $method['rpcMethod'];
+    }
+
+    // Discovery v1.0 puts the canonical path under the 'path' field.
+    if (! isset($method['path'])) {
+      $method['path'] = $method['restPath'];
+    }
+
+    $servicePath = $this->service->servicePath;
+
+    // Process Media Request
+    $contentType = false;
+    if (isset($method['mediaUpload'])) {
+      $media = Google_MediaFileUpload::process($postBody, $parameters);
+      if ($media) {
+        $contentType = isset($media['content-type']) ? $media['content-type']: null;
+        $postBody = isset($media['postBody']) ? $media['postBody'] : null;
+        $servicePath = $method['mediaUpload']['protocols']['simple']['path'];
+        $method['path'] = '';
+      }
+    }
+
+    $url = Google_REST::createRequestUri($servicePath, $method['path'], $parameters);
+    $httpRequest = new Google_HttpRequest($url, $method['httpMethod'], null, $postBody);
+    if ($postBody) {
+      $contentTypeHeader = array();
+      if (isset($contentType) && $contentType) {
+        $contentTypeHeader['content-type'] = $contentType;
+      } else {
+        $contentTypeHeader['content-type'] = 'application/json; charset=UTF-8';
+        $contentTypeHeader['content-length'] = Google_Utils::getStrLen($postBody);
+      }
+      $httpRequest->setRequestHeaders($contentTypeHeader);
+    }
+
+    $httpRequest = Google_Client::$auth->sign($httpRequest);
+    if (Google_Client::$useBatch) {
+      return $httpRequest;
+    }
+
+    // Terminate immediately if this is a resumable request.
+    if (isset($parameters['uploadType']['value'])
+        && Google_MediaFileUpload::UPLOAD_RESUMABLE_TYPE == $parameters['uploadType']['value']) {
+      $contentTypeHeader = array();
+      if (isset($contentType) && $contentType) {
+        $contentTypeHeader['content-type'] = $contentType;
+      }
+      $httpRequest->setRequestHeaders($contentTypeHeader);
+      if ($postBody) {
+        $httpRequest->setPostBody($postBody);
+      }
+      return $httpRequest;
+    }
+
+    return Google_REST::execute($httpRequest);
+  }
+
+  public  function useObjects() {
+    global $apiConfig;
+    return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
+  }
+
+  protected function stripNull(&$o) {
+    $o = (array) $o;
+    foreach ($o as $k => $v) {
+      if ($v === null || strstr($k, "\0*\0__")) {
+        unset($o[$k]);
+      }
+      elseif (is_object($v) || is_array($v)) {
+        $this->stripNull($o[$k]);
+      }
+    }
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Utils.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Utils.php
new file mode 100644
index 0000000000000000000000000000000000000000..be94902c2edf963ca6d36ae2ab66d02941a897a4
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Utils.php
@@ -0,0 +1,117 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Collection of static utility methods used for convenience across
+ * the client library.
+ *
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_Utils {
+  public static function urlSafeB64Encode($data) {
+    $b64 = base64_encode($data);
+    $b64 = str_replace(array('+', '/', '\r', '\n', '='),
+                       array('-', '_'),
+                       $b64);
+    return $b64;
+  }
+
+  public static function urlSafeB64Decode($b64) {
+    $b64 = str_replace(array('-', '_'),
+                       array('+', '/'),
+                       $b64);
+    return base64_decode($b64);
+  }
+
+  /**
+   * Misc function used to count the number of bytes in a post body, in the world of multi-byte chars
+   * and the unpredictability of strlen/mb_strlen/sizeof, this is the only way to do that in a sane
+   * manner at the moment.
+   *
+   * This algorithm was originally developed for the
+   * Solar Framework by Paul M. Jones
+   *
+   * @link   http://solarphp.com/
+   * @link   http://svn.solarphp.com/core/trunk/Solar/Json.php
+   * @link   http://framework.zend.com/svn/framework/standard/trunk/library/Zend/Json/Decoder.php
+   * @param  string $str
+   * @return int The number of bytes in a string.
+   */
+  static public function getStrLen($str) {
+    $strlenVar = strlen($str);
+    $d = $ret = 0;
+    for ($count = 0; $count < $strlenVar; ++ $count) {
+      $ordinalValue = ord($str{$ret});
+      switch (true) {
+        case (($ordinalValue >= 0x20) && ($ordinalValue <= 0x7F)):
+          // characters U-00000000 - U-0000007F (same as ASCII)
+          $ret ++;
+          break;
+
+        case (($ordinalValue & 0xE0) == 0xC0):
+          // characters U-00000080 - U-000007FF, mask 110XXXXX
+          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+          $ret += 2;
+          break;
+
+        case (($ordinalValue & 0xF0) == 0xE0):
+          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+          $ret += 3;
+          break;
+
+        case (($ordinalValue & 0xF8) == 0xF0):
+          // characters U-00010000 - U-001FFFFF, mask 11110XXX
+          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+          $ret += 4;
+          break;
+
+        case (($ordinalValue & 0xFC) == 0xF8):
+          // characters U-00200000 - U-03FFFFFF, mask 111110XX
+          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+          $ret += 5;
+          break;
+
+        case (($ordinalValue & 0xFE) == 0xFC):
+          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+          $ret += 6;
+          break;
+        default:
+          $ret ++;
+      }
+    }
+    return $ret;
+  }
+
+  /**
+   * Normalize all keys in an array to lower-case.
+   * @param array $arr
+   * @return array Normalized array.
+   */
+  public static function normalize($arr) {
+    if (!is_array($arr)) {
+      return array();
+    }
+
+    $normalized = array();
+    foreach ($arr as $key => $val) {
+      $normalized[strtolower($key)] = $val;
+    }
+    return $normalized;
+  }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/LICENSE.txt b/apps/files_external/3rdparty/irodsphp/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..caca18c59be22dfb02626982a299408f1b561859
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/LICENSE.txt
@@ -0,0 +1,28 @@
+iRODS license terms and copyright info from the irods site at: https://www.irods.org/index.php/License
+
+License
+iRODS Copyright and Licensing
+
+iRODS is open source software released under a BSD License, see license text in "iRODS License Terms and Conditions" below. 
+The BSD license has been described in very general terms as allowing you to do whatever you want to with the software and 
+source code as long as you acknowledge who wrote it and that, as with any open source software, there is no warranty and you're using the code "as is."
+In the spirit of collaborative open source software, the iRODS community encourages you to communicate with us, letting us know what features you like, 
+features that would be useful, problems, bugs, suggestions, etc., and to perhaps contribute source code.
+The iRODS community has formed the Data Intensive Cyberinfrastructure Foundation, a 501(c)(3) nonprofit corporation established to serve
+ as the home of the iRODS open source community over the long term. If you choose to contribute new code, you'll receive full acknowledgment. All you do is complete the Contributor's Agreement, under which you retain copyright ownership
+  in your code but give a free license to the iRODS nonprofit foundation, allowing your code to be integrated into iRODS and in turn released under the BSD license.
+Note: The above text is an educational overview of iRODS open source licensing, and not intended as legal advice nor is it part of the iRODS license agreement, which is below. As always, for legal advice consult an attorney.
+
+iRODS License Terms and Conditions Notice
+
+Copyright (c) 2005-2011, Regents of the University of California, the University of North Carolina, and the Data Intensive Cyberinfrastructure Foundation 
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of the University of California, San Diego (UCSD) nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT 
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini b/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
new file mode 100644
index 0000000000000000000000000000000000000000..f72b4a230dbdead5330fd85def298a3545d31cab
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/doc_config.ini
@@ -0,0 +1,87 @@
+;; phpDocumentor demonstration parse configuration file
+;;
+;; RUN THIS FILE FROM THE INSTALL DIRECTORY
+;; CHANGE HERE:
+
+;; where should the documentation be written?
+;; legal values: a legal path
+;target = /home/CelloG/output
+target = ./doc
+
+
+;; DONT CHANGE BELOW HERE
+;;
+;; This file is designed to cut down on repetitive typing on the command-line or web interface
+;; You can copy this file to create a number of configuration files that can be used with the
+;; command-line switch -c, as in phpdoc -c default.ini or phpdoc -c myini.ini.  The web
+;; interface will automatically generate a list of .ini files that can be used.
+;;
+;; ALL .ini files must be in the user subdirectory of phpDocumentor with an extension of .ini
+;;
+;; Copyright 2002, Greg Beaver <cellog@php.net>
+;;
+;; WARNING: do not change the 
+
+[Parse Data]
+;; title of all the documentation
+;; legal values: any string
+title = PRODS (iRODS PHP Client API) Documentation
+
+;; parse files that start with a . like .bash_profile
+;; legal values: true, false
+hidden = false
+
+;; show elements marked @access private in documentation by setting this to on
+;; legal values: on, off
+parseprivate = off
+
+;; parse with javadoc-like description (first sentence is always the short description)
+;; legal values: on, off
+javadocdesc = on
+
+;target=/dev/null
+
+;; add any custom @tags separated by commas here
+;; legal values: any legal tagname separated by commas.
+;customtags = mytag1,mytag2
+
+;; what is the main package?
+;; legal values: alphanumeric string plus - and _
+defaultpackagename = Prods
+
+;; output any parsing information?  set to on for cron jobs
+;; legal values: on
+;quiet = on
+
+;; limit output to the specified packages, even if others are parsed
+;; legal values: package names separated by commas
+;packageoutput = package1,package2
+
+;; comma-separated list of files to parse
+;; legal values: paths separated by commas
+;filename = /path/to/file1,/path/to/file2,fileincurrentdirectory
+
+;; comma-separated list of directories to parse
+;; legal values: directory paths separated by commas
+;directory = /path1,/path2,.,..,subdirectory
+;directory = /home/jeichorn/cvs/pear
+;directory = /you-MUST/change-me/to-fit/your-environment
+;directory = .
+
+directory = ./src,./tutorials
+
+;; comma-separated list of files, directories or wildcards ? and * (any wildcard) to ignore
+;; legal values: any wildcard strings separated by commas
+;; remember, this pathing is RELATIVE to the top-most directory in your "directory" value
+;ignore = path/to/ignore*,*list.php,myfile.php,subdirectory/
+ignore = templates_c/,*HTML/default/*,spec/,*.inc.php,packet/,set*.php,ProdsStreamer.class.php,RODSMessage.class.php,RODSConn.class.php,RODSKeyValPair.class.php,RODSConnManager.class.php  
+
+;; comma-separated list of Converters to use in outputformat:Convertername:templatedirectory format
+;; legal values: HTML:frames:default,HTML:frames:l0l33t,HTML:frames:phpdoc.de,HTML:frames:phphtmllib
+;;               HTML:frames:phpedit,HTML:frames:DOM/default,HTML:frames:DOM/l0l33t,HTML:frames:DOM/phpdoc.de
+;;               HTML:Smarty:default,HTML:Smarty:PHP,PDF:default:default,CHM:default:default,XML:DocBook:default
+output=HTML:Smarty:PHP
+
+;; turn this option on if you want highlighted source code for every file
+;; legal values: on/off
+sourcecode = on
diff --git a/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt b/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7e1b0549cff8c8306ca52decdf9bc7ec76dd0842
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/release_notes.txt
@@ -0,0 +1,34 @@
+
+*'''Project''': PHP Prods API for iRODS 
+*'''Date''': 06/04/2013
+*'''Release Version''': 3.3.0-beta1
+*'''git tag''': 3.3.0-beta1
+
+==News==
+
+PHP API for iRODS
+
+This alpha is a merge of community supported additions for PAM and tickets
+
+
+GForge for iDrop-swing is at:  [[https://code.renci.org/gf/project/irodsphp/]]
+
+==Requirements==
+
+Note that the following bug and feature requests are logged in GForge with related commit information [[https://code.renci.org/gf/project/irodsphp/tracker/]]
+
+==Features==
+
+*[#1280] Add PAM support to PHP
+
+*[#1122] Add Ticket support to PHP
+
+==Bug Fixes==
+
+
+
+==Outstanding Issues==
+
+Please consult [[https://code.renci.org/gf/project/irodsphp/tracker/]]
+
+for the latest open bugs and Jargon feature requests
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt b/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..caca18c59be22dfb02626982a299408f1b561859
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/LICENSE.txt
@@ -0,0 +1,28 @@
+iRODS license terms and copyright info from the irods site at: https://www.irods.org/index.php/License
+
+License
+iRODS Copyright and Licensing
+
+iRODS is open source software released under a BSD License, see license text in "iRODS License Terms and Conditions" below. 
+The BSD license has been described in very general terms as allowing you to do whatever you want to with the software and 
+source code as long as you acknowledge who wrote it and that, as with any open source software, there is no warranty and you're using the code "as is."
+In the spirit of collaborative open source software, the iRODS community encourages you to communicate with us, letting us know what features you like, 
+features that would be useful, problems, bugs, suggestions, etc., and to perhaps contribute source code.
+The iRODS community has formed the Data Intensive Cyberinfrastructure Foundation, a 501(c)(3) nonprofit corporation established to serve
+ as the home of the iRODS open source community over the long term. If you choose to contribute new code, you'll receive full acknowledgment. All you do is complete the Contributor's Agreement, under which you retain copyright ownership
+  in your code but give a free license to the iRODS nonprofit foundation, allowing your code to be integrated into iRODS and in turn released under the BSD license.
+Note: The above text is an educational overview of iRODS open source licensing, and not intended as legal advice nor is it part of the iRODS license agreement, which is below. As always, for legal advice consult an attorney.
+
+iRODS License Terms and Conditions Notice
+
+Copyright (c) 2005-2011, Regents of the University of California, the University of North Carolina, and the Data Intensive Cyberinfrastructure Foundation 
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of the University of California, San Diego (UCSD) nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT 
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7fa44b34d17e4062a29c35a8b0629bea27c5de4
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php
@@ -0,0 +1,4 @@
+<?php
+require_once("autoload.inc.php");
+require_once("ProdsConfig.inc.php");
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..478c90d631f20c5281eaf342630ef86168f15308
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php
@@ -0,0 +1,19 @@
+<?php
+
+/**#@+
+ * Constants
+ */
+
+define("RODS_REL_VERSION", 'rods1.1');
+define("RODS_API_VERSION", 'd');
+
+/**#@-*/
+
+if (file_exists(__DIR__ . "/prods.ini")) {
+  $GLOBALS['PRODS_CONFIG'] = parse_ini_file(__DIR__ . "/prods.ini", true);
+}
+else {
+  $GLOBALS['PRODS_CONFIG'] = array();
+}
+  
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsDir.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsDir.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..5c34c6ce45ab66da9da04b5b70397e3a3826d46d
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsDir.class.php
@@ -0,0 +1,730 @@
+<?php
+/**
+ * PRODS directory class
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package Prods
+ */
+
+require_once("autoload.inc.php");
+
+class ProdsDir extends ProdsPath
+{
+    /**
+     * @var RODSDirStats
+     */
+    public $stats;
+
+    private $child_dirs;
+    private $child_files;
+    private $all_children;
+    private $position;
+
+    /**
+     * Default Constructor.
+     *
+     * @param RODSAccount account iRODS account used for connection
+     * @param string $path_str the path of this dir
+     * @param boolean $verify whether verify if the path exsits
+     * @param RODSDirStats $stats if the stats for this dir is already known, initilize it here.
+     * @return a new ProdsDir
+     */
+    public function __construct(RODSAccount &$account, $path_str, $verify = false,
+                                RODSDirStats $stats = NULL)
+    {
+        $this->position = 0;
+        $this->stats = $stats;
+        parent::__construct($account, $path_str);
+        if ($verify === true) {
+            if ($this->exists() === false) {
+                throw new RODSException("Directory '$this' does not exist",
+                    'PERR_PATH_DOES_NOT_EXISTS');
+            }
+        }
+    }
+  
+
+ /**
+	* Create a ProdsDir object from URI string.
+	* @param string $path the URI Sting
+	* @param boolean $verify whether verify if the path exsits
+	* @return a new ProdsDir
+	*/
+  public static function fromURI($path, $verify=false)
+  {
+    if (0!=strncmp($path,"rods://",7))
+      $path="rods://".$path;
+    $url=parse_url($path);
+
+    $host=isset($url['host'])?$url['host']:'';
+    $port=isset($url['port'])?$url['port']:'';
+
+    $user='';
+    $zone='';
+    $authtype='irods';
+    if (isset($url['user']))
+    {
+      if (strstr($url['user'],".")!==false) {
+        $user_array=@explode(".",$url['user']);
+        if (count($user_array)===3) {
+          $user=$user_array[0];
+          $zone=$user_array[1];
+          $authtype=$user_array[2];
+        }
+        else {
+          $user=$user_array[0];
+          $zone=$user_array[1];
+        }
+      }
+      else
+        $user=$url['user'];
+    }
+
+    $pass=isset($url['pass'])?$url['pass']:'';
+
+    $account=new RODSAccount($host, $port, $user, $pass, $zone, '', $authtype);
+
+    $path_str=isset($url['path'])?$url['path']:'';
+
+    // treat query and fragment as part of name
+    if (isset($url['query'])&&(strlen($url['query'])>0))
+      $path_str=$path_str.'?'.$url['query'];
+    if (isset($url['fragment'])&&(strlen($url['fragment'])>0))
+      $path_str=$path_str.'#'.$url['fragment'];
+
+    if (empty($path_str))
+      $path_str='/';
+
+    return (new ProdsDir($account,$path_str,$verify));
+  }
+
+ /**
+	* Verify if this dir exist with server. This function shouldn't be called directly, use {@link exists}
+	*/
+  //protected function verify()
+  protected function verify($get_cb=array('RODSConnManager','getConn'),
+                            $rel_cb=array('RODSConnManager', 'releaseConn'))
+  {
+    //$conn = RODSConnManager::getConn($this->account);
+    $conn = call_user_func_array($get_cb, array(&$this->account));
+    $this->path_exists= $conn -> dirExists ($this->path_str);
+    //RODSConnManager::releaseConn($conn);
+    call_user_func($rel_cb, $conn);
+  }
+
+ /**
+  * get next file or directory from the directory, where the internal iterator points to.
+	* @return next file or directory from the directory. The file always come first and dir comes later. return false on failure
+	*/
+  public function getNextChild()
+  {
+    if (!$this->all_children)
+      $this->all_children=$this->getAllChildren();
+    if (($this->position>=count($this->all_children))||($this->position<0))
+      return false;
+    $names=array_keys($this->all_children);
+    $ret_val=$this->all_children[$names[$this->position]];
+    $this->position++;
+    return $ret_val;
+  }
+
+
+ /**
+	* Get children files of this dir.
+	*
+	* @param array $orderby An associated array specifying how to sort the result by attributes. See details in method {@link findFiles};
+	* @param int $startingInx starting index of all files. default is 0.
+	* @param int $maxresults max results returned. if negative, it returns all rows. default is -1
+	* @param int &$total_num_rows number of all results
+	* @param boolean $logical_file whether to return only logical files, if false, it returns all replica with resource name, if true, it returns only 1 logical file, with num_replica available in the stats. default is false.
+	* @return an array of ProdsFile
+	*/
+  public function getChildFiles(array $orderby=array(), $startingInx=0,
+    $maxresults=-1, &$total_num_rows=-1, $logicalFile=false)
+  {
+    $terms=array("descendantOnly"=>true,"recursive"=>false, 'logicalFile'=>$logicalFile);
+    return $this->findFiles($terms,$total_num_rows,$startingInx,$maxresults,$orderby);
+  }
+
+    /**
+     * Resets the directory stream to the beginning of the directory.
+     */
+    public function rewind()
+    {
+        $this->position = 0;
+    }
+
+
+    /**
+     * @return all children (files and dirs) of current dir
+     */
+    public function getAllChildren()
+    {
+        $this->all_children = array();
+        $this->all_children = array_merge($this->all_children,
+            $this->getChildFiles());
+        $this->all_children = array_merge($this->all_children,
+            $this->getChildDirs());
+
+        return $this->all_children;
+    }
+
+    /**
+     * Get children directories of this dir.
+     * @param $orderby An associated array specifying how to sort the result by attributes. See details in method {@link findDirs};
+     * Note that if the current dir is root '/', it will not return '/' as its child, unlike iCommand's current behavior.
+     * @return an array of ProdsDir
+     */
+    public function getChildDirs(array $orderby = array(), $startingInx = 0,
+                                 $maxresults = -1, &$total_num_rows = -1)
+    {
+        $terms = array("descendantOnly" => true, "recursive" => false);
+        return $this->findDirs($terms, $total_num_rows, $startingInx, $maxresults, $orderby);
+    }
+    
+    /**
+     * Make a new directory under this directory
+     * @param string $name full path of the new dir to be made on server
+     * @return ProdsDir the new directory just created (or already exists)
+     */
+    // public function mkdir($name)
+    public function mkdir($name,
+                          $get_cb = array('RODSConnManager', 'getConn'),
+                          $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $conn->mkdir($this->path_str . "/$name");
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+        return (new ProdsDir($this->account, $this->path_str . "/$name"));
+    }
+
+    /**
+     * remove this directory
+     * @param boolean $recursive whether recursively delete all child files and child directories recursively.
+     * @param boolean $force whether force delete the file/dir. If force delete, all files will be wiped physically. Else, they are moved to trash derectory.
+     * @param array   $additional_flags An array of keyval pairs (array) reprenting additional flags passed to the server/client message. Each keyval pair is an array with first element repsenting the key, and second element representing the value (default to ''). Supported keys are:
+     * -    'irodsRmTrash' - whether this rm is a rmtrash operation
+     * -    'irodsAdminRmTrash' - whether this rm is a rmtrash operation done by admin user
+     * @param mixed   $status_update_func It can be an string or array that represents the status update function (see http://us.php.net/manual/en/language.pseudo-types.php#language.types.callback), which can update status based on the server status update. Leave it blank or 'null' if there is no need to update the status. The function will be called with an assossive arry as parameter, supported fields are:
+     * - 'filesCnt' - finished number of files from previous update (normally 10 but not the last update)
+     * - 'lastObjPath' - last object that was processed.
+     * If this function returns 1, progress will be stopped.
+     */
+    // public function rmdir($recursive=true,$force=false, $additional_flags=array(),
+    //  $status_update_func=null)
+    public function rmdir($recursive = true, $force = false, $additional_flags = array(),
+                          $status_update_func = null,
+                          $get_cb = array('RODSConnManager', 'getConn'),
+                          $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $conn->rmdir($this->path_str, $recursive, $force, $additional_flags,
+            $status_update_func);
+        // RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+    }
+
+    /**
+     * get the dir stats
+     * @param boolean $force_reload If stats already present in the object, and this flag is true, a force reload will be done.
+     * @return RODSDirStats the stats object, note that if this object will not refresh unless $force_reload flag is used.
+     */
+    // public function getStats($force_reload=false)
+    public function getStats($force_reload = false,
+                             $get_cb = array('RODSConnManager', 'getConn'),
+                             $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        if (($force_reload === false) && ($this->stats))
+            return $this->stats;
+
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $stats = $conn->getDirStats($this->path_str);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+
+        if ($stats === false) $this->stats = NULL;
+        else $this->stats = $stats;
+        return $this->stats;
+    }
+    
+    public function getACL()
+    {
+
+        $collection = $this->path_str;
+
+        $connLocal = RODSConnManager::getConn($this->account);
+        $que_result_coll = $connLocal->genQuery(
+            array("COL_COLL_INHERITANCE", "COL_COLL_NAME", "COL_COLL_OWNER_NAME", "COL_COLL_ID"),
+            array(new RODSQueryCondition("COL_COLL_NAME", $collection)));
+        
+        $users['COL_COLL_INHERITANCE'] = (int)($que_result_coll['COL_COLL_INHERITANCE'][0]);
+
+        $que_result_users = $connLocal->genQuery(
+            array("COL_DATA_ACCESS_NAME", "COL_DATA_ACCESS_USER_ID"),
+            array(new RODSQueryCondition("COL_DATA_ACCESS_DATA_ID", $que_result_coll['COL_COLL_ID'][0])));
+        
+        for($i=0; $i<sizeof($que_result_users["COL_DATA_ACCESS_USER_ID"]);$i++) {
+            $que_result_user_info = $connLocal->genQuery(
+                array("COL_USER_NAME", "COL_USER_ZONE"),
+                array(new RODSQueryCondition("COL_USER_ID", $que_result_users["COL_DATA_ACCESS_USER_ID"][$i])));
+            
+            $users['COL_USERS'][] = (object) array(
+                "COL_USER_NAME" => $que_result_user_info['COL_USER_NAME'][0],
+                "COL_USER_ZONE" => $que_result_user_info['COL_USER_ZONE'][0],
+                "COL_DATA_ACCESS_NAME" => $que_result_users['COL_DATA_ACCESS_NAME'][$i]
+            );
+        }
+        
+        RODSConnManager::releaseConn($connLocal);
+        return $users;
+        
+
+    }
+
+    /**
+     * get the dir statistics, such as total number of files under this dir
+     * @param string $fld Name of the statistics, supported values are:
+     * - num_dirs number of directories
+     * - num_files number of files
+     * @param boolean $recursive wheather recursively through the sub collections, default is true.
+     * @return result, an integer value, assosiated with the query.
+     */
+    //public function queryStatistics($fld, $recursive=true)
+    public function queryStatistics($fld, $recursive = true,
+                                    $get_cb = array('RODSConnManager', 'getConn'),
+                                    $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        $condition = new RODSGenQueConds();
+        $select = new RODSGenQueSelFlds();
+        $ret_data_index = '';
+        switch ($fld) {
+            case 'num_dirs' :
+                $select->add('COL_COLL_ID', 'count');
+                $ret_data_index = 'COL_COLL_ID';
+                if ($recursive === true)
+                    $condition->add('COL_COLL_NAME', 'like', $this->path_str . '/%');
+                else
+                    $condition->add('COL_COLL_PARENT_NAME', '=', $this->path_str);
+                break;
+            case 'num_files' :
+                $select->add('COL_D_DATA_ID', 'count');
+                $ret_data_index = 'COL_D_DATA_ID';
+                if ($recursive === true)
+                    $condition->add('COL_COLL_NAME', 'like', $this->path_str . '/%',
+                        array(array('op' => '=', 'val' => $this->path_str)));
+                else
+                    $condition->add('COL_COLL_NAME', '=', $this->path_str);
+                break;
+            default :
+                throw new RODSException("Query field '$fld' not supported!",
+                    'PERR_USER_INPUT_ERROR');
+        }
+
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $results = $conn->query($select, $condition);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+        $result_values = $results->getValues();
+
+        if (isset($result_values[$ret_data_index][0]))
+            return intval($result_values[$ret_data_index][0]);
+        else {
+            throw new RODSException("Query did not get value back with expected " .
+                "index: $ret_data_index!", 'GENERAL_PRODS_ERR');
+        }
+    }
+
+    /**
+     * query metadata, and find matching files.
+     * @param array $terms an assositive array of search conditions, supported ones are:
+     * -    'name' (string) - partial name of the target (file or dir)
+     * -    'descendantOnly' (boolean) - whether to search among this directory's decendents. default is false.
+     * -    'recursive'      (boolean) - whether to search recursively, among all decendents and their children. default is false. This option only works when 'descendantOnly' is true
+     * -    'logicalFile'    (boolean) - whether to return logical file, instead of all replicas for each file. if true, the resource name for each file will be null, instead, num_replicas will be provided. default is false.
+     * -    'smtime'         (int)     - start last-modified-time in unix timestamp. The specified time is included in query, in other words the search can be thought was "mtime >= specified time"
+     * -    'emtime'         (int)     - end last-modified-time in unix timestamp. The specified time is not included in query, in other words the search can be thought was "mtime < specified time"
+     * -    'owner'          (string)  - owner name of the file
+     * -    'rescname'       (string)  - resource name of the file
+     * -    'metadata' (array of RODSMeta) - array of metadata.
+     * @param int &$total_count This value (passed by reference) returns the total potential count of search results
+     * @param int $start starting index of search results.
+     * @param int $limit up to how many results to be returned. If negative, give all results back.
+     * @param array $sort_flds associative array with following keys:
+     * -     'name'      - name of the file or dir
+     * -     'size'      - size of the file
+     * -     'mtime'     - last modified time
+     * -     'ctime'     - creation time
+     * -     'owner'     - owner of the file
+     * -     'typename'  - file/data type
+     * -     'dirname'   - directory/collection name for the file
+     * The results are sorted by specified array keys.
+     * The possible array value must be boolean: true stands for 'asc' and false stands for 'desc', default is 'asc'
+     * @return array of ProdsPath objects (ProdsFile or ProdsDir).
+     */
+    //public function findFiles(array $terms, &$total_count, $start=0, $limit=-1, array $sort_flds=array())
+    public function findFiles(array $terms, &$total_count, $start = 0, $limit = -1,
+                              array $sort_flds = array(),
+                              $get_cb = array('RODSConnManager', 'getConn'),
+                              $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        $flds = array("COL_DATA_NAME" => NULL, "COL_D_DATA_ID" => NULL,
+            "COL_DATA_TYPE_NAME" => NULL, "COL_D_RESC_NAME" => NULL,
+            "COL_DATA_SIZE" => NULL, "COL_D_OWNER_NAME" => NULL, "COL_D_OWNER_ZONE" => NULL,
+            "COL_D_CREATE_TIME" => NULL, "COL_D_MODIFY_TIME" => NULL,
+            "COL_COLL_NAME" => NULL, "COL_D_COMMENTS" => NULL);
+
+        foreach ($sort_flds as $sort_fld_key => $sort_fld_val) {
+            switch ($sort_fld_key) {
+                case 'name':
+                    if ($sort_fld_val === false)
+                        $flds['COL_DATA_NAME'] = 'order_by_desc';
+                    else
+                        $flds['COL_DATA_NAME'] = 'order_by_asc';
+                    break;
+
+                case 'size':
+                    if ($sort_fld_val === false)
+                        $flds['COL_DATA_SIZE'] = 'order_by_desc';
+                    else
+                        $flds['COL_DATA_SIZE'] = 'order_by_asc';
+                    break;
+
+                case 'mtime':
+                    if ($sort_fld_val === false)
+                        $flds['COL_D_MODIFY_TIME'] = 'order_by_desc';
+                    else
+                        $flds['COL_D_MODIFY_TIME'] = 'order_by_asc';
+                    break;
+
+                case 'ctime':
+                    if ($sort_fld_val === false)
+                        $flds['COL_D_CREATE_TIME'] = 'order_by_desc';
+                    else
+                        $flds['COL_D_CREATE_TIME'] = 'order_by_asc';
+                    break;
+
+                case 'typename':
+                    if ($sort_fld_val === false)
+                        $flds['COL_DATA_TYPE_NAME'] = 'order_by_desc';
+                    else
+                        $flds['COL_DATA_TYPE_NAME'] = 'order_by_asc';
+                    break;
+
+                case 'owner':
+                    if ($sort_fld_val === false)
+                        $flds['COL_D_OWNER_NAME'] = 'order_by_desc';
+                    else
+                        $flds['COL_D_OWNER_NAME'] = 'order_by_asc';
+                    break;
+
+                case 'dirname':
+                    if ($sort_fld_val === false)
+                        $flds['COL_COLL_NAME'] = 'order_by_desc';
+                    else
+                        $flds['COL_COLL_NAME'] = 'order_by_asc';
+                    break;
+
+                default:
+                    /*
+                    throw new RODSException("Sort field name '$sort_fld_key' is not valid",
+                      'PERR_USER_INPUT_ERROR');
+                    break;
+                    */
+            }
+        }
+        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
+
+        $descendantOnly = false;
+        $recursive = false;
+        $logicalFile = false;
+        $condition = new RODSGenQueConds();
+        foreach ($terms as $term_key => $term_val) {
+            switch ($term_key) {
+                case 'name':
+                    //$condition->add('COL_DATA_NAME', 'like', '%'.$term_val.'%');
+                    $condition->add('COL_DATA_NAME', 'like', $term_val);
+                    break;
+                case 'smtime':
+                    $condition->add('COL_D_MODIFY_TIME', '>=', $term_val);
+                    break;
+                case 'emtime':
+                    $condition->add('COL_D_MODIFY_TIME', '<', $term_val);
+                    break;
+                case 'owner':
+                    $condition->add('COL_D_OWNER_NAME', '=', $term_val);
+                    break;
+                case 'ownerzone':
+                    $condition->add('COL_D_OWNER_ZONE', '=', $term_val);
+                    break;
+                case 'rescname':
+                    $condition->add('COL_D_RESC_NAME', '=', $term_val);
+                    break;
+                case 'metadata':
+                    $meta_array = $term_val;
+                    foreach ($meta_array as $meta) {
+                        if (isset($meta->name)) {
+                            if ($meta->nameop === 'like') {
+                                $condition->add('COL_META_DATA_ATTR_NAME', 'like', '%' . $meta->name . '%');
+                            } else if (isset($meta->nameop)) {
+                                $condition->add('COL_META_DATA_ATTR_NAME', $meta->nameop, $meta->name);
+                            } else {
+                                $condition->add('COL_META_DATA_ATTR_NAME', '=', $meta->name);
+                            }
+                        }
+                        if (isset($meta->value)) {
+                            if ($meta->op === 'like') {
+                                $condition->add('COL_META_DATA_ATTR_VALUE', 'like', '%' . $meta->value . '%');
+                            } else if (isset($meta->op)) {
+                                $condition->add('COL_META_DATA_ATTR_VALUE', $meta->op, $meta->value);
+                            } else {
+                                $condition->add('COL_META_DATA_ATTR_VALUE', '=', $meta->value);
+                            }
+                        }
+                        if (isset($meta->unit)) {
+                            if ($meta->unitop === 'like') {
+                                $condition->add('COL_META_DATA_ATTR_UNIT', 'like', '%' . $meta->unit . '%');
+                            } else if (isset($meta->unitop)) {
+                                $condition->add('COL_META_DATA_ATTR_UNIT', $meta->unitop, $meta->unit);
+                            } else {
+                                $condition->add('COL_META_DATA_ATTR_UNIT', '=', $meta->unit);
+                            }
+                        }
+                    }
+                    break;
+
+                case 'descendantOnly':
+                    if (true === $term_val)
+                        $descendantOnly = true;
+                    break;
+
+                case 'recursive':
+                    if (true === $term_val)
+                        $recursive = true;
+                    break;
+
+                case 'logicalFile':
+                    if (true === $term_val)
+                        $logicalFile = true;
+                    break;
+
+                default:
+                    throw new RODSException("Term field name '$term_key' is not valid",
+                        'PERR_USER_INPUT_ERROR');
+                    break;
+            }
+        }
+
+        if ($descendantOnly === true) {
+            if ($recursive === true)
+                $condition->add('COL_COLL_NAME', 'like', $this->path_str . '/%',
+                    array(array('op' => '=', 'val' => $this->path_str)));
+            else
+                $condition->add('COL_COLL_NAME', '=', $this->path_str);
+        }
+
+        if ($logicalFile === true) {
+            $select->update('COL_D_RESC_NAME', 'count');
+            $select->update('COL_DATA_SIZE', 'max');
+            $select->update('COL_D_CREATE_TIME', 'min');
+            $select->update('COL_D_MODIFY_TIME', 'max');
+        }
+
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $results = $conn->query($select, $condition, $start, $limit);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+
+        $total_count = $results->getTotalCount();
+        $result_values = $results->getValues();
+        $found = array();
+        for ($i = 0; $i < $results->getNumRow(); $i++) {
+            $resc_name = ($logicalFile === true) ? NULL : $result_values['COL_D_RESC_NAME'][$i];
+            $num_replica = ($logicalFile === true) ? intval($result_values['COL_D_RESC_NAME'][$i]) : NULL;
+            $stats = new RODSFileStats(
+                $result_values['COL_DATA_NAME'][$i],
+                $result_values['COL_DATA_SIZE'][$i],
+                $result_values['COL_D_OWNER_NAME'][$i],
+                $result_values['COL_D_OWNER_ZONE'][$i],
+                $result_values['COL_D_MODIFY_TIME'][$i],
+                $result_values['COL_D_CREATE_TIME'][$i],
+                $result_values['COL_D_DATA_ID'][$i],
+                $result_values['COL_DATA_TYPE_NAME'][$i],
+                $resc_name,
+                $result_values['COL_D_COMMENTS'][$i],
+                $num_replica
+            );
+
+            if ($result_values['COL_COLL_NAME'][$i] == '/')
+                $full_path = '/' . $result_values['COL_DATA_NAME'][$i];
+            else
+                $full_path = $result_values['COL_COLL_NAME'][$i] . '/' .
+                    $result_values['COL_DATA_NAME'][$i];
+            $found[] = new ProdsFile($this->account, $full_path, false, $stats);
+        }
+        return $found;
+    }
+
+    /**
+     * query metadata, and find matching diretories.
+     * @param array $terms an assositive array of search conditions, supported ones are:
+     * -    'name' (string) - partial name of the target (file or dir)
+     * -    'descendantOnly' (boolean) - whether to search among this directory's decendents. default is false.
+     * -    'recursive'      (boolean) - whether to search recursively, among all decendents and their children. default is false. This option only works when 'descendantOnly' is true
+     * -    'smtime'         (int)     - start last-modified-time in unix timestamp. The specified time is included in query, in other words the search can be thought was "mtime >= specified time"
+     * -    'emtime'         (int)     - end last-modified-time in unix timestamp. The specified time is not included in query, in other words the search can be thought was "mtime < specified time"
+     * -    'owner'          (string)  - owner name of the dir
+     * -    'metadata' (array of RODSMeta) - array of metadata.
+     * @param int &$total_count This value (passed by reference) returns the total potential count of search results
+     * @param int $start starting index of search results.
+     * @param int $limit up to how many results to be returned. If negative, give all results back.
+     * @param array $sort_flds associative array with following keys:
+     * -     'name'      - name of the dir
+     * -     'mtime'     - last modified time
+     * -     'ctime'     - creation time
+     * -     'owner'     - owner of the dir
+     * The results are sorted by specified array keys.
+     * The possible array value must be boolean: true stands for 'asc' and false stands for 'desc', default is 'asc'
+     * @return array of ProdsPath objects (ProdsFile or ProdsDir).
+     */
+    public function findDirs(array $terms, &$total_count, $start = 0, $limit = -1,
+                             array $sort_flds = array())
+    {
+        $flds = array("COL_COLL_NAME" => NULL, "COL_COLL_ID" => NULL,
+            "COL_COLL_OWNER_NAME" => NULL, 'COL_COLL_OWNER_ZONE' => NULL,
+            "COL_COLL_CREATE_TIME" => NULL, "COL_COLL_MODIFY_TIME" => NULL,
+            "COL_COLL_COMMENTS" => NULL);
+
+        foreach ($sort_flds as $sort_fld_key => $sort_fld_val) {
+            switch ($sort_fld_key) {
+                case 'name':
+                    if ($sort_fld_val === false)
+                        $flds['COL_COLL_NAME'] = 'order_by_desc';
+                    else
+                        $flds['COL_COLL_NAME'] = 'order_by_asc';
+                    break;
+
+                case 'mtime':
+                    if ($sort_fld_val === false)
+                        $flds['COL_COLL_MODIFY_TIME'] = 'order_by_desc';
+                    else
+                        $flds['COL_COLL_MODIFY_TIME'] = 'order_by_asc';
+                    break;
+
+                case 'ctime':
+                    if ($sort_fld_val === false)
+                        $flds['COL_COLL_CREATE_TIME'] = 'order_by_desc';
+                    else
+                        $flds['COL_COLL_CREATE_TIME'] = 'order_by_asc';
+                    break;
+
+                case 'owner':
+                    if ($sort_fld_val === false)
+                        $flds['COL_COLL_OWNER_NAME'] = 'order_by_desc';
+                    else
+                        $flds['COL_COLL_OWNER_NAME'] = 'order_by_asc';
+                    break;
+
+                default:
+                    /*
+                    throw new RODSException("Sort field name '$sort_fld_key' is not valid",
+                      'PERR_USER_INPUT_ERROR');
+                    */
+                    break;
+            }
+        }
+        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
+
+        $descendantOnly = false;
+        $recursive = false;
+        $condition = new RODSGenQueConds();
+        foreach ($terms as $term_key => $term_val) {
+            switch ($term_key) {
+                case 'name':
+                    //$condition->add('COL_COLL_NAME', 'like', '%'.$term_val.'%');
+                    $condition->add('COL_COLL_NAME', 'like', $term_val);
+                    break;
+                case 'smtime':
+                    $condition->add('COL_COLL_MODIFY_TIME', '>=', $term_val);
+                    break;
+                case 'emtime':
+                    $condition->add('COL_COLL_MODIFY_TIME', '<', $term_val);
+                    break;
+                case 'owner':
+                    $condition->add('COL_COLL_OWNER_NAME', '=', $term_val);
+                    break;
+                case 'metadata':
+                    $meta_array = $term_val;
+                    foreach ($meta_array as $meta) {
+                        $condition->add('COL_META_COLL_ATTR_NAME', '=', $meta->name);
+                        if (isset($meta->op))
+                            $op = $meta->op;
+                        else
+                            $op = '=';
+                        if ($op == 'like')
+                            //$value='%'.$meta->value.'%';
+                            $value = $meta->value;
+                        else
+                            $value = $meta->value;
+                        $condition->add('COL_META_COLL_ATTR_VALUE', $op, $value);
+                    }
+                    break;
+
+                case 'descendantOnly':
+                    if (true === $term_val)
+                        $descendantOnly = true;
+                    break;
+
+                case 'recursive':
+                    if (true === $term_val)
+                        $recursive = true;
+                    break;
+
+                default:
+                    throw new RODSException("Term field name '$term_key' is not valid",
+                        'PERR_USER_INPUT_ERROR');
+                    break;
+            }
+        }
+
+        if ($descendantOnly === true) {
+            // eliminate '/' from children, if current path is already root
+            if ($this->path_str == '/')
+                $condition->add('COL_COLL_NAME', '<>', '/');
+
+            if ($recursive === true)
+                $condition->add('COL_COLL_PARENT_NAME', 'like', $this->path_str . '/%',
+                    array(array('op' => '=', 'val' => $this->path_str)));
+            else
+                $condition->add('COL_COLL_PARENT_NAME', '=', $this->path_str);
+        }
+
+        $conn = RODSConnManager::getConn($this->account);
+        $results = $conn->query($select, $condition, $start, $limit);
+        RODSConnManager::releaseConn($conn);
+
+        $total_count = $results->getTotalCount();
+        $result_values = $results->getValues();
+        $found = array();
+        for ($i = 0; $i < $results->getNumRow(); $i++) {
+            $full_path = $result_values['COL_COLL_NAME'][$i];
+            $acctual_name = basename($result_values['COL_COLL_NAME'][$i]);
+            $stats = new RODSDirStats(
+                $acctual_name,
+                $result_values['COL_COLL_OWNER_NAME'][$i],
+                $result_values['COL_COLL_OWNER_ZONE'][$i],
+                $result_values['COL_COLL_MODIFY_TIME'][$i],
+                $result_values['COL_COLL_CREATE_TIME'][$i],
+                $result_values['COL_COLL_ID'][$i],
+                $result_values['COL_COLL_COMMENTS'][$i]);
+
+            $found[] = new ProdsDir($this->account, $full_path, false, $stats);
+        }
+        return $found;
+    }
+}
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsFile.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsFile.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..3fa5da0dcc9368daf3b68535933977357c19c915
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsFile.class.php
@@ -0,0 +1,434 @@
+<?php
+/**
+ * PRODS file class
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package Prods
+ */
+
+require_once("autoload.inc.php");
+
+class ProdsFile extends ProdsPath
+{
+    public $stats;
+
+    private $rodsconn; //real RODS connection
+    private $l1desc; //lvl 1 descriptor on RODS server
+    private $conn; //the connection to RODS agent l1desc lives on.
+    private $rescname; //resource name.
+    private $openmode; //open mode used if file is opened
+    private $position; //current position of the file, if opened.
+
+    /**
+     * The class constructor
+     */
+    public function __construct(RODSAccount &$account, $path_str,
+                                $verify = false, RODSFileStats $stats = NULL)
+    {
+        $this->l1desc = -1;
+        $this->stats = $stats;
+
+        if ($path_str{strlen($path_str) - 1} == '/') {
+            throw new RODSException("Invalid file name '$path_str' ",
+                'PERR_USER_INPUT_PATH_ERROR');
+        }
+
+        parent::__construct($account, $path_str);
+        if ($verify === true) {
+            if ($this->exists() === false) {
+                throw new RODSException("File '$this' does not exist",
+                    'PERR_PATH_DOES_NOT_EXISTS');
+            }
+        }
+    }
+  
+  
+ /**
+	* Create a new ProdsFile object from URI string.
+	* @param string $path the URI Sting
+	* @param boolean $verify whether verify if the path exsits
+	* @return a new ProdsDir
+	*/
+  public static function fromURI($path, $verify=false)
+  {
+    if (0!=strncmp($path,"rods://",7))
+      $path="rods://".$path;
+    $url=parse_url($path);
+    
+    $host=isset($url['host'])?$url['host']:''; 
+    $port=isset($url['port'])?$url['port']:'';   
+    
+    $user='';
+    $zone='';
+    $authtype='irods';
+    if (isset($url['user']))
+    {
+      if (strstr($url['user'],".")!==false) {
+        $user_array=@explode(".",$url['user']);
+        if (count($user_array)===3) {
+          $user=$user_array[0];
+          $zone=$user_array[1];
+          $authtype=$user_array[2];
+        }
+        else {
+          $user=$user_array[0];
+          $zone=$user_array[1];
+        }
+      }
+      else
+        $user=$url['user'];
+    }  
+    
+    $pass=isset($url['pass'])?$url['pass']:'';
+    
+    $account=new RODSAccount($host, $port, $user, $pass, $zone, '', $authtype);
+    
+    $path_str=isset($url['path'])?$url['path']:''; 
+    
+    // treat query and fragment as part of name
+    if (isset($url['query'])&&(strlen($url['query'])>0))
+      $path_str=$path_str.'?'.$url['query'];
+    if (isset($url['fragment'])&&(strlen($url['fragment'])>0))
+      $path_str=$path_str.'#'.$url['fragment'];
+    
+    if (empty($path_str))
+      $path_str='/'; 
+      
+    return (new ProdsFile($account,$path_str,$verify));
+  }  
+  
+ /**
+	* Verify if this file exist with server. This function shouldn't be called directly, use {@link exists}
+	*/
+  protected function verify()
+  {
+    $conn = RODSConnManager::getConn($this->account);
+    $this->path_exists= $conn -> fileExists ($this->path_str);
+    RODSConnManager::releaseConn($conn);  
+  }
+  
+ /**
+  * get the file stats
+  */
+  public function getStats()
+  {
+    $conn = RODSConnManager::getConn($this->account);
+    $stats=$conn->getFileStats($this->path_str);
+    RODSConnManager::releaseConn($conn); 
+    
+    if ($stats===false) $this->stats=NULL;
+    else $this->stats=$stats;
+    return $this->stats;
+  }
+ 
+    /**
+     * Open a file path (string) exists on RODS server.
+     *
+     * @param string $mode open mode. Supported modes are:
+     * -  'r'     Open for reading only; place the file pointer at the beginning of the file.
+     * -  'r+'    Open for reading and writing; place the file pointer at the beginning of the file.
+     * -  'w'    Open for writing only; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
+     * -  'w+'    Open for reading and writing; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
+     * -  'a'    Open for writing only; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
+     * -  'a+'    Open for reading and writing; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
+     * -  'x'    Create and open for writing only; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
+     * -  'x+'    Create and open for reading and writing; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
+     * @param string $rescname. Note that this parameter is required only if the file does not exists (create mode). If the file already exists, and if file resource is unknown or unique or you-dont-care for that file, leave the field, or pass NULL.
+     * @param boolean $assum_file_exists. This parameter specifies whether file exists. If the value is false, this mothod will check with RODS server to make sure. If value is true, the check will NOT be done. Default value is false.
+     * @param string $filetype. This parameter only make sense when you want to specify the file type, if file does not exists (create mode). If not specified, it defaults to "generic"
+     * @param integer $cmode. This parameter is only used for "createmode". It specifies the file mode on physical storage system (RODS vault), in octal 4 digit format. For instance, 0644 is owner readable/writeable, and nothing else. 0777 is all readable, writable, and excutable. If not specified, and the open flag requirs create mode, it defaults to 0644.
+     */
+    public function open($mode, $rescname = NULL,
+                         $assum_file_exists = false, $filetype = 'generic', $cmode = 0644)
+    {
+        if ($this->l1desc >= 0)
+            return;
+
+        if (!empty($rescname))
+            $this->rescname = $rescname;
+
+        $this->conn = RODSConnManager::getConn($this->account);
+        $this->l1desc = $this->conn->openFileDesc($this->path_str, $mode,
+            $this->postion, $rescname, $assum_file_exists, $filetype, $cmode);
+        $this->openmode = $mode;
+        RODSConnManager::releaseConn($this->conn);
+    }
+
+    /**
+     * get the file open mode, if opened previously
+     * @return string open mode, if not opened, it return NULL
+     */
+    public function getOpenmode()
+    {
+        return $this->openmode;
+    }
+
+    /**
+     * get the file current position, if opened previously
+     * @return string open mode, if not opened, it return NULL
+     */
+    public function tell()
+    {
+        return $this->position;
+    }
+
+    /**
+     * unlink the file on server
+     * @param string $rescname resource name. Not required if there is no other replica.
+     * @param boolean $force flag (true or false) indicating whether force delete or not.
+     */
+    public function unlink($rescname = NULL, $force = false)
+    {
+        $conn = RODSConnManager::getConn($this->account);
+        $conn->fileUnlink($this->path_str, $rescname, $force);
+        RODSConnManager::releaseConn($conn);
+    }
+    /**
+     * close the file descriptor (private) made from RODS server earlier.
+     */
+    public function close()
+    {
+        if ($this->l1desc >= 0) {
+            while ($this->conn->isIdle() === false) {
+                trigger_error("The connection is not available! sleep for a while and retry...",
+                    E_USER_WARNING);
+                usleep(50);
+            }
+            $this->conn->lock();
+            $this->conn->closeFileDesc($this->l1desc);
+            $this->conn->unlock();
+            $this->conn = null; //release the connection
+            $this->l1desc = -1;
+        }
+    }
+
+    /**
+     * reads up to length bytes from the file. Reading stops when up to length bytes have been read, EOF (end of file) is reached
+     *
+     * @param int $length up to how many bytes to read.
+     * @return the read string.
+     */
+    public function read($length)
+    {
+        if ($this->l1desc < 0) {
+            throw new RODSException("File '$this' is not opened! l1desc=$this->l1desc",
+                'PERR_USER_INPUT_ERROR');
+        }
+
+        while ($this->conn->isIdle() === false) {
+            trigger_error("The connection is not available! sleep for a while and retry...",
+                E_USER_WARNING);
+            usleep(50);
+        }
+
+        $this->conn->lock();
+        $retval = $this->conn->fileRead($this->l1desc, $length);
+        $this->position = $this->position + strlen($retval);
+        $this->conn->unlock();
+        return $retval;
+    }
+
+    /**
+     * write up to length bytes to the server. this function is binary safe.
+     * @param string $string contents to be written.
+     * @param int $length up to how many bytes to write.
+     * @return the number of bytes written.
+     */
+    public function write($string, $length = NULL)
+    {
+        if ($this->l1desc < 0) {
+            throw new RODSException("File '$this' is not opened! l1desc=$this->l1desc",
+                'PERR_USER_INPUT_ERROR');
+        }
+
+        while ($this->conn->isIdle() === false) {
+            trigger_error("The connection is not available! sleep for a while and retry...",
+                E_USER_WARNING);
+            usleep(50);
+        }
+
+        $this->conn->lock();
+        $retval = $this->conn->fileWrite($this->l1desc, $string, $length);
+        $this->position = $this->position + (int)$retval;
+        $this->conn->unlock();
+        return $retval;
+    }
+
+    /**
+     *  Sets the file position for the file. The new position, measured in bytes from the beginning of the file, is obtained by adding offset to the position specified by whence, whose values are defined as follows:
+     *  SEEK_SET - Set position equal to offset bytes.
+     *  SEEK_CUR - Set position to current location plus offset.
+     *  SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
+     *  If whence is not specified, it is assumed to be SEEK_SET.
+     * @return int the current offset
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        if ($this->l1desc < 0) {
+            throw new RODSException("File '$this' is not opened! l1desc=$this->l1desc",
+                'PERR_USER_INPUT_ERROR');
+        }
+
+        while ($this->conn->isIdle() === false) {
+            trigger_error("The connection is not available! sleep for a while and retry...",
+                E_USER_WARNING);
+            usleep(50);
+        }
+
+        $this->conn->lock();
+        $retval = $this->conn->fileSeek($this->l1desc, $offset, $whence);
+        $this->position = (int)$retval;
+        $this->conn->unlock();
+        return $retval;
+    }
+
+    /**
+     * Sets the file position to the beginning of the file stream.
+     */
+    public function rewind()
+    {
+        while ($this->conn->isIdle() === false) {
+            trigger_error("The connection is not available! sleep for a while and retry...",
+                E_USER_WARNING);
+            usleep(50);
+        }
+
+        $this->seek(0, SEEK_SET);
+        $this->position = 0;
+    }
+
+    /**
+     * get the file descriptor (private) made from RODS server earlier.
+     */
+    public function getL1desc()
+    {
+        return $this->l1desc;
+    }
+
+    /**
+     * Because RODS server can only do file operations in a single connection, a RODS
+     * connection is 'reserved' when file is opened, and released when closed.
+     */
+    public function getConn()
+    {
+        return $this->conn;
+    }
+
+    /**
+     * Replicate file to resources with options.
+     * @param string $desc_resc destination resource
+     * @param array $options an assosive array of options:
+     *   - 'all'        (boolean): only meaningful if input resource is a resource group. Replicate to all the resources in the resource group.
+     *   - 'backupMode' (boolean): if a good copy already exists in this resource, don't make another copy.
+     *   - 'admin'      (boolean): admin user uses this option to backup/replicate other users files
+     *   - 'replNum'    (integer): the replica to copy, typically not needed
+     *   - 'srcResc'    (string): specifies the source resource of the data object to be replicate, only copies stored in this resource will be replicated. Otherwise, one of the copy will be replicated
+     * These options are all 'optional', if omitted, the server will try to do it anyway
+     * @return number of bytes written if success, in case of faliure, throw an exception
+     */
+    public function repl($desc_resc, array $options = array())
+    {
+        $conn = RODSConnManager::getConn($this->account);
+        $bytesWritten = $conn->repl($this->path_str, $desc_resc, $options);
+        RODSConnManager::releaseConn($conn);
+
+        return $bytesWritten;
+    }
+
+    /**
+     * get replica information for this file
+     * @return array of array, each child array is a associative and contains:
+     *   [repl_num]      : replica number
+     *   [chk_sum]       : checksum of the file
+     *   [size]          : size of the file (replica)
+     *   [resc_name]     : resource name
+     *   [resc_repl_status] : replica status (dirty bit), whether this replica is dirty (modifed), and requirs synchs to other replicas.
+     *   [resc_grp_name] : resource group name
+     *   [resc_type]     : resource type name
+     *   [resc_class]    : resource class name
+     *   [resc_loc]      : resource location
+     *   [resc_freespace]: resource freespace
+     *   [data_status]   : data status
+     *   [ctime]         : data creation time (unix timestamp)
+     *   [mtime]         : data last modified time (unix timestamp)
+     */
+    public function getReplInfo()
+    {
+        $select = new RODSGenQueSelFlds(
+            array("COL_DATA_REPL_NUM", "COL_D_DATA_CHECKSUM", 'COL_DATA_SIZE',
+                "COL_D_RESC_NAME", "COL_D_RESC_GROUP_NAME",
+                "COL_D_DATA_STATUS", "COL_D_CREATE_TIME",
+                "COL_D_MODIFY_TIME", 'COL_R_TYPE_NAME', 'COL_R_CLASS_NAME',
+                'COL_R_LOC', 'COL_R_FREE_SPACE', 'COL_D_REPL_STATUS')
+        );
+        $condition = new RODSGenQueConds(
+            array("COL_COLL_NAME", "COL_DATA_NAME"),
+            array("=", "="),
+            array($this->parent_path, $this->name)
+        );
+
+        $conn = RODSConnManager::getConn($this->account);
+        $que_result = $conn->query($select, $condition);
+        RODSConnManager::releaseConn($conn);
+
+        $ret_arr = array();
+        for ($i = 0; $i < $que_result->getNumRow(); $i++) {
+            $ret_arr_row = array();
+            $que_result_val = $que_result->getValues();
+            $ret_arr_row['repl_num'] = $que_result_val['COL_DATA_REPL_NUM'][$i];
+            $ret_arr_row['chk_sum'] = $que_result_val['COL_D_DATA_CHECKSUM'][$i];
+            $ret_arr_row['size'] = $que_result_val['COL_DATA_SIZE'][$i];
+            $ret_arr_row['resc_name'] = $que_result_val['COL_D_RESC_NAME'][$i];
+            $ret_arr_row['resc_grp_name'] = $que_result_val['COL_D_RESC_GROUP_NAME'][$i];
+            $ret_arr_row['data_status'] = $que_result_val['COL_D_DATA_STATUS'][$i];
+            $ret_arr_row['ctime'] = $que_result_val['COL_D_CREATE_TIME'][$i];
+            $ret_arr_row['mtime'] = $que_result_val['COL_D_MODIFY_TIME'][$i];
+            $ret_arr_row['resc_type'] = $que_result_val['COL_R_TYPE_NAME'][$i];
+            $ret_arr_row['resc_class'] = $que_result_val['COL_R_CLASS_NAME'][$i];
+            $ret_arr_row['resc_loc'] = $que_result_val['COL_R_LOC'][$i];
+            $ret_arr_row['resc_freespace'] = $que_result_val['COL_R_FREE_SPACE'][$i];
+            $ret_arr_row['resc_repl_status'] = $que_result_val['COL_D_REPL_STATUS'][$i];
+            $ret_arr[] = $ret_arr_row;
+        }
+        return $ret_arr;
+    }
+    
+        /**
+     * Get ACL (users and their rights on a file)
+     * @param string $filepath input file path string
+     * @return RODSFileStats. If file does not exists, return fales.
+     */
+    public function getACL()
+    {
+
+        $filepath = $this->path_str;
+        $parent = dirname($filepath);
+        $filename = basename($filepath);
+
+//        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
+//            new RODSQueryCondition("COL_DATA_NAME", $filename));
+        $cond = array(new RODSQueryCondition("COL_DATA_NAME", $filename),
+            new RODSQueryCondition("COL_COLL_NAME", $parent));
+
+        $connLocal = RODSConnManager::getConn($this->account);
+        $que_result = $connLocal->genQuery(
+              array("COL_USER_NAME", "COL_USER_ZONE", "COL_DATA_ACCESS_NAME"),
+            $cond, array());
+        RODSConnManager::releaseConn($connLocal);
+        if ($que_result === false) return false;
+
+
+        for($i=0; $i < sizeof($que_result['COL_USER_NAME']); $i++) {
+            $users[] = (object) array(
+                "COL_USER_NAME" => $que_result['COL_USER_NAME'][$i],
+                "COL_USER_ZONE" => $que_result['COL_USER_ZONE'][$i],
+                "COL_DATA_ACCESS_NAME" => $que_result['COL_DATA_ACCESS_NAME'][$i]
+            );
+        }
+        return $users;
+    }
+}   
+    
+    
+    
+    
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..be7c6c567882b0e45b71391e3305120331e6ff92
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * ProdsPath class file.
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package Prods
+ */
+
+require_once("autoload.inc.php");
+
+require_once(CLASS_DIR . "/ProdsConfig.inc.php");
+
+/**
+ * ProdsPath class. This class is a abastract class for objects that can be represented as a path, such as file or directory
+ * @package Prods
+ */
+abstract class ProdsPath
+{
+    /**
+     * string path
+     * @var string
+     */
+    public $path_str;
+
+    public $account;
+
+    protected $path_exists;
+
+    protected $parent_path;
+    protected $name;
+
+    /**
+     * Default Constructor. Because this class is abstract, this constructor should not be called directly.
+     *
+     * @param RODSAccount account iRODS account used for connection
+     * @param string $path_str the path of this dir
+     * @return ProdsPath a new ProdsPath
+     */
+    public function __construct(RODSAccount &$account, $path_str)
+    {
+        $this->account = $account;
+
+        // strip the tailing "/"
+        while ((strlen($path_str) > 1) && ($path_str{strlen($path_str) - 1} == '/')) {
+            $path_str = substr($path_str, 0, strlen($path_str) - 1);
+        }
+        // remove duplicate '/' characters
+        $path_str = str_replace('//', '/', $path_str);
+        $this->path_str = $path_str;
+        if ($path_str == '/') {
+            $this->parent_path = null;
+        } else {
+            $this->parent_path = dirname($this->path_str);
+        }
+        $this->name = basename($this->path_str);
+    }
+
+    public function __toString()
+    {
+        return $this->account . $this->path_str;
+    }
+
+    /**
+     * Whether this path (dir or file) exists on the server.
+     * @return boolean
+     */
+    public function exists()
+    {
+        if (isset($this->path_exists))
+            return $this->path_exists;
+
+        else {
+            $this->verify();
+            return $this->path_exists;
+        }
+    }
+
+    /**
+     * Verify if a path exist with server. This function shouldn't be called directly, use {@link exists}
+     */
+    abstract protected function verify();
+
+    /**
+     * Get meta data of this path (file or dir).
+     * @return array array of RODSMeta.
+     */
+    //public function getMeta()
+    public function getMeta($get_cb = array('RODSConnManager', 'getConn'),
+                            $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        if ($this instanceof ProdsFile)
+            $type = 'd';
+        else
+            if ($this instanceof ProdsDir)
+                $type = 'c';
+            else
+                throw new RODSException("Unsupported data type:" . get_class($this),
+                    "PERR_INTERNAL_ERR");
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $meta_array = $conn->getMeta($type, $this->path_str);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+        return $meta_array;
+    }
+
+    /**
+     * update metadata to this path (file or dir)
+     */
+    public function updateMeta(RODSMeta $meta_old, RODSMeta $meta_new)
+    {
+        $this->rmMeta($meta_old);
+        $this->addMeta($meta_new);
+    }
+
+    /**
+     * Add metadata to this path (file or dir)
+     */
+    // public function addMeta(RODSMeta $meta)
+    public function addMeta(RODSMeta $meta,
+                            $get_cb = array('RODSConnManager', 'getConn'),
+                            $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        if ($this instanceof ProdsFile)
+            $type = 'd';
+        else
+            if ($this instanceof ProdsDir)
+                $type = 'c';
+            else
+                throw new RODSException("Unsupported data type:" . get_class($this),
+                    "PERR_INTERNAL_ERR");
+
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $conn->addMeta($type, $this->path_str, $meta);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+    }
+
+    /**
+     * remove metadata to this path (file or dir)
+     */
+    // public function rmMeta(RODSMeta $meta)
+    public function rmMeta(RODSMeta $meta,
+                           $get_cb = array('RODSConnManager', 'getConn'),
+                           $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        if ($this instanceof ProdsFile)
+            $type = 'd';
+        else
+            if ($this instanceof ProdsDir)
+                $type = 'c';
+            else
+                throw new RODSException("Unsupported data type:" . get_class($this),
+                    "PERR_INTERNAL_ERR");
+
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $conn->rmMeta($type, $this->path_str, $meta);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+    }
+
+    /**
+     * remove metadata of this path (file or dir) by id
+     * @param integer metaid id of the metadata entry
+     */
+    // public function rmMetaByID ($metaid)
+    public function rmMetaByID($metaid,
+                               $get_cb = array('RODSConnManager', 'getConn'),
+                               $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        if ($this instanceof ProdsFile)
+            $type = 'd';
+        else
+            if ($this instanceof ProdsDir)
+                $type = 'c';
+            else
+                throw new RODSException("Unsupported data type:" . get_class($this),
+                    "PERR_INTERNAL_ERR");
+
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $conn->rmMetaByID($type, $this->path_str, $metaid);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+    }
+
+    /**
+     * copy meta data from this path (file or dir) to $dest path
+     */
+    // public function cpMeta(ProdsPath $dest)
+    public function cpMeta(ProdsPath $dest,
+                           $get_cb = array('RODSConnManager', 'getConn'),
+                           $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        if ($this instanceof ProdsFile)
+            $type_src = 'd';
+        else
+            if ($this instanceof ProdsDir)
+                $type_src = 'c';
+            else
+                throw new RODSException("Unsupported data type:" . get_class($this),
+                    "PERR_INTERNAL_ERR");
+
+        if ($dest instanceof ProdsFile)
+            $type_dest = 'd';
+        else
+            if ($dest instanceof ProdsDir)
+                $type_dest = 'c';
+            else
+                throw new RODSException("Unsupported data type:" . get_class($this),
+                    "PERR_INTERNAL_ERR");
+
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $conn->cpMeta($type_src, $type_dest, $this->path_str, $dest->path_str);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+    }
+
+    /**
+     * rename this path (file of dir)
+     * @param string $new_path_str new path string to be renamed to.
+     */
+    // public function rename($new_path_str)
+    public function rename($new_path_str,
+                           $get_cb = array('RODSConnManager', 'getConn'),
+                           $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        if ($this instanceof ProdsFile)
+            $type = 0;
+        else
+            $type = 1;
+        //$conn = RODSConnManager::getConn($this->account);
+        $conn = call_user_func_array($get_cb, array(&$this->account));
+        $conn->rename($this->path_str, $new_path_str, $type);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+        $this->path_str = $new_path_str;
+        $this->parent_path = dirname($this->path_str);
+        $this->name = basename($this->path_str);
+    }
+
+    /**
+     * Get name of this path. note that this is not the full path. for instance if path is "/foo/bar", the name is "bar"
+     * @return string name of the path.
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get string form of this path. note that this is the full path.
+     * @return string form of the path.
+     */
+    public function getPath()
+    {
+        return $this->path_str;
+    }
+
+    /**
+     * Get parent's path of this path.
+     * @return string parent's path.
+     */
+    public function getParentPath()
+    {
+        return $this->parent_path;
+    }
+
+    /**
+     * Get URI of this path.
+     * @return string this path's URI.
+     */
+    public function toURI()
+    {
+        return $this->account->toURI() . $this->path_str;
+    }
+
+}
+
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..62469725970100076c712fd0556cb60c23a192b0
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * ProdsQuery class.
+ *
+ * This class provides high level PRODS queries, which aren't specific
+ * to a path, account or resource.
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package Prods
+ */
+require_once("autoload.inc.php");
+
+class ProdsQuery
+{
+    public $account;
+
+    public function __construct(RODSAccount $account)
+    {
+        $this->account = $account;
+    }
+
+    /**
+     * Get all user defined metadata names for all files on the server.
+     * @return array of strings (metadata names).
+     */
+    public function getMetadataNamesForAllFiles()
+    {
+        $flds = array("COL_META_DATA_ATTR_NAME" => NULL);
+        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
+        $condition = new RODSGenQueConds();
+        $condition->add('COL_D_DATA_ID', '>=', '0');
+        $conn = RODSConnManager::getConn($this->account);
+        $results = $conn->query($select, $condition);
+        RODSConnManager::releaseConn($conn);
+
+        if ($results->getNumRow() < 1)
+            return array();
+        else {
+            $values = $results->getValues();
+            return $values['COL_META_DATA_ATTR_NAME'];
+        }
+    }
+
+    /**
+     * Get all user defined metadata names for all directories(collections) on the server.
+     * @return array of strings (metadata names).
+     */
+    public function getMetadataNamesForAllDirs()
+    {
+        $flds = array("COL_META_COLL_ATTR_NAME" => NULL);
+        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
+        $condition = new RODSGenQueConds();
+        $condition->add('COL_COLL_ID', '>=', '0');
+        $conn = RODSConnManager::getConn($this->account);
+        $results = $conn->query($select, $condition);
+        RODSConnManager::releaseConn($conn);
+
+        if ($results->getNumRow() < 1)
+            return array();
+        else {
+            $values = $results->getValues();
+            return $values['COL_META_COLL_ATTR_NAME'];
+        }
+    }
+
+    /**
+     * Get all resources registered on the server
+     * @return array with fields: id, name, type, zone, class, loc, info, comment, ctime, mtime, vault_path, free_space. If user not found return empty array.
+     */
+    public function getResources()
+    {
+        // set selected value
+        $flds = array("COL_R_RESC_ID" => NULL, "COL_R_RESC_NAME" => NULL,
+            "COL_R_ZONE_NAME" => NULL, "COL_R_TYPE_NAME" => NULL,
+            "COL_R_CLASS_NAME" => NULL, "COL_R_LOC" => NULL,
+            "COL_R_VAULT_PATH" => NULL, "COL_R_FREE_SPACE" => NULL,
+            "COL_R_RESC_INFO" => NULL, "COL_R_RESC_COMMENT" => NULL,
+            "COL_R_CREATE_TIME" => NULL, "COL_R_MODIFY_TIME" => NULL);
+        $select = new RODSGenQueSelFlds(array_keys($flds), array_values($flds));
+        $condition = new RODSGenQueConds();
+        $conn = RODSConnManager::getConn($this->account);
+        $results = $conn->query($select, $condition);
+        RODSConnManager::releaseConn($conn);
+        $result_vals = $results->getValues();
+        $retval = array();
+        for ($i = 0; $i < $results->getNumRow(); $i++) {
+            $retval_row = array();
+            $retval_row['id'] = $result_vals["COL_R_RESC_ID"][$i];
+            $retval_row['name'] = $result_vals["COL_R_RESC_NAME"][$i];
+            $retval_row['type'] = $result_vals["COL_R_TYPE_NAME"][$i];
+            $retval_row['zone'] = $result_vals["COL_R_ZONE_NAME"][$i];
+            $retval_row['class'] = $result_vals["COL_R_CLASS_NAME"][$i];
+            $retval_row['loc'] = $result_vals["COL_R_LOC"][$i];
+            $retval_row['info'] = $result_vals["COL_R_RESC_INFO"][$i];
+            $retval_row['comment'] = $result_vals["COL_R_RESC_COMMENT"][$i];
+            $retval_row['ctime'] = $result_vals["COL_R_CREATE_TIME"][$i];
+            $retval_row['mtime'] = $result_vals["COL_R_MODIFY_TIME"][$i];
+            $retval_row['vault_path'] = $result_vals["COL_R_VAULT_PATH"][$i];
+            $retval_row['free_space'] = $result_vals["COL_R_FREE_SPACE"][$i];
+            $retval[] = $retval_row;
+        }
+        return $retval;
+
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..42308d9cc35190095f9b637eff2b17f46921a5ee
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * ProdsRule class. Provides iRODS rule related functionalities.
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package Prods
+ */
+require_once("autoload.inc.php");
+
+class ProdsRule
+{
+    public $account;
+    public $body;
+    public $inp_params;
+    public $out_params;
+    public $remotesvr;
+    public $options;
+
+    /*
+     * @param RODSAccount account this is the account used to connect to iRODS server
+     * @param string $rule_body body of the rule. Read this tutorial for details about rules: http://www.irods.org/index.php/Executing_user_defined_rules/workflow
+     * @param array $inp_params associative array defining input parameters for micro services used in this rule. only string and keyval pair are supported at this time. If the array value is a string, then type is string, if the array value is an RODSKeyValPair object, it will be treated a keyval pair
+     * @param array $out_params an array of names (strings)
+     * @param array $remotesvr if this rule need to run at remote server, this associative array should have the following keys:
+     *    - 'host' remote host name or address
+     *    - 'port' remote port
+     *    - 'zone' remote zone
+     *    if any of the value is empty, this option will be ignored.
+     * @param RODSKeyValPair $options an RODSKeyValPair specifying additional options, purpose of this is unknown at the developement time. Leave it alone if you are as clueless as me...
+     */
+    public function __construct(RODSAccount $account, $rule_body,
+                                array $inp_params = array(), array $out_params = array(),
+                                array $remotesvr = array(), RODSKeyValPair $options = null)
+    {
+        $this->account = $account;
+        $this->rule_body = $rule_body;
+        $this->inp_params = $inp_params;
+        $this->out_params = $out_params;
+        $this->remotesvr = $remotesvr;
+        if (isset($options))
+            $this->options = $options;
+        else
+            $this->options = new RODSKeyValPair();
+    }
+
+    /**
+     * Excute the rule, assign
+     * @return an associative array. Each array key is the lable, and each array value's type will depend on the type of $out_param, at this moment, only string and RODSKeyValPair are supported
+     */
+    public function execute()
+    {
+        $conn = RODSConnManager::getConn($this->account);
+        $result = $conn->execUserRule($this->rule_body, $this->inp_params,
+            $this->out_params, $this->remotesvr, $this->options = null);
+        RODSConnManager::releaseConn($conn);
+
+        return $result;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..27b927bb0331ff4b32306a645b6da74ef366c2de
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php
@@ -0,0 +1,436 @@
+<?php
+
+/**
+ * PRODS class
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package Prods
+ */
+
+require_once("autoload.inc.php");
+
+class ProdsStreamer
+{
+ /**
+	* current position of the file or dir
+	*
+	* @access private
+	*/
+  private $position;
+  
+  /**
+	 * Name of the directory/collection specified in the URI to opendir().
+	 *
+	 * @access private
+	 */
+	private $dir;
+	
+	/**
+	 * Name of the file specified in the URI to fopen().
+	 *
+	 * @access private
+	 */
+	private $file;
+
+	
+	/**
+	 * url_stat() handler.
+	 *
+	 * @access private
+	 */
+	public function url_stat($path)
+	{
+		try {
+                  $file=ProdsDir::fromURI($path);
+                  $conn = RODSConnManager::getConn($file->account);
+
+                  $stats = $this->stat_file($conn, $file->path_str);
+                  if (!$stats) {
+                    $stats = $this->stat_dir($conn, $file->path_str);
+                  }
+                  
+                  RODSConnManager::releaseConn($conn);
+                  
+                  return $stats;
+                  
+		} catch (Exception $e) {
+                  trigger_error("Got an exception:$e", E_USER_WARNING);
+                  return false;
+		}
+	}
+
+        /**
+         * @param $conn
+         * @param $file
+         * @return mixed
+         */
+        private function stat_dir($conn, $path_str) {
+                 try {
+                   $irods_stats = $conn->getDirStats($path_str);
+                   if (!$irods_stats)
+                     return false;
+                   $stats = array();
+                   $stats[0] = $stats['dev'] = 0;
+                   $stats[1] = $stats['ino'] = 0;
+                   $stats[2] = $stats['mode'] = octdec('040755');
+                   $stats[3] = $stats['nlink'] = 1;
+                   $stats[4] = $stats['uid'] = 0;
+                   $stats[5] = $stats['gid'] = 0;
+                   $stats[6] = $stats['rdev'] = -1;
+                   $stats[7] = $stats['size'] = 0;
+                   $stats[8] = $stats['atime'] = time();
+                   $stats[9] = $stats['mtime'] = $irods_stats->mtime;
+                   $stats[10] = $stats['ctime'] = $irods_stats->ctime;
+                   $stats[11] = $stats['blksize'] = -1;
+                   $stats[12] = $stats['blocks'] = -1;
+                   return $stats;
+                 } catch (Exception $e) {
+                   trigger_error("Got an exception: $e", E_USER_WARNING);
+                   return false;
+                 }
+        }
+                 
+        /**
+         * @param $conn
+         * @param $file
+         * @return mixed
+         */
+        private function stat_file($conn, $path_str) {
+                 try {
+                   $irods_stats = $conn->getFileStats($path_str);
+                   if (!$irods_stats)
+                     return false;
+                   $stats = array();
+                   $stats[0] = $stats['dev'] = 0;
+                   $stats[1] = $stats['ino'] = 0;
+                   $stats[2] = $stats['mode'] = octdec('100644');
+                   $stats[3] = $stats['nlink'] = 1;
+                   $stats[4] = $stats['uid'] = 0;
+                   $stats[5] = $stats['gid'] = 0;
+                   $stats[6] = $stats['rdev'] = -1;
+                   $stats[7] = $stats['size'] = $irods_stats->size;
+                   $stats[8] = $stats['atime'] = time();
+                   $stats[9] = $stats['mtime'] = $irods_stats->mtime;
+                   $stats[10] = $stats['ctime'] = $irods_stats->ctime;
+                   $stats[11] = $stats['blksize'] = -1;
+                   $stats[12] = $stats['blocks'] = -1;
+                   return $stats;
+                 } catch (Exception $e) {
+                   trigger_error("Got an exception: $e", E_USER_WARNING);
+                   return false;
+                 }
+        }
+                 
+	/**
+	 * mkdir() handler.
+	 *
+	 * @access private
+	 */
+	function mkdir ($url, $mode, $options) {
+		try {
+                  $file=ProdsDir::fromURI($url);
+                  $conn = RODSConnManager::getConn($file->account);
+                  $conn->mkdir($file->path_str);
+                  
+                  RODSConnManager::releaseConn($conn);
+                  return true;
+		} catch (Exception $e) {
+                  trigger_error("Got an exception:$e", E_USER_WARNING);
+                  return false;
+		}
+	}
+
+	/**
+	 * rmdir() handler
+	 *
+	 * @param $url
+	 * @return bool
+	 */
+	function rmdir ($url) {
+		try {
+			$file=ProdsDir::fromURI($url);
+			$conn = RODSConnManager::getConn($file->account);
+			$conn->rmdir($file->path_str);
+
+			RODSConnManager::releaseConn($conn);
+			return true;
+		} catch (Exception $e) {
+			trigger_error("Got an exception:$e", E_USER_WARNING);
+			return false;
+		}
+	}
+
+	/**
+	 * unlink() handler.
+	 *
+	 * @access private
+	 */
+	function unlink ($url) {
+		try {
+                  $file=ProdsDir::fromURI($url);
+                  $conn = RODSConnManager::getConn($file->account);
+                  if (is_dir($url)) {
+                    $conn->rmdir($file->path_str, true, true);
+                  } else {
+                    $conn->fileUnlink($file->path_str, NULL, true);
+                  }
+                  
+                  RODSConnManager::releaseConn($conn);
+                  return true;
+		} catch (Exception $e) {
+                  trigger_error("Got an exception:$e", E_USER_WARNING);
+                  return false;
+		}
+	}
+
+	/**
+	 * rename() handler.
+	 *
+	 * @access private
+	 */
+        function rename ($url_from, $url_to) {
+                try {
+                  $file_from=ProdsDir::fromURI($url_from);
+                  $file_to=ProdsDir::fromURI($url_to);
+                  $conn = RODSConnManager::getConn($file_from->account);
+
+                  if (is_dir($url_from)) {
+                    $conn->rename($file_from->path_str, $file_to->path_str, 0);
+                  } else {
+                    $conn->rename($file_from->path_str, $file_to->path_str, 1);
+                  }
+
+                  RODSConnManager::releaseConn($conn);
+                  return true;
+                } catch (Exception $e) {
+                  trigger_error("Got an exception:$e", E_USER_WARNING);
+                  return false;
+                }
+        }
+
+	/**
+	 * opendir() handler.
+	 *
+	 * @access private
+	 */
+	public function dir_opendir ($path, $options) 
+	{
+		try {
+		  $this->dir=ProdsDir::fromURI($path,true);
+		  return true;
+		} catch (Exception $e) {
+		  trigger_error("Got an exception:$e", E_USER_WARNING);
+		  return false;
+		}
+	}
+
+    /**
+     * readdir() handler.
+     *
+     * @access private
+     */
+    public function dir_readdir()
+    {
+        try {
+            $child = $this->dir->getNextChild();
+            if ($child === false) return false;
+            return $child->getName();
+        } catch (Exception $e) {
+            trigger_error("Got an exception:$e", E_USER_WARNING);
+            return false;
+        }
+    }
+
+	/**
+	 * fread() and fgets() handler.
+	 *
+	 * @access private
+	 */
+	public function stream_read ($count) {
+		if (in_array ($this->file->getOpenMode(), array ('w', 'a', 'x'))) {
+			return false;
+		}
+		try {
+  		$ret = $this->file->read($count);
+  		$this->position=$this->file->tell();
+  		return $ret;
+  	} catch (Exception $e) {
+		  trigger_error("Got an exception:$e", E_USER_WARNING);
+		  return false;
+		}	
+	}
+
+	/**
+	 * fwrite() handler.
+	 *
+	 * @access private
+	 */
+	public function stream_write ($data) {
+		if ($this->file->getOpenMode() =='r') {
+			return false;
+		}
+		try {
+  		$ret = $this->file->write($data);
+  		$this->position=$this->file->tell();
+  		return $ret;
+  	} catch (Exception $e) {
+		  trigger_error("Got an exception:$e", E_USER_WARNING);
+		  return false;
+		}	
+	}
+    /**
+     * rewinddir() handler.
+     *
+     * @access private
+     */
+    public function dir_rewinddir()
+    {
+        try {
+            $this->dir->rewind();
+            return true;
+        } catch (Exception $e) {
+            trigger_error("Got an exception:$e", E_USER_WARNING);
+            return false;
+        }
+    }
+
+    /**
+     * closedir() handler.
+     *
+     * @access private
+     */
+    public function dir_closedir()
+    {
+        try {
+            $this->dir->rewind();
+            return true;
+        } catch (Exception $e) {
+            trigger_error("Got an exception:$e", E_USER_WARNING);
+            return false;
+        }
+    }
+
+    /**
+     * fopen() handler.
+     *
+     * @access private
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+
+        // get rid of tailing 'b', if any.
+        if (($mode{strlen($mode) - 1} == 'b') && (strlen($mode) > 1))
+            $mode = substr($mode, 0, strlen($mode) - 1);
+         try {
+            $this->file = ProdsFile::fromURI($path);
+            $this->file->open($mode);
+            return true;
+        } catch (Exception $e) {
+            trigger_error("Got an exception:$e", E_USER_WARNING);
+            return false;
+        }
+    }
+
+	/**
+	 * fstat() handler.
+	 *
+	 * @access private
+	 */
+	function stream_stat () {
+	  
+	  try {
+	    $stats=$this->file->getStats();
+	    return array (
+  			-1, -1, -1, -1, -1, -1, $stats->size, time (), $stats->mtime, $stats->ctime, -1, -1,
+  			'dev' => -1,
+  			'ino' => -1,
+  			'mode' => -1,
+  			'nlink' => -1,
+  			'uid' => -1,
+  			'gid' => -1,
+  			'rdev' => -1,
+  			'size' => $stats->size,
+  			'atime' => time (),
+  			'mtime' => $stats->mtime,
+  			'ctime' => $stats->ctime,
+  			'blksize' => -1,
+  			'blocks' => -1,
+  		);
+	  } catch (Exception $e) {
+		  trigger_error("Got an exception:$e", E_USER_WARNING);
+		  return false;
+		} 
+	}
+
+	/**
+	 * fclose() handler.
+	 *
+	 * @access private
+	 */
+	function stream_close () {
+		$this->file->close();
+		$this->position = 0;
+		$this->file = null;
+		$this->dir = null;
+	}
+
+    /**
+     * ftell() handler.
+     *
+     * @access private
+     */
+    function stream_tell()
+    {
+        return $this->position;
+    }
+
+    /**
+     * feof() handler.
+     *
+     * @access private
+     */
+    function stream_eof()
+    {
+        try {
+            $stats = $this->file->getStats();
+            return $this->position >= $stats->size;
+        } catch (Exception $e) {
+            trigger_error("Got an exception:$e", E_USER_WARNING);
+            return true;
+        }
+    }
+
+    /**
+     * fseek() handler.
+     *
+     * @access private
+     */
+    function stream_seek($offset, $whence)
+    {
+        try {
+            $this->file->seek($offset, $whence);
+            return true;
+        } catch (Exception $e) {
+            trigger_error("Got an exception:$e", E_USER_WARNING);
+            return false;
+        }
+    }
+
+    /**
+     * fflush() handler.  Please Note: This method must be called for any
+     * changes to be committed to the repository.
+     *
+     * @access private
+     */
+    function stream_flush()
+    {
+        return true;
+    }
+}
+  
+stream_wrapper_register('rods', 'ProdsStreamer')
+    or die ('Failed to register protocol:rods');
+stream_wrapper_register('rods+ticket', 'ProdsStreamer')
+    or die ('Failed to register protocol:rods');
+?>
+
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsTicket.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsTicket.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..0038a9c073a3f0e66e527516b95fd9f28192f210
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsTicket.class.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Developer: Daniel Speichert <s@drexel.edu>
+ * Date: 30.01.13
+ * Time: 14:15
+ */
+
+require_once("autoload.inc.php");
+
+class ProdsTicket
+{
+    private $account;
+
+    public function __construct( RODSAccount &$account )
+    {
+        $this->account = $account;
+    }
+
+    /*
+     * This is just a stupid wrapper
+     * It proxifies RODSConn->createTicket
+     */
+    public function createTicket( $object, $permission = 'read', $ticket = '' )
+    {
+        $conn = RODSConnManager::getConn($this->account);
+        $ticket = $conn->createTicket($object, $permission, $ticket );
+        RODSConnManager::releaseConn($conn);
+        return $ticket;
+    }
+
+    /*
+     * This is also a stupid wrapper
+     * It proxifies RODSConn->deleteTicket
+     */
+    public function deleteTicket( $ticket )
+    {
+        $conn = RODSConnManager::getConn($this->account);
+        $ticket = $conn->deleteTicket( $ticket );
+        RODSConnManager::releaseConn($conn);
+    }
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..f47f85bc238393fbddf2f4dd1cb5b3975c914eb7
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php
@@ -0,0 +1,203 @@
+<?php
+/**#@+
+ * Constants
+ */
+/**
+ * Maximum lengh of password string. Only up to this lengh of password are submitted to RODS server.
+ */
+define("MAX_PASSWORD_LEN", 50);
+/**#@-*/
+
+require_once("autoload.inc.php");
+
+class RODSAccount
+{
+ /**#@+
+  * @var string 
+  */
+  public $user;
+  public $pass;
+  public $host;
+  public $port;
+  public $zone; 
+  public $default_resc;
+  public $auth_type;
+  public $ticket;
+  /**#@-*/
+  
+  public function __construct($host, $port, $user, $pass, $zone="", 
+    $default_resc="", $auth_type="irods",$ticket = '')
+  {
+    $this->host=$host;
+    $this->port=$port;
+    $this->user=$user;
+    $this->pass=$pass;
+    $this->zone=$zone;
+    $this->default_resc=$default_resc;
+    $this->auth_type=$auth_type;
+     $this->ticket = $ticket;
+  }
+  
+ /**
+	* Create a RODSAccount object from URI string.
+	* @param string $uri 
+	* @return a new RODSAccount object
+	*/
+  public static function fromURI($uri)
+  {
+    $url=parse_url($uri);
+    
+    $host=isset($url['host'])?$url['host']:''; 
+    $port=isset($url['port'])?$url['port']:'';   
+    
+    $user='';
+    $zone='';
+    $authtype='irods';
+    if (isset($url['user']))
+    {
+      if (strstr($url['user'],".")!==false) {
+        $user_array=@explode(".",$url['user']);
+        if (count($user_array)===3) {
+          $user=$user_array[0];
+          $zone=$user_array[1];
+          $authtype=$user_array[2];
+        }
+        else {
+          $user=$user_array[0];
+          $zone=$user_array[1];
+        }
+      } 
+      else
+        $user=$url['user'];
+    }  
+    
+    $pass=isset($url['pass'])?$url['pass']:'';
+    
+    return (new RODSAccount($host, $port, $user, $pass, $zone, "", $authtype,$ticket = ''));
+  }
+  
+  
+
+    public function equals(RODSAccount $other)
+    {
+        if (!isset($other))
+            return false;
+
+        if (($this->host == $other->host) &&
+            ($this->port == $other->port) &&
+            ($this->user == $other->user)
+        ) {
+            $ret_val = true;
+        } else
+            $ret_val = false;
+
+        //echo ( "$this->host,$this->port,$this->user vs. $other->host,$other->port,$other->user = $ret_val");
+        //flush();
+        return $ret_val;
+    }
+
+    public function getSignature()
+    {
+        return (bin2hex(md5("$this->user.$this->zone:this->pass@$this->host:$this->port.$this->ticket", TRUE)));
+    }
+
+    public function __toString()
+    {
+        return "$this->user.$this->zone:(password hidden)@$this->host:$this->port";
+    }
+
+    public function toURI()
+    {
+        return ($this->user .
+            (empty($this->zone) ? '' : '.' . $this->zone) .
+            "@" . $this->host . ":" . $this->port);
+    }
+
+    /**
+     * Get user information
+     * @param string username, if not specified, it will use current username instead
+     * @return array with fields: id, name, type, zone, dn, info, comment, ctime, mtime. If user not found return empty array.
+     */
+    public function getUserInfo($username = NULL,
+                                $get_cb = array('RODSConnManager', 'getConn'),
+                                $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        //$conn = RODSConnManager::getConn($this);
+        $conn = call_user_func_array($get_cb, array(&$this));
+        //TODO: Overcome fear of passing $this by reference or stop passing $this by reference
+        $userinfo = $conn->getUserInfo($username);
+        //RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+        if ((!empty($userinfo)) && (!empty($userinfo['zone'])))
+            $this->zone = $userinfo['zone'];
+        return $userinfo;
+    }
+
+    /**
+     * Get a temp password for current user
+     * @return string of temp password
+     */
+    public function getTempPassword($get_cb = array('RODSConnManager', 'getConn'),
+                                    $rel_cb = array('RODSConnManager', 'releaseConn'))
+    {
+        //$conn = RODSConnManager::getConn($this);
+        $conn = call_user_func_array($get_cb, array(&$this));
+        //TODO: Overcome fear of passing $this by reference or stop passing $this by reference
+        $temppass = $conn->getTempPassword();
+        // RODSConnManager::releaseConn($conn);
+        call_user_func($rel_cb, $conn);
+        return $temppass;
+    }
+
+    /**
+     * Get user's home directory
+     * @param string init_path, if specified, it will overwrite the default path
+     * @return ProdsDir User's home directory
+     */
+    public function getUserHomeDir($init_path = NULL)
+    {
+        if (empty($this->zone))
+            $this->getUserInfo();
+        if (isset($init_path)) {
+            $dir = new ProdsDir($this, $init_path);
+            if ($dir->exists()) {
+                return $dir;
+            }
+        }
+        return new ProdsDir($this, "/$this->zone/home/$this->user");
+    }
+
+    /**
+     * Get user's home directory URI
+     * @param string init_path, if specified, it will overwrite the default path
+     * @return String User's home
+     */
+    public function getUserHomeDirURI($init_path = NULL)
+    {
+        $dir = $this->getUserHomeDir($init_path);
+        return $dir->toURI();
+    }
+
+    /**
+     * Get user's trash directory
+     * @return ProdsDir User's trash dir
+     */
+    public function getUserTrashDir()
+    {
+        if (empty($this->zone))
+            $this->getUserInfo();
+        return new ProdsDir($this, "/$this->zone/trash/home/$this->user");
+    }
+
+    /**
+     * Get user's trash directory URI
+     * @return String User's trash URI
+     */
+    public function getUserTrashDirURI()
+    {
+        $dir = $this->getUserTrashDir();
+        return $dir->toURI();
+    }
+}
+
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..0498f42cfaa7a43821222ee3b0513d58b043d328
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php
@@ -0,0 +1,1615 @@
+<?php
+/**
+ * RODS connection class
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package RODSConn
+ */
+
+
+require_once("autoload.inc.php");
+require_once("RodsAPINum.inc.php");
+require_once("RodsConst.inc.php");
+
+if (!defined("O_RDONLY")) define ("O_RDONLY", 0);
+if (!defined("O_WRONLY")) define ("O_WRONLY", 1);
+if (!defined("O_RDWR")) define ("O_RDWR", 2);
+if (!defined("O_TRUNC")) define ("O_TRUNC", 512);
+
+class RODSConn
+{
+  private $conn;     // (resource) socket connection to RODS server
+  
+  private $account;  // RODS user account  
+  
+  private $idle;
+  private $id;
+  
+  public  $connected;
+  
+  /**
+   * Makes a new connection to RODS server, with supplied user information (name, passwd etc.) 
+   * @param string $host hostname 
+   * @param string $port port number 
+   * @param string $user username 
+   * @param string $pass passwd 
+   * @param string $zone zonename 
+   */
+  public function __construct(RODSAccount &$account)
+  {
+    $this->account=$account;
+    $this->connected=false;
+    $this->conn=NULL;
+    $this->idle=true;
+  }
+  
+  public function __destruct()
+  {
+    if ($this->connected===true)
+      $this->disconnect();
+  }
+  
+  public function equals(RODSConn $other)
+  {
+    return $this->account->equals($other->account);
+  }
+  
+  public function getSignature()
+  {
+    return $this->account->getSignature();
+  }
+  
+  public function lock()
+  {
+    $this->idle=false;
+  }
+  
+  public function unlock()
+  {
+    $this->idle=true;
+  }
+  
+  public function isIdle()
+  {
+    return ($this->idle);
+  }
+  
+  public function getId()
+  {
+    return $this->id;
+  }
+  
+  public function setId($id)
+  {
+    $this->id=$id;
+  }
+  
+  public function getAccount()
+  {
+    return $this->account;
+  }
+  
+  public function connect()
+  {
+    $host=$this->account->host;
+    $port=$this->account->port;
+    $user=$this->account->user;
+    $pass=$this->account->pass;
+    $zone=$this->account->zone;
+    $auth_type = $this->account->auth_type;
+
+    // if we're going to use PAM, set up the socket context 
+    // options for SSL connections when we open the connection
+    if (strcasecmp($auth_type, "PAM") == 0) {
+      $ssl_opts = array('ssl' => array());
+      if (array_key_exists('ssl', $GLOBALS['PRODS_CONFIG'])) {
+        $ssl_conf = $GLOBALS['PRODS_CONFIG']['ssl'];
+        if (array_key_exists('verify_peer', $ssl_conf)) {
+          if (strcasecmp("true", $ssl_conf['verify_peer']) == 0) {
+            $ssl_opts['ssl']['verify_peer'] = true;
+          }
+        }
+        if (array_key_exists('allow_self_signed', $ssl_conf)) {
+          if (strcasecmp("true", $ssl_conf['allow_self_signed']) == 0) {
+            $ssl_opts['ssl']['allow_self_signed'] = true;
+          }
+        }
+        if (array_key_exists('cafile', $ssl_conf)) {
+          $ssl_opts['ssl']['cafile'] = $ssl_conf['cafile'];
+        }
+        if (array_key_exists('capath', $ssl_conf)) {
+          $ssl_opts['ssl']['capath'] = $ssl_conf['capath'];
+        }
+      }
+      $ssl_ctx = stream_context_get_default($ssl_opts);
+      $sock_timeout = ini_get("default_socket_timeout");
+      $conn = @stream_socket_client("tcp://$host:$port", $errno, $errstr,
+        $sock_timeout, STREAM_CLIENT_CONNECT, $ssl_ctx);
+    }
+    else {
+      $conn = @fsockopen($host, $port, $errno, $errstr);
+    }
+    if (!$conn)
+      throw new RODSException("Connection to '$host:$port' failed.1: ($errno)$errstr. ",
+        "SYS_SOCK_OPEN_ERR");
+    $this->conn=$conn;
+    
+    // connect to RODS server
+    $msg=RODSMessage::packConnectMsg($user,$zone);
+    fwrite($conn, $msg);
+    
+    $msg=new RODSMessage();
+    $intInfo=$msg->unpack($conn);
+    if ($intInfo<0)
+    {
+      throw new RODSException("Connection to '$host:$port' failed.2. User: $user Zone: $zone",
+        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+    }
+    
+    // are we doing PAM authentication
+    if (strcasecmp($auth_type, "PAM") == 0) 
+    {
+      // Ask server to turn on SSL
+      $req_packet = new RP_sslStartInp();
+      $msg=new RODSMessage("RODS_API_REQ_T", $req_packet, 
+        $GLOBALS['PRODS_API_NUMS']['SSL_START_AN']);
+      fwrite($conn, $msg->pack());
+      $msg=new RODSMessage();
+      $intInfo=$msg->unpack($conn);
+      if ($intInfo<0) 
+      {
+        throw new RODSException("Connection to '$host:$port' failed.ssl1. User: $user Zone: $zone",
+          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+      }
+      // Turn on SSL on our side
+      if (!stream_socket_enable_crypto($conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+        throw new RODSException("Error turning on SSL on connection to server '$host:$port'.");
+      }
+
+      // all good ... do the PAM authentication over the encrypted connection
+      $req_packet = new RP_pamAuthRequestInp($user, $pass, -1);
+      $msg=new RODSMessage("RODS_API_REQ_T", $req_packet,
+        $GLOBALS['PRODS_API_NUMS']['PAM_AUTH_REQUEST_AN']);
+      fwrite($conn, $msg->pack());
+      $msg=new RODSMessage();
+      $intInfo=$msg->unpack($conn);
+      if ($intInfo<0)
+      {
+        throw new RODSException("PAM auth failed at server '$host:$port' User: $user Zone: $zone",
+          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+      }
+      
+      // Update the account object with the temporary password
+      // and set the auth_type to irods for this connection
+      $pack = $msg->getBody();
+      $pass = $this->account->pass = $pack->irodsPamPassword;
+
+      // Done authentication ... turn ask the server to turn off SSL
+      $req_packet = new RP_sslEndInp();
+      $msg=new RODSMessage("RODS_API_REQ_T", $req_packet, 
+        $GLOBALS['PRODS_API_NUMS']['SSL_END_AN']);
+      fwrite($conn, $msg->pack());
+      $msg=new RODSMessage();
+      $intInfo=$msg->unpack($conn);
+      if ($intInfo<0) 
+      {
+        throw new RODSException("Connection to '$host:$port' failed.ssl2. User: $user Zone: $zone",
+          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+      }
+      // De-activate SSL on the connection
+      stream_socket_enable_crypto($conn, false);
+
+      // nasty hack ... some characters are left over to be read
+      // from the socket after the SSL shutdown, and I can't 
+      // figure out how to consume them via SSL routines, so I
+      // just read them and throw them away. They need to be consumed
+      // or later reads get out of sync with the API responses
+      $r = array($conn);
+      $w = $e = null;
+      while (stream_select($r, $w, $e, 0) > 0) {
+        $s = fread($conn, 1);
+      }
+
+    }
+      
+    // request authentication
+    $msg=new RODSMessage("RODS_API_REQ_T",NULL,
+      $GLOBALS['PRODS_API_NUMS']['AUTH_REQUEST_AN']);
+    fwrite($conn, $msg->pack());    
+    
+    // get chalange string
+    $msg=new RODSMessage();
+    $intInfo=$msg->unpack($conn);
+    if ($intInfo<0)
+    {
+      throw new RODSException("Connection to '$host:$port' failed.3. User: $user Zone: $zone",
+        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+    }
+    $pack=$msg->getBody();
+    $challenge_b64encoded=$pack->challenge;
+    $challenge=base64_decode($challenge_b64encoded);
+    
+    // encode chalange with passwd
+    $pad_pass=str_pad($pass,MAX_PASSWORD_LEN,"\0");
+    $pwmd5=md5($challenge.$pad_pass,true);
+    for ($i=0;$i<strlen($pwmd5);$i++) //"escape" the string in RODS way...
+    {
+      if (ord($pwmd5[$i])==0)
+      {
+        $pwmd5[$i]=chr(1);
+      }
+    }
+    $response=base64_encode($pwmd5);
+    
+    // set response
+    $resp_packet=new RP_authResponseInp($response,$user);
+    $msg=new RODSMessage("RODS_API_REQ_T",$resp_packet,
+      $GLOBALS['PRODS_API_NUMS']['AUTH_RESPONSE_AN']);
+    fwrite($conn, $msg->pack());
+    
+    // check if we are connected
+    // get chalange string
+    $msg=new RODSMessage();
+    $intInfo=$msg->unpack($conn);
+    if ($intInfo<0)
+    {
+      $this->disconnect();
+      throw new RODSException("Connection to '$host:$port' failed.4 (login failed, possible wrong user/passwd). User: $user Pass: $pass Zone: $zone",
+        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+    }
+    
+    $this->connected=true;
+    // use ticket if specified
+        if( !empty($this->account->ticket) ) {
+            $ticket_packet = new RP_ticketAdminInp('session', $this->account->ticket);
+            $msg = new RODSMessage('RODS_API_REQ_T', $ticket_packet, 723);
+            fwrite($conn, $msg->pack());
+
+            // get response
+            $msg = new RODSMessage();
+            $intInfo = $msg->unpack($conn);
+            if ($intInfo < 0) {
+                $this->disconnect();
+                throw new RODSException('Cannot set session ticket.',
+                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+            }
+        }
+
+  }
+    /**
+     * Close the connection (socket)
+     */
+    public function disconnect($force = false)
+    {
+        if (($this->connected === false) && ($force !== true))
+            return;
+
+        $msg = new RODSMessage("RODS_DISCONNECT_T");
+        fwrite($this->conn, $msg->pack());
+        fclose($this->conn);
+        $this->connected = false;
+    }
+
+    public function createTicket( $object, $permission = 'read', $ticket = '' )
+    {
+        if ($this->connected === false) {
+            throw new RODSException("createTicket needs an active connection, but the connection is currently inactive",
+                'PERR_CONN_NOT_ACTIVE');
+        }
+        if( empty($ticket) )
+        {
+            // create a 16 characters long ticket
+            $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+            for ($i = 0; $i < 16; $i++)
+                $ticket .= $chars[mt_rand(1, strlen($chars))-1];
+        }
+
+        $ticket_packet = new RP_ticketAdminInp('create', $ticket, $permission, $object);
+        $msg = new RODSMessage('RODS_API_REQ_T', $ticket_packet, 723);
+        fwrite($this->conn, $msg->pack());
+
+        // get response
+        $msg = new RODSMessage();
+        $intInfo = $msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException('Cannot create ticket "'.$ticket.'" for object "'.$object.'" with permission "'.$permission.'".',
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+
+        return $ticket;
+    }
+
+    public function deleteTicket( $ticket )
+    {
+        if ($this->connected === false) {
+            throw new RODSException("deleteTicket needs an active connection, but the connection is currently inactive",
+                'PERR_CONN_NOT_ACTIVE');
+        }
+        $ticket_packet = new RP_ticketAdminInp('delete', $ticket);
+        $msg = new RODSMessage('RODS_API_REQ_T', $ticket_packet, 723);
+        fwrite($this->conn, $msg->pack());
+
+        // get response
+        $msg = new RODSMessage();
+        $intInfo = $msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException('Cannot delete ticket "'.$ticket.'".',
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    /**
+     * Get a temp password from the server.
+     * @param string $key key obtained from server to generate password. If this key is not specified, this function will ask server for a new key.
+     * @return string temp password
+     */
+    public function getTempPassword($key = NULL)
+    {
+        if ($this->connected === false) {
+            throw new RODSException("getTempPassword needs an active connection, but the connection is currently inactive",
+                'PERR_CONN_NOT_ACTIVE');
+        }
+        if (NULL == $key)
+            $key = $this->getKeyForTempPassword();
+
+        $auth_str = str_pad($key . $this->account->pass, 100, "\0");
+        $pwmd5 = bin2hex(md5($auth_str, true));
+
+        return $pwmd5;
+    }
+
+
+    /**
+     * Get a key for temp password from the server. this key can then be hashed together with real password to generate an temp password.
+     * @return string key for temp password
+     */
+    public function getKeyForTempPassword()
+    {
+        if ($this->connected === false) {
+            throw new RODSException("getKeyForTempPassword needs an active connection, but the connection is currently inactive",
+                'PERR_CONN_NOT_ACTIVE');
+        }
+        $msg = new RODSMessage("RODS_API_REQ_T", null,
+            $GLOBALS['PRODS_API_NUMS']['GET_TEMP_PASSWORD_AN']);
+
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::getKeyForTempPassword has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+        return ($msg->getBody()->stringToHashWith);
+    }
+
+    /**
+     * Get user information
+     * @param string username, if not specified, it will use current username instead
+     * @return array with fields: id, name, type, zone, dn, info, comment, ctime, mtime. If user not found return empty array.
+     */
+    public function getUserInfo($user = NULL)
+    {
+        if (!isset($user))
+            $user = $this->account->user;
+
+        // set selected value
+        $select_val = array("COL_USER_ID", "COL_USER_NAME", "COL_USER_TYPE",
+            "COL_USER_ZONE", "COL_USER_DN", "COL_USER_INFO",
+            "COL_USER_COMMENT", "COL_USER_CREATE_TIME", "COL_USER_MODIFY_TIME");
+        $cond = array(new RODSQueryCondition("COL_USER_NAME", $user));
+        $que_result = $this->genQuery($select_val, $cond);
+
+        if (false === $que_result) {
+            return array();
+        } else {
+            $retval = array();
+            $retval['id'] = $que_result["COL_USER_ID"][0];
+            $retval['name'] = $que_result["COL_USER_NAME"][0];
+            $retval['type'] = $que_result["COL_USER_TYPE"][0];
+            // $retval['zone']=$que_result["COL_USER_ZONE"][0]; This can cause confusion if
+            // username is same as another federated grid - sometimes multiple records are returned.
+            // Changed source to force user to provide a zone until another method is suggested.
+            if ($this->account->zone == "") {
+                $retval['zone'] = $que_result["COL_USER_ZONE"][0];
+            } else {
+                $retval['zone'] = $this->account->zone;
+            }
+            $retval['dn'] = $que_result["COL_USER_DN"][0];
+            $retval['info'] = $que_result["COL_USER_INFO"][0];
+            $retval['comment'] = $que_result["COL_USER_COMMENT"][0];
+            $retval['ctime'] = $que_result["COL_USER_CREATE_TIME"][0];
+            $retval['mtime'] = $que_result["COL_USER_MODIFY_TIME"][0];
+
+            return $retval;
+        }
+    }
+
+    /**
+     * Make a new directory
+     * @param string $dir input direcotory path string
+     */
+    public function mkdir($dir)
+    {
+        $collInp_pk = new RP_CollInp($dir);
+        $msg = new RODSMessage("RODS_API_REQ_T", $collInp_pk,
+            $GLOBALS['PRODS_API_NUMS']['COLL_CREATE_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CATALOG_ALREADY_HAS_ITEM_BY_THAT_NAME') {
+                throw new RODSException("Collection '$dir' Already exists!",
+                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+            }
+            throw new RODSException("RODSConn::mkdir has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    /**
+     * remove a directory
+     * @param string  $dirpath input direcotory path string
+     * @param boolean $recursive whether recursively delete all child files and child directories recursively.
+     * @param boolean $force whether force delete the file/dir. If force delete, all files will be wiped physically. Else, they are moved to trash derectory.
+     * @param array   $additional_flags An array of keyval pairs (array) reprenting additional flags passed to the server/client message. Each keyval pair is an array with first element repsenting the key, and second element representing the value (default to ''). Supported keys are:
+     * -    'irodsRmTrash' - whether this rm is a rmtrash operation
+     * -    'irodsAdminRmTrash' - whether this rm is a rmtrash operation done by admin user
+     * @param mixed   $status_update_func It can be an string or array that represents the status update function (see http://us.php.net/manual/en/language.pseudo-types.php#language.types.callback), which can update status based on the server status update. Leave it blank or 'null' if there is no need to update the status. The function will be called with an assossive arry as parameter, supported fields are:
+     * - 'filesCnt' - finished number of files from previous update (normally 10 but not the last update)
+     * - 'lastObjPath' - last object that was processed.
+     * If this function returns 1, progress will be stopped.
+     */
+    public function rmdir($dirpath, $recursive = true, $force = false,
+                          $additional_flags = array(), $status_update_func = null)
+    {
+        $options = array();
+        if ($force === true) {
+            $options["forceFlag"] = "";
+        }
+        if ($recursive === true) {
+            $options["recursiveOpr"] = "";
+        }
+        foreach ($additional_flags as $flagkey => $flagval) {
+            if (!empty($flagkey))
+                $options[$flagkey] = $flagval;
+        }
+        $options_pk = new RP_KeyValPair();
+        $options_pk->fromAssocArray($options);
+
+        $collInp_pk = new RP_CollInp($dirpath, $options_pk);
+        $msg = new RODSMessage("RODS_API_REQ_T", $collInp_pk,
+            $GLOBALS['PRODS_API_NUMS']['RM_COLL_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        while ($msg->getBody() instanceof RP_CollOprStat) {
+            if (is_callable($status_update_func)) // call status update function if requested
+            {
+                $status = call_user_func($status_update_func,
+                    array(
+                        "filesCnt" => $msg->getBody()->filesCnt,
+                        "lastObjPath" => $msg->getBody()->lastObjPath
+                    )
+                );
+                if (false === $status)
+                    throw new Exception("status_update_func failed!");
+                else if (1 == $status) {
+                    return;
+                }
+            }
+
+            if ($intInfo == 0) //stop here if intinfo =0 (process completed)
+                break;
+            $this->replyStatusPacket();
+            $msg = new RODSMessage();
+            $intInfo = (int)$msg->unpack($this->conn);
+        }
+
+        if ($intInfo < 0) {
+            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
+                return;
+            }
+            throw new RODSException("RODSConn::rmdir has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    // this is a temp work around for status packet reply.
+    // in status packet protocol, the server gives a status update packet:
+    // SYS_SVR_TO_CLI_COLL_STAT (99999996)
+    // and it expects an  integer only SYS_CLI_TO_SVR_COLL_STAT_REPLY (99999997)
+    private function replyStatusPacket()
+    {
+        fwrite($this->conn, pack("N", 99999997));
+    }
+
+    /**
+     * Get children direcotories of input direcotory path string
+     * @param string $dir input direcotory path string
+     * @return an array of string, each string is the name of a child directory. This fuction return empty array, if there is no child direcotry found
+     */
+    public function getChildDir($dir, $startingInx = 0, $maxresults = 500,
+                                &$total_num_rows = -1)
+    {
+        $cond = array(new RODSQueryCondition("COL_COLL_PARENT_NAME", $dir));
+        $que_result = $this->genQuery(array("COL_COLL_NAME"), $cond, array(),
+            $startingInx, $maxresults, true, array(), 0, $total_num_rows);
+
+        if (false === $que_result) {
+            return array();
+        } else {
+            if ($dir == "/") {
+                $result = array();
+                foreach ($que_result["COL_COLL_NAME"] as $childdir) {
+                    if ($childdir != "/") {
+                        $result[] = $childdir;
+                    }
+                }
+                return $result;
+            }
+
+            return array_values($que_result["COL_COLL_NAME"]);
+        }
+    }
+
+    /**
+     * Get children direcotories, with basic stats,  of input direcotory path string
+     * @param string $dir input direcotory path string
+     * @param $orderby An associated array specifying how to sort the result by attributes. Each array key is the attribute, array val is 0 (assendent) or 1 (dessendent). The supported attributes are "name", "owner", "mtime".
+     * @return an array of RODSDirStats
+     */
+    public function getChildDirWithStats($dir, $orderby = array(), $startingInx = 0,
+                                         $maxresults = 500, &$total_num_rows = -1)
+    {
+        // set selected value
+        $select_val = array("COL_COLL_NAME", "COL_COLL_ID", "COL_COLL_OWNER_NAME",
+            "COL_COLL_OWNER_ZONE", "COL_COLL_CREATE_TIME", "COL_COLL_MODIFY_TIME",
+            "COL_COLL_COMMENTS");
+        $select_attr = array();
+
+        // set order by
+        if (!empty($orderby)) {
+            $select_attr = array_fill(0, count($select_val), 1);
+            foreach ($orderby as $key => $val) {
+                if ($key == "name") {
+                    if ($val == 0) $select_attr[0] = ORDER_BY;
+                    else $select_attr[0] = ORDER_BY_DESC;
+                } else
+                    if ($key == "owner") {
+                        if ($val == 0) $select_attr[2] = ORDER_BY;
+                        else $select_attr[2] = ORDER_BY_DESC;
+                    } else
+                        if ($key == "mtime") {
+                            if ($val == 0) $select_attr[5] = ORDER_BY;
+                            else $select_attr[5] = ORDER_BY_DESC;
+                        }
+            }
+        }
+
+        $cond = array(new RODSQueryCondition("COL_COLL_PARENT_NAME", $dir));
+        $continueInx = 0;
+        $que_result = $this->genQuery($select_val, $cond,
+            array(), $startingInx, $maxresults, true,
+            $select_attr, $continueInx, $total_num_rows);
+
+        if (false === $que_result) {
+            return array();
+        } else {
+            $ret_val = array();
+            for ($i = 0; $i < count($que_result['COL_COLL_ID']); $i++) {
+                if ($que_result['COL_COLL_NAME'][$i] != "/") {
+                    $ret_val[] = new RODSDirStats(
+                        basename($que_result['COL_COLL_NAME'][$i]),
+                        $que_result['COL_COLL_OWNER_NAME'][$i],
+                        $que_result['COL_COLL_OWNER_ZONE'][$i],
+                        $que_result['COL_COLL_MODIFY_TIME'][$i],
+                        $que_result['COL_COLL_CREATE_TIME'][$i],
+                        $que_result['COL_COLL_ID'][$i],
+                        $que_result['COL_COLL_COMMENTS'][$i]
+                    );
+                }
+            }
+            return $ret_val;
+        }
+    }
+
+    /**
+     * Get children file of input direcotory path string
+     * @param string $dir input direcotory path string
+     * @return an array of string, each string is the name of a child file.  This fuction return empty array, if there is no child direcotry found.
+     */
+    public function getChildFile($dir, $startingInx = 0, $maxresults = 500,
+                                 &$total_num_rows = -1)
+    {
+        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dir));
+        $que_result = $this->genQuery(array("COL_DATA_NAME"), $cond, array(),
+            $startingInx, $maxresults, true, array(), 0, $total_num_rows);
+
+        if (false === $que_result) {
+            return array();
+        } else {
+            return array_values($que_result["COL_DATA_NAME"]);
+        }
+    }
+
+    /**
+     * Get children file, with basic stats, of input direcotory path string
+     * The stats
+     * @param string $dir input direcotory path string
+     * @param $orderby An associated array specifying how to sort the result by attributes. Each array key is the attribute, array val is 0 (assendent) or 1 (dessendent). The supported attributes are "name", "size", "owner", "mtime".
+     * @return an array of RODSFileStats
+     */
+    public function getChildFileWithStats($dir, array $orderby = array(),
+                                          $startingInx = 0, $maxresults = 500, &$total_num_rows = -1)
+    {
+        // set selected value
+        $select_val = array("COL_DATA_NAME", "COL_D_DATA_ID", "COL_DATA_TYPE_NAME",
+            "COL_D_RESC_NAME", "COL_DATA_SIZE", "COL_D_OWNER_NAME",
+            "COL_D_CREATE_TIME", "COL_D_MODIFY_TIME");
+        $select_attr = array();
+
+        // set order by
+        if (!empty($orderby)) {
+            $select_attr = array_fill(0, count($select_val), 1);
+            foreach ($orderby as $key => $val) {
+                if ($key == "name") {
+                    if ($val == 0) $select_attr[0] = ORDER_BY;
+                    else $select_attr[0] = ORDER_BY_DESC;
+                } else
+                    if ($key == "size") {
+                        if ($val == 0) $select_attr[4] = ORDER_BY;
+                        else $select_attr[4] = ORDER_BY_DESC;
+                    } else
+                        if ($key == "owner") {
+                            if ($val == 0) $select_attr[5] = ORDER_BY;
+                            else $select_attr[5] = ORDER_BY_DESC;
+                        } else
+                            if ($key == "mtime") {
+                                if ($val == 0) $select_attr[7] = ORDER_BY;
+                                else $select_attr[7] = ORDER_BY_DESC;
+                            }
+            }
+        }
+
+        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dir));
+        $continueInx = 0;
+        $que_result = $this->genQuery($select_val, $cond,
+            array(), $startingInx, $maxresults, true,
+            $select_attr, $continueInx, $total_num_rows);
+
+
+        if (false === $que_result) {
+            return array();
+        } else {
+            $ret_val = array();
+            for ($i = 0; $i < count($que_result['COL_D_DATA_ID']); $i++) {
+                $ret_val[] = new RODSFileStats(
+                    $que_result['COL_DATA_NAME'][$i],
+                    $que_result['COL_DATA_SIZE'][$i],
+                    $que_result['COL_D_OWNER_NAME'][$i],
+                    $que_result['COL_D_MODIFY_TIME'][$i],
+                    $que_result['COL_D_CREATE_TIME'][$i],
+                    $que_result['COL_D_DATA_ID'][$i],
+                    $que_result['COL_DATA_TYPE_NAME'][$i],
+                    $que_result['COL_D_RESC_NAME'][$i]
+                );
+            }
+            return $ret_val;
+        }
+    }
+
+    /**
+     * Get basic stats, of input dir path string
+     * @param string $dirpath input dir path string
+     * @return RODSDirStats. If dir does not exists, return fales.
+     */
+    public function getDirStats($dirpath)
+    {
+        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dirpath));
+
+        $que_result = $this->genQuery(
+            array("COL_COLL_NAME", "COL_COLL_ID", "COL_COLL_OWNER_NAME",
+                "COL_COLL_OWNER_ZONE", "COL_COLL_CREATE_TIME", "COL_COLL_MODIFY_TIME",
+                "COL_COLL_COMMENTS"),
+            $cond, array(), 0, 1, false);
+        if ($que_result === false) return false;
+
+        $stats = new RODSDirStats(
+            basename($que_result['COL_COLL_NAME'][0]),
+            $que_result['COL_COLL_OWNER_NAME'][0],
+            $que_result['COL_COLL_OWNER_ZONE'][0],
+            $que_result['COL_COLL_MODIFY_TIME'][0],
+            $que_result['COL_COLL_CREATE_TIME'][0],
+            $que_result['COL_COLL_ID'][0],
+            $que_result['COL_COLL_COMMENTS'][0]
+        );
+        return $stats;
+    }
+
+    /**
+     * Get basic stats, of input file path string
+     * @param string $filepath input file path string
+     * @return RODSFileStats. If file does not exists, return fales.
+     */
+    public function getFileStats($filepath)
+    {
+        $parent = dirname($filepath);
+        $filename = basename($filepath);
+
+        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
+            new RODSQueryCondition("COL_DATA_NAME", $filename));
+
+        $que_result = $this->genQuery(
+            array("COL_DATA_NAME", "COL_D_DATA_ID", "COL_DATA_TYPE_NAME",
+                "COL_D_RESC_NAME", "COL_DATA_SIZE", "COL_D_OWNER_NAME", "COL_D_OWNER_ZONE",
+                "COL_D_CREATE_TIME",
+                "COL_D_MODIFY_TIME", "COL_D_COMMENTS"),
+            $cond, array(), 0, 1, false);
+        if ($que_result === false) return false;
+
+        $stats = new RODSFileStats(
+            $que_result['COL_DATA_NAME'][0],
+            $que_result['COL_DATA_SIZE'][0],
+            $que_result['COL_D_OWNER_NAME'][0],
+            $que_result['COL_D_OWNER_ZONE'][0],
+            $que_result['COL_D_MODIFY_TIME'][0],
+            $que_result['COL_D_CREATE_TIME'][0],
+            $que_result['COL_D_DATA_ID'][0],
+            $que_result['COL_DATA_TYPE_NAME'][0],
+            $que_result['COL_D_RESC_NAME'][0],
+            $que_result['COL_D_COMMENTS'][0]);
+        return $stats;
+    }
+
+    /**
+     * Check whether a directory (in string) exists on RODS server.
+     * @return true/false
+     */
+    public function dirExists($dir)
+    {
+        $cond = array(new RODSQueryCondition("COL_COLL_NAME", $dir));
+        $que_result = $this->genQuery(array("COL_COLL_ID"), $cond);
+
+        if ($que_result === false)
+            return false;
+        else
+            return true;
+    }
+
+    /**
+     * Check whether a file (in string) exists on RODS server.
+     * @return true/false
+     */
+    public function fileExists($filepath, $rescname = NULL)
+    {
+        $parent = dirname($filepath);
+        $filename = basename($filepath);
+        if (empty($rescname)) {
+            $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
+                new RODSQueryCondition("COL_DATA_NAME", $filename));
+            $que_result = $this->genQuery(array("COL_D_DATA_ID"), $cond);
+        } else {
+            $cond = array(new RODSQueryCondition("COL_COLL_NAME", $parent),
+                new RODSQueryCondition("COL_DATA_NAME", $filename),
+                new RODSQueryCondition("COL_D_RESC_NAME", $rescname));
+            $que_result = $this->genQuery(array("COL_D_DATA_ID"), $cond);
+        }
+
+        if ($que_result === false)
+            return false;
+        else
+            return true;
+    }
+
+    /**
+     * Replicate file to resources with options.
+     * @param string $path_src full path for the source file
+     * @param string $desc_resc destination resource
+     * @param array $options an assosive array of options:
+     *   - 'all'        (boolean): only meaningful if input resource is a resource group. Replicate to all the resources in the resource group.
+     *   - 'backupMode' (boolean): if a good copy already exists in this resource, don't make another copy.
+     *   - 'admin'      (boolean): admin user uses this option to backup/replicate other users files
+     *   - 'replNum'    (integer): the replica to copy, typically not needed
+     *   - 'srcResc'    (string): specifies the source resource of the data object to be replicate, only copies stored in this resource will be replicated. Otherwise, one of the copy will be replicated
+     * These options are all 'optional', if omitted, the server will try to do it anyway
+     * @return number of bytes written if success, in case of faliure, throw an exception
+     */
+    public function repl($path_src, $desc_resc, array $options = array())
+    {
+        require_once(dirname(__FILE__) . "/RODSObjIOOpr.inc.php");
+        require_once(dirname(__FILE__) . "/RodsGenQueryKeyWd.inc.php");
+
+        $optype = REPLICATE_OPR;
+
+        $opt_arr = array();
+        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['DEST_RESC_NAME_KW']] = $desc_resc;
+        foreach ($options as $option_key => $option_val) {
+            switch ($option_key) {
+                case 'all':
+                    if ($option_val === true)
+                        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['ALL_KW']] = '';
+                    break;
+
+                case 'admin':
+                    if ($option_val === true)
+                        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['IRODS_ADMIN_KW']] = '';
+                    break;
+
+                case 'replNum':
+                    $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']['REPL_NUM_KW']] = $option_val;
+                    break;
+
+                case 'backupMode':
+                    if ($option_val === true)
+                        $opt_arr[$GLOBALS['PRODS_GENQUE_KEYWD']
+                        ['BACKUP_RESC_NAME_KW']] = $desc_resc;
+                    break;
+
+                default:
+                    throw new RODSException("Option '$option_key'=>'$option_val' is not supported",
+                        'PERR_USER_INPUT_ERROR');
+            }
+        }
+
+        $keyvalpair = new RP_KeyValPair();
+        $keyvalpair->fromAssocArray($opt_arr);
+
+        $inp_pk = new RP_DataObjInp($path_src, 0, 0, 0, 0, 0, $optype, $keyvalpair);
+
+        $msg = new RODSMessage("RODS_API_REQ_T", $inp_pk,
+            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_REPL_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::repl has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+
+        $retpk = $msg->getBody();
+        return $retpk->bytesWritten;
+    }
+
+    /**
+     * Rename path_src to path_dest.
+     * @param string $path_src
+     * @param string $path_dest
+     * @param integer $path_type if 0, then path type is file, if 1, then path type if directory
+     * @return true/false
+     */
+    public function rename($path_src, $path_dest, $path_type)
+    {
+        require_once(dirname(__FILE__) . "/RODSObjIOOpr.inc.php");
+
+        if ($path_type === 0) {
+            $path_type_magic_num = RENAME_DATA_OBJ;
+        } else {
+            $path_type_magic_num = RENAME_COLL;
+        }
+        $src_pk = new RP_DataObjInp($path_src, 0, 0, 0, 0, 0, $path_type_magic_num);
+        $dest_pk = new RP_DataObjInp($path_dest, 0, 0, 0, 0, 0, $path_type_magic_num);
+        $inp_pk = new RP_DataObjCopyInp($src_pk, $dest_pk);
+        $msg = new RODSMessage("RODS_API_REQ_T", $inp_pk,
+            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_RENAME_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::rename has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    /**
+     * Open a file path (string) exists on RODS server.
+     *
+     * @param string $path file path
+     * @param string $mode open mode. Supported modes are:
+     *   'r'     Open for reading only; place the file pointer at the beginning of the file.
+     *   'r+'    Open for reading and writing; place the file pointer at the beginning of the file.
+     *   'w'    Open for writing only; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
+     *   'w+'    Open for reading and writing; place the file pointer at the beginning of the file and truncate the file to zero length. If the file does not exist, attempt to create it.
+     *   'a'    Open for writing only; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
+     *   'a+'    Open for reading and writing; place the file pointer at the end of the file. If the file does not exist, attempt to create it.
+     *   'x'    Create and open for writing only; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
+     *   'x+'    Create and open for reading and writing; place the file pointer at the beginning of the file. If the file already exists, the fopen() call will fail by returning FALSE and generating an error of level E_WARNING. If the file does not exist, attempt to create it. This is equivalent to specifying O_EXCL|O_CREAT flags for the underlying open(2) system call.
+     * @param postion updated position
+     * @param string $rescname. Note that this parameter is required only if the file does not exists (create mode). If the file already exists, and if file resource is unknown or unique or you-dont-care for that file, leave the field, or pass NULL.
+     * @param boolean $assum_file_exists. This parameter specifies whether file exists. If the value is false, this mothod will check with RODS server to make sure. If value is true, the check will NOT be done. Default value is false.
+     * @param string $filetype. This parameter only make sense when you want to specify the file type, if file does not exists (create mode). If not specified, it defaults to "generic"
+     * @param integer $cmode. This parameter is only used for "createmode". It specifies the file mode on physical storage system (RODS vault), in octal 4 digit format. For instance, 0644 is owner readable/writeable, and nothing else. 0777 is all readable, writable, and excutable. If not specified, and the open flag requirs create mode, it defaults to 0644.
+     * @return integer level 1 descriptor
+     */
+    public function openFileDesc($path, $mode, &$position, $rescname = NULL,
+                                 $assum_file_exists = false, $filetype = 'generic', $cmode = 0644)
+    {
+        $create_if_not_exists = false;
+        $error_if_exists = false;
+        $seek_to_end_of_file = false;
+        $position = 0;
+
+        switch ($mode) {
+            case 'r':
+                $open_flag = O_RDONLY;
+                break;
+            case 'r+':
+                $open_flag = O_RDWR;
+                break;
+            case 'w':
+                $open_flag = O_WRONLY|O_TRUNC;
+                $create_if_not_exists = true;
+                break;
+            case 'w+':
+                $open_flag = O_RDWR|O_TRUNC;
+                $create_if_not_exists = true;
+                break;
+            case 'a':
+                $open_flag = O_WRONLY;
+                $create_if_not_exists = true;
+                $seek_to_end_of_file = true;
+                break;
+            case 'a+':
+                $open_flag = O_RDWR;
+                $create_if_not_exists = true;
+                $seek_to_end_of_file = true;
+                break;
+            case 'x':
+                $open_flag = O_WRONLY;
+                $create_if_not_exists = true;
+                $error_if_exists = true;
+                break;
+            case 'x+':
+                $open_flag = O_RDWR;
+                $create_if_not_exists = true;
+                $error_if_exists = true;
+                break;
+            default:
+                throw new RODSException("RODSConn::openFileDesc() does not recognize input mode:'$mode' ",
+                    "PERR_USER_INPUT_ERROR");
+        }
+
+        if ($assum_file_exists === true)
+            $file_exists = true;
+        else
+            $file_exists = $this->fileExists($path, $rescname);
+
+        if (($error_if_exists) && ($file_exists === true)) {
+            throw new RODSException("RODSConn::openFileDesc() expect file '$path' dose not exists with mode '$mode', but the file does exists",
+                "PERR_USER_INPUT_ERROR");
+        }
+
+
+        if (($create_if_not_exists) && ($file_exists === false)) // create new file
+        {
+            $keyValPair_pk = new RP_KeyValPair(2, array("rescName", "dataType"),
+                array("$rescname", "$filetype"));
+            $dataObjInp_pk = new RP_DataObjInp($path, $cmode, $open_flag, 0, -1, 0, 0,
+                $keyValPair_pk);
+            $api_num = $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_CREATE_AN'];
+        } else // open existing file
+        {
+            // open the file and get descriptor
+            if (isset($rescname)) {
+                $keyValPair_pk = new RP_KeyValPair(1, array("rescName"),
+                    array("$rescname"));
+                $dataObjInp_pk = new RP_DataObjInp
+                ($path, 0, $open_flag, 0, -1, 0, 0, $keyValPair_pk);
+            } else {
+                $dataObjInp_pk = new RP_DataObjInp
+                ($path, 0, $open_flag, 0, -1, 0, 0);
+            }
+            $api_num = $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_OPEN_AN'];
+        }
+
+        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjInp_pk, $api_num);
+        fwrite($this->conn, $msg->pack()); // send it
+        // get value back
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
+                throw new RODSException("trying to open a file '$path' " .
+                        "which does not exists with mode '$mode' ",
+                    "PERR_USER_INPUT_ERROR");
+            }
+            throw new RODSException("RODSConn::openFileDesc has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+        $l1desc = $intInfo;
+
+        if ($seek_to_end_of_file === true) {
+            $position = $this->fileSeek($l1desc, 0, SEEK_END);
+        }
+
+        return $l1desc;
+    }
+
+    /**
+     * unlink the file on server
+     * @param string $path path of the file
+     * @param string $rescname resource name. Not required if there is no other replica.
+     * @param boolean $force flag (true or false) indicating whether force delete or not.
+     *
+     */
+    public function fileUnlink($path, $rescname = NULL, $force = false)
+    {
+        $options = array();
+        if (isset($rescname)) {
+            $options['rescName'] = $rescname;
+        }
+        if ($force == true) {
+            $options['forceFlag'] = "";
+        }
+
+        if (!empty($options)) {
+            $options_pk = new RP_KeyValPair();
+            $options_pk->fromAssocArray($options);
+            $dataObjInp_pk = new RP_DataObjInp
+            ($path, 0, 0, 0, -1, 0, 0, $options_pk);
+        } else {
+            $dataObjInp_pk = new RP_DataObjInp
+            ($path, 0, 0, 0, -1, 0, 0);
+        }
+
+        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjInp_pk,
+            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_UNLINK_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        // get value back
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
+                throw new RODSException("trying to unlink a file '$path' " .
+                        "which does not exists",
+                    "PERR_USER_INPUT_ERROR");
+            }
+            throw new RODSException("RODSConn::fileUnlink has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    /**
+     * close the input file descriptor on RODS server.
+     *
+     * @param int $l1desc level 1 file descriptor
+     */
+    public function closeFileDesc($l1desc)
+    {
+        try {
+            $dataObjCloseInp_pk = new RP_dataObjCloseInp($l1desc);
+            $msg = new RODSMessage("RODS_API_REQ_T", $dataObjCloseInp_pk,
+                $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_CLOSE_AN']);
+            fwrite($this->conn, $msg->pack()); // send it
+            // get value back
+            $msg = new RODSMessage();
+            $intInfo = (int)$msg->unpack($this->conn);
+            if ($intInfo < 0) {
+                trigger_error("Got an error from server:$intInfo",
+                    E_USER_WARNING);
+            }
+        } catch (RODSException $e) {
+            trigger_error("Got an exception:$e", E_USER_WARNING);
+        }
+    }
+
+    /**
+     * reads up to length bytes from the file pointer referenced by handle. Reading stops when up to length bytes have been read, EOF (end of file) is reached
+     *
+     * @param int $l1desc level 1 file descriptor
+     * @param int $length up to how many bytes to read.
+     * @return the read string.
+     */
+    public function fileRead($l1desc, $length)
+    {
+        $dataObjReadInp_pk = new RP_dataObjReadInp($l1desc, $length);
+        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjReadInp_pk,
+            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_READ_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::fileRead has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+        return $msg->getBinstr();
+    }
+
+    /**
+     * writes up to length bytes from the file pointer referenced by handle. returns number of bytes writtne.
+     *
+     * @param int $l1desc level 1 file descriptor
+     * @param string $string contents (binary safe) to be written
+     * @param int $length up to how many bytes to read.
+     * @return the number of bytes written.
+     */
+    public function fileWrite($l1desc, $string, $length = NULL)
+    {
+        if (!isset($length))
+            $length = strlen($string);
+
+        $dataObjWriteInp_pk = new RP_dataObjWriteInp($l1desc, $length);
+        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjWriteInp_pk,
+            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_WRITE_AN'], $string);
+        fwrite($this->conn, $msg->pack()); // send header and body msg
+        fwrite($this->conn, $string); // send contents
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::fileWrite has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+        return $intInfo;
+    }
+
+    /**
+     *  Sets the file position indicator for the file referenced by l1desc (int descriptor). The new position, measured in bytes from the beginning of the file, is obtained by adding offset to the position specified by whence, whose values are defined as follows:
+     *  SEEK_SET - Set position equal to offset bytes.
+     *  SEEK_CUR - Set position to current location plus offset.
+     *  SEEK_END - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
+     *  If whence is not specified, it is assumed to be SEEK_SET.
+     * @return int the current offset
+     */
+    public function fileSeek($l1desc, $offset, $whence = SEEK_SET)
+    {
+        $dataObjReadInp_pk = new RP_fileLseekInp($l1desc, $offset, $whence);
+        $msg = new RODSMessage("RODS_API_REQ_T", $dataObjReadInp_pk,
+            $GLOBALS['PRODS_API_NUMS']['DATA_OBJ_LSEEK_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::fileSeek has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+        $retpk = $msg->getBody();
+        return $retpk->offset;
+    }
+
+    /**
+     * Get metadata for a file, dir, resource or user
+     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
+     * @param string $name name of the target object. in the case of file and dir, use its full path
+     * @return RODSMeta $meta meta data for the target.
+     */
+    public function getMeta($pathtype, $name)
+    {
+        switch ($pathtype) {
+            case 'd':
+                $select = array("COL_META_DATA_ATTR_NAME", "COL_META_DATA_ATTR_VALUE",
+                    "COL_META_DATA_ATTR_UNITS", 'COL_META_DATA_ATTR_ID');
+                $condition = array(
+                    new RODSQueryCondition("COL_COLL_NAME", dirname($name)),
+                    new RODSQueryCondition("COL_DATA_NAME", basename($name))
+                );
+                break;
+            case 'c':
+                $select = array("COL_META_COLL_ATTR_NAME", "COL_META_COLL_ATTR_VALUE",
+                    "COL_META_COLL_ATTR_UNITS", 'COL_META_COLL_ATTR_ID');
+                $condition = array(new RODSQueryCondition("COL_COLL_NAME", $name));
+                break;
+            case 'r':
+                $select = array("COL_META_RESC_ATTR_NAME", "COL_META_RESC_ATTR_VALUE",
+                    "COL_META_RESC_ATTR_UNITS", 'COL_META_RESC_ATTR_ID');
+                $condition = array(new RODSQueryCondition("COL_R_RESC_NAME", $name));
+                break;
+            case 'u':
+                $select = array("COL_META_USER_ATTR_NAME", "COL_META_USER_ATTR_VALUE",
+                    "COL_META_USER_ATTR_UNITS", 'COL_META_USER_ATTR_ID');
+                $condition = array(new RODSQueryCondition("COL_USER_NAME", $name));
+                break;
+            default:
+                throw new RODSException("RODSConn::getMeta pathtype '$pathtype' is not supported!",
+                    'PERR_USER_INPUT_ERROR');
+        }
+
+        $genque_result = $this->genQuery($select, $condition);
+
+        if ($genque_result === false) {
+            return array();
+        }
+        $ret_array = array();
+        for ($i = 0; $i < count($genque_result[$select[0]]); $i++) {
+            $ret_array[$i] = new RODSMeta(
+                $genque_result[$select[0]][$i],
+                $genque_result[$select[1]][$i],
+                $genque_result[$select[2]][$i],
+                $genque_result[$select[3]][$i]
+            );
+
+        }
+        return $ret_array;
+
+    }
+
+    /**
+     * Add metadata to a file, dir, resource or user
+     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
+     * @param string $name name of the target object. in the case of file and dir, use its full path
+     * @param RODSMeta $meta meta data to be added.
+     */
+    public function addMeta($pathtype, $name, RODSMeta $meta)
+    {
+        $pkt = new RP_ModAVUMetadataInp("add", "-$pathtype", $name, $meta->name,
+            $meta->value, $meta->units);
+        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
+            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::addMeta has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    /**
+     * remove metadata to a file, dir, resource or user
+     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
+     * @param string $name name of the target object. in the case of file and dir, use its full path
+     * @param RODSMeta $meta meta data to be removed.
+     */
+    public function rmMeta($pathtype, $name, RODSMeta $meta)
+    {
+        $pkt = new RP_ModAVUMetadataInp("rm", "-$pathtype", $name, $meta->name,
+            $meta->value, $meta->units);
+        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
+            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::rmMeta has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    /**
+     * remove metadata to a file, dir, resource or user
+     * @param char $pathtype 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
+     * @param string $name name of the target object. in the case of file and dir, use its full path
+     * @param integer $metaid id of the metadata to be removed.
+     */
+    public function rmMetaByID($pathtype, $name, $metaid)
+    {
+        $pkt = new RP_ModAVUMetadataInp("rmi", "-$pathtype", $name, $metaid);
+        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
+            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            if (RODSException::rodsErrCodeToAbbr($intInfo) != 'CAT_SUCCESS_BUT_WITH_NO_INFO') {
+                throw new RODSException("RODSConn::rmMetaByID has got an error from the server",
+                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+            }
+        }
+    }
+
+    /**
+     * copy metadata between file, dir, resource or user
+     * @param char $pathtype_src source path type 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
+     * @param char $pathtype_dest destination path type 'd'=file, 'c'=dir, 'r'=resource, 'u'=user
+     * @param string $name_src name of the source target object. in the case of file and dir, use its full path
+     * @param string $name_dest name of the destination target object. in the case of file and dir, use its full path
+     */
+    public function cpMeta($pathtype_src, $pathtype_dest, $name_src, $name_dest)
+    {
+        $pkt = new RP_ModAVUMetadataInp("cp", "-$pathtype_src",
+            "-$pathtype_dest", $name_src, $name_dest);
+        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
+            $GLOBALS['PRODS_API_NUMS']['MOD_AVU_METADATA_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $msg = new RODSMessage();
+        $intInfo = (int)$msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::cpMeta has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+    }
+
+    /**
+     * Excute a user defined rule
+     * @param string $rule_body body of the rule. Read this tutorial for details about rules: http://www.irods.org/index.php/Executing_user_defined_rules/workflow
+     * @param array $inp_params associative array defining input parameter for micro services used in this rule. only string and keyval pair are supported at this time. If the array value is a string, then type is string, if the array value is an RODSKeyValPair object, it will be treated a keyval pair
+     * @param array $out_params an array of names (strings)
+     * @param array $remotesvr if this rule need to run at remote server, this associative array should have the following keys:
+     *    - 'host' remote host name or address
+     *    - 'port' remote port
+     *    - 'zone' remote zone
+     *    if any of the value is empty, this option will be ignored.
+     * @param RODSKeyValPair $options an RODSKeyValPair specifying additional options, purpose of this is unknown at the developement time. Leave it alone if you are as clueless as me...
+     * @return an associative array. Each array key is the lable, and each array value's type will depend on the type of $out_param, at this moment, only string and RODSKeyValPair are supported
+     */
+    public function execUserRule($rule_body,
+                                 array $inp_params = array(), array $out_params = array(),
+                                 array $remotesvr = array(), RODSKeyValPair $options = null)
+    {
+        $inp_params_packets = array();
+        foreach ($inp_params as $inp_param_key => $inp_param_val) {
+            if (is_a($inp_param_val, 'RODSKeyValPair')) {
+                $inp_params_packets[] = new RP_MsParam($inp_param_key,
+                    $inp_param_val->makePacket());
+            } else // a string
+            {
+                $inp_params_packets[] = new RP_MsParam($inp_param_key,
+                    new RP_STR($inp_param_val));
+            }
+        }
+        $inp_param_arr_packet = new RP_MsParamArray($inp_params_packets);
+
+        $out_params_desc = implode('%', $out_params);
+
+        if ((isset($remotesvr['host'])) && (isset($remotesvr['port'])) &&
+            (isset($remotesvr['zone']))
+        ) {
+            $remotesvr_packet = new RP_RHostAddr($remotesvr['host'],
+                $remotesvr['zone'], $remotesvr['port']);
+        } else {
+            $remotesvr_packet = new RP_RHostAddr();
+        }
+
+        if (!isset($options))
+            $options = new RODSKeyValPair();
+
+        $options_packet = $options->makePacket();
+
+        $pkt = new RP_ExecMyRuleInp($rule_body, $remotesvr_packet,
+            $options_packet, $out_params_desc, $inp_param_arr_packet);
+        $msg = new RODSMessage("RODS_API_REQ_T", $pkt,
+            $GLOBALS['PRODS_API_NUMS']['EXEC_MY_RULE_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        $resv_msg = new RODSMessage();
+        $intInfo = (int)$resv_msg->unpack($this->conn);
+        if ($intInfo < 0) {
+            throw new RODSException("RODSConn::execUserRule has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+        $retpk = $resv_msg->getBody();
+        $param_array = $retpk->MsParam_PI;
+        $ret_arr = array();
+        foreach ($param_array as $param) {
+            if ($param->type == 'STR_PI') {
+                $label = $param->label;
+                $ret_arr["$label"] = $param->STR_PI->myStr;
+            } else
+                if ($param->type == 'KeyValPair_PI') {
+                    $label = $param->label;
+                    $ret_arr["$label"] = RODSKeyValPair::fromPacket($param->KeyValPair_PI);
+                } else
+                    if ($param->type == 'ExecCmdOut_PI') {
+                        $label = $param->label;
+                        $exec_ret_val = $param->ExecCmdOut_PI->buf;
+                        $ret_arr["$label"] = $exec_ret_val;
+                    } else {
+                        throw new RODSException("RODSConn::execUserRule got. " .
+                                "an unexpected output param with type: '$param->type' \n",
+                            "PERR_UNEXPECTED_PACKET_FORMAT");
+                    }
+        }
+        return $ret_arr;
+    }
+
+    /**
+     * This function is depreciated, and kept only for lagacy reasons!
+     * Makes a general query to RODS server. Think it as an SQL. "select foo from sometab where bar = '3'". In this example, foo is specified by "$select", bar and "= '3'" are speficed by condition.
+     * @param array $select the fields (names) to be returned/interested. There can not be more than 50 input fields. For example:"COL_COLL_NAME" means collection-name.
+     * @param array $condition  Array of RODSQueryCondition. All fields are defined in RodsGenQueryNum.inc.php
+     * @param array $condition_kw  Array of RODSQueryCondition. All fields are defined in RodsGenQueryKeyWd.inc.php
+     * @param integer $startingInx result start from which row.
+     * @param integer $maxresult up to how man rows should the result contain.
+     * @param boolean $getallrows whether to retreive all results
+     * @param boolean $select_attr attributes (array of int) of each select value. For instance, the attribute can be ORDER_BY (0x400) or ORDER_BY_DESC (0x800) to have the results sorted on the server. The default value is 1 for each attribute. Pass empty array or leave the option if you don't want anything fancy.
+     * @param integer $continueInx This index can be used to retrieve rest of results, when there is a overflow of the rows (> 500)
+     * @return an associated array, keys are the returning field names, each value is an array of the field values. Also, it returns false (boolean), if no rows are found.
+     * Note: This function is very low level. It's not recommended for beginners.
+     */
+    public function genQuery(array $select, array $condition = array(),
+                             array $condition_kw = array(), $startingInx = 0, $maxresults = 500,
+                             $getallrows = true, array $select_attr = array(), &$continueInx = 0,
+                             &$total_num_rows = -1)
+    {
+        if (count($select) > 50) {
+            trigger_error("genQuery(): Only upto 50 input are supported, rest ignored",
+                E_USER_WARNING);
+            $select = array_slice($select, 0, 50);
+        }
+
+        $GenQueInp_options = 0;
+        if ($total_num_rows != -1) {
+            $GenQueInp_options = 1;
+        }
+
+        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
+        require_once("RodsGenQueryKeyWd.inc.php"); //load magic numbers
+
+        // contruct select packet (RP_InxIvalPair $selectInp)
+        $select_pk = NULL;
+        if (count($select) > 0) {
+            if (empty($select_attr))
+                $select_attr = array_fill(0, count($select), 1);
+            $idx = array();
+            foreach ($select as $selval) {
+                if (isset($GLOBALS['PRODS_GENQUE_NUMS']["$selval"]))
+                    $idx[] = $GLOBALS['PRODS_GENQUE_NUMS']["$selval"];
+                else
+                    trigger_error("genQuery(): select val '$selval' is not support, ignored",
+                        E_USER_WARNING);
+            }
+
+            $select_pk = new RP_InxIvalPair(count($select), $idx, $select_attr);
+        } else {
+            $select_pk = new RP_InxIvalPair();
+        }
+
+        foreach ($condition_kw as &$cond_kw) {
+            if (isset($GLOBALS['PRODS_GENQUE_KEYWD'][$cond_kw->name]))
+                $cond_kw->name = $GLOBALS['PRODS_GENQUE_KEYWD'][$cond_kw->name];
+        }
+
+        foreach ($condition as &$cond) {
+            if (isset($GLOBALS['PRODS_GENQUE_NUMS'][$cond->name]))
+                $cond->name = $GLOBALS['PRODS_GENQUE_NUMS'][$cond->name];
+        }
+
+        $condInput = new RP_KeyValPair();
+        $condInput->fromRODSQueryConditionArray($condition_kw);
+
+        $sqlCondInp = new RP_InxValPair();
+        $sqlCondInp->fromRODSQueryConditionArray($condition);
+
+        // construct RP_GenQueryInp packet
+        $genque_input_pk = new RP_GenQueryInp($maxresults, $continueInx, $condInput,
+            $select_pk, $sqlCondInp, $GenQueInp_options, $startingInx);
+
+        // contruce a new API request message, with type GEN_QUERY_AN
+        $msg = new RODSMessage("RODS_API_REQ_T", $genque_input_pk,
+            $GLOBALS['PRODS_API_NUMS']['GEN_QUERY_AN']);
+        fwrite($this->conn, $msg->pack()); // send it
+        // get value back
+        $msg_resv = new RODSMessage();
+        $intInfo = $msg_resv->unpack($this->conn);
+        if ($intInfo < 0) {
+            if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
+                return false;
+            }
+
+            throw new RODSException("RODSConn::genQuery has got an error from the server",
+                $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+        }
+        $genque_result_pk = $msg_resv->getBody();
+
+        $result_arr = array();
+        for ($i = 0; $i < $genque_result_pk->attriCnt; $i++) {
+            $sql_res_pk = $genque_result_pk->SqlResult_PI[$i];
+            $attri_name = $GLOBALS['PRODS_GENQUE_NUMS_REV'][$sql_res_pk->attriInx];
+            $result_arr["$attri_name"] = $sql_res_pk->value;
+        }
+        if ($total_num_rows != -1)
+            $total_num_rows = $genque_result_pk->totalRowCount;
+
+
+        $more_results = true;
+        // if there are more results to be fetched
+        while (($genque_result_pk->continueInx > 0) && ($more_results === true)
+            && ($getallrows === true)) {
+            $msg->getBody()->continueInx = $genque_result_pk->continueInx;
+            fwrite($this->conn, $msg->pack()); // re-send it with new continueInx
+            // get value back
+            $msg_resv = new RODSMessage();
+            $intInfo = $msg_resv->unpack($this->conn);
+            if ($intInfo < 0) {
+                if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
+                    $more_results = false;
+                    break;
+                } else
+                    throw new RODSException("RODSConn::genQuery has got an error from the server",
+                        $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+            }
+            $genque_result_pk = $msg_resv->getBody();
+
+            for ($i = 0; $i < $genque_result_pk->attriCnt; $i++) {
+                $sql_res_pk = $genque_result_pk->SqlResult_PI[$i];
+                $attri_name = $GLOBALS['PRODS_GENQUE_NUMS_REV'][$sql_res_pk->attriInx];
+                $result_arr["$attri_name"] =
+                    array_merge($result_arr["$attri_name"], $sql_res_pk->value);
+            }
+        }
+        
+         // Make sure and close the query if there are any results left.
+    if ($genque_result_pk->continueInx > 0) 
+    {
+      $msg->getBody()->continueInx=$genque_result_pk->continueInx;
+      $msg->getBody()->maxRows=-1;  // tells the server to close the query
+      fwrite($this->conn, $msg->pack());
+      $msg_resv=new RODSMessage();
+      $intInfo=$msg_resv->unpack($this->conn);
+      if ($intInfo<0)
+      {
+        throw new RODSException("RODSConn::genQuery has got an error from the server",
+          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+      }
+    }
+
+        return $result_arr;
+    }
+
+    /**
+     * Makes a general query to RODS server. Think it as an SQL. "select foo from sometab where bar = '3'". In this example, foo is specified by "$select", bar and "= '3'" are speficed by condition.
+     * @param RODSGenQueSelFlds $select the fields (names) to be returned/interested. There can not be more than 50 input fields. For example:"COL_COLL_NAME" means collection-name.
+     * @param RODSGenQueConds $condition  All fields are defined in RodsGenQueryNum.inc.php and RodsGenQueryKeyWd.inc.php
+     * @param integer $start result start from which row.
+     * @param integer $limit up to how many rows should the result contain. If -1 is passed, all available rows will be returned
+     * @return RODSGenQueResults
+     * Note: This function is very low level. It's not recommended for beginners.
+     */
+    public function query(RODSGenQueSelFlds $select, RODSGenQueConds $condition,
+                          $start = 0, $limit = -1)
+    {
+        if (($select->getCount() < 1) || ($select->getCount() > 50)) {
+            throw new RODSException("Only 1-50 fields are supported",
+                'PERR_USER_INPUT_ERROR');
+        }
+
+        // contruct select packet (RP_InxIvalPair $selectInp), and condition packets
+        $select_pk = $select->packetize();
+        $cond_pk = $condition->packetize();
+        $condkw_pk = $condition->packetizeKW();
+
+        // determin max number of results per query
+            if (($limit > 0) && ($limit < 500))
+                $max_result_per_query = $limit;
+            else
+                $max_result_per_query = 500;
+
+        $num_fetched_rows = 0;
+        $continueInx = 0;
+        $results = new RODSGenQueResults();
+        do {
+            // construct RP_GenQueryInp packet
+            $options = 1 | $GLOBALS['PRODS_GENQUE_NUMS']['RETURN_TOTAL_ROW_COUNT'];
+            $genque_input_pk = new RP_GenQueryInp($max_result_per_query,
+                $continueInx, $condkw_pk, $select_pk, $cond_pk, $options, $start);
+
+            // contruce a new API request message, with type GEN_QUERY_AN
+            $msg = new RODSMessage("RODS_API_REQ_T", $genque_input_pk,
+                $GLOBALS['PRODS_API_NUMS']['GEN_QUERY_AN']);
+            fwrite($this->conn, $msg->pack()); // send it
+            // get value back
+            $msg_resv = new RODSMessage();
+            $intInfo = $msg_resv->unpack($this->conn);
+            if ($intInfo < 0) {
+                if (RODSException::rodsErrCodeToAbbr($intInfo) == 'CAT_NO_ROWS_FOUND') {
+                    break;
+                }
+
+                throw new RODSException("RODSConn::query has got an error from the server",
+                    $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+            }
+            $genque_result_pk = $msg_resv->getBody();
+            $num_row_added = $results->addResults($genque_result_pk);
+            $continueInx = $genque_result_pk->continueInx;
+            $start = $start + $results->getNumRow();
+        } while (($continueInx > 0) &&
+            (($results->getNumRow() < $limit) || ($limit < 0)));
+    
+
+        // Make sure and close the query if there are any results left.
+    if ($continueInx > 0) 
+    {
+      $msg->getBody()->continueInx=$continueInx;
+      $msg->getBody()->maxRows=-1;  // tells the server to close the query
+      fwrite($this->conn, $msg->pack());
+      $msg_resv=new RODSMessage();
+      $intInfo=$msg_resv->unpack($this->conn);
+      if ($intInfo<0)
+      {
+        throw new RODSException("RODSConn::query has got an error from the server",
+          $GLOBALS['PRODS_ERR_CODES_REV']["$intInfo"]);
+      }
+    }
+        
+        return $results;
+    }
+}
+
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..830e01bde8447f97d10a806e589209f939411321
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php
@@ -0,0 +1,81 @@
+<?php
+
+/**#@+
+ * Constants
+ */
+/**
+ * Maximum number of connection per user per server
+ */
+define("MAX_NUM_CONN_PER_USER_SERVER", 5);
+/**#@-*/
+
+
+if (!isset($GLOBALS['RODSConnManager']))
+    $GLOBALS['RODSConnManager'] = new RODSConnManager();
+
+
+class RODSConnManager
+{
+    private $waiting_queue;
+    private $conn_map;
+
+    public function __construct()
+    {
+        $this->waiting_queue = array();
+        $this->conn_map = array();
+    }
+
+    public static function getConn(RODSAccount $account)
+    {
+        $manager = $GLOBALS['RODSConnManager'];
+
+        $conn = new RODSConn($account);
+        $conn_sig = $conn->getSignature();
+        if (!isset($manager->conn_map[$conn_sig]))
+            $manager->conn_map[$conn_sig] = array();
+
+        //check if there is any opened connection idle
+        foreach ($manager->conn_map[$conn_sig] as &$opened_conn) {
+            if ($opened_conn->isIdle()) {
+                //$opened_conn->lock();
+                $account = $opened_conn->getAccount(); //update account if needed...
+                return $opened_conn;
+            }
+        }
+
+        //check if there is any more new connection allowed
+        if (count($manager->conn_map[$conn_sig]) < MAX_NUM_CONN_PER_USER_SERVER) {
+            $conn->connect();
+            $id = count($manager->conn_map[$conn_sig]);
+            $manager->conn_map[$conn_sig][$id] = $conn;
+            $conn->setId($id);
+            //$conn->lock();
+            $account = $conn->getAccount(); //update account if needed...
+            return $conn;
+        }
+
+        //because PHP doesn't support multithread, if we run out of connections,
+        //there is probably something went wrong.
+        throw new RODSException("Unexpectedly ran out of connections. Maybe some connections are not released??? ",
+            "PERR_INTERNAL_ERR");
+
+        //if no connection are available, sleep for 100ms and retry
+        usleep(100);
+        echo "i am sleeping... <br/> \n";
+        return RODSConnManager::getConn($account);
+    }
+
+    public static function releaseConn(RODSConn $conn)
+    {
+        $manager = $GLOBALS['RODSConnManager'];
+        $conn_sig = $conn->getSignature();
+
+        //echo "id:".$conn->getId()." ".implode(",",array_keys($manager->conn_map[$conn_sig]))."<br/>\n";
+
+        if (isset($manager->conn_map[$conn_sig][$conn->getId()])) {
+            $manager->conn_map[$conn_sig][$conn->getId()]->unlock();
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSDirStats.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSDirStats.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..16d24584f4321801bec834419d96af577a7a8975
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSDirStats.class.php
@@ -0,0 +1,25 @@
+<?php
+
+class RODSDirStats
+{
+    public $name;
+    public $owner;
+    public $ownerzone;
+    public $mtime;
+    public $ctime;
+    public $id;
+    public $comments;
+
+    public function __construct($name, $owner, $ownerzone, $mtime, $ctime, $id, $comments)
+    {
+        $this->name = $name;
+        $this->owner = $owner;
+        $this->ownerzone = $ownerzone;
+        $this->mtime = $mtime;
+        $this->ctime = $ctime;
+        $this->id = $id;
+        $this->comments = $comments;
+    }
+
+}  
+     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..52eb95bbfb5c3c8f55fa51103b2438f86c9cbd54
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * RODS exception class
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package Prods
+ */
+
+$errtable_file = dirname(__FILE__) . "/RodsErrorTable.inc.php";
+
+if (is_readable($errtable_file))
+    require_once($errtable_file);
+else
+    die("Could not read file $errtable_file <br/>\n");
+
+/**
+ * custom exception class for RODS
+ */
+class RODSException extends Exception
+{
+    private $code_abbr;
+    private $cause;
+
+    /**
+     * Makes a new RODS excption
+     * @param string $message err/exception message
+     * @param string $code_abbr error code abbreviation
+     */
+    public function __construct($message, $code_abbr = "UNKNOWN_PRODS_ERR",
+                                Exception $cause = NULL)
+    {
+        $this->code_abbr = $code_abbr;
+        $this->cause = $cause;
+
+        parent::__construct($message, $GLOBALS['PRODS_ERR_CODES'][$code_abbr]);
+    }
+
+    public function getCause()
+    {
+        return $this->cause;
+    }
+
+    public function getCodeAbbr()
+    {
+        return $this->code_abbr;
+    }
+
+    public static function rodsErrCodeToAbbr($code)
+    {
+        if (isset($GLOBALS['PRODS_ERR_CODES_REV']["$code"]))
+            return $GLOBALS['PRODS_ERR_CODES_REV']["$code"];
+        else
+            return null;
+    }
+
+    public static function rodsErrAbbrToCode($codeabbr)
+    {
+        if (isset($GLOBALS['PRODS_ERR_CODES']["$codeabbr"]))
+            return $GLOBALS['PRODS_ERR_CODES']["$codeabbr"];
+        else
+            return null;
+    }
+
+    public function getStackTrace()
+    {
+        if ($this->cause !== null) {
+            $arr = array();
+            $trace = $this->getTrace();
+            array_push($arr, $trace[0]);
+            unset($trace);
+            if (get_class($this->cause) == "RODSException") {
+                foreach ($this->cause->getStackTrace() as $key => $trace) {
+                    array_push($arr, $trace);
+                }
+            } else {
+                foreach ($this->cause->getTrace() as $key => $trace) {
+                    array_push($arr, $trace);
+                }
+            }
+            return $arr;
+        } else {
+            return $this->getTrace();
+        }
+    }
+
+    public function showStackTrace()
+    {
+        $htmldoc = "<p style=\"font-family: monospace; border: solid 1px #000000\"><span style=\"font-weight: bold; color: #000000;\">An exception was thrown :<br/></span>";
+        $htmldoc .= "Exception code : $this->code<br/>";
+        $htmldoc .= "Exception abbr : $this->code_abbr<br/>";
+        $htmldoc .= "Exception message : $this->message<br/>";
+        $htmldoc .= "<span style=\"color: #0000FF;\">";
+        $i = 0;
+        foreach ($this->getStackTrace() as $key => $trace) {
+            $htmldoc .= $this->showTrace($trace, $i);
+            $i++;
+        }
+        $htmldoc .= "#$i {main}<br/>";
+        unset($i);
+        $htmldoc .= "</span></p>";
+        return $htmldoc;
+    }
+
+    private function showTrace($_trace, $_i)
+    {
+        $htmldoc = "#$_i ";
+        if (array_key_exists("file", $_trace)) {
+            $htmldoc .= $_trace["file"];
+        }
+        if (array_key_exists("line", $_trace)) {
+            $htmldoc .= "(" . $_trace["line"] . "): ";
+        }
+        if (array_key_exists("class", $_trace) && array_key_exists("type", $_trace)) {
+            $htmldoc .= $_trace["class"] . $_trace["type"];
+        }
+        if (array_key_exists("function", $_trace)) {
+            $htmldoc .= $_trace["function"] . "(";
+            if (array_key_exists("args", $_trace)) {
+                if (count($_trace["args"]) > 0) {
+                    $args = $_trace["args"];
+                    $type = gettype($args[0]);
+                    $value = $args[0];
+                    unset($args);
+                    if ($type == "boolean") {
+                        if ($value) {
+                            $htmldoc .= "true";
+                        } else {
+                            $htmldoc .= "false";
+                        }
+                    } elseif ($type == "integer" || $type == "double") {
+                        if (settype($value, "string")) {
+                            if (strlen($value) <= 20) {
+                                $htmldoc .= $value;
+                            } else {
+                                $htmldoc .= substr($value, 0, 17) . "...";
+                            }
+                        } else {
+                            if ($type == "integer") {
+                                $htmldoc .= "? integer ?";
+                            } else {
+                                $htmldoc .= "? double or float ?";
+                            }
+                        }
+                    } elseif ($type == "string") {
+                        if (strlen($value) <= 18) {
+                            $htmldoc .= "'$value'";
+                        } else {
+                            $htmldoc .= "'" . substr($value, 0, 15) . "...'";
+                        }
+                    } elseif ($type == "array") {
+                        $htmldoc .= "Array";
+                    } elseif ($type == "object") {
+                        $htmldoc .= "Object";
+                    } elseif ($type == "resource") {
+                        $htmldoc .= "Resource";
+                    } elseif ($type == "NULL") {
+                        $htmldoc .= "null";
+                    } elseif ($type == "unknown type") {
+                        $htmldoc .= "? unknown type ?";
+                    }
+                    unset($type);
+                    unset($value);
+                }
+                if (count($_trace["args"]) > 1) {
+                    $htmldoc .= ",...";
+                }
+            }
+            $htmldoc .= ")<br/>";
+        }
+        return $htmldoc;
+    }
+
+    /**
+     * Magic function to turn exception obj to a string
+     */
+    public function __toString()
+    {
+        return __CLASS__ . ": [{$this->code} $this->code_abbr]: {$this->message}\n";
+        //return $this->showStackTrace();
+    }
+
+}
+
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSFileStats.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSFileStats.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..6452c2b1e535d7ba97a75b9be7cb71dec9d89dec
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSFileStats.class.php
@@ -0,0 +1,34 @@
+<?php
+
+class RODSFileStats
+{
+    public $name;
+    public $size;
+    public $owner;
+    public $ownerzone;
+    public $mtime;
+    public $ctime;
+    public $id;
+    public $typename;
+    public $rescname;
+    public $comments;
+    public $num_replica;
+
+    public function __construct($name, $size, $owner, $ownerzone, $mtime, $ctime, $id, $typename,
+                                $rescname, $comments, $num_replica = null)
+    {
+        $this->name = $name;
+        $this->size = $size;
+        $this->owner = $owner;
+        $this->ownerzone = $ownerzone;
+        $this->mtime = $mtime;
+        $this->ctime = $ctime;
+        $this->id = $id;
+        $this->typename = $typename;
+        $this->rescname = $rescname;
+        $this->comments = $comments;
+        $this->num_replica = $num_replica;
+    }
+
+}  
+     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..848f29e85e95c83ad4fc77781f56124f8a066921
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php
@@ -0,0 +1,114 @@
+<?php
+require_once("autoload.inc.php");
+class RODSGenQueConds
+{
+    private $cond;
+    private $cond_kw;
+
+    /**
+     * default constructor. It take names, ops, and vals.
+     * suppose name='foo' op='>=' and val='0', then the triplex means
+     * "foo >= 0" as one iRODS general query condition.
+     * @param array (of string) $names names of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
+     * @param array (of string) $ops logical operator, such as '=' 'like' '>'
+     * @param array (of string) $vals value of the filed
+     */
+    public function __construct(array $names = array(), array $ops = array(),
+                                array $vals = array())
+    {
+        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
+        require_once("RodsGenQueryKeyWd.inc.php"); //load magic keywords
+
+        $this->cond = array('names' => array(), 'sysnames' => array(), 'values' => array());
+        $this->cond_kw = array('names' => array(), 'sysnames' => array(), 'values' => array());
+
+        for ($i = 0; $i < count($names); $i++) {
+            $name = $names[$i];
+            $op = $ops[$i];
+            $val = $vals[$i];
+            if (isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
+                $this->cond['names'][] = $name;
+                $this->cond['sysnames'][] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
+                $this->cond['values'][] = "$op '$val'";
+            } else
+                if (isset($GLOBALS['PRODS_GENQUE_KEYWD']["$name"])) {
+                    $this->cond_kw['names'][] = $name;
+                    $this->cond_kw['sysnames'][] = $GLOBALS['PRODS_GENQUE_KEYWD']["$name"];
+                    $this->cond_kw['values'][] = "$op '$val'";
+                } else {
+                    throw new RODSException("General Query condition field name '$name' is not valid",
+                        'PERR_USER_INPUT_ERROR');
+                }
+        }
+    }
+
+    /**
+     * Add a single select field.
+     * @param string $name names of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
+     * @param string $op logical operator, such as '=' 'like' '>'
+     * @param string $val value of the filed
+     * @param array  an array of tuples of extra op's and val's, each tuple is an assosive array that has key 'op' and 'val'. These conditions will be 'OR' with the other conditions.
+     * for example add ('COL_D_DATA_ID','like', '/tempZone/home/rods/%', array(array('op'=>'=','val'=>'/tempZone/home/rods'")))
+     * would select all file ids both in subdirectories under '/tempZone/home/rods' and directly under '/tempZone/home/rods'
+     */
+    public function add($name, $op, $val, array $OR_ops_vals = array())
+    {
+        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
+        require_once("RodsGenQueryKeyWd.inc.php"); //load magic keywords
+
+        if (isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
+            $this->cond['names'][] = $name;
+            $this->cond['sysnames'][] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
+            $value = "$op '$val'";
+            foreach ($OR_ops_vals as $op_val) {
+                $or_op = $op_val['op'];
+                $or_val = $op_val['val'];
+                if (empty($or_op) || empty($or_val))
+                    continue;
+                $value = $value . " || $or_op '$or_val'";
+            }
+            $this->cond['values'][] = $value;
+        } else
+            if (isset($GLOBALS['PRODS_GENQUE_KEYWD']["$name"])) {
+                $this->cond_kw['names'][] = $name;
+                $this->cond_kw['sysnames'][] = $GLOBALS['PRODS_GENQUE_KEYWD']["$name"];
+                $value = "$op '$val'";
+                foreach ($OR_ops_vals as $op_val) {
+                    $or_op = $op_val['op'];
+                    $or_val = $op_val['val'];
+                    if (empty($or_op) || empty($or_val))
+                        continue;
+                    $value = $value . " || $or_op '$or_val'";
+                }
+                $this->cond_kw['values'][] = $value;
+            } else {
+                throw new RODSException("General Query condition field name '$name' is not valid",
+                    'PERR_USER_INPUT_ERROR');
+            }
+    }
+
+    /**
+     * make a RP_InxValPair.
+     */
+    public function packetize()
+    {
+        return (new RP_InxValPair(count($this->cond['names']),
+            $this->cond['sysnames'], $this->cond['values']));
+    }
+
+    /**
+     * make a RP_KeyValPair.
+     */
+    public function packetizeKW()
+    {
+        return (new RP_KeyValPair(count($this->cond_kw['names']),
+            $this->cond_kw['sysnames'], $this->cond_kw['values']));
+    }
+
+    public function getCond()
+    {
+        return $this->cond;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..41be1069afd8dc3ecea38280b67565b0e05ff72f
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php
@@ -0,0 +1,99 @@
+<?php
+require_once("autoload.inc.php");
+class RODSGenQueResults
+{
+    private $total_count;
+    private $values;
+    private $numcol;
+    private $numrow;
+
+    /**
+     * default constructor.
+     * @param integer $total_count total count of all potential results.
+     * @param array $result_array an associative array of the values. Each key is the return field name, and each array element is an array of values of the query.
+     */
+    public function __construct($total_count = 0, array $result_array = array())
+    {
+        $this->total_count = $total_count;
+        $this->values = $result_array;
+        $this->numcol = count($result_array);
+        if ($this->numcol > 0)
+            $this->numrow = count(current($result_array));
+        else
+            $this->numrow = 0;
+    }
+
+    /**
+     * Add general query result packet RP_GenQueryOut, directly from the protocol level query,  into the result structure.
+     * @param RP_GenQueryOut $genque_result_pk result packet directly from the protocol level query.
+     * @return number of rows just added
+     */
+    public function addResults(RP_GenQueryOut $genque_result_pk)
+    {
+        if ($genque_result_pk->totalRowCount > $this->total_count)
+            $this->total_count = $genque_result_pk->totalRowCount;
+
+        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
+
+        $num_row_added = 0;
+        for ($i = 0; $i < $genque_result_pk->attriCnt; $i++) {
+            $sql_res_pk = $genque_result_pk->SqlResult_PI[$i];
+            $attri_name = $GLOBALS['PRODS_GENQUE_NUMS_REV'][$sql_res_pk->attriInx];
+            if (empty($this->values["$attri_name"]))
+                $this->values["$attri_name"] = $sql_res_pk->value;
+            else
+                array_splice($this->values["$attri_name"],
+                    count($this->values["$attri_name"]), 0, $sql_res_pk->value);
+            if ($i == 0) {
+                $num_row_added = count($sql_res_pk->value);
+                if ($num_row_added != (int)$genque_result_pk->rowCnt) {
+                    throw new RODSException("Gen Query result packet num row mismatch. Expect: $genque_result_pk->rowCnt, got: $num_row_added",
+                        'PERR_UNEXPECTED_PACKET_FORMAT');
+                }
+            }
+        }
+
+        $this->numcol = count($this->values);
+        if ($this->numcol > 0)
+            $this->numrow = count(current($this->values));
+        else
+            $this->numrow = 0;
+
+        return $num_row_added;
+    }
+
+    /**
+     * get result values in (2-d) array, each array key is the name
+     * used RODSGenQueSelFlds, such as COL_COLL_NAME
+     */
+    public function getValues()
+    {
+        return $this->values;
+    }
+
+    /**
+     * get total result count, including all the potential results not returned.
+     */
+    public function getTotalCount()
+    {
+        return $this->total_count;
+    }
+
+    /**
+     * get number of columns/fields of the results.
+     */
+    public function getNumCol()
+    {
+        return $this->numcol;
+    }
+
+    /**
+     * get number of rows of the results.
+     */
+    public function getNumRow()
+    {
+        return $this->numrow;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..10a32f6614faecbc424127f592ddad10f9b0ca95
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php
@@ -0,0 +1,160 @@
+<?php
+require_once("autoload.inc.php");
+class RODSGenQueSelFlds
+{
+    private $names;
+    private $indexes;
+    private $attrs;
+
+    /**
+     * default constructor.
+     * @param string $name name of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
+     * @param string $attrs extra options used for operations such as order_by, the expected values are:
+     * - 'order_by_asc' order the result by this field, in ASCENDING order
+     * - 'order_by_desc' order the result by this field, in DESCENDING order
+     * - min minimum of the group
+     * - max maximum of the group
+     * - sum sum of the group
+     * - avg average of the group
+     * - count count of the group
+     */
+    public function __construct(array $names = array(), array $attrs = array())
+    {
+        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
+
+        $this->names = $names;
+        $this->attrs = array();
+        $this->indexes = array();
+
+        for ($i = 0; $i < count($names); $i++) {
+            $name = $names[$i];
+            if (!isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
+                throw new RODSException("General Query select field name '$name' is not valid",
+                    'PERR_USER_INPUT_ERROR');
+            }
+            $this->indexes[] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
+            $this->attrs[] = RODSGenQueSelFlds::attr2GenQueNumber($attrs[$i]);
+        }
+
+    }
+
+    /**
+     * Add a single select field.
+     *
+     * @param string name name of the field, which must be one defined in file 'RodsGenQueryNum.inc.php'.
+     */
+    public function add($name, $attr = NULL)
+    {
+        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
+        if (!isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
+            throw new RODSException("General Query select field name '$name' is not valid",
+                'PERR_USER_INPUT_ERROR');
+        }
+        $this->indexes[] = $GLOBALS['PRODS_GENQUE_NUMS']["$name"];
+        $this->names[] = $name;
+        $this->attrs[] = RODSGenQueSelFlds::attr2GenQueNumber($attr);
+    }
+
+    /**
+     * update a single select field's attr/value. Note that if the value already exists,
+     * it will OR the bits. This is used when you want more than one type of operation
+     * for a select field, such as select_max and sort.
+     */
+    public function update($name, $attr)
+    {
+        require_once("RodsGenQueryNum.inc.php"); //load magic numbers
+        if (!isset($GLOBALS['PRODS_GENQUE_NUMS']["$name"])) {
+            throw new RODSException("General Query select field name '$name' is not valid",
+                'PERR_USER_INPUT_ERROR');
+        }
+
+        $newattr = RODSGenQueSelFlds::attr2GenQueNumber($attr);
+        for ($i = 0; $i < count($this->names); $i++) {
+            if ($this->names[$i] == $name) {
+                if ($this->attrs[$i] == 1)
+                    $this->attrs[$i] = $newattr;
+                else
+                    $this->attrs[$i] = $newattr | $this->attrs[$i];
+                return;
+            }
+        }
+        $this->add($name, $attr);
+    }
+
+    /**
+     * Convert supported attribute to magic number, that iRODS protocol uses
+     * Following attributes are supported:
+     * - 'order_by_asc' order the result by this field, in ASCENDING order
+     * - 'order_by_desc' order the result by this field, in DESCENDING order
+     * - min minimum of the group
+     * - max maximum of the group
+     * - sum sum of the group
+     * - avg average of the group
+     * - count count of the group
+     */
+    public static function attr2GenQueNumber($attr)
+    {
+        if (empty($attr)) return 1;
+        $retval = 1;
+        switch ($attr) {
+            case 'order_by_asc':
+                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['ORDER_BY'];
+                break;
+            case 'order_by_desc':
+                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['ORDER_BY_DESC'];
+                break;
+            case 'min':
+                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_MIN'];
+                break;
+            case 'max':
+                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_MAX'];
+                break;
+            case 'sum':
+                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_SUM'];
+                break;
+            case 'avg':
+                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_AVG'];
+                break;
+            case 'count':
+                $retval = $GLOBALS['PRODS_GENQUE_NUMS']['SELECT_COUNT'];
+                break;
+            default:
+                throw new RODSException("Unexpected attribute: '$attr'",
+                    'PERR_USER_INPUT_ERROR');
+        }
+        return intval($retval);
+    }
+
+    /**
+     * make a RP_InxIvalPair, a low level iRODS packet
+     */
+    public function packetize()
+    {
+        return (new RP_InxIvalPair(count($this->names), $this->indexes,
+            $this->attrs));
+
+    }
+
+    public function getIndexes()
+    {
+        return $this->indexes;
+    }
+
+    public function getAttrs()
+    {
+        return $this->attrs;
+    }
+
+    public function getCount()
+    {
+        return count($this->names);
+    }
+
+    public function getNames()
+    {
+        return $this->names;
+    }
+
+}
+
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..31b720cf19cb419f5bcdd810f0292db7c32ca33c
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * RODS keyval type class. This class is conresponding to iRODS's keyval type
+ * @author Sifang Lu <sifang@sdsc.edu>
+ * @copyright Copyright &copy; 2007, TBD
+ * @package RODSConn
+ */
+
+
+require_once("autoload.inc.php");
+
+class RODSKeyValPair
+{
+    private $keys;
+    private $vals;
+
+    public function __construct(array $arr = array())
+    {
+        $this->keys = array_keys($arr);
+        $this->vals = array_values($arr);
+    }
+
+    public function addPair($key, $val)
+    {
+        $this->keys[] = $key;
+        $this->vals[] = $val;
+    }
+
+    /**
+     * Make a RP_KeyValPair
+     * @return RP_KeyValPair a RP_KeyValPair object
+     */
+    public function makePacket()
+    {
+        return new RP_KeyValPair(count($this->keys), $this->keys, $this->vals);
+    }
+
+    /**
+     * make a RODSKeyValPair from a RP_KeyValPair
+     */
+    public static function fromPacket(RP_KeyValPair $RP_KeyValPair)
+    {
+        $new_keyval = new RODSKeyValPair();
+        $new_keyval->keys = $RP_KeyValPair->keyWord;
+        $new_keyval->vals = $RP_KeyValPair->svalue;
+        return $new_keyval;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..ca3e8bc23a6055ab34e42c5e5d35a781591088c9
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php
@@ -0,0 +1,185 @@
+<?php
+
+require_once("autoload.inc.php");
+
+$GLOBALS['RODSMessage_types'] = array(
+    "RODS_CONNECT_T" => "RODS_CONNECT",
+    "RODS_VERSION_T" => "RODS_VERSION",
+    "RODS_API_REQ_T" => "RODS_API_REQ",
+    "RODS_DISCONNECT_T" => "RODS_DISCONNECT",
+    "RODS_REAUTH_T" => "RODS_REAUTH",
+    "RODS_API_REPLY_T" => "RODS_API_REPLY"
+);
+
+class RODSMessage
+{
+    private $type; // (String) message type, such as "RODS_CONNECT_T"
+    private $typestr; // (String) str representation of the type that RODS server understand
+    private $msg; // (RODSPacket) main message body
+    private $header; // (RODSPacket) a special packet, header for other packets
+    private $header_xml; // (string) packet header in XML
+    private $msg_xml; // (string) message in XML
+    private $binstr; // (string) binary string
+    private $errstr; // (string) error string
+    private $intinfo; // an additional integer info, for API, it is the
+    // apiReqNum
+    private $serialized;
+
+    public function __construct($type = NULL, $_msg = NULL, $intinfo = 0, $binstr = "", $errstr = "")
+    {
+        if (!isset($type)) {
+            return;
+        }
+
+        $this->type = $type;
+        $RODSMessage_types = $GLOBALS['RODSMessage_types'];
+        if (!isset($RODSMessage_types[$type])) {
+            throw new RODSException("RODSMessage::__construct failed.1! Unknown type '$type'",
+                "PERR_INTERNAL_ERR");
+        }
+        $this->typestr = $RODSMessage_types[$type];
+
+        if (isset($_msg)) {
+            if (!($_msg instanceof RODSPacket)) {
+                throw new RODSException("RODSMessage::__construct failed.2!",
+                    "PERR_INTERNAL_ERR");
+            }
+        }
+        $this->msg = $_msg;
+        $this->intinfo = $intinfo;
+        $this->binstr = $binstr;
+        $this->errstr = $errstr;
+    }
+
+    public function pack()
+    {
+        if (isset($this->msg))
+            $this->msg_xml = $this->msg->toXML();
+
+        $this->header = new RP_MsgHeader($this->typestr, strlen($this->msg_xml),
+            strlen($this->errstr), strlen($this->binstr), $this->intinfo);
+        $header_xml = $this->header->toXML();
+        $this->serialized = pack("N", strlen($header_xml)) . $header_xml .
+            $this->msg_xml;
+        return $this->serialized;
+    }
+
+
+    public function unpack($conn, &$bslen = NULL)
+    {
+        if (FALSE === ($chunk = stream_get_contents($conn, 4))) {
+            throw new RODSException("RODSMessage::unpack failed.0! ",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+
+
+        $arr = unpack("Nlen", $chunk);
+        $header_len = $arr['len'];
+        if ((!is_int($header_len)) || ($header_len < 1) || ($header_len > 8192 - 4)) {
+            throw new RODSException("RODSMessage::unpack failed.1! The header length is unexpected: '$header_len'",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+
+        $this->header_xml = stream_get_contents($conn, $header_len);
+        $this->parseHeaderXML($this->header_xml);
+        $intInfo = $this->header->intInfo;
+
+        // get main msg string
+        $msg_len = $this->header->msgLen;
+        $this->msg_xml = stream_get_contents($conn, $msg_len);
+        if ($msg_len != strlen($this->msg_xml)) {
+            throw new RODSException("RODSMessage::unpack failed.2! " .
+                    "The body length is unexpected: " . strlen($this->msg_xml) .
+                    " expecting: $msg_len",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+        if ($msg_len > 0) {
+            $this->parseBodyXML($this->msg_xml);
+        }
+
+        // get err string
+        $errlen = $this->header->errorLen;
+        $this->errstr = stream_get_contents($conn, $errlen);
+        if ($errlen != strlen($this->errstr)) {
+            throw new RODSException("RODSMessage::unpack failed.3! " .
+                    "The err length is unexpected: " . strlen($this->errstr) .
+                    " expecting: $errlen",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+
+        // get bin string
+        $bslen = $this->header->bsLen;
+        $this->binstr = stream_get_contents($conn, $bslen);
+        if ($bslen != strlen($this->binstr)) {
+            throw new RODSException("RODSMessage::unpack failed.4! " .
+                    "The bin str length is unexpected: " . strlen($this->binstr) .
+                    " expecting: $bslen",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+
+        return $this->header->intInfo;
+    }
+
+    private function parseHeaderXML($xmlstr)
+    {
+        $xml = new SimpleXMLElement($xmlstr);
+        $name = $xml->getName();
+        if ($name != "MsgHeader_PI") {
+            throw new RODSException("RODSMessage::parseHeaderXML failed! " .
+                    "The XML header name is unexpected:$name " .
+                    " expecting: MsgHeader_PI",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+        $this->header = new RP_MsgHeader();
+        $this->header->fromSXE($xml);
+    }
+
+    private function parseBodyXML($xmlstr)
+    {
+        //try {
+        $xml = new SimpleXMLElement($xmlstr);
+        $name = $xml->getName();
+        if (substr($name, -3, 3) != "_PI") {
+            throw new RODSException("RODSMessage::parseMainBodyXML failed! " .
+                    "The XML node's name is unexpected:$name " .
+                    " expecting some thing like xxx_PI",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+        $rp_classname = "RP_" . substr($name, 0, strlen($name) - 3);
+        $this->msg = new $rp_classname();
+        $this->msg->fromSXE($xml);
+
+        /*} catch (Exception $e) {
+          throw new RODSException("RODSMessage::parseMainBodyXML failed! ".
+              "Mal formated XML in RODS message :".
+              $xmlstr,
+              "SYS_PACK_INSTRUCT_FORMAT_ERR",$e);
+        }
+        */
+    }
+
+    public function getBody()
+    {
+        return $this->msg;
+    }
+
+    public function getBinstr()
+    {
+        return $this->binstr;
+    }
+
+    public function getXML()
+    {
+        return $this->header_xml . "\n" . $this->msg_xml;
+    }
+
+    public static function packConnectMsg($user, $zone, $relVersion = RODS_REL_VERSION,
+                                          $apiVersion = RODS_API_VERSION, $option = NULL)
+    {
+        $msgbody = new RP_StartupPack($user, $zone, $relVersion, $apiVersion . $option);
+        $rods_msg = new RODSMessage("RODS_CONNECT_T", $msgbody);
+        return $rods_msg->pack();
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMeta.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMeta.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..55d48af19d2622e7d2d821e56285905d774e5092
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMeta.class.php
@@ -0,0 +1,21 @@
+<?php
+
+class RODSMeta
+{
+    public $name;
+    public $value;
+    public $units;
+    public $id;
+    public $op;
+
+    public function __construct($name, $value, $units = NULL, $id = NULL, $op = "=")
+    {
+        $this->name = $name;
+        $this->value = $value;
+        $this->units = $units;
+        $this->id = $id;
+        $this->op = $op;
+    }
+
+}  
+     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..95807d12ea8d3ba89f4b440ef2265be4d3bfcbef
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php
@@ -0,0 +1,20 @@
+<?php
+define ("DONE_OPR", 9999);
+define ("PUT_OPR", 1);
+define ("GET_OPR", 2);
+define ("SAME_HOST_COPY_OPR", 3);
+define ("COPY_TO_LOCAL_OPR", 4);
+define ("COPY_TO_REM_OPR", 5);
+define ("REPLICATE_OPR", 6);
+define ("REPLICATE_DEST", 7);
+define ("REPLICATE_SRC", 8);
+define ("COPY_DEST", 9);
+define ("COPY_SRC", 10);
+define ("RENAME_DATA_OBJ", 11);
+define ("RENAME_COLL", 12);
+define ("MOVE_OPR", 13);
+define ("RSYNC_OPR", 14);
+define ("PHYMV_OPR", 15);
+define ("PHYMV_SRC", 16);
+define ("PHYMV_DEST", 17);
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSQueryCondition.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSQueryCondition.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..ecc0282065697ef0d6d1600d038b42a3adf89227
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSQueryCondition.class.php
@@ -0,0 +1,22 @@
+<?php
+
+class RODSQueryCondition
+{
+    public $name;
+    public $value;
+    public $op;
+
+    public function __construct($name, $value, $op = "=")
+    {
+        $this->name = $name;
+        $this->value = $value;
+        $this->op = $op;
+    }
+
+    public function __toString()
+    {
+        return "$this->name $this->op '$this->value'";
+    }
+
+}  
+     
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4e2c031174ecb1589089138cfb6339ca96236d1
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php
@@ -0,0 +1,217 @@
+<?php
+
+/* This file is generated by setRodsAPINum.php   Please modify that file if you wish to update the    API number.            */
+
+$GLOBALS['PRODS_API_NUMS'] = array(
+    'FILE_CREATE_AN' => '500',
+    'FILE_OPEN_AN' => '501',
+    'FILE_WRITE_AN' => '502',
+    'FILE_CLOSE_AN' => '503',
+    'FILE_LSEEK_AN' => '504',
+    'FILE_READ_AN' => '505',
+    'FILE_UNLINK_AN' => '506',
+    'FILE_MKDIR_AN' => '507',
+    'FILE_CHMOD_AN' => '508',
+    'FILE_RMDIR_AN' => '509',
+    'FILE_STAT_AN' => '510',
+    'FILE_FSTAT_AN' => '511',
+    'FILE_FSYNC_AN' => '512',
+    'FILE_STAGE_AN' => '513',
+    'FILE_GET_FS_FREE_SPACE_AN' => '514',
+    'FILE_OPENDIR_AN' => '515',
+    'FILE_CLOSEDIR_AN' => '516',
+    'FILE_READDIR_AN' => '517',
+    'FILE_PUT_AN' => '518',
+    'FILE_GET_AN' => '519',
+    'FILE_CHKSUM_AN' => '520',
+    'CHK_N_V_PATH_PERM_AN' => '521',
+    'FILE_RENAME_AN' => '522',
+    'FILE_TRUNCATE_AN' => '523',
+    'DATA_OBJ_CREATE_AN' => '601',
+    'DATA_OBJ_OPEN_AN' => '602',
+    'DATA_OBJ_READ_AN' => '603',
+    'DATA_OBJ_WRITE_AN' => '604',
+    'DATA_OBJ_CLOSE_AN' => '605',
+    'DATA_OBJ_PUT_AN' => '606',
+    'DATA_PUT_AN' => '607',
+    'DATA_OBJ_GET_AN' => '608',
+    'DATA_GET_AN' => '609',
+    'DATA_OBJ_REPL_AN' => '610',
+    'DATA_COPY_AN' => '611',
+    'DATA_OBJ_LSEEK_AN' => '612',
+    'DATA_OBJ_COPY_AN' => '613',
+    'SIMPLE_QUERY_AN' => '614',
+    'DATA_OBJ_UNLINK_AN' => '615',
+    'COLL_CREATE_AN' => '616',
+    'RM_COLL_OLD_AN' => '617',
+    'REG_COLL_AN' => '618',
+    'REG_DATA_OBJ_AN' => '619',
+    'UNREG_DATA_OBJ_AN' => '620',
+    'REG_REPLICA_AN' => '621',
+    'MOD_DATA_OBJ_META_AN' => '622',
+    'RULE_EXEC_SUBMIT_AN' => '623',
+    'RULE_EXEC_DEL_AN' => '624',
+    'EXEC_MY_RULE_AN' => '625',
+    'OPR_COMPLETE_AN' => '626',
+    'DATA_OBJ_RENAME_AN' => '627',
+    'DATA_OBJ_RSYNC_AN' => '628',
+    'DATA_OBJ_CHKSUM_AN' => '629',
+    'PHY_PATH_REG_AN' => '630',
+    'DATA_OBJ_PHYMV_AN' => '631',
+    'DATA_OBJ_TRIM_AN' => '632',
+    'OBJ_STAT_AN' => '633',
+    'EXEC_CMD_AN' => '634',
+    'SUB_STRUCT_FILE_CREATE_AN' => '635',
+    'SUB_STRUCT_FILE_OPEN_AN' => '636',
+    'SUB_STRUCT_FILE_READ_AN' => '637',
+    'SUB_STRUCT_FILE_WRITE_AN' => '638',
+    'SUB_STRUCT_FILE_CLOSE_AN' => '639',
+    'SUB_STRUCT_FILE_UNLINK_AN' => '640',
+    'SUB_STRUCT_FILE_STAT_AN' => '641',
+    'SUB_STRUCT_FILE_FSTAT_AN' => '642',
+    'SUB_STRUCT_FILE_LSEEK_AN' => '643',
+    'SUB_STRUCT_FILE_RENAME_AN' => '644',
+    'QUERY_SPEC_COLL_AN' => '645',
+    'MOD_COLL_AN' => '646',
+    'SUB_STRUCT_FILE_MKDIR_AN' => '647',
+    'SUB_STRUCT_FILE_RMDIR_AN' => '648',
+    'SUB_STRUCT_FILE_OPENDIR_AN' => '649',
+    'SUB_STRUCT_FILE_READDIR_AN' => '650',
+    'SUB_STRUCT_FILE_CLOSEDIR_AN' => '651',
+    'DATA_OBJ_TRUNCATE_AN' => '652',
+    'SUB_STRUCT_FILE_TRUNCATE_AN' => '653',
+    'GET_XMSG_TICKET_AN' => '654',
+    'SEND_XMSG_AN' => '655',
+    'RCV_XMSG_AN' => '656',
+    'SUB_STRUCT_FILE_GET_AN' => '657',
+    'SUB_STRUCT_FILE_PUT_AN' => '658',
+    'SYNC_MOUNTED_COLL_AN' => '659',
+    'STRUCT_FILE_SYNC_AN' => '660',
+    'CLOSE_COLLECTION_AN' => '661',
+    'COLL_REPL_AN' => '662',
+    'RM_COLL_AN' => '663',
+    'GET_MISC_SVR_INFO_AN' => '700',
+    'GENERAL_ADMIN_AN' => '701',
+    'GEN_QUERY_AN' => '702',
+    'AUTH_REQUEST_AN' => '703',
+    'AUTH_RESPONSE_AN' => '704',
+    'AUTH_CHECK_AN' => '705',
+    'MOD_AVU_METADATA_AN' => '706',
+    'MOD_ACCESS_CONTROL_AN' => '707',
+    'RULE_EXEC_MOD_AN' => '708',
+    'GET_TEMP_PASSWORD_AN' => '709',
+    'GENERAL_UPDATE_AN' => '710',
+    'GSI_AUTH_REQUEST_AN' => '711',
+    'OPEN_COLLECTION_AN' => '712',
+    'READ_COLLECTION_AN' => '713',
+    'PAM_AUTH_REQUEST_AN' => '725',
+    'SSL_START_AN' => '1100',
+    'SSL_END_AN' => '1101',
+);
+$GLOBALS['PRODS_API_NUMS_REV'] = array(
+    '500' => 'FILE_CREATE_AN',
+    '501' => 'FILE_OPEN_AN',
+    '502' => 'FILE_WRITE_AN',
+    '503' => 'FILE_CLOSE_AN',
+    '504' => 'FILE_LSEEK_AN',
+    '505' => 'FILE_READ_AN',
+    '506' => 'FILE_UNLINK_AN',
+    '507' => 'FILE_MKDIR_AN',
+    '508' => 'FILE_CHMOD_AN',
+    '509' => 'FILE_RMDIR_AN',
+    '510' => 'FILE_STAT_AN',
+    '511' => 'FILE_FSTAT_AN',
+    '512' => 'FILE_FSYNC_AN',
+    '513' => 'FILE_STAGE_AN',
+    '514' => 'FILE_GET_FS_FREE_SPACE_AN',
+    '515' => 'FILE_OPENDIR_AN',
+    '516' => 'FILE_CLOSEDIR_AN',
+    '517' => 'FILE_READDIR_AN',
+    '518' => 'FILE_PUT_AN',
+    '519' => 'FILE_GET_AN',
+    '520' => 'FILE_CHKSUM_AN',
+    '521' => 'CHK_N_V_PATH_PERM_AN',
+    '522' => 'FILE_RENAME_AN',
+    '523' => 'FILE_TRUNCATE_AN',
+    '601' => 'DATA_OBJ_CREATE_AN',
+    '602' => 'DATA_OBJ_OPEN_AN',
+    '603' => 'DATA_OBJ_READ_AN',
+    '604' => 'DATA_OBJ_WRITE_AN',
+    '605' => 'DATA_OBJ_CLOSE_AN',
+    '606' => 'DATA_OBJ_PUT_AN',
+    '607' => 'DATA_PUT_AN',
+    '608' => 'DATA_OBJ_GET_AN',
+    '609' => 'DATA_GET_AN',
+    '610' => 'DATA_OBJ_REPL_AN',
+    '611' => 'DATA_COPY_AN',
+    '612' => 'DATA_OBJ_LSEEK_AN',
+    '613' => 'DATA_OBJ_COPY_AN',
+    '614' => 'SIMPLE_QUERY_AN',
+    '615' => 'DATA_OBJ_UNLINK_AN',
+    '616' => 'COLL_CREATE_AN',
+    '617' => 'RM_COLL_OLD_AN',
+    '618' => 'REG_COLL_AN',
+    '619' => 'REG_DATA_OBJ_AN',
+    '620' => 'UNREG_DATA_OBJ_AN',
+    '621' => 'REG_REPLICA_AN',
+    '622' => 'MOD_DATA_OBJ_META_AN',
+    '623' => 'RULE_EXEC_SUBMIT_AN',
+    '624' => 'RULE_EXEC_DEL_AN',
+    '625' => 'EXEC_MY_RULE_AN',
+    '626' => 'OPR_COMPLETE_AN',
+    '627' => 'DATA_OBJ_RENAME_AN',
+    '628' => 'DATA_OBJ_RSYNC_AN',
+    '629' => 'DATA_OBJ_CHKSUM_AN',
+    '630' => 'PHY_PATH_REG_AN',
+    '631' => 'DATA_OBJ_PHYMV_AN',
+    '632' => 'DATA_OBJ_TRIM_AN',
+    '633' => 'OBJ_STAT_AN',
+    '634' => 'EXEC_CMD_AN',
+    '635' => 'SUB_STRUCT_FILE_CREATE_AN',
+    '636' => 'SUB_STRUCT_FILE_OPEN_AN',
+    '637' => 'SUB_STRUCT_FILE_READ_AN',
+    '638' => 'SUB_STRUCT_FILE_WRITE_AN',
+    '639' => 'SUB_STRUCT_FILE_CLOSE_AN',
+    '640' => 'SUB_STRUCT_FILE_UNLINK_AN',
+    '641' => 'SUB_STRUCT_FILE_STAT_AN',
+    '642' => 'SUB_STRUCT_FILE_FSTAT_AN',
+    '643' => 'SUB_STRUCT_FILE_LSEEK_AN',
+    '644' => 'SUB_STRUCT_FILE_RENAME_AN',
+    '645' => 'QUERY_SPEC_COLL_AN',
+    '646' => 'MOD_COLL_AN',
+    '647' => 'SUB_STRUCT_FILE_MKDIR_AN',
+    '648' => 'SUB_STRUCT_FILE_RMDIR_AN',
+    '649' => 'SUB_STRUCT_FILE_OPENDIR_AN',
+    '650' => 'SUB_STRUCT_FILE_READDIR_AN',
+    '651' => 'SUB_STRUCT_FILE_CLOSEDIR_AN',
+    '652' => 'DATA_OBJ_TRUNCATE_AN',
+    '653' => 'SUB_STRUCT_FILE_TRUNCATE_AN',
+    '654' => 'GET_XMSG_TICKET_AN',
+    '655' => 'SEND_XMSG_AN',
+    '656' => 'RCV_XMSG_AN',
+    '657' => 'SUB_STRUCT_FILE_GET_AN',
+    '658' => 'SUB_STRUCT_FILE_PUT_AN',
+    '659' => 'SYNC_MOUNTED_COLL_AN',
+    '660' => 'STRUCT_FILE_SYNC_AN',
+    '661' => 'CLOSE_COLLECTION_AN',
+    '662' => 'COLL_REPL_AN',
+    '663' => 'RM_COLL_AN',
+    '700' => 'GET_MISC_SVR_INFO_AN',
+    '701' => 'GENERAL_ADMIN_AN',
+    '702' => 'GEN_QUERY_AN',
+    '703' => 'AUTH_REQUEST_AN',
+    '704' => 'AUTH_RESPONSE_AN',
+    '705' => 'AUTH_CHECK_AN',
+    '706' => 'MOD_AVU_METADATA_AN',
+    '707' => 'MOD_ACCESS_CONTROL_AN',
+    '708' => 'RULE_EXEC_MOD_AN',
+    '709' => 'GET_TEMP_PASSWORD_AN',
+    '710' => 'GENERAL_UPDATE_AN',
+    '711' => 'GSI_AUTH_REQUEST_AN',
+    '712' => 'OPEN_COLLECTION_AN',
+    '713' => 'READ_COLLECTION_AN',
+    '725' => 'PAM_AUTH_REQUEST_AN',
+    '1100' => 'SSL_START_AN',
+    '1101' => 'SSL_END_AN',
+);
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d51f619197a287eacb0de25bc491ffa57254aad
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+// following is general defines. Do not motify unless you know what you
+// are doing!
+define ("ORDER_BY", 0x400);
+define ("ORDER_BY_DESC", 0x800);
+
+?>  
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..7c4bb170d4a631a985f6e5f580055fa863799e26
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php
@@ -0,0 +1,587 @@
+<?php
+
+/* This file is generated by setRodsErrorCodes.php.    Please modify that file if you wish to update the    error codes.            */
+
+$GLOBALS['PRODS_ERR_CODES'] = array(
+    'SYS_SOCK_OPEN_ERR' => '-1000',
+    'SYS_SOCK_BIND_ERR' => '-2000',
+    'SYS_SOCK_ACCEPT_ERR' => '-3000',
+    'SYS_HEADER_READ_LEN_ERR' => '-4000',
+    'SYS_HEADER_WRITE_LEN_ERR' => '-5000',
+    'SYS_HEADER_TPYE_LEN_ERR' => '-6000',
+    'SYS_CAUGHT_SIGNAL' => '-7000',
+    'SYS_GETSTARTUP_PACK_ERR' => '-8000',
+    'SYS_EXCEED_CONNECT_CNT' => '-9000',
+    'SYS_USER_NOT_ALLOWED_TO_CONN' => '-10000',
+    'SYS_READ_MSG_BODY_INPUT_ERR' => '-11000',
+    'SYS_UNMATCHED_API_NUM' => '-12000',
+    'SYS_NO_API_PRIV' => '-13000',
+    'SYS_API_INPUT_ERR' => '-14000',
+    'SYS_PACK_INSTRUCT_FORMAT_ERR' => '-15000',
+    'SYS_MALLOC_ERR' => '-16000',
+    'SYS_GET_HOSTNAME_ERR' => '-17000',
+    'SYS_OUT_OF_FILE_DESC' => '-18000',
+    'SYS_FILE_DESC_OUT_OF_RANGE' => '-19000',
+    'SYS_UNRECOGNIZED_REMOTE_FLAG' => '-20000',
+    'SYS_INVALID_SERVER_HOST' => '-21000',
+    'SYS_SVR_TO_SVR_CONNECT_FAILED' => '-22000',
+    'SYS_BAD_FILE_DESCRIPTOR' => '-23000',
+    'SYS_INTERNAL_NULL_INPUT_ERR' => '-24000',
+    'SYS_CONFIG_FILE_ERR' => '-25000',
+    'SYS_INVALID_ZONE_NAME' => '-26000',
+    'SYS_COPY_LEN_ERR' => '-27000',
+    'SYS_PORT_COOKIE_ERR' => '-28000',
+    'SYS_KEY_VAL_TABLE_ERR' => '-29000',
+    'SYS_INVALID_RESC_TYPE' => '-30000',
+    'SYS_INVALID_FILE_PATH' => '-31000',
+    'SYS_INVALID_RESC_INPUT' => '-32000',
+    'SYS_INVALID_PORTAL_OPR' => '-33000',
+    'SYS_PARA_OPR_NO_SUPPORT' => '-34000',
+    'SYS_INVALID_OPR_TYPE' => '-35000',
+    'SYS_NO_PATH_PERMISSION' => '-36000',
+    'SYS_NO_ICAT_SERVER_ERR' => '-37000',
+    'SYS_AGENT_INIT_ERR' => '-38000',
+    'SYS_PROXYUSER_NO_PRIV' => '-39000',
+    'SYS_NO_DATA_OBJ_PERMISSION' => '-40000',
+    'SYS_DELETE_DISALLOWED' => '-41000',
+    'SYS_OPEN_REI_FILE_ERR' => '-42000',
+    'SYS_NO_RCAT_SERVER_ERR' => '-43000',
+    'SYS_UNMATCH_PACK_INSTRUCTI_NAME' => '-44000',
+    'SYS_SVR_TO_CLI_MSI_NO_EXIST' => '-45000',
+    'SYS_COPY_ALREADY_IN_RESC' => '-46000',
+    'SYS_RECONN_OPR_MISMATCH' => '-47000',
+    'SYS_INPUT_PERM_OUT_OF_RANGE' => '-48000',
+    'SYS_FORK_ERROR' => '-49000',
+    'SYS_PIPE_ERROR' => '-50000',
+    'SYS_EXEC_CMD_STATUS_SZ_ERROR' => '-51000',
+    'SYS_PATH_IS_NOT_A_FILE' => '-52000',
+    'SYS_UNMATCHED_SPEC_COLL_TYPE' => '-53000',
+    'SYS_TOO_MANY_QUERY_RESULT' => '-54000',
+    'USER_AUTH_SCHEME_ERR' => '-300000',
+    'USER_AUTH_STRING_EMPTY' => '-301000',
+    'USER_RODS_HOST_EMPTY' => '-302000',
+    'USER_RODS_HOSTNAME_ERR' => '-303000',
+    'USER_SOCK_OPEN_ERR' => '-304000',
+    'USER_SOCK_CONNECT_ERR' => '-305000',
+    'USER_STRLEN_TOOLONG' => '-306000',
+    'USER_API_INPUT_ERR' => '-307000',
+    'USER_PACKSTRUCT_INPUT_ERR' => '-308000',
+    'USER_NO_SUPPORT_ERR' => '-309000',
+    'USER_FILE_DOES_NOT_EXIST' => '-310000',
+    'USER_FILE_TOO_LARGE' => '-311000',
+    'OVERWITE_WITHOUT_FORCE_FLAG' => '-312000',
+    'UNMATCHED_KEY_OR_INDEX' => '-313000',
+    'USER_CHKSUM_MISMATCH' => '-314000',
+    'USER_BAD_KEYWORD_ERR' => '-315000',
+    'USER__NULL_INPUT_ERR' => '-316000',
+    'USER_INPUT_PATH_ERR' => '-317000',
+    'USER_INPUT_OPTION_ERR' => '-318000',
+    'USER_INVALID_USERNAME_FORMAT' => '-319000',
+    'USER_DIRECT_RESC_INPUT_ERR' => '-320000',
+    'USER_NO_RESC_INPUT_ERR' => '-321000',
+    'USER_PARAM_LABEL_ERR' => '-322000',
+    'USER_PARAM_TYPE_ERR' => '-323000',
+    'BASE64_BUFFER_OVERFLOW' => '-324000',
+    'BASE64_INVALID_PACKET' => '-325000',
+    'USER_MSG_TYPE_NO_SUPPORT' => '-326000',
+    'USER_RSYNC_NO_MODE_INPUT_ERR' => '-337000',
+    'USER_OPTION_INPUT_ERR' => '-338000',
+    'SAME_SRC_DEST_PATHS_ERR' => '-339000',
+    'USER_RESTART_FILE_INPUT_ERR' => '-340000',
+    'RESTART_OPR_FAILED' => '-341000',
+    'BAD_EXEC_CMD_PATH' => '-342000',
+    'EXEC_CMD_OUTPUT_TOO_LARGE' => '-343000',
+    'EXEC_CMD_ERROR' => '-344000',
+    'FILE_INDEX_LOOKUP_ERR' => '-500000',
+    'UNIX_FILE_OPEN_ERR' => '-510000',
+    'UNIX_FILE_OPEN_ERR_1' => '-510001',
+    'UNIX_FILE_OPEN_ERR_2' => '-510002',
+    'UNIX_FILE_CREATE_ERR' => '-511000',
+    'UNIX_FILE_READ_ERR' => '-512000',
+    'UNIX_FILE_WRITE_ERR' => '-513000',
+    'UNIX_FILE_CLOSE_ERR' => '-514000',
+    'UNIX_FILE_UNLINK_ERR' => '-515000',
+    'UNIX_FILE_STAT_ERR' => '-516000',
+    'UNIX_FILE_FSTAT_ERR' => '-517000',
+    'UNIX_FILE_LSEEK_ERR' => '-518000',
+    'UNIX_FILE_FSYNC_ERR' => '-519000',
+    'UNIX_FILE_MKDIR_ERR' => '-520000',
+    'UNIX_FILE_RMDIR_ERR' => '-521000',
+    'UNIX_FILE_OPENDIR_ERR' => '-522000',
+    'UNIX_FILE_CLOSEDIR_ERR' => '-523000',
+    'UNIX_FILE_READDIR_ERR' => '-524000',
+    'UNIX_FILE_STAGE_ERR' => '-525000',
+    'UNIX_FILE_GET_FS_FREESPACE_ERR' => '-526000',
+    'UNIX_FILE_CHMOD_ERR' => '-527000',
+    'UNIX_FILE_RENAME_ERR' => '-528000',
+    'CATALOG_NOT_CONNECTED' => '-801000',
+    'CAT_ENV_ERR' => '-802000',
+    'CAT_CONNECT_ERR' => '-803000',
+    'CAT_DISCONNECT_ERR' => '-804000',
+    'CAT_CLOSE_ENV_ERR' => '-805000',
+    'CAT_SQL_ERR' => '-806000',
+    'CAT_GET_ROW_ERR' => '-807000',
+    'CAT_NO_ROWS_FOUND' => '-808000',
+    'CATALOG_ALREADY_HAS_ITEM_BY_THAT_NAME' => '-809000',
+    'CAT_INVALID_RESOURCE_TYPE' => '-810000',
+    'CAT_INVALID_RESOURCE_CLASS' => '-811000',
+    'CAT_INVALID_RESOURCE_NET_ADDR' => '-812000',
+    'CAT_INVALID_RESOURCE_VAULT_PATH' => '-813000',
+    'CAT_UNKNOWN_COLLECTION' => '-814000',
+    'CAT_INVALID_DATA_TYPE' => '-815000',
+    'CAT_INVALID_ARGUMENT' => '-816000',
+    'CAT_UNKNOWN_FILE' => '-817000',
+    'CAT_NO_ACCESS_PERMISSION' => '-818000',
+    'CAT_SUCCESS_BUT_WITH_NO_INFO' => '-819000',
+    'CAT_INVALID_USER_TYPE' => '-820000',
+    'CAT_COLLECTION_NOT_EMPTY' => '-821000',
+    'CAT_TOO_MANY_TABLES' => '-822000',
+    'CAT_UNKNOWN_TABLE' => '-823000',
+    'CAT_NOT_OPEN' => '-824000',
+    'CAT_FAILED_TO_LINK_TABLES' => '-825000',
+    'CAT_INVALID_AUTHENTICATION' => '-826000',
+    'CAT_INVALID_USER' => '-827000',
+    'CAT_INVALID_ZONE' => '-828000',
+    'CAT_INVALID_GROUP' => '-829000',
+    'CAT_INSUFFICIENT_PRIVILEGE_LEVEL' => '-830000',
+    'CAT_INVALID_RESOURCE' => '-831000',
+    'CAT_INVALID_CLIENT_USER' => '-832000',
+    'CAT_NAME_EXISTS_AS_COLLECTION' => '-833000',
+    'CAT_NAME_EXISTS_AS_DATAOBJ' => '-834000',
+    'CAT_RESOURCE_NOT_EMPTY' => '-835000',
+    'CAT_NOT_A_DATAOBJ_AND_NOT_A_COLLECTION' => '-836000',
+    'CAT_RECURSIVE_MOVE' => '-837000',
+    'CAT_LAST_REPLICA' => '-838000',
+    'CAT_OCI_ERROR' => '-839000',
+    'CAT_PASSWORD_EXPIRED' => '-840000',
+    'FILE_OPEN_ERR' => '-900000',
+    'FILE_READ_ERR' => '-901000',
+    'FILE_WRITE_ERR' => '-902000',
+    'PASSWORD_EXCEEDS_MAX_SIZE' => '-903000',
+    'ENVIRONMENT_VAR_HOME_NOT_DEFINED' => '-904000',
+    'UNABLE_TO_STAT_FILE' => '-905000',
+    'AUTH_FILE_NOT_ENCRYPTED' => '-906000',
+    'AUTH_FILE_DOES_NOT_EXIST' => '-907000',
+    'UNLINK_FAILED' => '-908000',
+    'NO_PASSWORD_ENTERED' => '-909000',
+    'OBJPATH_EMPTY_IN_STRUCT_ERR' => '-1000000',
+    'RESCNAME_EMPTY_IN_STRUCT_ERR' => '-1001000',
+    'DATATYPE_EMPTY_IN_STRUCT_ERR' => '-1002000',
+    'DATASIZE_EMPTY_IN_STRUCT_ERR' => '-1003000',
+    'CHKSUM_EMPTY_IN_STRUCT_ERR' => '-1004000',
+    'VERSION_EMPTY_IN_STRUCT_ERR' => '-1005000',
+    'FILEPATH_EMPTY_IN_STRUCT_ERR' => '-1006000',
+    'REPLNUM_EMPTY_IN_STRUCT_ERR' => '-1007000',
+    'REPLSTATUS_EMPTY_IN_STRUCT_ERR' => '-1008000',
+    'DATAOWNER_EMPTY_IN_STRUCT_ERR' => '-1009000',
+    'DATAOWNERZONE_EMPTY_IN_STRUCT_ERR' => '-1010000',
+    'DATAEXPIRY_EMPTY_IN_STRUCT_ERR' => '-1011000',
+    'DATACOMMENTS_EMPTY_IN_STRUCT_ERR' => '-1012000',
+    'DATACREATE_EMPTY_IN_STRUCT_ERR' => '-1013000',
+    'DATAMODIFY_EMPTY_IN_STRUCT_ERR' => '-1014000',
+    'DATAACCESS_EMPTY_IN_STRUCT_ERR' => '-1015000',
+    'DATAACCESSINX_EMPTY_IN_STRUCT_ERR' => '-1016000',
+    'NO_RULE_FOUND_ERR' => '-1017000',
+    'NO_MORE_RULES_ERR' => '-1018000',
+    'UNMATCHED_ACTION_ERR' => '-1019000',
+    'RULES_FILE_READ_ERROR' => '-1020000',
+    'ACTION_ARG_COUNT_MISMATCH' => '-1021000',
+    'MAX_NUM_OF_ARGS_IN_ACTION_EXCEEDED' => '-1022000',
+    'UNKNOWN_PARAM_IN_RULE_ERR' => '-1023000',
+    'DESTRESCNAME_EMPTY_IN_STRUCT_ERR' => '-1024000',
+    'BACKUPRESCNAME_EMPTY_IN_STRUCT_ERR' => '-1025000',
+    'DATAID_EMPTY_IN_STRUCT_ERR' => '-1026000',
+    'COLLID_EMPTY_IN_STRUCT_ERR' => '-1027000',
+    'RESCGROUPNAME_EMPTY_IN_STRUCT_ERR' => '-1028000',
+    'STATUSSTRING_EMPTY_IN_STRUCT_ERR' => '-1029000',
+    'DATAMAPID_EMPTY_IN_STRUCT_ERR' => '-1030000',
+    'USERNAMECLIENT_EMPTY_IN_STRUCT_ERR' => '-1031000',
+    'RODSZONECLIENT_EMPTY_IN_STRUCT_ERR' => '-1032000',
+    'USERTYPECLIENT_EMPTY_IN_STRUCT_ERR' => '-1033000',
+    'HOSTCLIENT_EMPTY_IN_STRUCT_ERR' => '-1034000',
+    'AUTHSTRCLIENT_EMPTY_IN_STRUCT_ERR' => '-1035000',
+    'USERAUTHSCHEMECLIENT_EMPTY_IN_STRUCT_ERR' => '-1036000',
+    'USERINFOCLIENT_EMPTY_IN_STRUCT_ERR' => '-1037000',
+    'USERCOMMENTCLIENT_EMPTY_IN_STRUCT_ERR' => '-1038000',
+    'USERCREATECLIENT_EMPTY_IN_STRUCT_ERR' => '-1039000',
+    'USERMODIFYCLIENT_EMPTY_IN_STRUCT_ERR' => '-1040000',
+    'USERNAMEPROXY_EMPTY_IN_STRUCT_ERR' => '-1041000',
+    'RODSZONEPROXY_EMPTY_IN_STRUCT_ERR' => '-1042000',
+    'USERTYPEPROXY_EMPTY_IN_STRUCT_ERR' => '-1043000',
+    'HOSTPROXY_EMPTY_IN_STRUCT_ERR' => '-1044000',
+    'AUTHSTRPROXY_EMPTY_IN_STRUCT_ERR' => '-1045000',
+    'USERAUTHSCHEMEPROXY_EMPTY_IN_STRUCT_ERR' => '-1046000',
+    'USERINFOPROXY_EMPTY_IN_STRUCT_ERR' => '-1047000',
+    'USERCOMMENTPROXY_EMPTY_IN_STRUCT_ERR' => '-1048000',
+    'USERCREATEPROXY_EMPTY_IN_STRUCT_ERR' => '-1049000',
+    'USERMODIFYPROXY_EMPTY_IN_STRUCT_ERR' => '-1050000',
+    'COLLNAME_EMPTY_IN_STRUCT_ERR' => '-1051000',
+    'COLLPARENTNAME_EMPTY_IN_STRUCT_ERR' => '-1052000',
+    'COLLOWNERNAME_EMPTY_IN_STRUCT_ERR' => '-1053000',
+    'COLLOWNERZONE_EMPTY_IN_STRUCT_ERR' => '-1054000',
+    'COLLEXPIRY_EMPTY_IN_STRUCT_ERR' => '-1055000',
+    'COLLCOMMENTS_EMPTY_IN_STRUCT_ERR' => '-1056000',
+    'COLLCREATE_EMPTY_IN_STRUCT_ERR' => '-1057000',
+    'COLLMODIFY_EMPTY_IN_STRUCT_ERR' => '-1058000',
+    'COLLACCESS_EMPTY_IN_STRUCT_ERR' => '-1059000',
+    'COLLACCESSINX_EMPTY_IN_STRUCT_ERR' => '-1060000',
+    'COLLMAPID_EMPTY_IN_STRUCT_ERR' => '-1062000',
+    'COLLINHERITANCE_EMPTY_IN_STRUCT_ERR' => '-1063000',
+    'RESCZONE_EMPTY_IN_STRUCT_ERR' => '-1065000',
+    'RESCLOC_EMPTY_IN_STRUCT_ERR' => '-1066000',
+    'RESCTYPE_EMPTY_IN_STRUCT_ERR' => '-1067000',
+    'RESCTYPEINX_EMPTY_IN_STRUCT_ERR' => '-1068000',
+    'RESCCLASS_EMPTY_IN_STRUCT_ERR' => '-1069000',
+    'RESCCLASSINX_EMPTY_IN_STRUCT_ERR' => '-1070000',
+    'RESCVAULTPATH_EMPTY_IN_STRUCT_ERR' => '-1071000',
+    'NUMOPEN_ORTS_EMPTY_IN_STRUCT_ERR' => '-1072000',
+    'PARAOPR_EMPTY_IN_STRUCT_ERR' => '-1073000',
+    'RESCID_EMPTY_IN_STRUCT_ERR' => '-1074000',
+    'GATEWAYADDR_EMPTY_IN_STRUCT_ERR' => '-1075000',
+    'RESCMAX_BJSIZE_EMPTY_IN_STRUCT_ERR' => '-1076000',
+    'FREESPACE_EMPTY_IN_STRUCT_ERR' => '-1077000',
+    'FREESPACETIME_EMPTY_IN_STRUCT_ERR' => '-1078000',
+    'FREESPACETIMESTAMP_EMPTY_IN_STRUCT_ERR' => '-1079000',
+    'RESCINFO_EMPTY_IN_STRUCT_ERR' => '-1080000',
+    'RESCCOMMENTS_EMPTY_IN_STRUCT_ERR' => '-1081000',
+    'RESCCREATE_EMPTY_IN_STRUCT_ERR' => '-1082000',
+    'RESCMODIFY_EMPTY_IN_STRUCT_ERR' => '-1083000',
+    'INPUT_ARG_NOT_WELL_FORMED_ERR' => '-1084000',
+    'INPUT_ARG_OUT_OF_ARGC_RANGE_ERR' => '-1085000',
+    'INSUFFICIENT_INPUT_ARG_ERR' => '-1086000',
+    'INPUT_ARG_DOES_NOT_MATCH_ERR' => '-1087000',
+    'RETRY_WITHOUT_RECOVERY_ERR' => '-1088000',
+    'CUT_ACTION_PROCESSED_ERR' => '-1089000',
+    'ACTION_FAILED_ERR' => '-1090000',
+    'FAIL_ACTION_ENCOUNTERED_ERR' => '-1091000',
+    'VARIABLE_NAME_TOO_LONG_ERR' => '-1092000',
+    'UNKNOWN_VARIABLE_MAP_ERR' => '-1093000',
+    'UNDEFINED_VARIABLE_MAP_ERR' => '-1094000',
+    'NULL_VALUE_ERR' => '-1095000',
+    'DVARMAP_FILE_READ_ERROR' => '-1096000',
+    'NO_RULE_OR_MSI_FUNCTION_FOUND_ERR' => '-1097000',
+    'FILE_CREATE_ERROR' => '-1098000',
+    'FMAP_FILE_READ_ERROR' => '-1099000',
+    'DATE_FORMAT_ERR' => '-1100000',
+    'RULE_FAILED_ERR' => '-1101000',
+    'NO_MICROSERVICE_FOUND_ERR' => '-1102000',
+    'INVALID_REGEXP' => '-1103000',
+    'INVALID_OBJECT_NAME' => '-1104000',
+    'INVALID_OBJECT_TYPE' => '-1105000',
+    'NO_VALUES_FOUND' => '-1106000',
+    'NO_COLUMN_NAME_FOUND' => '-1107000',
+    'SYS_NULL_INPUT' => '-99999996',
+    'SYS_HANDLER_DONE_WITH_ERROR' => '-99999997',
+    'SYS_HANDLER_DONE_NO_ERROR' => '-99999998',
+    'SYS_NO_HANDLER_REPLY_MSG' => '-99999999',
+    'GENERAL_PRODS_ERR' => '-3000000',
+    'PERR_INTERNAL_ERR' => '-3100000',
+    'PERR_UNEXPECTED_PACKET_FORMAT' => '-3101000',
+    'PERR_PATH_DOES_NOT_EXISTS' => '-3102000',
+    'PERR_UNSUPPORTED_PROTOCOL_SCHEME' => '-3103000',
+    'PERR_USER_INPUT_ERROR' => '-3104000',
+    'PERR_USER_INPUT_PATH_ERROR' => '-3105000',
+    'PERR_CONN_NOT_ACTIVE' => '-3106000',
+    'SSL_NOT_BUILT_INTO_CLIENT' => '-2100000',
+    'SSL_NOT_BUILT_INTO_SERVER' => '-2101000',
+    'SSL_INIT_ERROR' => '-2102000',
+    'SSL_HANDSHAKE_ERROR' => '-2103000',
+    'SSL_SHUTDOWN_ERROR' => '-2104000',
+    'SSL_CERT_ERROR' => '-2105000',
+    'PAM_AUTH_NOT_BUILT_INTO_CLIENT' => '-991000',
+    'PAM_AUTH_NOT_BUILT_INTO_SERVER' => '-992000',
+    'PAM_AUTH_PASSWORD_FAILED' => '-993000',
+    'PAM_AUTH_PASSWORD_INVALID_TTL' => '-994000',
+);
+$GLOBALS['PRODS_ERR_CODES_REV'] = array(
+    '-1000' => 'SYS_SOCK_OPEN_ERR',
+    '-2000' => 'SYS_SOCK_BIND_ERR',
+    '-3000' => 'SYS_SOCK_ACCEPT_ERR',
+    '-4000' => 'SYS_HEADER_READ_LEN_ERR',
+    '-5000' => 'SYS_HEADER_WRITE_LEN_ERR',
+    '-6000' => 'SYS_HEADER_TPYE_LEN_ERR',
+    '-7000' => 'SYS_CAUGHT_SIGNAL',
+    '-8000' => 'SYS_GETSTARTUP_PACK_ERR',
+    '-9000' => 'SYS_EXCEED_CONNECT_CNT',
+    '-10000' => 'SYS_USER_NOT_ALLOWED_TO_CONN',
+    '-11000' => 'SYS_READ_MSG_BODY_INPUT_ERR',
+    '-12000' => 'SYS_UNMATCHED_API_NUM',
+    '-13000' => 'SYS_NO_API_PRIV',
+    '-14000' => 'SYS_API_INPUT_ERR',
+    '-15000' => 'SYS_PACK_INSTRUCT_FORMAT_ERR',
+    '-16000' => 'SYS_MALLOC_ERR',
+    '-17000' => 'SYS_GET_HOSTNAME_ERR',
+    '-18000' => 'SYS_OUT_OF_FILE_DESC',
+    '-19000' => 'SYS_FILE_DESC_OUT_OF_RANGE',
+    '-20000' => 'SYS_UNRECOGNIZED_REMOTE_FLAG',
+    '-21000' => 'SYS_INVALID_SERVER_HOST',
+    '-22000' => 'SYS_SVR_TO_SVR_CONNECT_FAILED',
+    '-23000' => 'SYS_BAD_FILE_DESCRIPTOR',
+    '-24000' => 'SYS_INTERNAL_NULL_INPUT_ERR',
+    '-25000' => 'SYS_CONFIG_FILE_ERR',
+    '-26000' => 'SYS_INVALID_ZONE_NAME',
+    '-27000' => 'SYS_COPY_LEN_ERR',
+    '-28000' => 'SYS_PORT_COOKIE_ERR',
+    '-29000' => 'SYS_KEY_VAL_TABLE_ERR',
+    '-30000' => 'SYS_INVALID_RESC_TYPE',
+    '-31000' => 'SYS_INVALID_FILE_PATH',
+    '-32000' => 'SYS_INVALID_RESC_INPUT',
+    '-33000' => 'SYS_INVALID_PORTAL_OPR',
+    '-34000' => 'SYS_PARA_OPR_NO_SUPPORT',
+    '-35000' => 'SYS_INVALID_OPR_TYPE',
+    '-36000' => 'SYS_NO_PATH_PERMISSION',
+    '-37000' => 'SYS_NO_ICAT_SERVER_ERR',
+    '-38000' => 'SYS_AGENT_INIT_ERR',
+    '-39000' => 'SYS_PROXYUSER_NO_PRIV',
+    '-40000' => 'SYS_NO_DATA_OBJ_PERMISSION',
+    '-41000' => 'SYS_DELETE_DISALLOWED',
+    '-42000' => 'SYS_OPEN_REI_FILE_ERR',
+    '-43000' => 'SYS_NO_RCAT_SERVER_ERR',
+    '-44000' => 'SYS_UNMATCH_PACK_INSTRUCTI_NAME',
+    '-45000' => 'SYS_SVR_TO_CLI_MSI_NO_EXIST',
+    '-46000' => 'SYS_COPY_ALREADY_IN_RESC',
+    '-47000' => 'SYS_RECONN_OPR_MISMATCH',
+    '-48000' => 'SYS_INPUT_PERM_OUT_OF_RANGE',
+    '-49000' => 'SYS_FORK_ERROR',
+    '-50000' => 'SYS_PIPE_ERROR',
+    '-51000' => 'SYS_EXEC_CMD_STATUS_SZ_ERROR',
+    '-52000' => 'SYS_PATH_IS_NOT_A_FILE',
+    '-53000' => 'SYS_UNMATCHED_SPEC_COLL_TYPE',
+    '-54000' => 'SYS_TOO_MANY_QUERY_RESULT',
+    '-300000' => 'USER_AUTH_SCHEME_ERR',
+    '-301000' => 'USER_AUTH_STRING_EMPTY',
+    '-302000' => 'USER_RODS_HOST_EMPTY',
+    '-303000' => 'USER_RODS_HOSTNAME_ERR',
+    '-304000' => 'USER_SOCK_OPEN_ERR',
+    '-305000' => 'USER_SOCK_CONNECT_ERR',
+    '-306000' => 'USER_STRLEN_TOOLONG',
+    '-307000' => 'USER_API_INPUT_ERR',
+    '-308000' => 'USER_PACKSTRUCT_INPUT_ERR',
+    '-309000' => 'USER_NO_SUPPORT_ERR',
+    '-310000' => 'USER_FILE_DOES_NOT_EXIST',
+    '-311000' => 'USER_FILE_TOO_LARGE',
+    '-312000' => 'OVERWITE_WITHOUT_FORCE_FLAG',
+    '-313000' => 'UNMATCHED_KEY_OR_INDEX',
+    '-314000' => 'USER_CHKSUM_MISMATCH',
+    '-315000' => 'USER_BAD_KEYWORD_ERR',
+    '-316000' => 'USER__NULL_INPUT_ERR',
+    '-317000' => 'USER_INPUT_PATH_ERR',
+    '-318000' => 'USER_INPUT_OPTION_ERR',
+    '-319000' => 'USER_INVALID_USERNAME_FORMAT',
+    '-320000' => 'USER_DIRECT_RESC_INPUT_ERR',
+    '-321000' => 'USER_NO_RESC_INPUT_ERR',
+    '-322000' => 'USER_PARAM_LABEL_ERR',
+    '-323000' => 'USER_PARAM_TYPE_ERR',
+    '-324000' => 'BASE64_BUFFER_OVERFLOW',
+    '-325000' => 'BASE64_INVALID_PACKET',
+    '-326000' => 'USER_MSG_TYPE_NO_SUPPORT',
+    '-337000' => 'USER_RSYNC_NO_MODE_INPUT_ERR',
+    '-338000' => 'USER_OPTION_INPUT_ERR',
+    '-339000' => 'SAME_SRC_DEST_PATHS_ERR',
+    '-340000' => 'USER_RESTART_FILE_INPUT_ERR',
+    '-341000' => 'RESTART_OPR_FAILED',
+    '-342000' => 'BAD_EXEC_CMD_PATH',
+    '-343000' => 'EXEC_CMD_OUTPUT_TOO_LARGE',
+    '-344000' => 'EXEC_CMD_ERROR',
+    '-500000' => 'FILE_INDEX_LOOKUP_ERR',
+    '-510000' => 'UNIX_FILE_OPEN_ERR',
+    '-510001' => 'UNIX_FILE_OPEN_ERR_1',
+    '-510002' => 'UNIX_FILE_OPEN_ERR_2',
+    '-511000' => 'UNIX_FILE_CREATE_ERR',
+    '-512000' => 'UNIX_FILE_READ_ERR',
+    '-513000' => 'UNIX_FILE_WRITE_ERR',
+    '-514000' => 'UNIX_FILE_CLOSE_ERR',
+    '-515000' => 'UNIX_FILE_UNLINK_ERR',
+    '-516000' => 'UNIX_FILE_STAT_ERR',
+    '-517000' => 'UNIX_FILE_FSTAT_ERR',
+    '-518000' => 'UNIX_FILE_LSEEK_ERR',
+    '-519000' => 'UNIX_FILE_FSYNC_ERR',
+    '-520000' => 'UNIX_FILE_MKDIR_ERR',
+    '-521000' => 'UNIX_FILE_RMDIR_ERR',
+    '-522000' => 'UNIX_FILE_OPENDIR_ERR',
+    '-523000' => 'UNIX_FILE_CLOSEDIR_ERR',
+    '-524000' => 'UNIX_FILE_READDIR_ERR',
+    '-525000' => 'UNIX_FILE_STAGE_ERR',
+    '-526000' => 'UNIX_FILE_GET_FS_FREESPACE_ERR',
+    '-527000' => 'UNIX_FILE_CHMOD_ERR',
+    '-528000' => 'UNIX_FILE_RENAME_ERR',
+    '-801000' => 'CATALOG_NOT_CONNECTED',
+    '-802000' => 'CAT_ENV_ERR',
+    '-803000' => 'CAT_CONNECT_ERR',
+    '-804000' => 'CAT_DISCONNECT_ERR',
+    '-805000' => 'CAT_CLOSE_ENV_ERR',
+    '-806000' => 'CAT_SQL_ERR',
+    '-807000' => 'CAT_GET_ROW_ERR',
+    '-808000' => 'CAT_NO_ROWS_FOUND',
+    '-809000' => 'CATALOG_ALREADY_HAS_ITEM_BY_THAT_NAME',
+    '-810000' => 'CAT_INVALID_RESOURCE_TYPE',
+    '-811000' => 'CAT_INVALID_RESOURCE_CLASS',
+    '-812000' => 'CAT_INVALID_RESOURCE_NET_ADDR',
+    '-813000' => 'CAT_INVALID_RESOURCE_VAULT_PATH',
+    '-814000' => 'CAT_UNKNOWN_COLLECTION',
+    '-815000' => 'CAT_INVALID_DATA_TYPE',
+    '-816000' => 'CAT_INVALID_ARGUMENT',
+    '-817000' => 'CAT_UNKNOWN_FILE',
+    '-818000' => 'CAT_NO_ACCESS_PERMISSION',
+    '-819000' => 'CAT_SUCCESS_BUT_WITH_NO_INFO',
+    '-820000' => 'CAT_INVALID_USER_TYPE',
+    '-821000' => 'CAT_COLLECTION_NOT_EMPTY',
+    '-822000' => 'CAT_TOO_MANY_TABLES',
+    '-823000' => 'CAT_UNKNOWN_TABLE',
+    '-824000' => 'CAT_NOT_OPEN',
+    '-825000' => 'CAT_FAILED_TO_LINK_TABLES',
+    '-826000' => 'CAT_INVALID_AUTHENTICATION',
+    '-827000' => 'CAT_INVALID_USER',
+    '-828000' => 'CAT_INVALID_ZONE',
+    '-829000' => 'CAT_INVALID_GROUP',
+    '-830000' => 'CAT_INSUFFICIENT_PRIVILEGE_LEVEL',
+    '-831000' => 'CAT_INVALID_RESOURCE',
+    '-832000' => 'CAT_INVALID_CLIENT_USER',
+    '-833000' => 'CAT_NAME_EXISTS_AS_COLLECTION',
+    '-834000' => 'CAT_NAME_EXISTS_AS_DATAOBJ',
+    '-835000' => 'CAT_RESOURCE_NOT_EMPTY',
+    '-836000' => 'CAT_NOT_A_DATAOBJ_AND_NOT_A_COLLECTION',
+    '-837000' => 'CAT_RECURSIVE_MOVE',
+    '-838000' => 'CAT_LAST_REPLICA',
+    '-839000' => 'CAT_OCI_ERROR',
+    '-840000' => 'CAT_PASSWORD_EXPIRED',
+    '-900000' => 'FILE_OPEN_ERR',
+    '-901000' => 'FILE_READ_ERR',
+    '-902000' => 'FILE_WRITE_ERR',
+    '-903000' => 'PASSWORD_EXCEEDS_MAX_SIZE',
+    '-904000' => 'ENVIRONMENT_VAR_HOME_NOT_DEFINED',
+    '-905000' => 'UNABLE_TO_STAT_FILE',
+    '-906000' => 'AUTH_FILE_NOT_ENCRYPTED',
+    '-907000' => 'AUTH_FILE_DOES_NOT_EXIST',
+    '-908000' => 'UNLINK_FAILED',
+    '-909000' => 'NO_PASSWORD_ENTERED',
+    '-1000000' => 'OBJPATH_EMPTY_IN_STRUCT_ERR',
+    '-1001000' => 'RESCNAME_EMPTY_IN_STRUCT_ERR',
+    '-1002000' => 'DATATYPE_EMPTY_IN_STRUCT_ERR',
+    '-1003000' => 'DATASIZE_EMPTY_IN_STRUCT_ERR',
+    '-1004000' => 'CHKSUM_EMPTY_IN_STRUCT_ERR',
+    '-1005000' => 'VERSION_EMPTY_IN_STRUCT_ERR',
+    '-1006000' => 'FILEPATH_EMPTY_IN_STRUCT_ERR',
+    '-1007000' => 'REPLNUM_EMPTY_IN_STRUCT_ERR',
+    '-1008000' => 'REPLSTATUS_EMPTY_IN_STRUCT_ERR',
+    '-1009000' => 'DATAOWNER_EMPTY_IN_STRUCT_ERR',
+    '-1010000' => 'DATAOWNERZONE_EMPTY_IN_STRUCT_ERR',
+    '-1011000' => 'DATAEXPIRY_EMPTY_IN_STRUCT_ERR',
+    '-1012000' => 'DATACOMMENTS_EMPTY_IN_STRUCT_ERR',
+    '-1013000' => 'DATACREATE_EMPTY_IN_STRUCT_ERR',
+    '-1014000' => 'DATAMODIFY_EMPTY_IN_STRUCT_ERR',
+    '-1015000' => 'DATAACCESS_EMPTY_IN_STRUCT_ERR',
+    '-1016000' => 'DATAACCESSINX_EMPTY_IN_STRUCT_ERR',
+    '-1017000' => 'NO_RULE_FOUND_ERR',
+    '-1018000' => 'NO_MORE_RULES_ERR',
+    '-1019000' => 'UNMATCHED_ACTION_ERR',
+    '-1020000' => 'RULES_FILE_READ_ERROR',
+    '-1021000' => 'ACTION_ARG_COUNT_MISMATCH',
+    '-1022000' => 'MAX_NUM_OF_ARGS_IN_ACTION_EXCEEDED',
+    '-1023000' => 'UNKNOWN_PARAM_IN_RULE_ERR',
+    '-1024000' => 'DESTRESCNAME_EMPTY_IN_STRUCT_ERR',
+    '-1025000' => 'BACKUPRESCNAME_EMPTY_IN_STRUCT_ERR',
+    '-1026000' => 'DATAID_EMPTY_IN_STRUCT_ERR',
+    '-1027000' => 'COLLID_EMPTY_IN_STRUCT_ERR',
+    '-1028000' => 'RESCGROUPNAME_EMPTY_IN_STRUCT_ERR',
+    '-1029000' => 'STATUSSTRING_EMPTY_IN_STRUCT_ERR',
+    '-1030000' => 'DATAMAPID_EMPTY_IN_STRUCT_ERR',
+    '-1031000' => 'USERNAMECLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1032000' => 'RODSZONECLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1033000' => 'USERTYPECLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1034000' => 'HOSTCLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1035000' => 'AUTHSTRCLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1036000' => 'USERAUTHSCHEMECLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1037000' => 'USERINFOCLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1038000' => 'USERCOMMENTCLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1039000' => 'USERCREATECLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1040000' => 'USERMODIFYCLIENT_EMPTY_IN_STRUCT_ERR',
+    '-1041000' => 'USERNAMEPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1042000' => 'RODSZONEPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1043000' => 'USERTYPEPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1044000' => 'HOSTPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1045000' => 'AUTHSTRPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1046000' => 'USERAUTHSCHEMEPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1047000' => 'USERINFOPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1048000' => 'USERCOMMENTPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1049000' => 'USERCREATEPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1050000' => 'USERMODIFYPROXY_EMPTY_IN_STRUCT_ERR',
+    '-1051000' => 'COLLNAME_EMPTY_IN_STRUCT_ERR',
+    '-1052000' => 'COLLPARENTNAME_EMPTY_IN_STRUCT_ERR',
+    '-1053000' => 'COLLOWNERNAME_EMPTY_IN_STRUCT_ERR',
+    '-1054000' => 'COLLOWNERZONE_EMPTY_IN_STRUCT_ERR',
+    '-1055000' => 'COLLEXPIRY_EMPTY_IN_STRUCT_ERR',
+    '-1056000' => 'COLLCOMMENTS_EMPTY_IN_STRUCT_ERR',
+    '-1057000' => 'COLLCREATE_EMPTY_IN_STRUCT_ERR',
+    '-1058000' => 'COLLMODIFY_EMPTY_IN_STRUCT_ERR',
+    '-1059000' => 'COLLACCESS_EMPTY_IN_STRUCT_ERR',
+    '-1060000' => 'COLLACCESSINX_EMPTY_IN_STRUCT_ERR',
+    '-1062000' => 'COLLMAPID_EMPTY_IN_STRUCT_ERR',
+    '-1063000' => 'COLLINHERITANCE_EMPTY_IN_STRUCT_ERR',
+    '-1065000' => 'RESCZONE_EMPTY_IN_STRUCT_ERR',
+    '-1066000' => 'RESCLOC_EMPTY_IN_STRUCT_ERR',
+    '-1067000' => 'RESCTYPE_EMPTY_IN_STRUCT_ERR',
+    '-1068000' => 'RESCTYPEINX_EMPTY_IN_STRUCT_ERR',
+    '-1069000' => 'RESCCLASS_EMPTY_IN_STRUCT_ERR',
+    '-1070000' => 'RESCCLASSINX_EMPTY_IN_STRUCT_ERR',
+    '-1071000' => 'RESCVAULTPATH_EMPTY_IN_STRUCT_ERR',
+    '-1072000' => 'NUMOPEN_ORTS_EMPTY_IN_STRUCT_ERR',
+    '-1073000' => 'PARAOPR_EMPTY_IN_STRUCT_ERR',
+    '-1074000' => 'RESCID_EMPTY_IN_STRUCT_ERR',
+    '-1075000' => 'GATEWAYADDR_EMPTY_IN_STRUCT_ERR',
+    '-1076000' => 'RESCMAX_BJSIZE_EMPTY_IN_STRUCT_ERR',
+    '-1077000' => 'FREESPACE_EMPTY_IN_STRUCT_ERR',
+    '-1078000' => 'FREESPACETIME_EMPTY_IN_STRUCT_ERR',
+    '-1079000' => 'FREESPACETIMESTAMP_EMPTY_IN_STRUCT_ERR',
+    '-1080000' => 'RESCINFO_EMPTY_IN_STRUCT_ERR',
+    '-1081000' => 'RESCCOMMENTS_EMPTY_IN_STRUCT_ERR',
+    '-1082000' => 'RESCCREATE_EMPTY_IN_STRUCT_ERR',
+    '-1083000' => 'RESCMODIFY_EMPTY_IN_STRUCT_ERR',
+    '-1084000' => 'INPUT_ARG_NOT_WELL_FORMED_ERR',
+    '-1085000' => 'INPUT_ARG_OUT_OF_ARGC_RANGE_ERR',
+    '-1086000' => 'INSUFFICIENT_INPUT_ARG_ERR',
+    '-1087000' => 'INPUT_ARG_DOES_NOT_MATCH_ERR',
+    '-1088000' => 'RETRY_WITHOUT_RECOVERY_ERR',
+    '-1089000' => 'CUT_ACTION_PROCESSED_ERR',
+    '-1090000' => 'ACTION_FAILED_ERR',
+    '-1091000' => 'FAIL_ACTION_ENCOUNTERED_ERR',
+    '-1092000' => 'VARIABLE_NAME_TOO_LONG_ERR',
+    '-1093000' => 'UNKNOWN_VARIABLE_MAP_ERR',
+    '-1094000' => 'UNDEFINED_VARIABLE_MAP_ERR',
+    '-1095000' => 'NULL_VALUE_ERR',
+    '-1096000' => 'DVARMAP_FILE_READ_ERROR',
+    '-1097000' => 'NO_RULE_OR_MSI_FUNCTION_FOUND_ERR',
+    '-1098000' => 'FILE_CREATE_ERROR',
+    '-1099000' => 'FMAP_FILE_READ_ERROR',
+    '-1100000' => 'DATE_FORMAT_ERR',
+    '-1101000' => 'RULE_FAILED_ERR',
+    '-1102000' => 'NO_MICROSERVICE_FOUND_ERR',
+    '-1103000' => 'INVALID_REGEXP',
+    '-1104000' => 'INVALID_OBJECT_NAME',
+    '-1105000' => 'INVALID_OBJECT_TYPE',
+    '-1106000' => 'NO_VALUES_FOUND',
+    '-1107000' => 'NO_COLUMN_NAME_FOUND',
+    '-99999996' => 'SYS_NULL_INPUT',
+    '-99999997' => 'SYS_HANDLER_DONE_WITH_ERROR',
+    '-99999998' => 'SYS_HANDLER_DONE_NO_ERROR',
+    '-99999999' => 'SYS_NO_HANDLER_REPLY_MSG',
+    '-3000000' => 'GENERAL_PRODS_ERR',
+    '-3100000' => 'PERR_INTERNAL_ERR',
+    '-3101000' => 'PERR_UNEXPECTED_PACKET_FORMAT',
+    '-3102000' => 'PERR_PATH_DOES_NOT_EXISTS',
+    '-3103000' => 'PERR_UNSUPPORTED_PROTOCOL_SCHEME',
+    '-3104000' => 'PERR_USER_INPUT_ERROR',
+    '-3105000' => 'PERR_USER_INPUT_PATH_ERROR',
+    '-3106000' => 'PERR_CONN_NOT_ACTIVE',
+    '-2100000' => 'SSL_NOT_BUILT_INTO_CLIENT',
+    '-2101000' => 'SSL_NOT_BUILT_INTO_SERVER',
+    '-2102000' => 'SSL_INIT_ERROR',
+    '-2103000' => 'SSL_HANDSHAKE_ERROR',
+    '-2104000' => 'SSL_SHUTDOWN_ERROR',
+    '-2105000' => 'SSL_CERT_ERROR',
+    '-991000' => 'PAM_AUTH_NOT_BUILT_INTO_CLIENT',
+    '-992000' => 'PAM_AUTH_NOT_BUILT_INTO_SERVER',
+    '-993000' => 'PAM_AUTH_PASSWORD_FAILED',
+    '-994000' => 'PAM_AUTH_PASSWORD_INVALID_TTL',
+);
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..ff830c6d6aabe1a8da5b35134aaa566f74fb53c6
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php
@@ -0,0 +1,225 @@
+<?php
+/* This file is generated by setRodsGenQueryKeyWd.php   Please modify that file if you wish to update the    Gen Query keywords.            */
+$GLOBALS['PRODS_GENQUE_KEYWD'] = array(
+    'ALL_KW' => "all",
+    'COPIES_KW' => "copies",
+    'EXEC_LOCALLY_KW' => "execLocally",
+    'FORCE_FLAG_KW' => "forceFlag",
+    'CLI_IN_SVR_FIREWALL_KW' => "cliInSvrFirewall",
+    'REG_CHKSUM_KW' => "regChksum",
+    'VERIFY_CHKSUM_KW' => "verifyChksum",
+    'VERIFY_BY_SIZE_KW' => "verifyBySize",
+    'OBJ_PATH_KW' => "objPath",
+    'RESC_NAME_KW' => "rescName",
+    'DEST_RESC_NAME_KW' => "destRescName",
+    'BACKUP_RESC_NAME_KW' => "backupRescName",
+    'DATA_TYPE_KW' => "dataType",
+    'DATA_SIZE_KW' => "dataSize",
+    'CHKSUM_KW' => "chksum",
+    'VERSION_KW' => "version",
+    'FILE_PATH_KW' => "filePath",
+    'REPL_NUM_KW' => "replNum",
+    'REPL_STATUS_KW' => "replStatus",
+    'ALL_REPL_STATUS_KW' => "allReplStatus",
+    'DATA_INCLUDED_KW' => "dataIncluded",
+    'DATA_OWNER_KW' => "dataOwner",
+    'DATA_OWNER_ZONE_KW' => "dataOwnerZone",
+    'DATA_EXPIRY_KW' => "dataExpiry",
+    'DATA_COMMENTS_KW' => "dataComments",
+    'DATA_CREATE_KW' => "dataCreate",
+    'DATA_MODIFY_KW' => "dataModify",
+    'DATA_ACCESS_KW' => "dataAccess",
+    'DATA_ACCESS_INX_KW' => "dataAccessInx",
+    'NO_OPEN_FLAG_KW' => "noOpenFlag",
+    'STREAMING_KW' => "streaming",
+    'DATA_ID_KW' => "dataId",
+    'COLL_ID_KW' => "collId",
+    'RESC_GROUP_NAME_KW' => "rescGroupName",
+    'STATUS_STRING_KW' => "statusString",
+    'DATA_MAP_ID_KW' => "dataMapId",
+    'NO_PARA_OP_KW' => "noParaOpr",
+    'LOCAL_PATH_KW' => "localPath",
+    'RSYNC_MODE_KW' => "rsyncMode",
+    'RSYNC_DEST_PATH_KW' => "rsyncDestPath",
+    'RSYNC_CHKSUM_KW' => "rsyncChksum",
+    'CHKSUM_ALL_KW' => "ChksumAll",
+    'FORCE_CHKSUM_KW' => "forceChksum",
+    'COLLECTION_KW' => "collection",
+    'IRODS_ADMIN_KW' => "irodsAdmin",
+    'RESC_ZONE_KW' => "zoneName",
+    'RESC_LOC_KW' => "rescLoc",
+    'RESC_TYPE_KW' => "rescType",
+    'RESC_CLASS_KW' => "rescClass",
+    'RESC_VAULT_PATH_KW' => "rescVaultPath",
+    'NUM_OPEN_PORTS_KW' => "numOpenPorts",
+    'PARA_OPR_KW' => "paraOpr",
+    'GATEWAY_ADDR_KW' => "gateWayAddr",
+    'RESC_MAX_OBJ_SIZE_KW' => "rescMaxObjSize",
+    'FREE_SPACE_KW' => "freeSpace",
+    'FREE_SPACE_TIME_KW' => "freeSpaceTime",
+    'FREE_SPACE_TIMESTAMP_KW' => "freeSpaceTimeStamp",
+    'RESC_TYPE_INX_KW' => "rescTypeInx",
+    'RESC_CLASS_INX_KW' => "rescClassInx",
+    'RESC_ID_KW' => "rescId",
+    'RESC_INFO_KW' => "rescInfo",
+    'RESC_COMMENTS_KW' => "rescComments",
+    'RESC_CREATE_KW' => "rescCreate",
+    'RESC_MODIFY_KW' => "rescModify",
+    'USER_NAME_CLIENT_KW' => "userNameClient",
+    'RODS_ZONE_CLIENT_KW' => "rodsZoneClient",
+    'HOST_CLIENT_KW' => "hostClient",
+    'USER_TYPE_CLIENT_KW' => "userTypeClient",
+    'AUTH_STR_CLIENT_KW' => "authStrClient",
+    'USER_AUTH_SCHEME_CLIENT_KW' => "userAuthSchemeClient",
+    'USER_INFO_CLIENT_KW' => "userInfoClient",
+    'USER_COMMENT_CLIENT_KW' => "userCommentClient",
+    'USER_CREATE_CLIENT_KW' => "userCreateClient",
+    'USER_MODIFY_CLIENT_KW' => "userModifyClient",
+    'USER_NAME_PROXY_KW' => "userNameProxy",
+    'RODS_ZONE_PROXY_KW' => "rodsZoneProxy",
+    'HOST_PROXY_KW' => "hostProxy",
+    'USER_TYPE_PROXY_KW' => "userTypeProxy",
+    'AUTH_STR_PROXY_KW' => "authStrProxy",
+    'USER_AUTH_SCHEME_PROXY_KW' => "userAuthSchemeProxy",
+    'USER_INFO_PROXY_KW' => "userInfoProxy",
+    'USER_COMMENT_PROXY_KW' => "userCommentProxy",
+    'USER_CREATE_PROXY_KW' => "userCreateProxy",
+    'USER_MODIFY_PROXY_KW' => "userModifyProxy",
+    'ACCESS_PERMISSION_KW' => "accessPermission",
+    'COLL_NAME_KW' => "collName",
+    'COLL_PARENT_NAME_KW' => "collParentName",
+    'COLL_OWNER_NAME_KW' => "collOwnername",
+    'COLL_OWNER_ZONE_KW' => "collOwnerZone",
+    'COLL_MAP_ID_KW' => "collMapId",
+    'COLL_INHERITANCE_KW' => "collInheritance",
+    'COLL_COMMENTS_KW' => "collComments",
+    'COLL_EXPIRY_KW' => "collExpiry",
+    'COLL_CREATE_KW' => "collCreate",
+    'COLL_MODIFY_KW' => "collModify",
+    'COLL_ACCESS_KW' => "collAccess",
+    'COLL_ACCESS_INX_KW' => "collAccessInx",
+    'COLL_ID_KW' => "collId",
+    'RULE_NAME_KW' => "ruleName",
+    'RULE_REI_FILE_PATH_KW' => "reiFilePath",
+    'RULE_USER_NAME_KW' => "userName",
+    'RULE_EXE_ADDRESS_KW' => "exeAddress",
+    'RULE_EXE_TIME_KW' => "exeTime",
+    'RULE_EXE_FREQUENCY_KW' => "exeFrequency",
+    'RULE_PRIORITY_KW' => "priority",
+    'RULE_ESTIMATE_EXE_TIME_KW' => "estimateExeTime",
+    'RULE_NOTIFICATION_ADDR_KW' => "notificationAddr",
+    'RULE_LAST_EXE_TIME_KW' => "lastExeTime",
+    'RULE_EXE_STATUS_KW' => "exeStatus",
+);
+$GLOBALS['PRODS_GENQUE_KEYWD_REV'] = array(
+    "all" => 'ALL_KW',
+    "copies" => 'COPIES_KW',
+    "execLocally" => 'EXEC_LOCALLY_KW',
+    "forceFlag" => 'FORCE_FLAG_KW',
+    "cliInSvrFirewall" => 'CLI_IN_SVR_FIREWALL_KW',
+    "regChksum" => 'REG_CHKSUM_KW',
+    "verifyChksum" => 'VERIFY_CHKSUM_KW',
+    "verifyBySize" => 'VERIFY_BY_SIZE_KW',
+    "objPath" => 'OBJ_PATH_KW',
+    "rescName" => 'RESC_NAME_KW',
+    "destRescName" => 'DEST_RESC_NAME_KW',
+    "backupRescName" => 'BACKUP_RESC_NAME_KW',
+    "dataType" => 'DATA_TYPE_KW',
+    "dataSize" => 'DATA_SIZE_KW',
+    "chksum" => 'CHKSUM_KW',
+    "version" => 'VERSION_KW',
+    "filePath" => 'FILE_PATH_KW',
+    "replNum" => 'REPL_NUM_KW',
+    "replStatus" => 'REPL_STATUS_KW',
+    "allReplStatus" => 'ALL_REPL_STATUS_KW',
+    "dataIncluded" => 'DATA_INCLUDED_KW',
+    "dataOwner" => 'DATA_OWNER_KW',
+    "dataOwnerZone" => 'DATA_OWNER_ZONE_KW',
+    "dataExpiry" => 'DATA_EXPIRY_KW',
+    "dataComments" => 'DATA_COMMENTS_KW',
+    "dataCreate" => 'DATA_CREATE_KW',
+    "dataModify" => 'DATA_MODIFY_KW',
+    "dataAccess" => 'DATA_ACCESS_KW',
+    "dataAccessInx" => 'DATA_ACCESS_INX_KW',
+    "noOpenFlag" => 'NO_OPEN_FLAG_KW',
+    "streaming" => 'STREAMING_KW',
+    "dataId" => 'DATA_ID_KW',
+    "collId" => 'COLL_ID_KW',
+    "rescGroupName" => 'RESC_GROUP_NAME_KW',
+    "statusString" => 'STATUS_STRING_KW',
+    "dataMapId" => 'DATA_MAP_ID_KW',
+    "noParaOpr" => 'NO_PARA_OP_KW',
+    "localPath" => 'LOCAL_PATH_KW',
+    "rsyncMode" => 'RSYNC_MODE_KW',
+    "rsyncDestPath" => 'RSYNC_DEST_PATH_KW',
+    "rsyncChksum" => 'RSYNC_CHKSUM_KW',
+    "ChksumAll" => 'CHKSUM_ALL_KW',
+    "forceChksum" => 'FORCE_CHKSUM_KW',
+    "collection" => 'COLLECTION_KW',
+    "irodsAdmin" => 'IRODS_ADMIN_KW',
+    "zoneName" => 'RESC_ZONE_KW',
+    "rescLoc" => 'RESC_LOC_KW',
+    "rescType" => 'RESC_TYPE_KW',
+    "rescClass" => 'RESC_CLASS_KW',
+    "rescVaultPath" => 'RESC_VAULT_PATH_KW',
+    "numOpenPorts" => 'NUM_OPEN_PORTS_KW',
+    "paraOpr" => 'PARA_OPR_KW',
+    "gateWayAddr" => 'GATEWAY_ADDR_KW',
+    "rescMaxObjSize" => 'RESC_MAX_OBJ_SIZE_KW',
+    "freeSpace" => 'FREE_SPACE_KW',
+    "freeSpaceTime" => 'FREE_SPACE_TIME_KW',
+    "freeSpaceTimeStamp" => 'FREE_SPACE_TIMESTAMP_KW',
+    "rescTypeInx" => 'RESC_TYPE_INX_KW',
+    "rescClassInx" => 'RESC_CLASS_INX_KW',
+    "rescId" => 'RESC_ID_KW',
+    "rescInfo" => 'RESC_INFO_KW',
+    "rescComments" => 'RESC_COMMENTS_KW',
+    "rescCreate" => 'RESC_CREATE_KW',
+    "rescModify" => 'RESC_MODIFY_KW',
+    "userNameClient" => 'USER_NAME_CLIENT_KW',
+    "rodsZoneClient" => 'RODS_ZONE_CLIENT_KW',
+    "hostClient" => 'HOST_CLIENT_KW',
+    "userTypeClient" => 'USER_TYPE_CLIENT_KW',
+    "authStrClient" => 'AUTH_STR_CLIENT_KW',
+    "userAuthSchemeClient" => 'USER_AUTH_SCHEME_CLIENT_KW',
+    "userInfoClient" => 'USER_INFO_CLIENT_KW',
+    "userCommentClient" => 'USER_COMMENT_CLIENT_KW',
+    "userCreateClient" => 'USER_CREATE_CLIENT_KW',
+    "userModifyClient" => 'USER_MODIFY_CLIENT_KW',
+    "userNameProxy" => 'USER_NAME_PROXY_KW',
+    "rodsZoneProxy" => 'RODS_ZONE_PROXY_KW',
+    "hostProxy" => 'HOST_PROXY_KW',
+    "userTypeProxy" => 'USER_TYPE_PROXY_KW',
+    "authStrProxy" => 'AUTH_STR_PROXY_KW',
+    "userAuthSchemeProxy" => 'USER_AUTH_SCHEME_PROXY_KW',
+    "userInfoProxy" => 'USER_INFO_PROXY_KW',
+    "userCommentProxy" => 'USER_COMMENT_PROXY_KW',
+    "userCreateProxy" => 'USER_CREATE_PROXY_KW',
+    "userModifyProxy" => 'USER_MODIFY_PROXY_KW',
+    "accessPermission" => 'ACCESS_PERMISSION_KW',
+    "collName" => 'COLL_NAME_KW',
+    "collParentName" => 'COLL_PARENT_NAME_KW',
+    "collOwnername" => 'COLL_OWNER_NAME_KW',
+    "collOwnerZone" => 'COLL_OWNER_ZONE_KW',
+    "collMapId" => 'COLL_MAP_ID_KW',
+    "collInheritance" => 'COLL_INHERITANCE_KW',
+    "collComments" => 'COLL_COMMENTS_KW',
+    "collExpiry" => 'COLL_EXPIRY_KW',
+    "collCreate" => 'COLL_CREATE_KW',
+    "collModify" => 'COLL_MODIFY_KW',
+    "collAccess" => 'COLL_ACCESS_KW',
+    "collAccessInx" => 'COLL_ACCESS_INX_KW',
+    "collId" => 'COLL_ID_KW',
+    "ruleName" => 'RULE_NAME_KW',
+    "reiFilePath" => 'RULE_REI_FILE_PATH_KW',
+    "userName" => 'RULE_USER_NAME_KW',
+    "exeAddress" => 'RULE_EXE_ADDRESS_KW',
+    "exeTime" => 'RULE_EXE_TIME_KW',
+    "exeFrequency" => 'RULE_EXE_FREQUENCY_KW',
+    "priority" => 'RULE_PRIORITY_KW',
+    "estimateExeTime" => 'RULE_ESTIMATE_EXE_TIME_KW',
+    "notificationAddr" => 'RULE_NOTIFICATION_ADDR_KW',
+    "lastExeTime" => 'RULE_LAST_EXE_TIME_KW',
+    "exeStatus" => 'RULE_EXE_STATUS_KW',
+);
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..82de94095b21787a653129cbc5d22b87b92d692d
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php
@@ -0,0 +1,235 @@
+<?php
+/* This file is generated by setRodsGenQueryNum.php   Please modify that file if you wish to update the    Gen Query number.            */
+$GLOBALS['PRODS_GENQUE_NUMS'] = array(
+    'MAX_SQL_ATTR' => '50',
+    'MAX_SQL_ROWS' => '500',
+    'ORDER_BY' => '1024',
+    'ORDER_BY_DESC' => '2048',
+    'RETURN_TOTAL_ROW_COUNT' => '32',
+    'SELECT_MIN' => '2',
+    'SELECT_MAX' => '3',
+    'SELECT_SUM' => '4',
+    'SELECT_AVG' => '5',
+    'SELECT_COUNT' => '6',
+    'COL_ZONE_ID' => '101',
+    'COL_ZONE_NAME' => '102',
+    'COL_USER_ID' => '201',
+    'COL_USER_NAME' => '202',
+    'COL_USER_TYPE' => '203',
+    'COL_USER_ZONE' => '204',
+    'COL_USER_DN' => '205',
+    'COL_USER_INFO' => '206',
+    'COL_USER_COMMENT' => '207',
+    'COL_USER_CREATE_TIME' => '208',
+    'COL_USER_MODIFY_TIME' => '209',
+    'COL_R_RESC_ID' => '301',
+    'COL_R_RESC_NAME' => '302',
+    'COL_R_ZONE_NAME' => '303',
+    'COL_R_TYPE_NAME' => '304',
+    'COL_R_CLASS_NAME' => '305',
+    'COL_R_LOC' => '306',
+    'COL_R_VAULT_PATH' => '307',
+    'COL_R_FREE_SPACE' => '308',
+    'COL_R_RESC_INFO' => '309',
+    'COL_R_RESC_COMMENT' => '310',
+    'COL_R_CREATE_TIME' => '311',
+    'COL_R_MODIFY_TIME' => '312',
+    'COL_D_DATA_ID' => '401',
+    'COL_D_COLL_ID' => '402',
+    'COL_DATA_NAME' => '403',
+    'COL_DATA_REPL_NUM' => '404',
+    'COL_DATA_VERSION' => '405',
+    'COL_DATA_TYPE_NAME' => '406',
+    'COL_DATA_SIZE' => '407',
+    'COL_D_RESC_GROUP_NAME' => '408',
+    'COL_D_RESC_NAME' => '409',
+    'COL_D_DATA_PATH' => '410',
+    'COL_D_OWNER_NAME' => '411',
+    'COL_D_OWNER_ZONE' => '412',
+    'COL_D_REPL_STATUS' => '413',
+    'COL_D_DATA_STATUS' => '414',
+    'COL_D_DATA_CHECKSUM' => '415',
+    'COL_D_EXPIRY' => '416',
+    'COL_D_MAP_ID' => '417',
+    'COL_D_COMMENTS' => '418',
+    'COL_D_CREATE_TIME' => '419',
+    'COL_D_MODIFY_TIME' => '420',
+    'COL_COLL_ID' => '500',
+    'COL_COLL_NAME' => '501',
+    'COL_COLL_PARENT_NAME' => '502',
+    'COL_COLL_OWNER_NAME' => '503',
+    'COL_COLL_OWNER_ZONE' => '504',
+    'COL_COLL_MAP_ID' => '505',
+    'COL_COLL_INHERITANCE' => '506',
+    'COL_COLL_COMMENTS' => '507',
+    'COL_COLL_CREATE_TIME' => '508',
+    'COL_COLL_MODIFY_TIME' => '509',
+    'COL_COLL_TYPE' => '510',
+    'COL_COLL_INFO1' => '511',
+    'COL_COLL_INFO2' => '512',
+    'COL_META_DATA_ATTR_NAME' => '600',
+    'COL_META_DATA_ATTR_VALUE' => '601',
+    'COL_META_DATA_ATTR_UNITS' => '602',
+    'COL_META_DATA_ATTR_ID' => '603',
+    'COL_META_COLL_ATTR_NAME' => '610',
+    'COL_META_COLL_ATTR_VALUE' => '611',
+    'COL_META_COLL_ATTR_UNITS' => '612',
+    'COL_META_COLL_ATTR_ID' => '613',
+    'COL_META_NAMESPACE_COLL' => '620',
+    'COL_META_NAMESPACE_DATA' => '621',
+    'COL_META_NAMESPACE_RESC' => '622',
+    'COL_META_NAMESPACE_USER' => '623',
+    'COL_META_RESC_ATTR_NAME' => '630',
+    'COL_META_RESC_ATTR_VALUE' => '631',
+    'COL_META_RESC_ATTR_UNITS' => '632',
+    'COL_META_RESC_ATTR_ID' => '633',
+    'COL_META_USER_ATTR_NAME' => '640',
+    'COL_META_USER_ATTR_VALUE' => '641',
+    'COL_META_USER_ATTR_UNITS' => '642',
+    'COL_META_USER_ATTR_ID' => '643',
+    'COL_DATA_ACCESS_TYPE' => '700',
+    'COL_DATA_ACCESS_NAME' => '701',
+    'COL_DATA_TOKEN_NAMESPACE' => '702',
+    'COL_DATA_ACCESS_USER_ID' => '703',
+    'COL_DATA_ACCESS_DATA_ID' => '704',
+    'COL_RESC_GROUP_RESC_ID' => '800',
+    'COL_RESC_GROUP_NAME' => '801',
+    'COL_USER_GROUP_ID' => '900',
+    'COL_USER_GROUP_NAME' => '901',
+    'COL_RULE_EXEC_ID' => '1000',
+    'COL_RULE_EXEC_NAME' => '1001',
+    'COL_RULE_EXEC_REI_FILE_PATH' => '1002',
+    'COL_RULE_EXEC_USER_NAME' => '1003',
+    'COL_RULE_EXEC_ADDRESS' => '1004',
+    'COL_RULE_EXEC_TIME' => '1005',
+    'COL_RULE_EXEC_FREQUENCY' => '1006',
+    'COL_RULE_EXEC_PRIORITY' => '1007',
+    'COL_RULE_EXEC_ESTIMATED_EXE_TIME' => '1008',
+    'COL_RULE_EXEC_NOTIFICATION_ADDR' => '1009',
+    'COL_RULE_EXEC_LAST_EXE_TIME' => '1010',
+    'COL_RULE_EXEC_STATUS' => '1011',
+    'COL_TOKEN_NAMESPACE' => '1100',
+    'COL_TOKEN_ID' => '1101',
+    'COL_TOKEN_NAME' => '1102',
+    'COL_TOKEN_VALUE' => '1103',
+    'COL_TOKEN_VALUE2' => '1104',
+    'COL_TOKEN_VALUE3' => '1105',
+    'COL_TOKEN_COMMENT' => '1106',
+);
+$GLOBALS['PRODS_GENQUE_NUMS_REV'] = array(
+    '50' => 'MAX_SQL_ATTR',
+    '500' => 'MAX_SQL_ROWS',
+    '1024' => 'ORDER_BY',
+    '2048' => 'ORDER_BY_DESC',
+    '32' => 'RETURN_TOTAL_ROW_COUNT',
+    '2' => 'SELECT_MIN',
+    '3' => 'SELECT_MAX',
+    '4' => 'SELECT_SUM',
+    '5' => 'SELECT_AVG',
+    '6' => 'SELECT_COUNT',
+    '101' => 'COL_ZONE_ID',
+    '102' => 'COL_ZONE_NAME',
+    '201' => 'COL_USER_ID',
+    '202' => 'COL_USER_NAME',
+    '203' => 'COL_USER_TYPE',
+    '204' => 'COL_USER_ZONE',
+    '205' => 'COL_USER_DN',
+    '206' => 'COL_USER_INFO',
+    '207' => 'COL_USER_COMMENT',
+    '208' => 'COL_USER_CREATE_TIME',
+    '209' => 'COL_USER_MODIFY_TIME',
+    '301' => 'COL_R_RESC_ID',
+    '302' => 'COL_R_RESC_NAME',
+    '303' => 'COL_R_ZONE_NAME',
+    '304' => 'COL_R_TYPE_NAME',
+    '305' => 'COL_R_CLASS_NAME',
+    '306' => 'COL_R_LOC',
+    '307' => 'COL_R_VAULT_PATH',
+    '308' => 'COL_R_FREE_SPACE',
+    '309' => 'COL_R_RESC_INFO',
+    '310' => 'COL_R_RESC_COMMENT',
+    '311' => 'COL_R_CREATE_TIME',
+    '312' => 'COL_R_MODIFY_TIME',
+    '401' => 'COL_D_DATA_ID',
+    '402' => 'COL_D_COLL_ID',
+    '403' => 'COL_DATA_NAME',
+    '404' => 'COL_DATA_REPL_NUM',
+    '405' => 'COL_DATA_VERSION',
+    '406' => 'COL_DATA_TYPE_NAME',
+    '407' => 'COL_DATA_SIZE',
+    '408' => 'COL_D_RESC_GROUP_NAME',
+    '409' => 'COL_D_RESC_NAME',
+    '410' => 'COL_D_DATA_PATH',
+    '411' => 'COL_D_OWNER_NAME',
+    '412' => 'COL_D_OWNER_ZONE',
+    '413' => 'COL_D_REPL_STATUS',
+    '414' => 'COL_D_DATA_STATUS',
+    '415' => 'COL_D_DATA_CHECKSUM',
+    '416' => 'COL_D_EXPIRY',
+    '417' => 'COL_D_MAP_ID',
+    '418' => 'COL_D_COMMENTS',
+    '419' => 'COL_D_CREATE_TIME',
+    '420' => 'COL_D_MODIFY_TIME',
+    '500' => 'COL_COLL_ID',
+    '501' => 'COL_COLL_NAME',
+    '502' => 'COL_COLL_PARENT_NAME',
+    '503' => 'COL_COLL_OWNER_NAME',
+    '504' => 'COL_COLL_OWNER_ZONE',
+    '505' => 'COL_COLL_MAP_ID',
+    '506' => 'COL_COLL_INHERITANCE',
+    '507' => 'COL_COLL_COMMENTS',
+    '508' => 'COL_COLL_CREATE_TIME',
+    '509' => 'COL_COLL_MODIFY_TIME',
+    '510' => 'COL_COLL_TYPE',
+    '511' => 'COL_COLL_INFO1',
+    '512' => 'COL_COLL_INFO2',
+    '600' => 'COL_META_DATA_ATTR_NAME',
+    '601' => 'COL_META_DATA_ATTR_VALUE',
+    '602' => 'COL_META_DATA_ATTR_UNITS',
+    '603' => 'COL_META_DATA_ATTR_ID',
+    '610' => 'COL_META_COLL_ATTR_NAME',
+    '611' => 'COL_META_COLL_ATTR_VALUE',
+    '612' => 'COL_META_COLL_ATTR_UNITS',
+    '613' => 'COL_META_COLL_ATTR_ID',
+    '620' => 'COL_META_NAMESPACE_COLL',
+    '621' => 'COL_META_NAMESPACE_DATA',
+    '622' => 'COL_META_NAMESPACE_RESC',
+    '623' => 'COL_META_NAMESPACE_USER',
+    '630' => 'COL_META_RESC_ATTR_NAME',
+    '631' => 'COL_META_RESC_ATTR_VALUE',
+    '632' => 'COL_META_RESC_ATTR_UNITS',
+    '633' => 'COL_META_RESC_ATTR_ID',
+    '640' => 'COL_META_USER_ATTR_NAME',
+    '641' => 'COL_META_USER_ATTR_VALUE',
+    '642' => 'COL_META_USER_ATTR_UNITS',
+    '643' => 'COL_META_USER_ATTR_ID',
+    '700' => 'COL_DATA_ACCESS_TYPE',
+    '701' => 'COL_DATA_ACCESS_NAME',
+    '702' => 'COL_DATA_TOKEN_NAMESPACE',
+    '703' => 'COL_DATA_ACCESS_USER_ID',
+    '704' => 'COL_DATA_ACCESS_DATA_ID',
+    '800' => 'COL_RESC_GROUP_RESC_ID',
+    '801' => 'COL_RESC_GROUP_NAME',
+    '900' => 'COL_USER_GROUP_ID',
+    '901' => 'COL_USER_GROUP_NAME',
+    '1000' => 'COL_RULE_EXEC_ID',
+    '1001' => 'COL_RULE_EXEC_NAME',
+    '1002' => 'COL_RULE_EXEC_REI_FILE_PATH',
+    '1003' => 'COL_RULE_EXEC_USER_NAME',
+    '1004' => 'COL_RULE_EXEC_ADDRESS',
+    '1005' => 'COL_RULE_EXEC_TIME',
+    '1006' => 'COL_RULE_EXEC_FREQUENCY',
+    '1007' => 'COL_RULE_EXEC_PRIORITY',
+    '1008' => 'COL_RULE_EXEC_ESTIMATED_EXE_TIME',
+    '1009' => 'COL_RULE_EXEC_NOTIFICATION_ADDR',
+    '1010' => 'COL_RULE_EXEC_LAST_EXE_TIME',
+    '1011' => 'COL_RULE_EXEC_STATUS',
+    '1100' => 'COL_TOKEN_NAMESPACE',
+    '1101' => 'COL_TOKEN_ID',
+    '1102' => 'COL_TOKEN_NAME',
+    '1103' => 'COL_TOKEN_VALUE',
+    '1104' => 'COL_TOKEN_VALUE2',
+    '1105' => 'COL_TOKEN_VALUE3',
+    '1106' => 'COL_TOKEN_COMMENT',
+);
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/autoload.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/autoload.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..593b901959e21993c1775a97132dfba68a46c1f3
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/autoload.inc.php
@@ -0,0 +1,47 @@
+<?php
+// change this, if this code isn't "higher" than ALL classfiles
+define("CLASS_DIR", dirname(__FILE__));
+
+/**
+ * autoload classes (no need to include them one by one)
+ *
+ * @uses classFolder()
+ * @param $className string
+ */
+function __autoload($className)
+{
+    $folder = classFolder($className);
+
+    if ($folder)
+        require_once($folder . $className . ".class.php");
+}
+
+/**
+ * search for folders and subfolders with classes
+ *
+ * @param $className string
+ * @param $sub string[optional]
+ * @return string
+ */
+function classFolder($className, $sub = "/")
+{
+    $dir = dir(CLASS_DIR . $sub);
+
+    if (file_exists(CLASS_DIR . $sub . $className . ".class.php"))
+        return CLASS_DIR . $sub;
+
+    while (false !== ($folder = $dir->read())) {
+        if ($folder != "." && $folder != "..") {
+            if (is_dir(CLASS_DIR . $sub . $folder)) {
+                $subFolder = classFolder($className, $sub . $folder . "/");
+
+                if ($subFolder)
+                    return $subFolder;
+            }
+        }
+    }
+    $dir->close();
+    return false;
+}
+
+spl_autoload_register('__autoload');
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..89040882d20f053bb16e827e45d23a4d84cca0b6
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php
@@ -0,0 +1,250 @@
+<?php
+
+//require_once(dirname(__FILE__)."/../autoload.inc.php");
+
+/*
+$GLOBALS['Pack_PI_Table']=array (
+  "MsgHeader_PI" => array ("type" => NULL, "msgLen" => 0, 
+      "errorLen" => 0, "bsLen" => 0, "intInfo" => 0),
+  "StartupPack_PI" => array ("irodsProt" => 1, "connectCnt" => 0, 
+      "proxyUser" => NULL, "proxyRcatZone" => NULL, "clientUser" => NULL,  
+      "clientRcatZone" => NULL, "relVersion" => NULL,  
+      "apiVersion" => NULL, "option" => NULL ),
+   "Version_PI" => array ("status"=>0,"relVersion"=>NULL,"apiVersion"=>NULL),
+   "authResponseInp_PI" => array("response" => NULL, "username" => NULL),
+   "authRequestOut_PI"  => array("challenge" => NULL)   
+);
+*/
+
+class RODSPacket
+{
+    protected $type; // type of packet
+    protected $packlets; // (array of mixed) main message body
+
+    public function __construct($type = NULL, array $arr = NULL)
+    {
+        if (!isset($type))
+            return;
+
+        $this->type = $type;
+        $this->packlets = $arr;
+    }
+
+    public function toXML()
+    {
+        if (empty($this->type))
+            return NULL;
+
+        $doc = new DOMDocument();
+        $root = $this->toDOMElement($doc);
+        $doc->appendChild($root);
+        return ($doc->saveXML($root, LIBXML_NOEMPTYTAG));
+    }
+
+    /*
+    public function fromXML($str)
+    {
+      try {
+        $xml = new SimpleXMLElement($str);
+      } catch (Exception $e) {
+        throw new RODSException("RODSPacket::fromXML failed. ".
+            "Mal-formated XML: '$str'\n",
+            PERR_INTERNAL_ERR);
+      }
+
+      if (isset($this->type)&&($this->type!=$xml->getName()))
+      {
+        throw new RODSException("RODSPacket::fromXML failed. ".
+            "Possible type mismatch! expected type:".$this->type." but got: ".
+            $xml->getName()." \n",
+            PERR_INTERNAL_ERR);
+      }
+
+      $this->type=$xml->getName();
+
+      foreach($xml as $key => $val)
+      {
+        if (!array_key_exists($key,$this->msg))
+        {
+          throw new RODSException("RODSPacket::fromXML failed. ".
+            "Possible type mismatch! expected key '$key' doesn't exists\n",
+            PERR_INTERNAL_ERR);
+        }
+        $this->msg[$key]=(string)$val;
+      }
+    }
+    */
+
+    public static function parseXML($xmlstr)
+    {
+        if (false == ($doc = DOMDocument::loadXML($xmlstr))) {
+            throw new RODSException("RODSPacket::parseXML failed. " .
+                    "Failed to loadXML(). The xmlstr is: $xmlstr\n",
+                PERR_UNEXPECTED_PACKET_FORMAT);
+        }
+
+        $rp_classname = "RP_" . substr($doc->tagName, 0, strlen($doc->tagName) - 3);
+        $packet = new $rp_classname();
+        $packet->fromDOM($doc);
+    }
+
+    /*
+    public function fromDOM(DOMNode $domnode)
+    {
+      if (!isset($this->packlets))
+        return;
+
+      $i=0;
+      $domnode_children=$domnode->childNodes;
+
+      foreach($this->packlets as $packlet_key => &$packlet_val)
+      {
+        $domnode_child=$domnode_children->item($i++);
+
+        // check if the tag names are expected
+        if ($domnode_child->tagName!=$packlet_key)
+        {
+          throw new RODSException("RODSPacket::fromDOM failed. ".
+            "Expecting packlet:$packlet_key, but got:".$domnode_child->tagName." \n",
+            PERR_UNEXPECTED_PACKET_FORMAT);
+        }
+
+        if (is_a($packlet_val, "RODSPacket")) //if expecting sub packet
+        {
+          $packlet_val->fromDOM($domnode_child);
+        }
+        else //if expecting an string
+        {
+
+        }
+      }
+    }
+
+    */
+
+    public function fromSXE(SimpleXMLElement $sxe)
+    {
+        if (!isset($this->packlets))
+            return;
+
+        foreach ($this->packlets as $packlet_key => &$packlet_val) {
+            if ($packlet_val instanceof RODSPacket) //if expecting sub packet
+            {
+                if (!isset($sxe->$packlet_key)) {
+                    throw new RODSException("RODSPacket(" . get_class($this) . ")::fromSXE failed. " .
+                            "Failed to find expected packlet: '$packlet_key' \n",
+                        "PERR_UNEXPECTED_PACKET_FORMAT");
+                }
+                $packlet_val->fromSXE($sxe->$packlet_key);
+            } else
+                if (is_array($packlet_val)) //if expecting array
+                {
+                    if (isset($sxe->$packlet_key)) {
+                        $packlet_val = array();
+                        foreach ($sxe->$packlet_key as $sxe_val) {
+                            if ((!empty($this->array_rp_type)) &&
+                                (!empty($this->array_rp_type["$packlet_key"]))
+                            ) // if it's an array of packets
+                            {
+                                $class_name = $this->array_rp_type[$packlet_key];
+                                $sub_array_packet = new $class_name();
+                                $sub_array_packet->fromSXE($sxe_val);
+                                $packlet_val[] = $sub_array_packet;
+                            } else {
+                                $packlet_val[] = (string)$sxe_val;
+                            }
+                        }
+                    }
+
+                } else {
+                    if (isset($sxe->$packlet_key)) {
+                        $packlet_val = (string)$sxe->$packlet_key;
+                    }
+                }
+        }
+        /*
+        foreach($sxe->children() as $child)
+        {
+          $tagname=$child->getName();
+          if(substr($tagname,-3,3)=="_PI")
+          {
+            $rp_classname="RP_".substr($name,0,strlen($name)-3);
+            $child_rp=new $rp_classname();
+            $child_rp->fromSXE($child);
+          }
+          else
+          {
+            $this->packlets[$child->getName()]=(string)$child;
+          }
+        }
+        */
+    }
+
+    public function toDOMElement(DOMDocument $doc)
+    {
+        if (empty($this->type))
+            return NULL;
+
+        $node = $doc->createElement($this->type);
+
+        foreach ($this->packlets as $name => $packlet) {
+            if ($packlet instanceof RODSPacket) //if node is a packet
+            {
+                $child_node = $packlet->toDOMElement($doc);
+                if (isset($child_node))
+                    $node->appendChild($packlet->toDOMElement($doc));
+            } else
+                if (is_array($packlet)) //if node is an array
+                {
+                    if (isset($packlet)) {
+                        foreach ($packlet as $sub_packlet) {
+                            if ($sub_packlet instanceof RODSPacket) //if sub_node is a packet
+                            {
+                                $child_node = $sub_packlet->toDOMElement($doc);
+                                if (isset($child_node))
+                                    $node->appendChild($sub_packlet->toDOMElement($doc));
+                            } else {
+                                //echo "sub_packlet = $sub_packlet<br/>\n";
+                                $node->appendChild($doc->createElement($name, htmlspecialchars($sub_packlet)));
+                            }
+                        }
+                    }
+                } else //if node holds a string
+                { //echo "packlet = $packlet<br/>\n";
+                    $node->appendChild($doc->createElement($name, htmlspecialchars($packlet)));
+                }
+        }
+
+        return $node;
+    }
+
+    public function __get($name)
+    {
+        if (array_key_exists($name, $this->packlets))
+            return $this->packlets[$name];
+        else {
+            debug_print_backtrace();
+            throw new RODSException("RODSPacket::__get() failed. Trying to access field '$name' that doesn't exist!",
+                "PERR_INTERNAL_ERR");
+        }
+    }
+
+    public function __set($name, $val)
+    {
+        if (array_key_exists($name, $this->packlets))
+            $this->packlets[$name] = $val;
+        else
+            throw new RODSException("RODSPacket::__set() failed. Trying to access field '$name' that doesn't exist!",
+                "PERR_INTERNAL_ERR");
+    }
+
+    /*
+    public static function makeStartupPack($user,$zone)
+    {
+      $msg=array(1,0,$user,$zone,$user,$zone,'rods0.5','a',NULL);
+      return (new RODSPacket("StartupPack_PI",$msg));
+    }
+    */
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..8cabcd0ae423ccc1dd1d431c99d0618d942d314a
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_BinBytesBuf extends RODSPacket
+{
+    public function __construct($buflen = '', $buf = '')
+    {
+        $packlets = array("buflen" => $buflen, "buf" => $buf);
+        parent::__construct("BinBytesBuf_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..b7ad6fd0cad02dc2f4892da951b38146756f091b
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_CollInp extends RODSPacket
+{
+    public function __construct($collName = "",
+                                RP_KeyValPair $KeyValPair_PI = NULL)
+    {
+        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
+
+        $packlets = array("collName" => $collName,
+            'KeyValPair_PI' => $KeyValPair_PI);
+        parent::__construct("CollInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..939d2e3759641a1ba07ec22e0a7bb62dcb60890c
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php
@@ -0,0 +1,17 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_CollOprStat extends RODSPacket
+{
+    public function __construct($filesCnt = 0, $totalFileCnt = 0, $bytesWritten = 0,
+                                $lastObjPath = '')
+    {
+        $packlets = array("filesCnt" => $filesCnt, "totalFileCnt" => $totalFileCnt,
+            'bytesWritten' => $bytesWritten, 'lastObjPath' => $lastObjPath);
+        parent::__construct("CollOprStat_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..c16b3628f5ebd901905de52e9dbc8816462b391f
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_DataObjCopyInp extends RODSPacket
+{
+    public function __construct(RP_DataObjInp $src = NULL,
+                                RP_DataObjInp $dest = NULL)
+    {
+        if (!isset($src)) $src = new RP_DataObjInp();
+        if (!isset($dest)) $dest = new RP_DataObjInp();
+
+        $packlets = array("src" => $src, 'dest' => $dest);
+        parent::__construct("DataObjCopyInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..f7a8f939b82d6bfdf5158f7138380e06ae58f777
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_DataObjInp extends RODSPacket
+{
+    public function __construct($objPath = "", $createMode = 0, $openFlags = 0,
+                                $offset = 0, $dataSize = -1, $numThreads = 0, $oprType = 0,
+                                RP_KeyValPair $KeyValPair_PI = NULL)
+    {
+        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
+
+        $packlets = array("objPath" => $objPath, 'createMode' => $createMode,
+            'openFlags' => $openFlags, 'offset' => $offset, "dataSize" => $dataSize,
+            "numThreads" => $numThreads, "oprType" => $oprType,
+            'KeyValPair_PI' => $KeyValPair_PI);
+        parent::__construct("DataObjInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..55dcb02383d12179e423dc53d5733e573ca5d2fd
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php
@@ -0,0 +1,56 @@
+<?php
+/* 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of RP_ExecCmdOut
+ *
+ * @author lisa
+ */
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_ExecCmdOut extends RODSPacket
+{
+
+    public function __construct($buf = '', $buflen = 0)
+    {
+        $packlets = array("buf" => $buf);
+        parent::__construct("ExecCmdOut_PI", $packlets);
+    }
+
+    public function fromSXE(SimpleXMLElement $sxe)
+    {
+        $binbytes = "BinBytesBuf_PI";
+        $name = "buf";
+
+        if (!isset($this->packlets))
+            return;
+
+        $packlet_value = "";
+        try {
+            foreach ($sxe->$binbytes as $binpacket) {
+                if (strlen($binpacket->$name) > 0) {
+                    $decoded_value = base64_decode($binpacket->$name);
+                    $packlet_value .= $decoded_value;
+                }
+            }
+
+            // can't find a better way yet to get rid of the garbage on the end of the string ...
+            $len = strlen($packlet_value);
+            $cleaned_value = "";
+            for ($i = 0; $i < $len; $i++) {
+                if (ord($packlet_value{$i}) <= 0) break;
+                $cleaned_value .= $packlet_value{$i};
+            }
+
+            $this->packlets[$name] = $cleaned_value;
+            $this->packlets["buflen"] = $i;
+        } catch (Exception $ex) {
+            $this->packlets[$name] = "";
+        }
+    }
+}
+
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..88a62fc2b0c6515de6614f285df0f482f1db2384
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_ExecMyRuleInp extends RODSPacket
+{
+    public function __construct($myRule = '', RP_RHostAddr $RHostAddr_PI = null,
+                                RP_KeyValPair $KeyValPair_PI = null, $outParamDesc = '',
+                                RP_MsParamArray $MsParamArray_PI = null)
+    {
+        if (!isset($RHostAddr_PI)) $RHostAddr_PI = new RP_RHostAddr();
+        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
+        if (!isset($MsParamArray_PI)) $MsParamArray_PI = new RP_MsParamArray();
+
+        $packlets = array("myRule" => $myRule, "RHostAddr_PI" => $RHostAddr_PI,
+            "KeyValPair_PI" => $KeyValPair_PI, "outParamDesc" => $outParamDesc,
+            "MsParamArray_PI" => $MsParamArray_PI);
+        parent::__construct("ExecMyRuleInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e1e29a2bfeb440c6572c0f7138c5294c518b9b8
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php
@@ -0,0 +1,25 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_GenQueryInp extends RODSPacket
+{
+    public function __construct($maxRows = 500, $continueInx = 0,
+                                RP_KeyValPair $KeyValPair_PI = NULL,
+                                RP_InxIvalPair $InxIvalPair_PI = NULL,
+                                RP_InxValPair $InxValPair_PI = NULL,
+                                $options = 0, $partialStartIndex = 0)
+    {
+        if (!isset($KeyValPair_PI)) $KeyValPair_PI = new RP_KeyValPair();
+        if (!isset($InxIvalPair_PI)) $InxIvalPair_PI = new RP_InxIvalPair();
+        if (!isset($InxValPair_PI)) $InxValPair_PI = new RP_InxValPair();
+
+        $packlets = array("maxRows" => $maxRows, 'continueInx' => $continueInx,
+            'partialStartIndex' => $partialStartIndex, 'options' => $options,
+            'KeyValPair_PI' => $KeyValPair_PI, 'InxIvalPair_PI' => $InxIvalPair_PI,
+            'InxValPair_PI' => $InxValPair_PI);
+        parent::__construct("GenQueryInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..e9f31dd5368be60e68382a17add633fb3d1ca11f
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_GenQueryOut extends RODSPacket
+{
+    // if one of the packlet is an array of packets, define it here.
+    protected $array_rp_type;
+
+    public function __construct($rowCnt = 0, $attriCnt = 0, $continueInx = 0,
+                                $totalRowCount = 0, array $SqlResult_PI = array())
+    {
+        $this->array_rp_type = array("SqlResult_PI" => "RP_SqlResult");
+
+        $packlets = array("rowCnt" => $rowCnt, 'attriCnt' => $attriCnt,
+            'continueInx' => $continueInx, 'totalRowCount' => $totalRowCount,
+            'SqlResult_PI' => $SqlResult_PI);
+        parent::__construct("GenQueryOut_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac56bc93df8cf67a8cd77638c49efd32a732df33
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php
@@ -0,0 +1,27 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_InxIvalPair extends RODSPacket
+{
+    public function __construct($iiLen = 0, array $inx = array(), array $ivalue = array())
+    {
+        $packlets = array("iiLen" => $iiLen, 'inx' => $inx, 'ivalue' => $ivalue);
+        parent::__construct("InxIvalPair_PI", $packlets);
+    }
+
+    public function fromAssocArray($array)
+    {
+        if (!empty($array)) {
+            $this->packlets["iiLen"] = count($array);
+            $this->packlets["inx"] = array_keys($array);
+            $this->packlets["ivalue"] = array_values($array);
+        } else {
+            $this->packlets["iiLen"] = 0;
+            $this->packlets["inx"] = array();
+            $this->packlets["ivalue"] = array();
+        }
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..787d27fd1031f5b6e0dab90573c35324b2205fa6
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php
@@ -0,0 +1,44 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+require_once(dirname(__FILE__) . "/../RodsGenQueryNum.inc.php");
+
+class RP_InxValPair extends RODSPacket
+{
+    public function __construct($isLen = 0, array $inx = array(), array $svalue = array())
+    {
+        $packlets = array("isLen" => $isLen, 'inx' => $inx, 'svalue' => $svalue);
+        parent::__construct("InxValPair_PI", $packlets);
+    }
+
+    public function fromAssocArray($array)
+    {
+        if (!empty($array)) {
+            $this->packlets["isLen"] = count($array);
+            $this->packlets["inx"] = array_keys($array);
+            $this->packlets["svalue"] = array_values($array);
+        } else {
+            $this->packlets["isLen"] = 0;
+            $this->packlets["inx"] = array();
+            $this->packlets["svalue"] = array();
+        }
+    }
+
+    public function fromRODSQueryConditionArray($array)
+    {
+        $this->packlets["isLen"] = 0;
+        $this->packlets["inx"] = array();
+        $this->packlets["svalue"] = array();
+
+        if (!isset($array)) return;
+
+        $this->packlets["isLen"] = count($array);
+        foreach ($array as $cond) {
+            $this->packlets["inx"][] = $cond->name;
+            $this->packlets["svalue"][] = "$cond->op '$cond->value'";
+            //echo "<pre> $cond->op '$cond->value' </pre>";
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d8dd12ff1263577a6796e68bcb9371f9b506ea6
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php
@@ -0,0 +1,47 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_KeyValPair extends RODSPacket
+{
+    public function __construct($ssLen = 0, array $keyWord = array(), array $svalue = array())
+    {
+        if ($ssLen < 1) {
+            $keyWord = NULL;
+            $svalue = NULL;
+        }
+
+        $packlets = array("ssLen" => $ssLen, 'keyWord' => $keyWord,
+            'svalue' => $svalue);
+        parent::__construct("KeyValPair_PI", $packlets);
+    }
+
+    public function fromAssocArray(array $array)
+    {
+        if (!empty($array)) {
+            $this->packlets["ssLen"] = count($array);
+            $this->packlets["keyWord"] = array_keys($array);
+            $this->packlets["svalue"] = array_values($array);
+        } else {
+            $this->packlets["ssLen"] = 0;
+            $this->packlets["keyWord"] = array();
+            $this->packlets["svalue"] = array();
+        }
+    }
+
+    public function fromRODSQueryConditionArray($array)
+    {
+        $this->packlets["ssLen"] = 0;
+        $this->packlets["keyWord"] = array();
+        $this->packlets["svalue"] = array();
+
+        if (!isset($array)) return;
+
+        $this->packlets["ssLen"] = count($array);
+        foreach ($array as $cond) {
+            $this->packlets["keyWord"][] = $cond->name;
+            $this->packlets["svalue"][] = "$cond->op '$cond->value'";
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..65ee3580e97043dcb0790448327a14b734e79ab6
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php
@@ -0,0 +1,17 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_MiscSvrInfo extends RODSPacket
+{
+    public function __construct($serverType = 0, $relVersion = 0, $apiVersion = 0,
+                                $rodsZone = '')
+    {
+        $packlets = array("serverType" => $serverType, 'relVersion' => $relVersion,
+            'apiVersion' => $apiVersion, 'rodsZone' => $rodsZone);
+        parent::__construct("MiscSvrInfo_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..b67b7083d44667f65f751e33228fed76099abdb9
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php
@@ -0,0 +1,18 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_ModAVUMetadataInp extends RODSPacket
+{
+    public function __construct($arg0 = NULL, $arg1 = NULL, $arg2 = NULL,
+                                $arg3 = NULL, $arg4 = NULL, $arg5 = NULL, $arg6 = NULL, $arg7 = NULL, $arg8 = NULL,
+                                $arg9 = NULL)
+    {
+        $packlets = array("arg0" => $arg0, "arg1" => $arg1, "arg2" => $arg2,
+            "arg3" => $arg3, "arg4" => $arg4, "arg5" => $arg5,
+            "arg6" => $arg6, "arg7" => $arg7, "arg8" => $arg8, "arg9" => $arg9);
+        parent::__construct("ModAVUMetadataInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..abf9bc471bbf0ecee958e4e5dce2d246f916ca7b
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php
@@ -0,0 +1,45 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_MsParam extends RODSPacket
+{
+    public function __construct($label = '', RODSPacket $inOutStruct = null,
+                                RP_BinBytesBuf $BinBytesBuf_PI = null)
+    {
+        if (!isset($BinBytesBuf_PI)) $BinBytesBuf_PI = new RP_BinBytesBuf();
+        if (!isset($inOutStruct)) $inOutStruct = new RODSPacket();
+
+        $packlets = array("label" => $label, "type" => $inOutStruct->type,
+            $inOutStruct->type => $inOutStruct, "BinBytesBuf_PI" => $BinBytesBuf_PI);
+        parent::__construct("MsParam_PI", $packlets);
+    }
+
+    // need to overwrite it's parent function here, since $inOutStruct->type
+    // can be undefined, when it's parent packet class was defined.
+    public function fromSXE(SimpleXMLElement $sxe)
+    {
+        if (!isset($this->packlets))
+            return;
+
+        $this->packlets["label"] = (string)$sxe->label;
+        $this->packlets["type"] = (string)$sxe->type;
+
+        $typename = $this->packlets["type"]; //type of the expected packet
+        if (substr($typename, -3, 3) != "_PI") {
+            throw new RODSException("RP_MsParam::fromSXE " .
+                    "The XML node's type is unexpected: '$typename' " .
+                    " expecting some thing like xxx_PI",
+                "SYS_PACK_INSTRUCT_FORMAT_ERR");
+        }
+        $rp_classname = "RP_" . substr($typename, 0, strlen($typename) - 3);
+        $inOutStruct = new $rp_classname();
+        $inOutStruct->fromSXE($sxe->$typename);
+        $this->packlets["$typename"] = $inOutStruct;
+
+        $this->packlets['BinBytesBuf_PI'] = new RP_BinBytesBuf();
+        $this->packlets['BinBytesBuf_PI']->fromSXE($sxe->BinBytesBuf_PI);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..b747c098dd21d79fd955ce67690c28f18f8311bb
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php
@@ -0,0 +1,21 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_MsParamArray extends RODSPacket
+{
+    // if one of the packlet is an array of packets, define it here.
+    protected $array_rp_type;
+
+    public function __construct(array $MsParam_PI = array(),
+                                $oprType = 0)
+    {
+        $this->array_rp_type = array("MsParam_PI" => "RP_MsParam");
+
+        $packlets = array("paramLen" => count($MsParam_PI),
+            "oprType" => $oprType, "MsParam_PI" => $MsParam_PI);
+        parent::__construct("MsParamArray_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..0249da9a05d2f1406620a5d9a4e33ad639c5e3e2
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php
@@ -0,0 +1,17 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_MsgHeader extends RODSPacket
+{
+    public function __construct($type = NULL, $msgLen = 0, $errorLen = 0, $bsLen = 0,
+                                $intInfo = 0)
+    {
+        $packlets = array("type" => $type, "msgLen" => $msgLen,
+            "errorLen" => $errorLen, "bsLen" => $bsLen, "intInfo" => $intInfo);
+        parent::__construct("MsgHeader_PI", $packlets);
+    }
+
+}
+
+?>
+  
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..28602f3150f4d3e62fe282e5fa4a7d26bbbc8018
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php
@@ -0,0 +1,15 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_RHostAddr extends RODSPacket
+{
+    public function __construct($hostAddr = '', $rodsZone = '', $port = 0)
+    {
+        $packlets = array("hostAddr" => $hostAddr, "rodsZone" => $rodsZone,
+            "port" => $port);
+        parent::__construct("RHostAddr_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..290a4c9a5b0ff5cf0f9409e7362efd615d697e3a
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_RodsObjStat extends RODSPacket
+{
+    public function __construct($objSize = 0, $objType = 0, $numCopies = 0,
+                                $dataId = -1, $chksum = NULL, $ownerName = NULL, $ownerZone = NULL,
+                                $createTime = NULL, $modifyTime = NULL)
+    {
+        $packlets = array("objSize" => $objSize, 'objType' => $objType,
+            'numCopies' => $numCopies, 'dataId' => $dataId, "chksum" => $chksum,
+            "ownerName" => $ownerName, "ownerZone" => $ownerZone,
+            'createTime' => $createTime, 'modifyTime' => $modifyTime);
+        parent::__construct("RodsObjStat_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..3f5a91a35d053e023295a8e89882e4ee7bd550e8
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_STR extends RODSPacket
+{
+    public function __construct($myStr = '')
+    {
+        $packlets = array("myStr" => $myStr);
+        parent::__construct("STR_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..1950f096f1307a7f553ec2f8abd8b75912985336
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php
@@ -0,0 +1,15 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_SqlResult extends RODSPacket
+{
+    public function __construct($attriInx = 0, $reslen = 0, array $value = array())
+    {
+        $packlets = array("attriInx" => $attriInx, 'reslen' => $reslen, 'value' => $value);
+        parent::__construct("SqlResult_PI", $packlets);
+    }
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..a411bd7425b01bf759ed0b9474314a08d2db08a7
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php
@@ -0,0 +1,18 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_StartupPack extends RODSPacket
+{
+    public function __construct($user = "", $zone = "", $relVersion = RODS_REL_VERSION,
+                                $apiVersion = RODS_API_VERSION, $option = NULL)
+    {
+        $packlets = array("irodsProt" => 1, "connectCnt" => 0,
+            "proxyUser" => $user, "proxyRcatZone" => $zone, "clientUser" => $user,
+            "clientRcatZone" => $zone, "relVersion" => $relVersion,
+            "apiVersion" => $apiVersion, "option" => $option);
+        parent::__construct("StartupPack_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb591f01343a0eb2031ddf14a867c2dfa0f72b37
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_TransStat extends RODSPacket
+{
+    public function __construct($numThreads = 0, $bytesWritten = 0)
+    {
+        $packlets = array("numThreads" => $numThreads,
+            'bytesWritten' => $bytesWritten);
+        parent::__construct("TransStat_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..a08cb6cc24c6340206aee7149cf394ae0e81a6bf
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_Version extends RODSPacket
+{
+    public function __construct($status = 0, $relVersion = 'rods0.5',
+                                $apiVersion = 'a')
+    {
+        $packlets = array("status" => $status, "relVersion" => $relVersion,
+            "apiVersion" => $apiVersion);
+        parent::__construct("Version_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..9dc87140635980e9f515f8b5fce6569a3d305feb
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_authRequestOut extends RODSPacket
+{
+    public function __construct($challenge = "")
+    {
+        $packlets = array("challenge" => $challenge);
+        parent::__construct("authRequestOut_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..23d754df0acff8989bacd99fabf0115191d14393
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_authResponseInp extends RODSPacket
+{
+    public function __construct($response = "", $username = "")
+    {
+        $packlets = array("response" => $response, "username" => $username);
+        parent::__construct("authResponseInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..d16e1b3f3a44b4472b76b2d530a8c71c94fdc3c7
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_dataObjCloseInp extends RODSPacket
+{
+    public function __construct($l1descInx = -1, $bytesWritten = 0)
+    {
+        $packlets = array("l1descInx" => $l1descInx,
+            'bytesWritten' => $bytesWritten);
+        parent::__construct("dataObjCloseInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..29bd1b68e35577025c0b14cb3ee754b3a1a06175
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_dataObjReadInp extends RODSPacket
+{
+    public function __construct($l1descInx = -1, $len = 0)
+    {
+        $packlets = array("l1descInx" => $l1descInx,
+            'len' => $len);
+        parent::__construct("dataObjReadInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..5327d7a8932a9daec965efcf4e4f5cb63f51b311
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_dataObjWriteInp extends RODSPacket
+{
+    public function __construct($dataObjInx = -1, $len = 0)
+    {
+        $packlets = array("dataObjInx" => $dataObjInx,
+            'len' => $len);
+        parent::__construct("dataObjWriteInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..e28a7b3b49870fd96c45375d5343a73218200855
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_fileLseekInp extends RODSPacket
+{
+    public function __construct($fileInx = -1, $offset = 0, $whence = 0)
+    {
+        $packlets = array("fileInx" => $fileInx, "offset" => $offset,
+            'whence' => $whence);
+        parent::__construct("fileLseekInp_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf01741bea605e0de73404a94dafe21850320127
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php
@@ -0,0 +1,15 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_fileLseekOut extends RODSPacket
+{
+    public function __construct($offset = 0)
+    {
+        $packlets = array("offset" => $offset);
+        parent::__construct("fileLseekOut_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..ba073e979398e85e6359dff6d39b72a34348bc29
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+class RP_getTempPasswordOut extends RODSPacket
+{
+    public function __construct($stringToHashWith = '')
+    {
+        $packlets = array("stringToHashWith" => $stringToHashWith);
+        parent::__construct("getTempPasswordOut_PI", $packlets);
+    }
+
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..0bbc2334a827738875ed43033d0247bd01714bce
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once(dirname(__FILE__)."/../autoload.inc.php");
+class RP_pamAuthRequestInp extends RODSPacket
+{
+  public function __construct($pamUser="", $pamPassword="", $timeToLive=-1)
+  {
+    $packlets=array("pamUser" => $pamUser, "pamPassword" => $pamPassword, "timeToLive" => $timeToLive);  
+    parent::__construct("pamAuthRequestInp_PI",$packlets);
+  }
+     
+}
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..01959954c97f6c5c0e186f25614a37289b9b52cf
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once(dirname(__FILE__)."/../autoload.inc.php");
+class RP_pamAuthRequestOut extends RODSPacket
+{
+  public function __construct($irodsPamPassword="")
+  {
+    $packlets=array("irodsPamPassword" => $irodsPamPassword);  
+    parent::__construct("pamAuthRequestOut_PI",$packlets);
+  }
+     
+}
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..530f304860442b04aaf180ca23275d24d496232f
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once(dirname(__FILE__)."/../autoload.inc.php");
+class RP_sslEndInp extends RODSPacket
+{
+  public function __construct($arg0="")
+  {
+    $packlets=array("arg0" => $arg0);  
+    parent::__construct("sslEndInp_PI",$packlets);
+  }
+     
+}
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..03c8365898e698671b4237f10eb147b434447eb5
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once(dirname(__FILE__)."/../autoload.inc.php");
+class RP_sslStartInp extends RODSPacket
+{
+  public function __construct($arg0="")
+  {
+    $packlets=array("arg0" => $arg0);  
+    parent::__construct("sslStartInp_PI",$packlets);
+  }
+     
+}
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ticketAdminInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ticketAdminInp.class.php
new file mode 100644
index 0000000000000000000000000000000000000000..ec849b68dbebc8b16daa753966b24acc862edbe9
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ticketAdminInp.class.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Developer: Daniel
+ * Date: 11.01.13
+ * Time: 16:45
+ */
+
+require_once(dirname(__FILE__) . "/../autoload.inc.php");
+
+class RP_ticketAdminInp extends RODSPacket
+{
+    public function __construct($arg1 = 'session', // session -> to use it, create -> to... create!,
+                                $arg2 = '', // the actual ticket
+                                $arg3 = '', // "read" or "write" -> in case of "create" above
+                                $arg4 = '', // full path to the resource, e.g.: /tempZone/home/rods/as
+                                $arg5 = '',
+                                $arg6 = '')
+    {
+
+        $packlets = array(  'arg1' => $arg1,
+                            'arg2' => $arg2,
+                            'arg3' => $arg3,
+                            'arg4' => $arg4,
+                            'arg5' => $arg5,
+                            'arg6' => $arg6,
+                        );
+        parent::__construct('ticketAdminInp_PI', $packlets);
+    }
+
+}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/prods.ini b/apps/files_external/3rdparty/irodsphp/prods/src/prods.ini
new file mode 100644
index 0000000000000000000000000000000000000000..5c81a71de73d45c7a08b3e37231513f56c5f181c
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/prods.ini
@@ -0,0 +1,15 @@
+; Configuration file for the Prods API
+
+[ssl]
+; Require verification of SSL certificate used. Default "false".
+;verify_peer = "true"
+; Allow self-signed certificates. Requires verify_peer. Default "false".
+;allow_self_signed = "true"
+; Location of Certificate Authority file on local filesystem which 
+; should be used with verify_peer equal "true" to authenticate 
+; the identity of the remote peer. 
+;cafile = "/path/to/cert.pem"
+; If cafile is not specified or if the certificate is not found there, 
+; the directory pointed to by capath is searched for a suitable 
+; certificate. capath must be a correctly hashed certificate directory.
+;capath = "/path/to/certfiles"
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/release_notes.txt b/apps/files_external/3rdparty/irodsphp/prods/src/release_notes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7d892eedb6ea4df9096c84c79dda9b6deb39f38a
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/release_notes.txt
@@ -0,0 +1,31 @@
+
+*'''Project''': iRODS PHP Library PRODS and PRODS Web Browser
+*'''Date''': 11/26/2012
+*'''Release Version''': 3.2.0 Release
+*'''git tag''':  3.2.0
+
+==News==
+
+This is the consolidated and updated release of the PRODS PHP library for iRODS.  This library provides a pure-PHP interface to the iRODS system.  This library is suitable for simple and quick interfaces to the iRODS data grid, and will be maintained for stability and compatibility.  If advanced or higher-performance interfaces are desired, the Jargon Java API should be considered.  Note that PHP, Jython, JRuby, Groovy, and other JVM dynamic languages can be used with Jarogn.
+
+The PRODS PHP Web Browser is also included in this project, and remains supported.  Note that the PHP Web Browser functionality has been subsumed by the idrop-web browser and idrop-swing client. 
+
+Please go to [[https://code.renci.org/gf/project/irodsphp/] for the latest news and info.
+
+Note that the git repository is now the canonical version of the PHP code.  The code in the iRODS SVN server is deprecated and will be taken down at the 3.0.0 release point.  There may be other versions in Google Code and other places, but these should be considered obsolete.
+
+
+==Requirements==
+
+==Libraries==
+
+==Features==
+
+*[#1076] irods 3.2 release activities
+**Added a LICENSE.txt file at the top project level
+
+
+==Bug Fixes==
+
+*[#1071] php uses self-closing tags for empty HTML tags
+**Added patch suggested by community  Changing line 41 in RODSPacket.class.php (in PRods) from return ($doc->saveXML($root)); to return ($doc->saveXML($root, LIBXML_NOEMPTYTAG));
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
new file mode 100644
index 0000000000000000000000000000000000000000..382a85c051e0866bfb53bcf42a51d4ea97bb62e1
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php
@@ -0,0 +1,70 @@
+<?php
+$PRODS_tree_root = dirname(__FILE__) . "/../../..";
+$RODS_tree_root = "/opt/sifang/iRODS";
+
+$capi_api_num_file = $RODS_tree_root . "/lib/api/include/apiNumber.h";
+$prods_api_num_file = $PRODS_tree_root . "/clients/prods/src/RodsAPINum.inc.php";
+
+
+// Add more API number here, if you wish. It will be added to the default
+// RODS API number. Note that these API number are for web server/client
+// only. RODS server does not recongnize them.
+$new_api_nums = array(//array("SOMEAPI", 40000),
+);
+
+$value_pairs = array();
+
+$lines = explode("\n", file_get_contents($capi_api_num_file));
+
+foreach ($lines as $line) {
+    if (strlen($line) < 8) continue;
+    if (substr($line, 0, 7) == '#define') {
+        $rest = trim(substr($line, 7));
+        $tokens = preg_split("/\s+/", $rest);
+        var_dump($tokens);
+        if (count($tokens) < 2)
+            continue;
+        $val1 = NULL;
+        $val2 = NULL;
+        foreach ($tokens as $token) {
+            if (strlen($token) > 1) {
+                if (empty($val1)) $val1 = trim($token);
+                else $val2 = trim($token);
+            }
+        }
+        if ((!empty($val1)) && (!empty($val2))) {
+            array_push($value_pairs, array($val1, $val2));
+        }
+    }
+}
+var_dump($value_pairs);
+foreach ($new_api_nums as $new_code_pair) {
+    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
+        die("unexpected new_code_pair:$new_code_pair\n");
+    array_push($value_pairs, $new_code_pair);
+}
+
+$outputstr = "<?php \n" .
+    "/* This file is generated by " . basename(__FILE__) .
+    "   Please modify that file if you wish to update the " .
+    "   API number.            */\n";
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_API_NUMS\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  '$val1' => '$val2',\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_API_NUMS_REV\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  '$val2' => '$val1',\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . "?>\n";
+file_put_contents($prods_api_num_file, $outputstr);
+
+?>  
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5c4377384525434aa7e0e42db41bbfe0f1bb841
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php
@@ -0,0 +1,75 @@
+<?php
+$RODS_tree_root = dirname(__FILE__) . "/../../..";
+
+$capi_error_table_file = $RODS_tree_root . "/lib/core/include/rodsErrorTable.h";
+$prods_error_table_file = $RODS_tree_root . "/clients/prods/src/RodsErrorTable.inc.php";
+
+// Add more error code here, if you wish. It will be added to the default
+// RODS error code. Note that these errors code are for web server/client
+// only. RODS server does not recongnize them.
+$new_error_codes = array(
+    array("GENERAL_PRODS_ERR", -3000000),
+    array("PERR_INTERNAL_ERR", -3100000),
+    array("PERR_UNEXPECTED_PACKET_FORMAT", -3101000),
+    array("PERR_PATH_DOES_NOT_EXISTS", -3102000),
+    array("PERR_UNSUPPORTED_PROTOCOL_SCHEME", -3103000),
+    array("PERR_USER_INPUT_ERROR", -3104000),
+    array("PERR_USER_INPUT_PATH_ERROR", -3105000),
+    array("PERR_CONN_NOT_ACTIVE", -3106000)
+);
+
+$value_pairs = array();
+
+$lines = explode("\n", file_get_contents($capi_error_table_file));
+
+foreach ($lines as $line) {
+    if (strlen($line) < 8) continue;
+    if (substr($line, 0, 7) == '#define') {
+        $rest = trim(substr($line, 7));
+        $tokens = preg_split("/\s+/", $rest);
+        if (count($tokens) < 2)
+            continue;
+        $val1 = NULL;
+        $val2 = NULL;
+        foreach ($tokens as $token) {
+            if (strlen($token) > 3) {
+                if (empty($val1)) $val1 = trim($token);
+                else $val2 = trim($token);
+            }
+        }
+        if ((!empty($val1)) && (!empty($val2))) {
+            array_push($value_pairs, array($val1, $val2));
+        }
+    }
+}
+
+foreach ($new_error_codes as $new_code_pair) {
+    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
+        die("unexpected new_code_pair:$new_code_pair\n");
+    array_push($value_pairs, $new_code_pair);
+}
+
+$outputstr = "<?php \n" .
+    "/* This file is generated by setRodsErrorCodes.php. " .
+    "   Please modify that file if you wish to update the " .
+    "   error codes.            */\n";
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_ERR_CODES\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  '$val1' => '$val2',\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_ERR_CODES_REV\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  '$val2' => '$val1',\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . "?>\n";
+file_put_contents($prods_error_table_file, $outputstr);
+
+?>  
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
new file mode 100644
index 0000000000000000000000000000000000000000..4372a849aac0703523a714795572d995dad19d08
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php
@@ -0,0 +1,73 @@
+<?php
+$RODS_tree_root = dirname(__FILE__) . "/../../..";
+
+$capi_genque_KeyWd_file = $RODS_tree_root . "/lib/core/include/rodsKeyWdDef.h";
+$prods_genque_keywd_file = $RODS_tree_root . "/clients/prods/src/RodsGenQueryKeyWd.inc.php";
+
+// Add more Query keywd here, if you wish. It will be added to the default
+// RODS Gen Que number. Note that these number are for web server/client
+// only. RODS server does not recongnize them.
+$new_genque_keywds = array(//array("SOMEKEYWD", "SOMESTR"),
+);
+
+$value_pairs = array();
+
+$lines = explode("\n", file_get_contents($capi_genque_KeyWd_file));
+foreach ($lines as $line) {
+    if (strlen($line) < 8) continue;
+    if (substr($line, 0, 7) == '#define') {
+        $rest = trim(substr($line, 7));
+        $tokens = preg_split("/\s+/", $rest);
+        if (count($tokens) < 2)
+            continue;
+        $val1 = NULL;
+        $val2 = NULL;
+
+        foreach ($tokens as $token) {
+
+            if (strlen($token) > 1) {
+                if (empty($val1)) $val1 = trim($token);
+                else {
+
+                    if (($token{0} == '"') /*&&($token{strlen($token)-1}=='"')*/) {
+                        if (empty($val2))
+                            $val2 = trim($token);
+                    }
+                }
+            }
+        }
+        if ((!empty($val1)) && (!empty($val2))) {
+            array_push($value_pairs, array($val1, $val2));
+        }
+    }
+}
+foreach ($new_genque_keywds as $new_code_pair) {
+    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
+        die("unexpected new_code_pair:$new_code_pair\n");
+    array_push($value_pairs, $new_code_pair);
+}
+
+$outputstr = "<?php \n" .
+    "/* This file is generated by " . basename(__FILE__) .
+    "   Please modify that file if you wish to update the " .
+    "   Gen Query keywords.            */\n";
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_KEYWD\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  '$val1' => $val2,\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_KEYWD_REV\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  $val2 => '$val1',\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . "?>\n";
+file_put_contents($prods_genque_keywd_file, $outputstr);
+
+?>  
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
new file mode 100644
index 0000000000000000000000000000000000000000..03fa051f092a4ef70c18484b8e0092eec151e0ca
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php
@@ -0,0 +1,63 @@
+<?php
+$RODS_tree_root = dirname(__FILE__) . "/../../..";
+
+$capi_genque_num_file = $RODS_tree_root . "/lib/core/include/rodsGenQuery.h";
+$prods_genque_num_file = $RODS_tree_root . "/clients/prods/src/RodsGenQueryNum.inc.php";
+
+// Add more GenQue number here, if you wish. It will be added to the default
+// RODS Gen Que number. Note that these number are for web server/client
+// only. RODS server does not recongnize them.
+$new_genque_nums = array(//array("SOMENUMBER", 40000),
+);
+
+$value_pairs = array();
+
+$lines = explode("\n", file_get_contents($capi_genque_num_file));
+
+foreach ($lines as $line) {
+    if (strlen($line) < 8) continue;
+    if (substr($line, 0, 7) == '#define') {
+        $rest = trim(substr($line, 7));
+        $tokens = preg_split("/\s+/", $rest);
+        if (count($tokens) < 2)
+            continue;
+
+        $val1 = trim($tokens[0]);
+        $val2 = trim($tokens[1]);
+
+        if ((!empty($val1)) && (!empty($val2))) {
+            array_push($value_pairs, array($val1, 0 + $val2));
+        }
+    }
+}
+var_dump($value_pairs);
+foreach ($new_genque_nums as $new_code_pair) {
+    if ((!is_array($new_code_pair)) || (count($new_code_pair) != 2))
+        die("unexpected new_code_pair:$new_code_pair\n");
+    array_push($value_pairs, $new_code_pair);
+}
+
+$outputstr = "<?php \n" .
+    "/* This file is generated by " . basename(__FILE__) .
+    "   Please modify that file if you wish to update the " .
+    "   Gen Query number.            */\n";
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_NUMS\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  '$val1' => '$val2',\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . '$GLOBALS[\'PRODS_GENQUE_NUMS_REV\']=array(' . "\n";
+foreach ($value_pairs as $value_pair) {
+    $val1 = $value_pair[0];
+    $val2 = $value_pair[1];
+    $outputstr = $outputstr . "  '$val2' => '$val1',\n";
+}
+$outputstr = $outputstr . ");\n";
+
+$outputstr = $outputstr . "?>\n";
+file_put_contents($prods_genque_num_file, $outputstr);
+
+?>  
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/irodsphp/prods/utilities/exif2meta.php b/apps/files_external/3rdparty/irodsphp/prods/utilities/exif2meta.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ee9495f1023bab5e77d75c0f4445b7d25bc40b8
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/prods/utilities/exif2meta.php
@@ -0,0 +1,145 @@
+<?php
+
+// reset the connection parameters below
+$host = 'rt.sdsc.edu';
+$port = 1247;
+$user = 'rods';
+$pass = 'RODS';
+
+
+/**
+ * This simple script reads JPEG/TIFF files stored in iRODS, extract
+ * its EXIF information, and set it as userdefined metadata.
+ * Note: EXIF php module is required for this program to work properly
+ *       http://us2.php.net/manual/en/ref.exif.php
+ *
+ * Example: php -f exif2meta.php /tempZone/home/rods/test2/RIMG0087.jpg
+ */
+
+//----------don't modify below this line!! -----------
+
+require_once("../src/Prods.inc.php");
+
+$target_file = $argv[1];
+
+try {
+    $account = new RODSAccount($host, $port, $user, $pass);
+    $irodsfile = new ProdsFile($account, $target_file, true);
+
+    $metas = $irodsfile->getMeta();
+    $metaalreadyset = false;
+    foreach ($metas as $meta) {
+        if ($meta->name == 'EXIF.ExifVersion') {
+            $metaalreadyset = true;
+            break;
+        }
+    }
+
+    if ($metaalreadyset === true) {
+        $time = '[' . date('c') . ']';
+        echo "$time 0: metadata already set for '$target_file'\n";
+        exit(0);
+    }
+
+    // download file from irods to tmp
+    $localfile = '/tmp/' . basename($target_file);
+    if (file_exists($localfile))
+        unlink($localfile);
+    $irodsfile->open("r");
+    $str = '';
+    while ((($buffer = $irodsfile->read(1024 * 1024)) != NULL) &&
+        (connection_status() == 0)) {
+        $str = $str . $buffer;
+    }
+    $irodsfile->close();
+    file_put_contents($localfile, $str);
+
+    extactExif($localfile, $irodsfile);
+
+    if (file_exists($localfile))
+        unlink($localfile);
+
+    $time = '[' . date('c') . ']';
+    echo "$time 0: '$target_file' processed!\n";
+    exit(0);
+
+} catch (Exception $e) {
+
+    if (file_exists($localfile))
+        unlink($localfile);
+
+    $time = '[' . date('c') . ']';
+    echo "$time " . $e->getCode() . ": " . "$e";
+    exit(-1);
+}
+
+
+function extactExif($localfile, $remoteRODSfile)
+{
+    $exif = exif_read_data($localfile, 'EXIF');
+    if ($exif === false) return;
+
+    foreach ($exif as $name => $val) {
+
+        // replace ascii char that can't be displayed, which causes problem in irods
+        if ((!is_array($val)) && (is_string($val)) &&
+            ((ord($val[0]) < 32) || (ord($val[0]) > 126)) &&
+            ($name != 'UserComment')
+        ) {
+            $val = '__undefined__';
+        }
+
+        if ($name == 'THUMBNAIL') {
+            foreach ($val as $tname => $tval)
+                $remoteRODSfile->addMeta(new RODSMeta(
+                    'EXIF.THUMBNAIL.' . $tname, $tval, ''));
+        } else
+            if ($name == 'COMPUTED') {
+                foreach ($val as $cname => $cval) {
+                    if ($cname == 'html') {
+                        //skip html tag, because there is a irods server bug that corrupting string with
+                        //double quotes: 'COMPUTED.html: width="3264" height="2448"'
+                    } else
+                        $remoteRODSfile->addMeta(new RODSMeta(
+                            'EXIF.COMPUTED.' . $cname, $cval, ''));
+                }
+            } else
+                if ($name == 'MakerNote') {
+                    //skip makernote
+                } else
+                    if ($name == 'ComponentsConfiguration') {
+                        //skip ComponentsConfiguration, because there is a irods server bug that corrupting string with
+
+                    } else
+                        if ($name == 'UserComment') {
+                            if (($start = strpos($val, 'GCM_TAG')) !== false) {
+                                $str = substr($val, $start + strlen('GCM_TAG'));
+                                $gcm_tokens = explode(chr(0), $str);
+                                $gcm_counter = 0;
+                                foreach ($gcm_tokens as $gcm_tag) {
+                                    if ((strlen($gcm_tag) > 0) && (preg_match('/^[' . chr(32) . '-' . chr(126) . ']+$/', $gcm_tag))) {
+                                        $remoteRODSfile->addMeta(new RODSMeta(
+                                            'EXIF.UserComment' . $gcm_counter++, $gcm_tag, ''));
+                                    }
+                                }
+                            } else {
+                                if (strlen($val) < 1)
+                                    $str = ' ';
+                                //replace no displable char
+                                $str = preg_replace('/[^' . chr(32) . '-' . chr(126) . ']+/', ' ', $val);
+                                $remoteRODSfile->addMeta(new RODSMeta(
+                                    'EXIF.UserComment', $str, ''));
+                            }
+                        } else
+                            if (is_array($val)) {
+                                foreach ($val as $cname => $cval) {
+                                    $remoteRODSfile->addMeta(new RODSMeta(
+                                        "EXIF.$name." . $cname, $cval, ''));
+                                }
+                            } else
+                                $remoteRODSfile->addMeta(new RODSMeta(
+                                    'EXIF.' . $name, $val, ''));
+    }
+}
+
+?>
diff --git a/apps/files_external/3rdparty/irodsphp/release_notes.txt b/apps/files_external/3rdparty/irodsphp/release_notes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9d109faf8438516cd5deae30ae24fcda750ca778
--- /dev/null
+++ b/apps/files_external/3rdparty/irodsphp/release_notes.txt
@@ -0,0 +1,14 @@
+*'''Project''': iRODS PHP Library PRODS and PRODS Web Browser
+*'''Date''': 06/04/2013
+*'''Release Version''': 3.3.0-beta1
+*'''git tag''':  3.3.0-beta1
+
+==News==
+
+The PRODS PHP Web Browser is also included in this project, and remains supported.  Note that the PHP Web Browser functionality has been subsumed by the idrop-web browser and idrop-swing client. 
+
+Please go to [[https://code.renci.org/gf/project/irodsphp/] for the latest news and info.
+
+Note that the git repository is now the canonical version of the PHP code.  The code in the iRODS SVN server is deprecated and will be taken down at the 3.0.0 release point.  There may be other versions in Google Code and other places, but these should be considered obsolete.
+
+Please review release notes in sub projects for details
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
index 70adcb2c2ad4f7a8d10bab181544bef73deb604c..e63b7cb07b96039020ac7bf1663e5edf4cf3f184 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -1,64 +1,42 @@
 <?php
-
-require_once 'Google/common.inc.php';
+set_include_path(get_include_path().PATH_SEPARATOR.
+	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
+require_once 'Google_Client.php';
 
 OCP\JSON::checkAppEnabled('files_external');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
-$consumer = new OAuthConsumer('anonymous', 'anonymous');
-$sigMethod = new OAuthSignatureMethod_HMAC_SHA1();
-if (isset($_POST['step'])) {
-	switch ($_POST['step']) {
-		case 1:
-			if (isset($_POST['callback'])) {
-				$callback = $_POST['callback'];
-			} else {
-				$callback = null;
-			}
-			$scope = 'https://docs.google.com/feeds/'
-					.' https://docs.googleusercontent.com/'
-					.' https://spreadsheets.google.com/feeds/';
-			$url = 'https://www.google.com/accounts/OAuthGetRequestToken?scope='.urlencode($scope);
-			$params = array('scope' => $scope, 'oauth_callback' => $callback);
-			$request = OAuthRequest::from_consumer_and_token($consumer, null, 'GET', $url, $params);
-			$request->sign_request($sigMethod, $consumer, null);
-			$response = send_signed_request('GET', $url, array($request->to_header()), null, false);
-			$token = array();
-			parse_str($response, $token);
-			if (isset($token['oauth_token']) && isset($token['oauth_token_secret'])) {
-				$authUrl = 'https://www.google.com/accounts/OAuthAuthorizeToken?oauth_token='.$token['oauth_token'];
-				OCP\JSON::success(array('data' => array('url' => $authUrl,
-														'request_token' => $token['oauth_token'],
-														'request_token_secret' => $token['oauth_token_secret'])));
-			} else {
+if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) {
+	$client = new Google_Client();
+	$client->setClientId($_POST['client_id']);
+	$client->setClientSecret($_POST['client_secret']);
+	$client->setRedirectUri($_POST['redirect']);
+	$client->setScopes(array('https://www.googleapis.com/auth/drive'));
+	if (isset($_POST['step'])) {
+		$step = $_POST['step'];
+		if ($step == 1) {
+			try {
+				$authUrl = $client->createAuthUrl();
+				OCP\JSON::success(array('data' => array(
+					'url' => $authUrl
+				)));
+			} catch (Exception $exception) {
 				OCP\JSON::error(array('data' => array(
-					'message' => 'Fetching request tokens failed. Error: '.$response
-					)));
+					'message' => 'Step 1 failed. Exception: '.$exception->getMessage()
+				)));
 			}
-			break;
-		case 2:
-			if (isset($_POST['oauth_verifier'])
-				&& isset($_POST['request_token'])
-				&& isset($_POST['request_token_secret'])
-			) {
-				$token = new OAuthToken($_POST['request_token'], $_POST['request_token_secret']);
-				$url = 'https://www.google.com/accounts/OAuthGetAccessToken';
-				$request = OAuthRequest::from_consumer_and_token($consumer, $token, 'GET', $url,
-																 array('oauth_verifier' => $_POST['oauth_verifier']));
-				$request->sign_request($sigMethod, $consumer, $token);
-				$response = send_signed_request('GET', $url, array($request->to_header()), null, false);
-				$token = array();
-				parse_str($response, $token);
-				if (isset($token['oauth_token']) && isset($token['oauth_token_secret'])) {
-					OCP\JSON::success(array('access_token' => $token['oauth_token'],
-											'access_token_secret' => $token['oauth_token_secret']));
-				} else {
-					OCP\JSON::error(array('data' => array(
-						'message' => 'Fetching access tokens failed. Error: '.$response
-						)));
-				}
+		} else if ($step == 2 && isset($_POST['code'])) {
+			try {
+				$token = $client->authenticate($_POST['code']);
+				OCP\JSON::success(array('data' => array(
+					'token' => $token
+				)));
+			} catch (Exception $exception) {
+				OCP\JSON::error(array('data' => array(
+					'message' => 'Step 2 failed. Exception: '.$exception->getMessage()
+				)));
 			}
-			break;
+		}
 	}
-}
+}
\ No newline at end of file
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index d786c6c7a2aa33552d1ad30c93bf325f4000f014..dd0b76ed9d7746a8e07c26c44776422820a2ac5f 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -15,9 +15,14 @@ OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
 OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
 OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
 OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
+OC::$CLASSPATH['OC\Files\Storage\iRODS'] = 'files_external/lib/irods.php';
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 
 OCP\App::registerAdmin('files_external', 'settings');
 if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == 'yes') {
 	OCP\App::registerPersonal('files_external', 'personal');
 }
+
+// connecting hooks
+OCP\Util::connectHook( 'OC_User', 'post_login', 'OC\Files\Storage\iRODS', 'login' );
+
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 94b453793b1badda59574975a89fb9da90893b4e..f2f40247b28c02b9875dda7a26c29e8722f0d7a4 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,10 +1,24 @@
-td.status>span { display:inline-block; height:16px; width:16px; }
-span.success { background-image: url('../img/success.png'); background-repeat:no-repeat; }
-span.error { background-image: url('../img/error.png'); background-repeat:no-repeat; }
-span.waiting { background-image: url('../img/waiting.png'); background-repeat:no-repeat; }
+td.status > span {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	vertical-align: text-bottom;
+}
+
+span.success {
+	background: #37ce02;
+	border-radius: 8px;
+}
+span.error {
+	background: #ce3702;
+}
+span.waiting {
+	background: none;
+}
+
 td.mountPoint, td.backend { width:10em; }
 td.remove>img { visibility:hidden; padding-top:0.8em; }
 tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
 #addMountPoint>td { border:none; }
 #addMountPoint>td.applicable { visibility:hidden; }
-#selectBackend { margin-left:-10px; }
\ No newline at end of file
+#selectBackend { margin-left:-10px; }
diff --git a/apps/files_external/img/error.png b/apps/files_external/img/error.png
deleted file mode 100644
index e8cf45e7a41e358da5d573dc48edf966b9d8d3cb..0000000000000000000000000000000000000000
Binary files a/apps/files_external/img/error.png and /dev/null differ
diff --git a/apps/files_external/img/success.png b/apps/files_external/img/success.png
deleted file mode 100644
index 6f7022ee7f5672b43bdf72f848a7358e4473eb60..0000000000000000000000000000000000000000
Binary files a/apps/files_external/img/success.png and /dev/null differ
diff --git a/apps/files_external/img/waiting.png b/apps/files_external/img/waiting.png
deleted file mode 100644
index 02a8cbff0da63ad584ae7a5c11ddefdf0bd9e24b..0000000000000000000000000000000000000000
Binary files a/apps/files_external/img/waiting.png and /dev/null differ
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 7be1b338e904fb1cba80cea821d28882a465d18b..7e111a95d982a1d320187d1c1a3672d6ab7d0355 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -1,69 +1,89 @@
 $(document).ready(function() {
 
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google').each(function(index, tr) {
-		setupGoogleRow(tr);
-	});
-
-	$('#externalStorage').on('change', '#selectBackend', function() {
-		if ($(this).val() == '\\OC\\Files\\Storage\\Google') {
-			setupGoogleRow($('#externalStorage tbody>tr:last').prev('tr'));
-		}
-	});
-
-	function setupGoogleRow(tr) {
-		var configured = $(tr).find('[data-parameter="configured"]');
+	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google').each(function() {
+		var configured = $(this).find('[data-parameter="configured"]');
 		if ($(configured).val() == 'true') {
-			$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+			$(this).find('.configuration input').attr('disabled', 'disabled');
+			$(this).find('.configuration').append($('<span/>').attr('id', 'access')
+				.text(t('files_external', 'Access granted')));
 		} else {
-			var token = $(tr).find('[data-parameter="token"]');
-			var token_secret = $(tr).find('[data-parameter="token_secret"]');
-			var params = {};
-			window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
-				params[key] = value;
-			});
-			if (params['oauth_token'] !== undefined && params['oauth_verifier'] !== undefined && decodeURIComponent(params['oauth_token']) == $(token).val()) {
-				var statusSpan = $(tr).find('.status span');
-				statusSpan.removeClass();
-				statusSpan.addClass('waiting');
-				$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 2, oauth_verifier: params['oauth_verifier'], request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
-					if (result && result.status == 'success') {
-						$(token).val(result.access_token);
-						$(token_secret).val(result.access_token_secret);
-						$(configured).val('true');
-						OC.MountConfig.saveStorage(tr);
-						$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
-					} else {
-						OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage'));
-						onGoogleInputsChange(tr);
-					}
+			var client_id = $(this).find('.configuration [data-parameter="client_id"]').val();
+			var client_secret = $(this).find('.configuration [data-parameter="client_secret"]')
+				.val();
+			if (client_id != '' && client_secret != '') {
+				var params = {};
+				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
+					params[key] = value;
 				});
+				if (params['code'] !== undefined) {
+					var tr = $(this);
+					var token = $(this).find('.configuration [data-parameter="token"]');
+					var statusSpan = $(tr).find('.status span');
+					statusSpan.removeClass();
+					statusSpan.addClass('waiting');
+					$.post(OC.filePath('files_external', 'ajax', 'google.php'),
+						{
+							step: 2,
+							client_id: client_id,
+							client_secret: client_secret,
+							redirect: location.protocol + '//' + location.host + location.pathname,
+							code: params['code'],
+						}, function(result) {
+							if (result && result.status == 'success') {
+								$(token).val(result.data.token);
+								$(configured).val('true');
+								OC.MountConfig.saveStorage(tr);
+								$(tr).find('.configuration input').attr('disabled', 'disabled');
+								$(tr).find('.configuration').append($('<span/>')
+									.attr('id', 'access')
+									.text(t('files_external', 'Access granted')));
+							} else {
+								OC.dialogs.alert(result.data.message,
+									t('files_external', 'Error configuring Google Drive storage')
+								);
+							}
+						}
+					);
+				}
 			} else {
-				onGoogleInputsChange(tr);
+				onGoogleInputsChange($(this));
 			}
 		}
-	}
-
-	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td', function() {
-		var tr = $(this).parent();
-		setTimeout(function() {
-			onGoogleInputsChange(tr);
-		}, 20);
 	});
 
-	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td', function() {
-		onGoogleInputsChange($(this).parent());
-	});
+	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td',
+		function() {
+			var tr = $(this).parent();
+			setTimeout(function() {
+				onGoogleInputsChange(tr);
+			}, 20);
+		}
+	);
 
-	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google .chzn-select', function() {
-		onGoogleInputsChange($(this).parent().parent());
-	});
+	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td',
+		function() {
+			onGoogleInputsChange($(this).parent());
+		}
+	);
+
+	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google .chzn-select'
+		, function() {
+			onGoogleInputsChange($(this).parent().parent());
+		}
+	);
 
 	function onGoogleInputsChange(tr) {
 		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
 			var config = $(tr).find('.configuration');
-			if ($(tr).find('.mountPoint input').val() != '' && ($(tr).find('.chzn-select').length == 0 || $(tr).find('.chzn-select').val() != null)) {
+			if ($(tr).find('.mountPoint input').val() != ''
+				&& $(config).find('[data-parameter="client_id"]').val() != ''
+				&& $(config).find('[data-parameter="client_secret"]').val() != ''
+				&& ($(tr).find('.chzn-select').length == 0
+				|| $(tr).find('.chzn-select').val() != null))
+			{
 				if ($(tr).find('.google').length == 0) {
-					$(config).append('<a class="button google">'+t('files_external', 'Grant access')+'</a>');
+					$(config).append($('<a/>').addClass('button google')
+						.text(t('files_external', 'Grant access')));
 				} else {
 					$(tr).find('.google').show();
 				}
@@ -77,22 +97,33 @@ $(document).ready(function() {
 		event.preventDefault();
 		var tr = $(this).parent().parent();
 		var configured = $(this).parent().find('[data-parameter="configured"]');
-		var token = $(this).parent().find('[data-parameter="token"]');
-		var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
+		var client_id = $(this).parent().find('[data-parameter="client_id"]').val();
+		var client_secret = $(this).parent().find('[data-parameter="client_secret"]').val();
 		var statusSpan = $(tr).find('.status span');
-		$.post(OC.filePath('files_external', 'ajax', 'google.php'), { step: 1, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
-			if (result && result.status == 'success') {
-				$(configured).val('false');
-				$(token).val(result.data.request_token);
-				$(token_secret).val(result.data.request_token_secret);
-				OC.MountConfig.saveStorage(tr);
-				statusSpan.removeClass();
-				statusSpan.addClass('waiting');
-				window.location = result.data.url;
-			} else {
-				OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Google Drive storage'));
-			}
-		});
+		if (client_id != '' && client_secret != '') {
+			var token = $(this).parent().find('[data-parameter="token"]');
+			$.post(OC.filePath('files_external', 'ajax', 'google.php'),
+				{
+					step: 1,
+					client_id: client_id,
+					client_secret: client_secret,
+					redirect: location.protocol + '//' + location.host + location.pathname,
+				}, function(result) {
+					if (result && result.status == 'success') {
+						$(configured).val('false');
+						$(token).val('false');
+						OC.MountConfig.saveStorage(tr);
+						statusSpan.removeClass();
+						statusSpan.addClass('waiting');
+						window.location = result.data.url;
+					} else {
+						OC.dialogs.alert(result.data.message,
+							t('files_external', 'Error configuring Google Drive storage')
+						);
+					}
+				}
+			);
+		}
 	});
 
-});
+});
\ No newline at end of file
diff --git a/apps/files_external/l10n/af_ZA.php b/apps/files_external/l10n/af_ZA.php
index cf9b951828d37de8c9b72ba32f7c45a4fe83daef..261c44310fddc54f7343ae77dcf3614c25f299bb 100644
--- a/apps/files_external/l10n/af_ZA.php
+++ b/apps/files_external/l10n/af_ZA.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Users" => "Gebruikers"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index a53bfe48bc3c82a5f1659537d337390903c6f136..905d221e886d43f4ec75fec51336841f9f81d9ee 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Ù…Ø¬Ù…ÙˆØ¹Ø§Øª",
 "Users" => "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†",
 "Delete" => "Ø¥Ù„ØºØ§Ø¡"
 );
+$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;";
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index fcb01152bf83135b17bf3821c411c4a70cf38bfb..17665d222863efc70f2d8a451b207d3c615e797f 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Ð”Ð¾ÑÑ‚ÑŠÐ¿ÑŠÑ‚ Ðµ Ð´Ð°Ð´ÐµÐ½",
 "Grant access" => "Ð”Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ð¾ÑÑ‚ÑŠÐ¿",
 "External Storage" => "Ð’ÑŠÐ½ÑˆÐ½Ð¾ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ",
@@ -16,3 +17,4 @@
 "SSL root certificates" => "SSL Ð¾ÑÐ½Ð¾Ð²Ð½Ð¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¸",
 "Import Root Certificate" => "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²ÐµÐ½ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 0f032df9f05782566bf6f92f82a3dcb02a6fe6c9..0591dbba55c42a934e1674959ae29d3c1dd50e00 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "à¦…à¦§à¦¿à¦—à¦®à¦¨à§‡à¦°  à¦…à¦¨à§à¦®à¦¤à¦¿ à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à¦²à§‹",
 "Error configuring Dropbox storage" => "Dropbox à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦° à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ ",
 "Grant access" => "à¦…à¦§à¦¿à¦—à¦®à¦¨à§‡à¦°  à¦…à¦¨à§à¦®à¦¤à¦¿ à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦•à¦°",
@@ -18,3 +19,4 @@
 "SSL root certificates" => "SSL  à¦°à§à¦Ÿ à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦°",
 "Import Root Certificate" => "à¦°à§à¦Ÿ à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦°à¦Ÿà¦¿ à¦†à¦®à¦¦à¦¾à¦¨à¦¿ à¦•à¦°à§à¦¨"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index 90ac954301f827110222c7abf00c5187e97c00fb..c1d6ec077b4cdb36caefead8b2e48d97cb93ca09 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "S'ha concedit l'accÃ©s",
 "Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
 "Grant access" => "Concedeix accÃ©s",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificats SSL root",
 "Import Root Certificate" => "Importa certificat root"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 12603044d63ee36907d3bf21af1829eec5084957..a574e0506cf365c90ee92e4a08f27b1ed810423a 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -1,12 +1,13 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "PÅ™Ãstup povolen",
 "Error configuring Dropbox storage" => "Chyba pÅ™i nastavenÃ ÃºloÅ¾iÅ¡tÄ› Dropbox",
 "Grant access" => "Povolit pÅ™Ãstup",
 "Please provide a valid Dropbox app key and secret." => "Zadejte, prosÃm, platnÃ½ klÃÄ a bezpeÄnostnÃ frÃ¡zi aplikace Dropbox.",
 "Error configuring Google Drive storage" => "Chyba pÅ™i nastavenÃ ÃºloÅ¾iÅ¡tÄ› Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡n program \"smbclient\". NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ CIFS/SMB. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ jej nainstaluje.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡na, nebo povolena, podpora FTP v PHP. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ FTP. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡na, nebo povolena, podpora Curl v PHP. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ ownCloud, WebDAV, Äi GoogleDrive. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> podpora FTP v PHP nenÃ povolena nebo nenÃ nainstalovÃ¡na. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ FTP. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> podpora CURL v PHP nenÃ povolena nebo nenÃ nainstalovÃ¡na. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ ownCloud, WebDAV, Äi GoogleDrive. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje.",
 "External Storage" => "ExternÃ ÃºloÅ¾iÅ¡tÄ›",
 "Folder name" => "NÃ¡zev sloÅ¾ky",
 "External storage" => "ExternÃ ÃºloÅ¾iÅ¡tÄ›",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "KoÅ™enovÃ© certifikÃ¡ty SSL",
 "Import Root Certificate" => "Importovat koÅ™enovÃ©ho certifikÃ¡tu"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
index 78bbb987eb89093f6cd7b433b0db498071696f8e..33992789cb3b8cb4b508e4eb125b5829806352ed 100644
--- a/apps/files_external/l10n/cy_GB.php
+++ b/apps/files_external/l10n/cy_GB.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Grwpiau",
 "Users" => "Defnyddwyr",
 "Delete" => "Dileu"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index f2c1e45778d34c42f15eb8c7ac220c73025cee0d..3a25142b36d7982f377b6b1677b5e4b78250fcc7 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Adgang godkendt",
 "Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads",
 "Grant access" => "Godkend adgang",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL-rodcertifikater",
 "Import Root Certificate" => "Importer rodcertifikat"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 8dfa0eafbb4b037fa9910a93f0223bb1651f2ee4..b2c72f768891ffb67ba97181e350d604c9574d47 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Zugriff gestattet",
 "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
 "Grant access" => "Zugriff gestatten",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 9b7ab4d53ca80523d2dee4b7f998aa83e14c14f7..8f6a25cb522f17c23e425e9b9b162993fd4150c8 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Zugriff gestattet",
 "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
 "Grant access" => "Zugriff gestatten",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 62703b08fbc1422f2b7b9b95bd65643009da7825..0161c0901d68060fd91663c5f5c06b5a3f0cd0fc 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Î ÏÎ¿ÏƒÎ²Î±ÏƒÎ· Ï€Î±ÏÎ±ÏƒÏ‡ÎÎ¸Î·ÎºÎµ",
 "Error configuring Dropbox storage" => "Î£Ï†Î¬Î»Î¼Î± ÏÏ…Î¸Î¼Î¯Î¶Ï‰Î½Ï„Î±Ï‚ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Dropbox ",
 "Grant access" => "Î Î±ÏÎ¿Ï‡Î® Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¬ SSL root",
 "Import Root Certificate" => "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Root"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index b0afb77498f28d39dcc65fa278b1172f8eda92a2..5697221cac09f94982d6ab1f52045fea6657e192 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Alirpermeso donita",
 "Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
 "Grant access" => "Doni alirpermeson",
@@ -19,3 +20,4 @@
 "SSL root certificates" => "Radikaj SSL-atestoj",
 "Import Root Certificate" => "Enporti radikan ateston"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index d145a176f7191e13985e8d0f95a26fe91db096c3..5179d9329a55014a2d75d6efddf50c0ec63d0a7e 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Acceso concedido",
 "Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
 "Grant access" => "Conceder acceso",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificados raÃz SSL",
 "Import Root Certificate" => "Importar certificado raÃz"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index a84461527254965297444acf4140557e0a1666b5..a0bb3a8dfeaa6b45936f4d690cd2e95a3e9e1dea 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -1,12 +1,13 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Acceso permitido",
 "Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox",
 "Grant access" => "Permitir acceso",
 "Please provide a valid Dropbox app key and secret." => "Por favor, proporcionÃ¡ un secreto y una contraseÃ±a vÃ¡lida para la aplicaciÃ³n Dropbox.",
 "Error configuring Google Drive storage" => "Error al configurar el almacenamiento de Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de Curl de PHP no estÃ¡ activado ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no serÃ¡ posible. Pedile al administrador del sistema que lo instale.",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb \"smbclient\" no estÃ¡ instalado. Montar archivos CIFS/SMB no es posible. Por favor, pedile al administrador de tu sistema que lo instale.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no estÃ¡ instalado. Montar archivos FTP no es posible. Por favor, pedile al administrador de tu sistema que lo instale.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de Curl de PHP no estÃ¡ activo ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no serÃ¡ posible. Pedile al administrador del sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Folder name" => "Nombre de la carpeta",
 "External storage" => "Almacenamiento externo",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "certificados SSL raÃz",
 "Import Root Certificate" => "Importar certificado raÃz"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 465201df4dd3834a40f41c088ca9f7a2c1ce1199..a7e623eb7dac6311db20b7b0f2c29decff33be81 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "LigipÃ¤Ã¤s on antud",
 "Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
 "Grant access" => "Anna ligipÃ¤Ã¤s",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL root sertifikaadid",
 "Import Root Certificate" => "Impordi root sertifikaadid"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index 9dc1f3e9c033a63d70988cc672be544ee2812f14..db92e2f001cfee85faac417ad454192b47f569eb 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Sarrera baimendua",
 "Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
 "Grant access" => "Baimendu sarrera",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL erro ziurtagiriak",
 "Import Root Certificate" => "Inportatu Erro Ziurtagiria"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 1921ba9f2aebc217c287ab8204ddba0dbe40a376..216893811cb4e796ca2abea7dc143e10d263058d 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -1,13 +1,28 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Access granted" => "Ù…Ø¬ÙˆØ² Ø¯Ø³ØªØ±Ø³ÛŒ ØµØ§Ø¯Ø± Ø´Ø¯",
+"Error configuring Dropbox storage" => "Ø®Ø·Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ØªÙ†Ø¸ÛŒÙ… ÙØ¶Ø§ÛŒ Ø¯Ø±Ø§Ù¾ Ø¨Ø§Ú©Ø³",
+"Grant access" => " Ù…Ø¬ÙˆØ² Ø§Ø¹Ø·Ø§ Ø¯Ø³ØªØ±Ø³ÛŒ",
+"Please provide a valid Dropbox app key and secret." => "Ù„Ø·ÙØ§ ÛŒÚ© Ú©Ù„ÛŒØ¯ Ùˆ Ú©Ø¯ Ø§Ù…Ù†ÛŒØªÛŒ ØµØÛŒØ Ø¯Ø±Ø§Ù¾ Ø¨Ø§Ú©Ø³ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯.",
+"Error configuring Google Drive storage" => "Ø®Ø·Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ØªÙ†Ø¸ÛŒÙ… ÙØ¶Ø§ÛŒ Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "Ø®Ø·Ø§: \"smbclient\" Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù†ØµØ¨ Ùˆ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø³Ù‡Ø§Ù…  CIFS/SMB Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†Ù…ÛŒØ¨Ø§Ø´Ø¯. Ù„Ø·ÙØ§ Ø§Ø² Ù…Ø¯ÛŒØ±ÛŒØª Ø³Ø§Ø²Ù…Ø§Ù† Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø¢Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù†Ù…Ø§ÛŒÛŒØ¯.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "Ø®Ø·Ø§: Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ FTP Ø¯Ø± PHP ÙØ¹Ø§Ù„ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯ ÛŒØ§ Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù†ØµØ¨ Ùˆ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø§Ø² Ø³Ù‡Ù… Ù‡Ø§ÛŒ FTP Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯. Ù„Ø·ÙØ§ Ø§Ø² Ù…Ø¯ÛŒØ± Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø¢Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª\nÚ©Ù†ÛŒØ¯.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "Ø®Ø·Ø§: Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Curl  ÙØ¹Ø§Ù„ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯ ÛŒØ§ Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù†ØµØ¨ Ùˆ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ  ownCloud / WebDAV ÛŒØ§ GoogleDrive Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†ÛŒØ³Øª. Ù„Ø·ÙØ§ Ø§Ø² Ù…Ø¯ÛŒØ± Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ Ø¢Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ú©Ù†ÛŒØ¯.",
 "External Storage" => "ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ",
+"Folder name" => "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡",
+"External storage" => "ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ",
 "Configuration" => "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ",
 "Options" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
 "Applicable" => "Ù‚Ø§Ø¨Ù„ Ø§Ø¬Ø±Ø§",
+"Add storage" => "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† ØØ§ÙØ¸Ù‡",
 "None set" => "ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡",
 "All Users" => "ØªÙ…Ø§Ù… Ú©Ø§Ø±Ø¨Ø±Ø§Ù†",
 "Groups" => "Ú¯Ø±ÙˆÙ‡ Ù‡Ø§",
 "Users" => "Ú©Ø§Ø±Ø¨Ø±Ø§Ù†",
 "Delete" => "ØØ°Ù",
 "Enable User External Storage" => "ÙØ¹Ø§Ù„ Ø³Ø§Ø²ÛŒ ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ Ú©Ø§Ø±Ø¨Ø±",
-"Allow users to mount their own external storage" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ú©Ø±Ø¯Ù† Ù…Ù†Ø§Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒ Ø®ÙˆØ¯Ø´Ø§Ù†"
+"Allow users to mount their own external storage" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ú©Ø±Ø¯Ù† Ù…Ù†Ø§Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒ Ø®ÙˆØ¯Ø´Ø§Ù†",
+"SSL root certificates" => "Ú¯ÙˆØ§Ù‡ÛŒ Ù‡Ø§ÛŒ Ø§ØµÙ„ÛŒ SSL ",
+"Import Root Certificate" => "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú¯ÙˆØ§Ù‡ÛŒ Ø§ØµÙ„ÛŒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index ba39d140fbc87f922ee3e02fd645ac34168fa6f8..9632aa255ea4c5c4c165e2987d03359c63e56047 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "PÃ¤Ã¤sy sallittu",
 "Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtÃ¤essÃ¤",
 "Grant access" => "Salli pÃ¤Ã¤sy",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL-juurivarmenteet",
 "Import Root Certificate" => "Tuo juurivarmenne"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 5006133a7b688cc4e59bb84d097a777acc5ac7ec..f6b1a75200c3437509b3e7025f53b1b447d8ee19 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "AccÃ¨s autorisÃ©",
 "Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
 "Grant access" => "Autoriser l'accÃ¨s",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificats racine SSL",
 "Import Root Certificate" => "Importer un certificat racine"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index 77f23c39bc3f95b1c37bd7c5cfc2b4d6708f7559..3dda999dd18ce0b67b371eefd102aa3dd5cd9b98 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Concedeuse acceso",
 "Error configuring Dropbox storage" => "Produciuse un erro ao configurar o almacenamento en Dropbox",
 "Grant access" => "Permitir o acceso",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificados SSL root",
 "Import Root Certificate" => "Importar o certificado root"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index 9cba045d1eafe5d12b01ba1c05bbb5261af7f44c..e99c9f5193d89e99c048717c8c76c1a698d6b682 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "×”×•×¢× ×§×” ×’×™×©×”",
 "Error configuring Dropbox storage" => "××™×¨×¢×” ×©×’×™××” ×‘×¢×ª ×”×’×“×¨×ª ××—×¡×•×Ÿ ×‘Ö¾Dropbox",
 "Grant access" => "×”×¢× ×§×ª ×’×™×©×”",
@@ -19,3 +20,4 @@
 "SSL root certificates" => "×©×•×¨×© ××™×©×•×¨×™ ××‘×˜×—×ª SSL ",
 "Import Root Certificate" => "×™×™×‘×•× ××™×©×•×¨ ××‘×˜×—×ª ×©×•×¨×©"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hi.php b/apps/files_external/l10n/hi.php
index 0482efc4b23d20d9675fd371d1f1d8fc8a55e4a5..7df96572596a7781b219b9c5745591a935119d1a 100644
--- a/apps/files_external/l10n/hi.php
+++ b/apps/files_external/l10n/hi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Users" => "à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hr.php b/apps/files_external/l10n/hr.php
index 24f27ddf81bc2a1067493880089e0db8c9fa0156..91536e0b873ec0ee03fbc19a35e4a5146b8912de 100644
--- a/apps/files_external/l10n/hr.php
+++ b/apps/files_external/l10n/hr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Grupe",
 "Users" => "Korisnici",
 "Delete" => "ObriÅ¡i"
 );
+$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;";
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index b88737a19abde8df8d97c60f132795cc2f4c8d30..23fe916eba65acf3085718f48fa813bcb72a27b9 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Ã‰rvÃ©nyes hozzÃ¡fÃ©rÃ©s",
 "Error configuring Dropbox storage" => "A Dropbox tÃ¡rolÃ³t nem sikerÃ¼lt beÃ¡llÃtani",
 "Grant access" => "Megadom a hozzÃ¡fÃ©rÃ©st",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL tanÃºsÃtvÃ¡nyok",
 "Import Root Certificate" => "SSL tanÃºsÃtvÃ¡nyok importÃ¡lÃ¡sa"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hy.php b/apps/files_external/l10n/hy.php
index 3b80487278a16a8f1f7b407908ea855f3f5def10..f933bec8feb91959b1303f8d028dda1c815ccf3e 100644
--- a/apps/files_external/l10n/hy.php
+++ b/apps/files_external/l10n/hy.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Delete" => "Õ‹Õ¶Õ»Õ¥Õ¬"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php
index f57f96688bf4c0d532e338be9f4fce3f0d276d2a..47b0f89b8b5b5c2406a04c311472f3d02c0dbd60 100644
--- a/apps/files_external/l10n/ia.php
+++ b/apps/files_external/l10n/ia.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Gruppos",
 "Users" => "Usatores",
 "Delete" => "Deler"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 30cd28bba1c91fb9f70fcd6809a12040c796f830..53ab79ae7eea955ffb0477efcb4fe99295a50fa2 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Akses diberikan",
 "Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
 "Grant access" => "Berikan hak akses",
@@ -23,3 +24,4 @@
 "SSL root certificates" => "Sertifikat root SSL",
 "Import Root Certificate" => "Impor Sertifikat Root"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index 6af53096facafd5205ff3deb9529ab3576397049..d2229d1fcdd8e7c19256fa148d409f6c0e976f78 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "AÃ°gengi veitt",
 "Error configuring Dropbox storage" => "Villa viÃ° aÃ° setja upp Dropbox gagnasvÃ¦Ã°i",
 "Grant access" => "Veita aÃ°gengi",
@@ -21,3 +22,4 @@
 "SSL root certificates" => "SSL rÃ³tar skilrÃki",
 "Import Root Certificate" => "Flytja inn rÃ³tar skilrÃki"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index 4c70a04022ecba70b8b9845d10047a256a8c5dcb..b53663beb564598cf79944b6d4f9aeafb2cb5791 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Accesso consentito",
 "Error configuring Dropbox storage" => "Errore durante la configurazione dell'archivio Dropbox",
 "Grant access" => "Concedi l'accesso",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificati SSL radice",
 "Import Root Certificate" => "Importa certificato radice"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
index 97dd4e119d4d9fdecdbe1bc41dfac60d830bdcfd..fc528f035c2b9f142842dfe405be48538bfb943f 100644
--- a/apps/files_external/l10n/ja_JP.php
+++ b/apps/files_external/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "ã‚¢ã‚¯ã‚»ã‚¹ã¯è¨±å¯ã•ã‚Œã¾ã—ãŸ",
 "Error configuring Dropbox storage" => "Dropboxã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã®è¨å®šã‚¨ãƒ©ãƒ¼",
 "Grant access" => "ã‚¢ã‚¯ã‚»ã‚¹ã‚’è¨±å¯",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSLãƒ«ãƒ¼ãƒˆè¨¼æ˜Žæ›¸",
 "Import Root Certificate" => "ãƒ«ãƒ¼ãƒˆè¨¼æ˜Žæ›¸ã‚’ã‚¤ãƒ³ãƒãƒ¼ãƒˆ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ka.php b/apps/files_external/l10n/ka.php
index 14c0625e1f280d2661e7dd33cb07e27814ef1fe4..f6356d2cef83005942ee5e3e5ee4b8db773a25ab 100644
--- a/apps/files_external/l10n/ka.php
+++ b/apps/files_external/l10n/ka.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Users" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index b0845555b4b41d6d46b76cffb628dd6b61ee37af..445d40e70899ea33a99017a2b2a2fd154ab8ed46 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ áƒ›áƒ˜áƒœáƒ˜áƒáƒ”áƒ‘áƒ£áƒšáƒ˜áƒ",
 "Error configuring Dropbox storage" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ Dropbox áƒ¡áƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡",
 "Grant access" => "áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒ˜áƒœáƒ˜áƒáƒ”áƒ‘áƒ",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL root áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ”áƒ‘áƒ˜",
 "Import Root Certificate" => "Root áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜áƒ¡ áƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 803b489c218313cae5ce99d463eebee15e753d59..64d815a5bcb59e2d2ea5a7248a6bd2db43a2d11a 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "ì ‘ê·¼ í—ˆê°€ë¨",
 "Error configuring Dropbox storage" => "Dropbox ì €ìž¥ì†Œ ì„¤ì • ì˜¤ë¥˜",
 "Grant access" => "ì ‘ê·¼ ê¶Œí•œ ë¶€ì—¬",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL ë£¨íŠ¸ ì¸ì¦ì„œ",
 "Import Root Certificate" => "ë£¨íŠ¸ ì¸ì¦ì„œ ê°€ì ¸ì˜¤ê¸°"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
index 59eabb36c9ffd7f5779582ff862c0ff9723ee4ea..39778bce07238a15a01a931bba6b46475a73ce42 100644
--- a/apps/files_external/l10n/ku_IQ.php
+++ b/apps/files_external/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Folder name" => "Ù†Ø§ÙˆÛŒ Ø¨ÙˆØ®Ú†Ù‡",
 "Users" => "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 4e78227ec4854d4d7281a9fc69199347bde8c6f1..13233bf36262761dffc5eb70baa1fc379d9c65d1 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Folder name" => "Dossiers Numm:",
 "Groups" => "Gruppen",
 "Users" => "Benotzer",
 "Delete" => "LÃ¤schen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 29c962d9a8057b2898921ce6113494c5b9b5ac76..57cdfe6722a97e21b216b7a00f030ec2eb238d87 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "PriÄ—jimas suteiktas",
 "Error configuring Dropbox storage" => "Klaida nustatinÄ—jant Dropbox talpyklÄ…",
 "Grant access" => "Suteikti priÄ—jimÄ…",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL sertifikatas",
 "Import Root Certificate" => "Ä®kelti pagrindinÄ¯ sertifikatÄ…"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index b37dbcbdc16adbeeace1cbaf2588e5ce6bec524f..bc9e3aeefe7634c284bb5e596374fa4a50d5744c 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "PieÅ¡Ä·irta pieeja",
 "Error configuring Dropbox storage" => "KÄ¼Å«da, konfigurÄ“jot Dropbox krÄtuvi",
 "Grant access" => "PieÅ¡Ä·irt pieeju",
@@ -23,3 +24,4 @@
 "SSL root certificates" => "SSL saknes sertifikÄti",
 "Import Root Certificate" => "ImportÄ“t saknes sertifikÄtus"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index 1f1a1c27831fd1a6d97e8f5bb4b23b0c13068082..e410b398ac95473cd7c943bd5f4699513f920add 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "ÐŸÑ€Ð¸ÑÑ‚Ð°Ð¿Ð¾Ñ‚ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½",
 "Error configuring Dropbox storage" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ˜Ð° Ð½Ð° Dropbox",
 "Grant access" => "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿",
@@ -21,3 +22,4 @@
 "SSL root certificates" => "SSL root ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¸",
 "Import Root Certificate" => "Ð£Ð²ÐµÐ·Ð¸"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php
index 2fdb089ebc6f42d110ca755d899f683269f4fcc2..4e33263a8631b252528a3f09ab5f1bc1df76aa6f 100644
--- a/apps/files_external/l10n/ms_MY.php
+++ b/apps/files_external/l10n/ms_MY.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Kumpulan",
 "Users" => "Pengguna",
 "Delete" => "Padam"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/my_MM.php b/apps/files_external/l10n/my_MM.php
index 5acfbb0321e780fbde7413815f045f9ec50a4366..1cbe5f0fe52b691a7f0bde497b1c5fb043ba05a0 100644
--- a/apps/files_external/l10n/my_MM.php
+++ b/apps/files_external/l10n/my_MM.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Users" => "á€žá€¯á€¶á€¸á€…á€½á€²á€žá€°"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index ea8648303d1be23bec5c75f626e4f1f5ccaf63ec..cb31ac89227f9f4c6bac176edf275eb765042508 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Tilgang innvilget",
 "Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
 "Grant access" => "Gi tilgang",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL root-sertifikater",
 "Import Root Certificate" => "Importer root-sertifikat"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index ded5a861a8b50ca0509b0dce2ceb65b97c96715e..35e63b09a352d5639655bc1801683396f651fd73 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Toegang toegestaan",
 "Error configuring Dropbox storage" => "Fout tijdens het configureren van Dropbox opslag",
 "Grant access" => "Sta toegang toe",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL root certificaten",
 "Import Root Certificate" => "Importeer root certificaat"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
index 998c3f824578b5d2553d84eecd777aff27a8c4ff..7bb38f14cee42a817458068331022b1fef4d2af3 100644
--- a/apps/files_external/l10n/nn_NO.php
+++ b/apps/files_external/l10n/nn_NO.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Configuration" => "Innstillingar",
 "Groups" => "Grupper",
 "Users" => "Brukarar",
 "Delete" => "Slett"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php
index 47db011473f714e564a7f6f4879819579babee4c..99f2fd507d2b86388c61f60e17c95878940b082a 100644
--- a/apps/files_external/l10n/oc.php
+++ b/apps/files_external/l10n/oc.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Grops",
 "Users" => "UsanciÃ¨rs",
 "Delete" => "Escafa"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index e03ded1e70a222268880990d6d7fc2339755e9e4..f5501b9755b47091ca0047f3ae232031746284b6 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "DostÄ™p do",
 "Error configuring Dropbox storage" => "WystÄ…piÅ‚ bÅ‚Ä…d podczas konfigurowania zasobu Dropbox",
 "Grant access" => "Udziel dostÄ™pu",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "GÅ‚Ã³wny certyfikat SSL",
 "Import Root Certificate" => "Importuj gÅ‚Ã³wny certyfikat"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index bc3c356a5175f89f4d93437da084f4b67376aa4b..f69bbc1ebe62e0e0a7de8397dd6aecf371873876 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Acesso concedido",
 "Error configuring Dropbox storage" => "Erro ao configurar armazenamento do Dropbox",
 "Grant access" => "Permitir acesso",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificados SSL raÃz",
 "Import Root Certificate" => "Importar Certificado RaÃz"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 0a05d1f8825fb3654dae7470c8b54616aa82dcf6..3f2afd33f079d364f2eb12a7b985492f3a706228 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Acesso autorizado",
 "Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
 "Grant access" => "Conceder acesso",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificados SSL de raiz",
 "Import Root Certificate" => "Importar Certificado Root"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index ed23b4cca8f7c52266f92e96603956a8bd59eb9b..7115d09ea94780ab2e8ac624b2ef8238a8146427 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Acces permis",
 "Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox",
 "Grant access" => "Permite accesul",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Certificate SSL root",
 "Import Root Certificate" => "ImportÄƒ certificat root"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index d2c5292bac414da45f92ca36d928ff3ff087d238..50c25acba06833573977bbba3e7c71ee5eae5be2 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½",
 "Error configuring Dropbox storage" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐµ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ð° Dropbox",
 "Grant access" => "ÐŸÑ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "ÐšÐ¾Ñ€Ð½ÐµÐ²Ñ‹Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹ SSL",
 "Import Root Certificate" => "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ñ€Ð½ÐµÐ²Ñ‹Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹"
 );
+$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);";
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
index a43417dfbc1a134a783914c108680fa888d81f06..6dcd0460ada2f514705df2d7ecf5e9e9529665c7 100644
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹",
 "Delete" => "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 );
+$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);";
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index cc9cb9b9ce50084b2bb06281e90782e5c9df89c9..cad928accef3604aa3b0d97d98a553b6435fb9fe 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "à¶´à·’à·€à·’à·ƒà·“à¶¸à¶§ à·„à·à¶š",
 "Error configuring Dropbox storage" => "Dropbox à¶œà¶¶à¶©à·à·€ à·€à·’à¶±à·Šâ€à¶ºà·à·ƒ à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·à¶ºà¶šà·Š à¶‡à¶",
 "Grant access" => "à¶´à·’à·€à·’à·ƒà·”à¶¸ à¶½à¶¶à·à¶¯à·™à¶±à·Šà¶±",
@@ -19,3 +20,4 @@
 "SSL root certificates" => "SSL à¶¸à·–à¶½ à·ƒà·„à¶à·’à¶šà¶ºà¶±à·Š",
 "Import Root Certificate" => "à¶¸à·–à¶½ à·ƒà·„à¶à·’à¶šà¶º à¶†à¶ºà·à¶ à¶šà¶»à¶±à·Šà¶±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 33edcb9d4c8c112202b001263ff202486b01156e..ca445387bcae8d08b7dc5f40245791fa92791156 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "PrÃstup povolenÃ½",
 "Error configuring Dropbox storage" => "Chyba pri konfigurÃ¡cii ÃºloÅ¾iska Dropbox",
 "Grant access" => "PovoliÅ¥ prÃstup",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "KoreÅˆovÃ© SSL certifikÃ¡ty",
 "Import Root Certificate" => "ImportovaÅ¥ koreÅˆovÃ½ certifikÃ¡t"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 09b91b913e9a796899b1b8b96d7756939b5e8814..b0fcbf9eb69d306a9c12de375ee42410cb9e20dd 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Dostop je odobren",
 "Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
 "Grant access" => "Odobri dostop",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Korenska potrdila SSL",
 "Import Root Certificate" => "Uvozi korensko potrdilo"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php
index d5393aa38527a242df701d3002ca1c60335c346c..42de15edadc8ddad3b715e774dfd974ef81eec25 100644
--- a/apps/files_external/l10n/sq.php
+++ b/apps/files_external/l10n/sq.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Users" => "PÃ«rdoruesit",
 "Delete" => "Elimino"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sr.php b/apps/files_external/l10n/sr.php
index 2554c498ddafc60584bcbd399f6b4190d60b3749..c456daa004db0dcd52418dd33b016015a99698cf 100644
--- a/apps/files_external/l10n/sr.php
+++ b/apps/files_external/l10n/sr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ðµ",
 "Users" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
 "Delete" => "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
 );
+$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);";
diff --git a/apps/files_external/l10n/sr@latin.php b/apps/files_external/l10n/sr@latin.php
index 24f27ddf81bc2a1067493880089e0db8c9fa0156..a2489bbc64b7db27bb2e2644bc785bc5ace4630a 100644
--- a/apps/files_external/l10n/sr@latin.php
+++ b/apps/files_external/l10n/sr@latin.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "Grupe",
 "Users" => "Korisnici",
 "Delete" => "ObriÅ¡i"
 );
+$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);";
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 80e68ab6e0645305d0440d03cd8c17372b5fb4d8..2c0b0ab69e4dd508b939fd0b80fb4be3b097f2cd 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Ã…tkomst beviljad",
 "Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
 "Grant access" => "Bevilja Ã¥tkomst",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL rotcertifikat",
 "Import Root Certificate" => "Importera rotcertifikat"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
index cee3b6edb8a2b669287a99296b232c942e17c651..bb663a4fcb6a31f26f4d8a4b064d49038ac764e3 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "à®…à®©à¯à®®à®¤à®¿ à®µà®´à®™à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
 "Error configuring Dropbox storage" => "Dropbox à®šà¯‡à®®à®¿à®ªà¯à®ªà¯ˆ à®¤à®•à®µà®®à¯ˆà®ªà¯à®ªà®¤à®¿à®²à¯ à®µà®´à¯",
 "Grant access" => "à®…à®©à¯à®®à®¤à®¿à®¯à¯ˆ à®µà®´à®™à¯à®•à®²à¯",
@@ -19,3 +20,4 @@
 "SSL root certificates" => "SSL à®µà¯‡à®°à¯ à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯à®•à®³à¯",
 "Import Root Certificate" => "à®µà¯‡à®°à¯ à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯ˆ à®‡à®±à®•à¯à®•à¯à®®à®¤à®¿ à®šà¯†à®¯à¯à®•"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
index 3d31f6438f586ab936a37a0dca4cf1cc7ccc8e40..7f8d893d46382d80d7c621bcd1ae161d70e65cc7 100644
--- a/apps/files_external/l10n/te.php
+++ b/apps/files_external/l10n/te.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Folder name" => "à°¸à°‚à°šà°¯à°‚ à°ªà±‡à°°à±",
 "Users" => "à°µà°¾à°¡à±à°•à°°à±à°²à±",
 "Delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index 2f733eab9e8f4efca77ffada056b5a28167bb900..f2ea35f10f4783252a3a3ce87ae3733241da516b 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸™à¸¸à¸à¸²à¸•à¹à¸¥à¹‰à¸§",
 "Error configuring Dropbox storage" => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥ Dropbox",
 "Grant access" => "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸”à¹‰",
@@ -21,3 +22,4 @@
 "SSL root certificates" => "à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸”à¹‰à¸§à¸¢à¸£à¸°à¸šà¸š SSL à¸ˆà¸²à¸ Root",
 "Import Root Certificate" => "à¸™à¸³à¹€à¸‚à¹‰à¸²à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸ˆà¸²à¸ Root"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index 3c3c0c24f97ad6baa6c8529f8272b5aed44ff0b1..cc52c425b8d67c344a2aedf67d357b163900fe89 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "GiriÅŸ kabul edildi",
 "Error configuring Dropbox storage" => "Dropbox depo yapÄ±landÄ±rma hatasÄ±",
 "Grant access" => "EriÅŸim saÄŸlandÄ±",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL kÃ¶k sertifikalarÄ±",
 "Import Root Certificate" => "KÃ¶k SertifikalarÄ±nÄ± Ä°Ã§e Aktar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
index 2d1dea989063c0cc93a38882d4c7303f60e6ae1e..ae20f7424da7e96e56d7547f07d1aec42e948b16 100644
--- a/apps/files_external/l10n/ug.php
+++ b/apps/files_external/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Folder name" => "Ù‚Ù‰Ø³Ù‚Û‡Ú† Ø¦Ø§ØªÙ‰",
 "External storage" => "Ø³Ù‰Ø±ØªÙ‚Ù‰ Ø³Ø§Ù‚Ù„Ù‰ØºÛ‡Ú†",
 "Configuration" => "Ø³Û•Ù¾Ù„Ù‰Ù…Û•",
@@ -7,3 +8,4 @@
 "Users" => "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰Ù„Û•Ø±",
 "Delete" => "Ø¦Û†Ú†ÛˆØ±"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index 34d19af0ee94ac061e583979c4dc7ba9521fb3a8..e535b455d10aacbab34ceb58d786423a5f99506e 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾",
 "Error configuring Dropbox storage" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ– ÑÑ…Ð¾Ð²Ð¸Ñ‰Ð° Dropbox",
 "Grant access" => "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿",
@@ -6,6 +7,7 @@
 "Error configuring Google Drive storage" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ– ÑÑ…Ð¾Ð²Ð¸Ñ‰Ð° Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ:</b> ÐšÐ»Ñ–Ñ”Ð½Ñ‚ \"smbclient\" Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾. ÐŸÑ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ CIFS/SMB Ñ‚ÐµÐº Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾. ÐŸÐ¾Ð¿Ñ€Ð¾Ñ…Ð°Ð¹Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ:</b> ÐŸÑ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ° FTP Ð² PHP Ð½Ðµ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð° Ñ‡Ð¸ Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°. ÐŸÑ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ FTP Ñ‚ÐµÐº Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾. ÐŸÐ¾Ð¿Ñ€Ð¾Ñ…Ð°Ð¹Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ—Ñ—.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ:</b> ÐŸÑ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ° CURL Ð² PHP Ð½Ðµ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð° Ñ‡Ð¸ Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°. ÐŸÑ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð°Ñ‚Ð¸ÑÑ OwnCloud / WebDav Ð°Ð±Ð¾ Google Drive Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ. ÐŸÐ¾Ð¿Ñ€Ð¾Ñ…Ð°Ð¹Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ—Ñ—.",
 "External Storage" => "Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ– ÑÑ…Ð¾Ð²Ð¸Ñ‰Ð°",
 "Folder name" => "Ð†Ð¼'Ñ Ñ‚ÐµÐºÐ¸",
 "External storage" => "Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ” ÑÑ…Ð¾Ð²Ð¸Ñ‰Ðµ",
@@ -23,3 +25,4 @@
 "SSL root certificates" => "SSL ÐºÐ¾Ñ€Ð½ÐµÐ²Ñ– ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¸",
 "Import Root Certificate" => "Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ñ€Ð½ÐµÐ²Ñ– ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¸"
 );
+$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);";
diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php
index 278357b4d68c5ec2cb0ed08de2979f0c75aeacb1..56df17991bcf1d655b943a3906474043e1ba1047 100644
--- a/apps/files_external/l10n/ur_PK.php
+++ b/apps/files_external/l10n/ur_PK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Users" => "ÛŒÙˆØ²Ø±Ø²"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 769f9e2a0976aa443ffda271da4e10fe6de52959..da8ac419cdaa9f95e69f842d55931f9fd74366d5 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "ÄÃ£ cáº¥p quyá»n truy cáºp",
 "Error configuring Dropbox storage" => "Lá»—i cáº¥u hÃ¬nh lÆ°u trá»¯ Dropbox ",
 "Grant access" => "Cáº¥p quyá»n truy cáºp",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "Chá»©ng chá»‰ SSL root",
 "Import Root Certificate" => "Nháºp Root Certificate"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php
index 47298f8007dbfc9b2fa59ceed1e90334347f357f..3633de6314e2057deaa31e7fbbf863f124d88b74 100644
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "å·²æŽˆäºˆæƒé™",
 "Error configuring Dropbox storage" => "é…ç½® Dropbox å˜å‚¨å‡ºé”™",
 "Grant access" => "æŽˆäºˆæƒé™",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL æ ¹è¯ä¹¦",
 "Import Root Certificate" => "å¯¼å…¥æ ¹è¯ä¹¦"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 8157923183cc92a1909a3b06cb7c28b1c8ec2089..5e2c2e4fe0c5b80b27f5e700e0061a00caa4a8b7 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "æƒé™å·²æŽˆäºˆã€‚",
 "Error configuring Dropbox storage" => "é…ç½®Dropboxå˜å‚¨æ—¶å‡ºé”™",
 "Grant access" => "æŽˆæƒ",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSLæ ¹è¯ä¹¦",
 "Import Root Certificate" => "å¯¼å…¥æ ¹è¯ä¹¦"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php
index a85b5a03b8a57a72423892c9f6446fb6b36f6087..76e0ed69d27fa72ab2b56f77b254e757b29f262a 100644
--- a/apps/files_external/l10n/zh_HK.php
+++ b/apps/files_external/l10n/zh_HK.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Groups" => "ç¾¤çµ„",
 "Users" => "ç”¨æˆ¶",
 "Delete" => "åˆªé™¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index a8314dcef03660b8b3ecd734b66c340f5fb3c610..d85d18a1c321634dd24af794f60119c9d92adc59 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Access granted" => "å…è¨±å˜å–",
 "Error configuring Dropbox storage" => "è¨å®š Dropbox å„²å˜æ™‚ç™¼ç”ŸéŒ¯èª¤",
 "Grant access" => "å…è¨±å˜å–",
@@ -24,3 +25,4 @@
 "SSL root certificates" => "SSL æ ¹æ†‘è‰",
 "Import Root Certificate" => "åŒ¯å…¥æ ¹æ†‘è‰"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 7bcefd4176c94ac9da2e6a690c34a4a7b09cd98e..f4d1940b184140ad20e6b659a0cf1d790beacefd 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -4,7 +4,9 @@
  * ownCloud
  *
  * @author Michael Gapczynski
+ * @author Christian Berendt
  * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ * @copyright 2013 Christian Berendt berendt@b1-systems.de
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -22,164 +24,325 @@
 
 namespace OC\Files\Storage;
 
-require_once 'aws-sdk/sdk.class.php';
+set_include_path(get_include_path() . PATH_SEPARATOR .
+        \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+require 'aws-autoloader.php';
+
+use Aws\S3\S3Client;
+use Aws\S3\Exception\S3Exception;
 
 class AmazonS3 extends \OC\Files\Storage\Common {
 
-	private $s3;
+	/**
+	 * @var \Aws\S3\S3Client
+	 */
+	private $connection;
+	/**
+	 * @var string
+	 */
 	private $bucket;
-	private $objects = array();
-	private $id;
+	/**
+	 * @var array
+	 */
+	private static $tmpFiles = array();
+	/**
+	 * @var bool
+	 */
+	private $test = false;
+	/**
+	 * @var int
+	 */
+	private $timeout = 15;
 
-	private static $tempFiles = array();
+	private function normalizePath($path) {
+		$path = trim($path, '/');
 
-	// TODO Update to new AWS SDK
+		if (!$path) {
+			$path = '.';
+		}
 
-	public function __construct($params) {
-		if (isset($params['key']) && isset($params['secret']) && isset($params['bucket'])) {
-			$this->id = 'amazon::' . $params['key'] . md5($params['secret']);
-			$this->s3 = new \AmazonS3(array('key' => $params['key'], 'secret' => $params['secret']));
-			$this->bucket = $params['bucket'];
-		} else {
-			throw new \Exception();
+		return $path;
+	}
+
+	private function testTimeout() {
+		if ($this->test) {
+			sleep($this->timeout);
 		}
 	}
 
-	private function getObject($path) {
-		if (array_key_exists($path, $this->objects)) {
-			return $this->objects[$path];
-		} else {
-			$response = $this->s3->get_object_metadata($this->bucket, $path);
-			if ($response) {
-				$this->objects[$path] = $response;
-				return $response;
-				// This object could be a folder, a '/' must be at the end of the path
-			} else if (substr($path, -1) != '/') {
-				$response = $this->s3->get_object_metadata($this->bucket, $path . '/');
-				if ($response) {
-					$this->objects[$path] = $response;
-					return $response;
-				}
+	public function __construct($params) {
+		if (!isset($params['key']) || !isset($params['secret']) || !isset($params['bucket'])) {
+			throw new \Exception("Access Key, Secret and Bucket have to be configured.");
+		}
+
+		$this->id = 'amazon::' . $params['key'] . md5($params['secret']);
+
+		$this->bucket = $params['bucket'];
+		$scheme = ($params['use_ssl'] === 'false') ? 'http' : 'https';
+		$this->test = ( isset($params['test'])) ? true : false;
+		$this->timeout = ( ! isset($params['timeout'])) ? 15 : $params['timeout'];
+		$params['region'] = ( ! isset($params['region'])) ? 'eu-west-1' : $params['region'];
+		$params['hostname'] = ( !isset($params['hostname'])) ? 's3.amazonaws.com' : $params['hostname'];
+		if (!isset($params['port'])) {
+			$params['port'] = ($params['use_ssl'] === 'false') ? 80 : 443;
+		}
+		$base_url = $scheme.'://'.$params['hostname'].':'.$params['port'].'/';
+
+		$this->connection = S3Client::factory(array(
+			'key' => $params['key'],
+			'secret' => $params['secret'],
+			'base_url' => $base_url,
+			'region' => $params['region']
+		));
+
+		if (!$this->connection->isValidBucketName($this->bucket)) {
+			throw new \Exception("The configured bucket name is invalid.");
+		}
+
+		if (!$this->connection->doesBucketExist($this->bucket)) {
+			try {
+				$result = $this->connection->createBucket(array(
+					'Bucket' => $this->bucket
+				));
+				$this->connection->waitUntilBucketExists(array(
+					'Bucket' => $this->bucket,
+					'waiter.interval' => 1,
+					'waiter.max_attempts' => 15
+				));
+			$this->testTimeout();
+			} catch (S3Exception $e) {
+				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+				throw new \Exception("Creation of bucket failed.");
 			}
 		}
-		return false;
-	}
 
-	public function getId() {
-		return $this->id;
+		if (!$this->file_exists('.')) {
+			$result = $this->connection->putObject(array(
+				'Bucket' => $this->bucket,
+				'Key'    => '.',
+				'Body'   => '',
+				'ContentType' => 'httpd/unix-directory',
+				'ContentLength' => 0
+			));
+			$this->testTimeout();
+		}
 	}
 
 	public function mkdir($path) {
-		// Folders in Amazon S3 are 0 byte objects with a '/' at the end of the name
-		if (substr($path, -1) != '/') {
+		$path = $this->normalizePath($path);
+
+		if ($this->is_dir($path)) {
+			return false;
+		}
+
+		try {
+			$result = $this->connection->putObject(array(
+				'Bucket' => $this->bucket,
+				'Key'    => $path . '/',
+				'Body'   => '',
+				'ContentType' => 'httpd/unix-directory',
+				'ContentLength' => 0
+			));
+			$this->testTimeout();
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
+		}
+
+		return true;
+	}
+
+	public function file_exists($path) {
+		$path = $this->normalizePath($path);
+
+		if (!$path) {
+			$path = '.';
+		} else if ($path != '.' && $this->is_dir($path)) {
 			$path .= '/';
 		}
-		$response = $this->s3->create_object($this->bucket, $path, array('body' => ''));
-		return $response->isOK();
+
+		try {
+			$result = $this->connection->doesObjectExist(
+				$this->bucket,
+				$path
+			);
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
+		}
+
+		return $result;
 	}
 
+
 	public function rmdir($path) {
-		if (substr($path, -1) != '/') {
-			$path .= '/';
+		$path = $this->normalizePath($path);
+
+		if (!$this->file_exists($path)) {
+			return false;
 		}
-		return $this->unlink($path);
+
+		$dh = $this->opendir($path);
+		while ($file = readdir($dh)) {
+			if ($file === '.' || $file === '..') {
+				continue;
+			}
+
+			if ($this->is_dir($path . '/' . $file)) {
+				$this->rmdir($path . '/' . $file);
+			} else {
+				$this->unlink($path . '/' . $file);
+			}
+               	}
+
+		try {
+			$result = $this->connection->deleteObject(array(
+				'Bucket' => $this->bucket,
+				'Key' => $path . '/'
+			));
+			$this->testTimeout();
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
+		}
+
+		return true;
 	}
 
 	public function opendir($path) {
-		if ($path == '' || $path == '/') {
-			// Use the '/' delimiter to only fetch objects inside the folder
-			$opt = array('delimiter' => '/');
-		} else {
-			if (substr($path, -1) != '/') {
-				$path .= '/';
-			}
-			$opt = array('delimiter' => '/', 'prefix' => $path);
+		$path = $this->normalizePath($path);
+
+		if ($path === '.') {
+			$path = '';
+		} else if ($path) {
+			$path .= '/';
 		}
-		$response = $this->s3->list_objects($this->bucket, $opt);
-		if ($response->isOK()) {
+
+		try {
 			$files = array();
-			foreach ($response->body->Contents as $object) {
-				// The folder being opened also shows up in the list of objects, don't add it to the files
-				if ($object->Key != $path) {
-					$files[] = basename($object->Key);
+			$result = $this->connection->getIterator('ListObjects', array(
+				'Bucket' => $this->bucket,
+				'Delimiter' => '/',
+				'Prefix' => $path
+			), array('return_prefixes' => true));
+
+			foreach ($result as $object) {
+				$file = basename(
+					isset($object['Key']) ? $object['Key'] : $object['Prefix']
+				);
+
+				if ($file != basename($path)) {
+					$files[] = $file;
 				}
 			}
-			// Sub folders show up as CommonPrefixes
-			foreach ($response->body->CommonPrefixes as $object) {
-				$files[] = basename($object->Prefix);
-			}
+
 			\OC\Files\Stream\Dir::register('amazons3' . $path, $files);
+
 			return opendir('fakedir://amazons3' . $path);
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
 		}
-		return false;
 	}
 
 	public function stat($path) {
-		if ($path == '' || $path == '/') {
-			$stat['size'] = $this->s3->get_bucket_filesize($this->bucket);
-			$stat['atime'] = time();
-			$stat['mtime'] = $stat['atime'];
-		} else if ($object = $this->getObject($path)) {
-			$stat['size'] = $object['Size'];
+		$path = $this->normalizePath($path);
+
+		try {
+			if ($this->is_dir($path) && $path != '.') {
+				$path .= '/';
+			}
+
+			$result = $this->connection->headObject(array(
+				'Bucket' => $this->bucket,
+				'Key' => $path
+			));
+
+			$stat = array();
+			$stat['size'] = $result['ContentLength'] ? $result['ContentLength'] : 0;
+			if ($result['Metadata']['lastmodified']) {
+				$stat['mtime'] = strtotime($result['Metadata']['lastmodified']);
+			} else {
+				$stat['mtime'] = strtotime($result['LastModified']);
+			}
 			$stat['atime'] = time();
-			$stat['mtime'] = strtotime($object['LastModified']);
-		}
-		if (isset($stat)) {
+
 			return $stat;
+		} catch(S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
 		}
-		return false;
 	}
 
 	public function filetype($path) {
-		if ($path == '' || $path == '/') {
-			return 'dir';
-		} else {
-			$object = $this->getObject($path);
-			if ($object) {
-				// Amazon S3 doesn't have typical folders, this is an alternative method to detect a folder
-				if (substr($object['Key'], -1) == '/' && $object['Size'] == 0) {
-					return 'dir';
-				} else {
-					return 'file';
-				}
+		$path = $this->normalizePath($path);
+
+		try {
+			if ($path != '.' && $this->connection->doesObjectExist($this->bucket, $path)) {
+				return 'file';
 			}
+
+			if ($path != '.') {
+				$path .= '/';
+			}
+
+			if ($this->connection->doesObjectExist($this->bucket, $path)) {
+				return 'dir';
+			}
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
 		}
+
 		return false;
 	}
 
 	public function isReadable($path) {
-		// TODO Check acl and determine who grantee is
 		return true;
 	}
 
 	public function isUpdatable($path) {
-		// TODO Check acl and determine who grantee is
 		return true;
 	}
 
-	public function file_exists($path) {
-		if ($this->filetype($path) == 'dir' && substr($path, -1) != '/') {
-			$path .= '/';
+	public function unlink($path) {
+		$path = $this->normalizePath($path);
+
+		try {
+			$result = $this->connection->deleteObject(array(
+				'Bucket' => $this->bucket,
+				'Key' => $path
+			));
+			$this->testTimeout();
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
 		}
-		return $this->s3->if_object_exists($this->bucket, $path);
-	}
 
-	public function unlink($path) {
-		$response = $this->s3->delete_object($this->bucket, $path);
-		return $response->isOK();
+		return true;
 	}
 
 	public function fopen($path, $mode) {
+		$path = $this->normalizePath($path);
+
 		switch ($mode) {
 			case 'r':
 			case 'rb':
 				$tmpFile = \OC_Helper::tmpFile();
-				$handle = fopen($tmpFile, 'w');
-				$response = $this->s3->get_object($this->bucket, $path, array('fileDownload' => $handle));
-				if ($response->isOK()) {
-					return fopen($tmpFile, 'r');
+				self::$tmpFiles[$tmpFile] = $path;
+
+				try {
+					$result = $this->connection->getObject(array(
+						'Bucket' => $this->bucket,
+						'Key' => $path,
+						'SaveAs' => $tmpFile
+					));
+				} catch (S3Exception $e) {
+					\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+					return false;
 				}
-				break;
+
+				return fopen($tmpFile, 'r');
 			case 'w':
 			case 'wb':
 			case 'a':
@@ -203,45 +366,147 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 					$source = $this->fopen($path, 'r');
 					file_put_contents($tmpFile, $source);
 				}
-				self::$tempFiles[$tmpFile] = $path;
+				self::$tmpFiles[$tmpFile] = $path;
+
 				return fopen('close://' . $tmpFile, $mode);
 		}
 		return false;
 	}
 
-	public function writeBack($tmpFile) {
-		if (isset(self::$tempFiles[$tmpFile])) {
-			$handle = fopen($tmpFile, 'r');
-			$response = $this->s3->create_object($this->bucket,
-				self::$tempFiles[$tmpFile],
-				array('fileUpload' => $handle));
-			if ($response->isOK()) {
-				unlink($tmpFile);
-			}
-		}
-	}
-
 	public function getMimeType($path) {
-		if ($this->filetype($path) == 'dir') {
+		$path = $this->normalizePath($path);
+
+		if ($this->is_dir($path)) {
 			return 'httpd/unix-directory';
-		} else {
-			$object = $this->getObject($path);
-			if ($object) {
-				return $object['ContentType'];
+		} else if ($this->file_exists($path)) {
+			try {
+				$result = $this->connection->headObject(array(
+					'Bucket' => $this->bucket,
+					'Key' => $path
+				));
+			} catch (S3Exception $e) {
+				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+				return false;
 			}
+
+			return $result['ContentType'];
 		}
 		return false;
 	}
 
 	public function touch($path, $mtime = null) {
-		if (is_null($mtime)) {
-			$mtime = time();
+		$path = $this->normalizePath($path);
+
+		$metadata = array();
+		if (!is_null($mtime)) {
+			$metadata = array('lastmodified' => $mtime);
 		}
-		if ($this->filetype($path) == 'dir' && substr($path, -1) != '/') {
-			$path .= '/';
+
+		try {
+			if ($this->file_exists($path)) {
+				if ($this->is_dir($path) && $path != '.') {
+					$path .= '/';
+				}
+				$result = $this->connection->copyObject(array(
+					'Bucket' => $this->bucket,
+					'Key' => $path,
+					'Metadata' => $metadata,
+					'CopySource' => $this->bucket . '/' . $path
+				));
+				$this->testTimeout();
+			} else {
+				$result = $this->connection->putObject(array(
+					'Bucket' => $this->bucket,
+					'Key' => $path,
+					'Metadata' => $metadata
+				));
+				$this->testTimeout();
+			}
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
+		}
+
+		return true;
+	}
+
+	public function copy($path1, $path2) {
+		$path1 = $this->normalizePath($path1);
+		$path2 = $this->normalizePath($path2);
+
+		if ($this->is_file($path1)) {
+			try {
+				$result = $this->connection->copyObject(array(
+					'Bucket' => $this->bucket,
+					'Key' => $path2,
+					'CopySource' => $this->bucket . '/' . $path1
+				));
+				$this->testTimeout();
+			} catch (S3Exception $e) {
+				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+				return false;
+			}
+		} else {
+			if ($this->file_exists($path2)) {
+				return false;
+			}
+
+			try {
+				$result = $this->connection->copyObject(array(
+					'Bucket' => $this->bucket,
+					'Key' => $path2 . '/',
+					'CopySource' => $this->bucket . '/' . $path1 . '/'
+				));
+				$this->testTimeout();
+			} catch (S3Exception $e) {
+				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+				return false;
+			}
+
+			$dh = $this->opendir($path1);
+			while ($file = readdir($dh)) {
+				if ($file === '.' || $file === '..') {
+					continue;
+				}
+
+				$source = $path1 . '/' . $file;
+				$target = $path2 . '/' . $file;
+				$this->copy($source, $target);
+                	}
+		}
+
+		return true;
+	}
+
+	public function rename($path1, $path2) {
+		$path1 = $this->normalizePath($path1);
+		$path2 = $this->normalizePath($path2);
+
+		if ($this->is_file($path1)) {
+			if ($this->copy($path1, $path2) === false) {
+				return false;
+			}
+
+			if ($this->unlink($path1) === false) {
+				$this->unlink($path2);
+				return false;
+			}
+		} else {
+			if ($this->file_exists($path2)) {
+				return false;
+			}
+
+			if ($this->copy($path1, $path2) === false) {
+				return false;
+			}
+
+			if ($this->rmdir($path1) === false) {
+				$this->rmdir($path2);
+				return false;
+			}
 		}
-		$response = $this->s3->update_object($this->bucket, $path, array('meta' => array('LastModified' => $mtime)));
-		return $response->isOK();
+
+		return true;
 	}
 
 	public function test() {
@@ -252,4 +517,33 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		return false;
 	}
 
+	public function getId() {
+		return $this->id;
+	}
+
+	public function getConnection() {
+		return $this->connection;
+	}
+
+	public function writeBack($tmpFile) {
+		if (!isset(self::$tmpFiles[$tmpFile])) {
+			return false;
+		}
+
+		try {
+			$result= $this->connection->putObject(array(
+				'Bucket' => $this->bucket,
+				'Key' => self::$tmpFiles[$tmpFile],
+				'SourceFile' => $tmpFile,
+				'ContentType' => \OC_Helper::getMimeType($tmpFile),
+				'ContentLength' => filesize($tmpFile)
+			));
+			$this->testTimeout();
+
+			unlink($tmpFile);
+		} catch (S3Exception $e) {
+			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+			return false;
+		}
+	}
 }
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 4cb9b7c8ecdc4751b24a3828a5b9b1bd769a740c..e3a2cf0b30b347a7e136d055e79bdb5896318b65 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -34,7 +34,7 @@ class OC_Mount_Config {
 	* If the configuration parameter should be secret, add a '*' to the beginning of the value
 	* If the configuration parameter is a boolean, add a '!' to the beginning of the value
 	* If the configuration parameter is optional, add a '&' to the beginning of the value
-	* If the configuration parameter is hidden, add a '#' to the begining of the value
+	* If the configuration parameter is hidden, add a '#' to the beginning of the value
 	* @return array
 	*/
 	public static function getBackends() {
@@ -47,9 +47,14 @@ class OC_Mount_Config {
 		$backends['\OC\Files\Storage\AmazonS3']=array(
 			'backend' => 'Amazon S3',
 			'configuration' => array(
-				'key' => 'Key',
-				'secret' => '*Secret',
-				'bucket' => 'Bucket'));
+				'key' => 'Access Key',
+				'secret' => '*Secret Key',
+				'bucket' => 'Bucket',
+				'hostname' => 'Hostname (optional)',
+				'port' => 'Port (optional)',
+				'region' => 'Region (optional)',
+				'use_ssl' => '!Enable SSL',
+				'use_path_style' => '!Enable Path Style'));
 
 		$backends['\OC\Files\Storage\Dropbox']=array(
 			'backend' => 'Dropbox',
@@ -74,8 +79,9 @@ class OC_Mount_Config {
 			'backend' => 'Google Drive',
 			'configuration' => array(
 				'configured' => '#configured',
-				'token' => '#token',
-				'token_secret' => '#token secret'),
+				'client_id' => 'Client ID',
+				'client_secret' => 'Client secret',
+				'token' => '#token'),
 				'custom' => 'google');
 
 		$backends['\OC\Files\Storage\SWIFT']=array(
@@ -113,6 +119,17 @@ class OC_Mount_Config {
 				'password' => '*Password',
 				'root' => '&Root'));
 
+		$backends['\OC\Files\Storage\iRODS']=array(
+			'backend' => 'iRODS',
+			'configuration' => array(
+				'host' => 'Host',
+				'port' => 'Port',
+				'use_logon_credentials' => '!Use ownCloud login',
+				'user' => 'Username',
+				'password' => '*Password',
+				'auth_mode' => 'Authentication Mode',
+				'zone' => 'Zone'));
+
 		return($backends);
 	}
 
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index ec7de3f35709dec0e879dbfd42d3e14f957a70d4..ef8dd6d8cad588653991b194bbf5753c134c9529 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -1,437 +1,409 @@
 <?php
-
 /**
-* ownCloud
-*
-* @author Michael Gapczynski
-* @copyright 2012 Michael Gapczynski mtgap@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * ownCloud
+ *
+ * @author Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 namespace OC\Files\Storage;
 
-require_once 'Google/common.inc.php';
+set_include_path(get_include_path().PATH_SEPARATOR.
+	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
+require_once 'Google_Client.php';
+require_once 'contrib/Google_DriveService.php';
 
 class Google extends \OC\Files\Storage\Common {
 
-	private $consumer;
-	private $oauth_token;
-	private $sig_method;
-	private $entries;
 	private $id;
+	private $service;
+	private $driveFiles;
 
 	private static $tempFiles = array();
 
+	// Google Doc mimetypes
+	const FOLDER = 'application/vnd.google-apps.folder';
+	const DOCUMENT = 'application/vnd.google-apps.document';
+	const SPREADSHEET = 'application/vnd.google-apps.spreadsheet';
+	const DRAWING = 'application/vnd.google-apps.drawing';
+	const PRESENTATION = 'application/vnd.google-apps.presentation';
+
 	public function __construct($params) {
-		if (isset($params['configured']) && $params['configured'] == 'true'
+		if (isset($params['configured']) && $params['configured'] === 'true'
+			&& isset($params['client_id']) && isset($params['client_secret'])
 			&& isset($params['token'])
-			&& isset($params['token_secret'])
 		) {
-			$consumer_key = isset($params['consumer_key']) ? $params['consumer_key'] : 'anonymous';
-			$consumer_secret = isset($params['consumer_secret']) ? $params['consumer_secret'] : 'anonymous';
-			$this->id = 'google::' . $params['token'];
-			$this->consumer = new \OAuthConsumer($consumer_key, $consumer_secret);
-			$this->oauth_token = new \OAuthToken($params['token'], $params['token_secret']);
-			$this->sig_method = new \OAuthSignatureMethod_HMAC_SHA1();
-			$this->entries = array();
+			$client = new \Google_Client();
+			$client->setClientId($params['client_id']);
+			$client->setClientSecret($params['client_secret']);
+			$client->setScopes(array('https://www.googleapis.com/auth/drive'));
+			$client->setUseObjects(true);
+			$client->setAccessToken($params['token']);
+			$this->service = new \Google_DriveService($client);
+			$token = json_decode($params['token'], true);
+			$this->id = 'google::'.substr($params['client_id'], 0, 30).$token['created'];
 		} else {
 			throw new \Exception('Creating \OC\Files\Storage\Google storage failed');
 		}
 	}
 
-	private function sendRequest($uri,
-								 $httpMethod,
-								 $postData = null,
-								 $extraHeaders = null,
-								 $isDownload = false,
-								 $returnHeaders = false,
-								 $isContentXML = true,
-								 $returnHTTPCode = false) {
-		$uri = trim($uri);
-		// create an associative array from each key/value url query param pair.
-		$params = array();
-		$pieces = explode('?', $uri);
-		if (isset($pieces[1])) {
-			$params = explode_assoc('=', '&', $pieces[1]);
-		}
-		// urlencode each url parameter key/value pair
-		$tempStr = $pieces[0];
-		foreach ($params as $key => $value) {
-			$tempStr .= '&' . urlencode($key) . '=' . urlencode($value);
-		}
-		$uri = preg_replace('/&/', '?', $tempStr, 1);
-		$request = \OAuthRequest::from_consumer_and_token($this->consumer,
-														 $this->oauth_token,
-														 $httpMethod,
-														 $uri,
-														 $params);
-		$request->sign_request($this->sig_method, $this->consumer, $this->oauth_token);
-		$auth_header = $request->to_header();
-		$headers = array($auth_header, 'GData-Version: 3.0');
-		if ($isContentXML) {
-			$headers = array_merge($headers, array('Content-Type: application/atom+xml'));
-		}
-		if (is_array($extraHeaders)) {
-			$headers = array_merge($headers, $extraHeaders);
-		}
-		$curl = curl_init($uri);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($curl, CURLOPT_FAILONERROR, false);
-		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-		switch ($httpMethod) {
-			case 'GET':
-				curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-				break;
-			case 'POST':
-				curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-				curl_setopt($curl, CURLOPT_POST, 1);
-				curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-				break;
-			case 'PUT':
-				$headers[] = 'If-Match: *';
-				curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-				curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $httpMethod);
-				curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
-				break;
-			case 'DELETE':
-				$headers[] = 'If-Match: *';
-				curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-				curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $httpMethod);
-				break;
-			default:
-				curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-		}
-		if ($isDownload) {
-			$tmpFile = \OC_Helper::tmpFile();
-			$handle = fopen($tmpFile, 'w');
-			curl_setopt($curl, CURLOPT_FILE, $handle);
-		}
-		if ($returnHeaders) {
-			curl_setopt($curl, CURLOPT_HEADER, true);
-		}
-		$result = curl_exec($curl);
-		$httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		curl_close($curl);
-		if ($result) {
-			// TODO https://developers.google.com/google-apps/documents-list/#handling_api_errors
-			// TODO Log error messages
-			if ($httpCode <= 308) {
-				if ($isDownload) {
-					return $tmpFile;
-				} else if ($returnHTTPCode) {
-					return array('result' => $result, 'code' => $httpCode);
+	public function getId() {
+		return $this->id;
+	}
+
+	/**
+	 * Get the Google_DriveFile object for the specified path
+	 * @param string $path
+	 * @return Google_DriveFile
+	 */
+	private function getDriveFile($path) {
+		// Remove leading and trailing slashes
+		$path = trim($path, '/');
+		if (isset($this->driveFiles[$path])) {
+			return $this->driveFiles[$path];
+		} else if ($path === '') {
+			$root = $this->service->files->get('root');
+			$this->driveFiles[$path] = $root;
+			return $root;
+		} else {
+			// Google Drive SDK does not have methods for retrieving files by path
+			// Instead we must find the id of the parent folder of the file
+			$parentId = $this->getDriveFile('')->getId();
+			$folderNames = explode('/', $path);
+			$path = '';
+			// Loop through each folder of this path to get to the file
+			foreach ($folderNames as $name) {
+				// Reconstruct path from beginning
+				if ($path === '') {
+					$path .= $name;
 				} else {
-					return $result;
+					$path .= '/'.$name;
+				}
+				if (isset($this->driveFiles[$path])) {
+					$parentId = $this->driveFiles[$path]->getId();
+				} else {
+					$q = "title='".$name."' and '".$parentId."' in parents and trashed = false";
+					$result = $this->service->files->listFiles(array('q' => $q))->getItems();
+					if (!empty($result)) {
+						// Google Drive allows files with the same name, ownCloud doesn't
+						if (count($result) > 1) {
+							$this->onDuplicateFileDetected($path);
+							return false;
+						} else {
+							$file = current($result);
+							$this->driveFiles[$path] = $file;
+							$parentId = $file->getId();
+						}
+					} else {
+						// Google Docs have no extension in their title, so try without extension
+						$pos = strrpos($path, '.');
+						if ($pos !== false) {
+							$pathWithoutExt = substr($path, 0, $pos);
+							$file = $this->getDriveFile($pathWithoutExt);
+							if ($file) {
+								// Switch cached Google_DriveFile to the correct index
+								unset($this->driveFiles[$pathWithoutExt]);
+								$this->driveFiles[$path] = $file;
+								$parentId = $file->getId();
+							} else {
+								return false;
+							}
+						} else {
+							return false;
+						}
+					}
 				}
 			}
+			return $this->driveFiles[$path];
 		}
-		return false;
-	}
-
-	private function getFeed($feedUri, $httpMethod, $postData = null) {
-		$result = $this->sendRequest($feedUri, $httpMethod, $postData);
-		if ($result) {
-			$dom = new \DOMDocument();
-			$dom->loadXML($result);
-			return $dom;
-		}
-		return false;
 	}
 
 	/**
-	 * Base url for google docs feeds
+	 * Set the Google_DriveFile object in the cache
+	 * @param string $path
+	 * @param Google_DriveFile|false $file
 	 */
-	const BASE_URI='https://docs.google.com/feeds';
-
-	private function getResource($path) {
-		$file = basename($path);
-		if (array_key_exists($file, $this->entries)) {
-			return $this->entries[$file];
-		} else {
-			// Strip the file extension; file could be a native Google Docs resource
-			if ($pos = strpos($file, '.')) {
-				$title = substr($file, 0, $pos);
-				$dom = $this->getFeed(self::BASE_URI.'/default/private/full?showfolders=true&title='.$title, 'GET');
-				// Check if request was successful and entry exists
-				if ($dom && $entry = $dom->getElementsByTagName('entry')->item(0)) {
-					$this->entries[$file] = $entry;
-					return $entry;
+	private function setDriveFile($path, $file) {
+		$path = trim($path, '/');
+		$this->driveFiles[$path] = $file;
+		if ($file === false) {
+			// Set all child paths as false
+			$len = strlen($path);
+			foreach ($this->driveFiles as $key => $file) {
+				if (substr($key, 0, $len) === $path) {
+					$this->driveFiles[$key] = false;
 				}
 			}
-			$dom = $this->getFeed(self::BASE_URI.'/default/private/full?showfolders=true&title='.$file, 'GET');
-			// Check if request was successful and entry exists
-			if ($dom && $entry = $dom->getElementsByTagName('entry')->item(0)) {
-				$this->entries[$file] = $entry;
-				return $entry;
-			}
-			return false;
 		}
 	}
 
-	private function getExtension($entry) {
-		$mimetype = $this->getMimeType('', $entry);
-		switch ($mimetype) {
-			case 'httpd/unix-directory':
-				return '';
-			case 'application/vnd.oasis.opendocument.text':
-				return 'odt';
-			case 'application/vnd.oasis.opendocument.spreadsheet':
-				return 'ods';
-			case 'application/vnd.oasis.opendocument.presentation':
-				return 'pptx';
-			case 'text/html':
-				return 'html';
-			default:
-				return 'html';
-		}
+	/**
+	 * Write a log message to inform about duplicate file names
+	 * @param string $path
+	 */
+	private function onDuplicateFileDetected($path) {
+		$about = $this->service->about->get();
+		$user = $about->getName();
+		\OCP\Util::writeLog('files_external',
+			'Ignoring duplicate file name: '.$path.' on Google Drive for Google user: '.$user,
+			\OCP\Util::INFO
+		);
 	}
 
-	public function getId(){
-		return $this->id;
+	/**
+	 * Generate file extension for a Google Doc, choosing Open Document formats for download
+	 * @param string $mimetype
+	 * @return string
+	 */
+	private function getGoogleDocExtension($mimetype) {
+		if ($mimetype === self::DOCUMENT) {
+			return 'odt';
+		} else if ($mimetype === self::SPREADSHEET) {
+			return 'ods';
+		} else if ($mimetype === self::DRAWING) {
+			return 'jpg';
+		} else if ($mimetype === self::PRESENTATION) {
+			// Download as .odp is not available
+			return 'pdf';
+		} else {
+			return '';
+		}
 	}
 
 	public function mkdir($path) {
-		$collection = dirname($path);
-		// Check if path parent is root directory
-		if ($collection == '/' || $collection == '\.' || $collection == '.') {
-			$uri = self::BASE_URI.'/default/private/full';
-		} else {
-			// Get parent content link
-			$dom = $this->getResource(basename($collection));
-			if ($dom) {
-				$uri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
-			}
-		}
-		if (isset($uri)) {
-			$title = basename($path);
-			// Construct post data
-			$postData = '<?xml version="1.0" encoding="UTF-8"?>';
-			$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
-			$postData .= '<category scheme="http://schemas.google.com/g/2005#kind"';
-			$postData .=          ' term="http://schemas.google.com/docs/2007#folder"/>';
-			$postData .= '<title>'.$title.'</title>';
-			$postData .= '</entry>';
-			$dom = $this->sendRequest($uri, 'POST', $postData);
-			if ($dom) {
-				return true;
+		if (!$this->is_dir($path)) {
+			$parentFolder = $this->getDriveFile(dirname($path));
+			if ($parentFolder) {
+				$folder = new \Google_DriveFile();
+				$folder->setTitle(basename($path));
+				$folder->setMimeType(self::FOLDER);
+				$parent = new \Google_ParentReference();
+				$parent->setId($parentFolder->getId());
+				$folder->setParents(array($parent));
+				$result = $this->service->files->insert($folder);
+				if ($result) {
+					$this->setDriveFile($path, $result);
+				}
+				return (bool)$result;
 			}
 		}
 		return false;
 	}
 
 	public function rmdir($path) {
-		return $this->unlink($path);
+		if (trim($path, '/') === '') {
+			$dir = $this->opendir($path);
+			while ($file = readdir($dir)) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+					if (!$this->unlink($path.'/'.$file)) {
+						return false;
+					}
+				}
+			}
+			closedir($dir);
+			$this->driveFiles = array();
+			return true;
+		} else {
+			return $this->unlink($path);
+		}
 	}
 
 	public function opendir($path) {
-		if ($path == '' || $path == '/') {
-			$next = self::BASE_URI.'/default/private/full/folder%3Aroot/contents';
-		} else {
-			$entry = $this->getResource($path);
-			if ($entry) {
-				$next = $entry->getElementsByTagName('content')->item(0)->getAttribute('src');
-			} else {
-				return false;
-			}
-		}
-		$files = array();
-		while ($next) {
-			$dom = $this->getFeed($next, 'GET');
-			$links = $dom->getElementsByTagName('link');
-			foreach ($links as $link) {
-				if ($link->getAttribute('rel') == 'next') {
-					$next = $link->getAttribute('src');
-					break;
-				} else {
-					$next = false;
+		// Remove leading and trailing slashes
+		$path = trim($path, '/');
+		$folder = $this->getDriveFile($path);
+		if ($folder) {
+			$files = array();
+			$duplicates = array();
+			$pageToken = true;
+			while ($pageToken) {
+				$params = array();
+				if ($pageToken !== true) {
+					$params['pageToken'] = $pageToken;
 				}
-			}
-			$entries = $dom->getElementsByTagName('entry');
-			foreach ($entries as $entry) {
-				$name = $entry->getElementsByTagName('title')->item(0)->nodeValue;
-				// Google Docs resources don't always include extensions in title
-				if ( ! strpos($name, '.')) {
-					$extension = $this->getExtension($entry);
-					if ($extension != '') {
-						$name .= '.'.$extension;
+				$params['q'] = "'".$folder->getId()."' in parents and trashed = false";
+				$children = $this->service->files->listFiles($params);
+				foreach ($children->getItems() as $child) {
+					$name = $child->getTitle();
+					// Check if this is a Google Doc i.e. no extension in name
+					if ($child->getFileExtension() === ''
+						&& $child->getMimeType() !== self::FOLDER
+					) {
+						$name .= '.'.$this->getGoogleDocExtension($child->getMimeType());
+					}
+					if ($path === '') {
+						$filepath = $name;
+					} else {
+						$filepath = $path.'/'.$name;
+					}
+					// Google Drive allows files with the same name, ownCloud doesn't
+					// Prevent opendir() from returning any duplicate files
+					$key = array_search($name, $files);
+					if ($key !== false || isset($duplicates[$filepath])) {
+						if (!isset($duplicates[$filepath])) {
+							$duplicates[$filepath] = true;
+							$this->setDriveFile($filepath, false);
+							unset($files[$key]);
+							$this->onDuplicateFileDetected($filepath);
+						}
+					} else {
+						// Cache the Google_DriveFile for future use
+						$this->setDriveFile($filepath, $child);
+						$files[] = $name;
 					}
 				}
-				$files[] = basename($name);
-				// Cache entry for future use
-				$this->entries[$name] = $entry;
+				$pageToken = $children->getNextPageToken();
 			}
+			\OC\Files\Stream\Dir::register('google'.$path, $files);
+			return opendir('fakedir://google'.$path);
+		} else {
+			return false;
 		}
-		\OC\Files\Stream\Dir::register('google'.$path, $files);
-		return opendir('fakedir://google'.$path);
 	}
 
 	public function stat($path) {
-		if ($path == '' || $path == '/') {
-			$stat['size'] = $this->free_space($path);
-			$stat['atime'] = time();
-			$stat['mtime'] = time();
-			$stat['ctime'] = time();
-		} else {
-			$entry = $this->getResource($path);
-			if ($entry) {
-				// NOTE: Native resources don't have a file size
-				$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005',
-															   'quotaBytesUsed')->item(0)->nodeValue;
-				//if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005',
-				//													'lastViewed')->item(0)->nodeValue))
-				//$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005',
-				//															'lastViewed')->item(0)->nodeValue);
-				$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
+		$file = $this->getDriveFile($path);
+		if ($file) {
+			$stat = array();
+			if ($this->filetype($path) === 'dir') {
+				$stat['size'] = 0;
+			} else {
+				// Check if this is a Google Doc
+				if ($this->getMimeType($path) !== $file->getMimeType()) {
+					// Return unknown file size
+					$stat['size'] = \OC\Files\FREE_SPACE_UNKNOWN;
+				} else {
+					$stat['size'] = $file->getFileSize();
+				}
 			}
-		}
-		if (isset($stat)) {
+			$stat['atime'] = strtotime($file->getLastViewedByMeDate());
+			$stat['mtime'] = strtotime($file->getModifiedDate());
+			$stat['ctime'] = strtotime($file->getCreatedDate());
 			return $stat;
+		} else {
+			return false;
 		}
-		return false;
 	}
 
 	public function filetype($path) {
-		if ($path == '' || $path == '/') {
+		if ($path === '') {
 			return 'dir';
 		} else {
-			$entry = $this->getResource($path);
-			if ($entry) {
-				$categories = $entry->getElementsByTagName('category');
-				foreach ($categories as $category) {
-					if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
-						$type = $category->getAttribute('label');
-						if (strlen(strstr($type, 'folder')) > 0) {
-							return 'dir';
-						} else {
-							return 'file';
-						}
-					}
+			$file = $this->getDriveFile($path);
+			if ($file) {
+				if ($file->getMimeType() === self::FOLDER) {
+					return 'dir';
+				} else {
+					return 'file';
 				}
+			} else {
+				return false;
 			}
 		}
-		return false;
 	}
 
 	public function isReadable($path) {
-		return true;
+		return $this->file_exists($path);
 	}
 
 	public function isUpdatable($path) {
-		if ($path == '' || $path == '/') {
-			return true;
+		$file = $this->getDriveFile($path);
+		if ($file) {
+			return $file->getEditable();
 		} else {
-			$entry = $this->getResource($path);
-			if ($entry) {
-				// Check if edit or edit-media links exist
-				$links = $entry->getElementsByTagName('link');
-				foreach ($links as $link) {
-					if ($link->getAttribute('rel') == 'edit') {
-						return true;
-					} else if ($link->getAttribute('rel') == 'edit-media') {
-						return true;
-					}
-				}
-			}
+			return false;
 		}
-		return false;
 	}
 
 	public function file_exists($path) {
-		if ($path == '' || $path == '/') {
-			return true;
-		} else if ($this->getResource($path)) {
-			return true;
-		}
-		return false;
+		return (bool)$this->getDriveFile($path);
 	}
 
 	public function unlink($path) {
-		// Get resource self link to trash resource
-		$entry = $this->getResource($path);
-		if ($entry) {
-			$links = $entry->getElementsByTagName('link');
-			foreach ($links as $link) {
-				if ($link->getAttribute('rel') == 'self') {
-					$uri = $link->getAttribute('href');
-					break;
-				}
+		$file = $this->getDriveFile($path);
+		if ($file) {
+			$result = $this->service->files->trash($file->getId());
+			if ($result) {
+				$this->setDriveFile($path, false);
 			}
+			return (bool)$result;
+		} else {
+			return false;
 		}
-		if (isset($uri)) {
-			$this->sendRequest($uri, 'DELETE');
-			return true;
-		}
-		return false;
 	}
 
 	public function rename($path1, $path2) {
-		$entry = $this->getResource($path1);
-		if ($entry) {
-			$collection = dirname($path2);
-			if (dirname($path1) == $collection) {
-				// Get resource edit link to rename resource
-				$etag = $entry->getAttribute('gd:etag');
-				$links = $entry->getElementsByTagName('link');
-				foreach ($links as $link) {
-					if ($link->getAttribute('rel') == 'edit') {
-						$uri = $link->getAttribute('href');
-						break;
-					}
-				}
-				$title = basename($path2);
-				// Construct post data
-				$postData = '<?xml version="1.0" encoding="UTF-8"?>';
-				$postData .= '<entry xmlns="http://www.w3.org/2005/Atom"';
-				$postData .=       ' xmlns:docs="http://schemas.google.com/docs/2007"';
-				$postData .=       ' xmlns:gd="http://schemas.google.com/g/2005"';
-				$postData .=       ' gd:etag='.$etag.'>';
-				$postData .= '<title>'.$title.'</title>';
-				$postData .= '</entry>';
-				$this->sendRequest($uri, 'PUT', $postData);
-				return true;
+		$file = $this->getDriveFile($path1);
+		if ($file) {
+			if (dirname($path1) === dirname($path2)) {
+				$file->setTitle(basename(($path2)));
 			} else {
-				// Move to different collection
-				$collectionEntry = $this->getResource($collection);
-				if ($collectionEntry) {
-					$feedUri = $collectionEntry->getElementsByTagName('content')->item(0)->getAttribute('src');
-					// Construct post data
-					$postData = '<?xml version="1.0" encoding="UTF-8"?>';
-					$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
-					$postData .= '<id>'.$entry->getElementsByTagName('id')->item(0).'</id>';
-					$postData .= '</entry>';
-					$this->sendRequest($feedUri, 'POST', $postData);
-					return true;
+				// Change file parent
+				$parentFolder2 = $this->getDriveFile(dirname($path2));
+				if ($parentFolder2) {
+					$parent = new \Google_ParentReference();
+					$parent->setId($parentFolder2->getId());
+					$file->setParents(array($parent));
+				} else {
+					return false;
 				}
 			}
+			$result = $this->service->files->patch($file->getId(), $file);
+			if ($result) {
+				$this->setDriveFile($path1, false);
+				$this->setDriveFile($path2, $result);
+			}
+			return (bool)$result;
+		} else {
+			return false;
 		}
-		return false;
 	}
 
 	public function fopen($path, $mode) {
+		$pos = strrpos($path, '.');
+		if ($pos !== false) {
+			$ext = substr($path, $pos);
+		} else {
+			$ext = '';
+		}
 		switch ($mode) {
 			case 'r':
 			case 'rb':
-				$entry = $this->getResource($path);
-				if ($entry) {
-					$extension = $this->getExtension($entry);
-					$downloadUri = $entry->getElementsByTagName('content')->item(0)->getAttribute('src');
-					// TODO Non-native documents don't need these additional parameters
-					$downloadUri .= '&exportFormat='.$extension.'&format='.$extension;
-					$tmpFile = $this->sendRequest($downloadUri, 'GET', null, null, true);
-					return fopen($tmpFile, 'r');
+				$file = $this->getDriveFile($path);
+				if ($file) {
+					$exportLinks = $file->getExportLinks();
+					$mimetype = $this->getMimeType($path);
+					$downloadUrl = null;
+					if ($exportLinks && isset($exportLinks[$mimetype])) {
+						$downloadUrl = $exportLinks[$mimetype];
+					} else {
+						$downloadUrl = $file->getDownloadUrl();
+					}
+					if (isset($downloadUrl)) {
+						$request = new \Google_HttpRequest($downloadUrl, 'GET', null, null);
+						$httpRequest = \Google_Client::$io->authenticatedRequest($request);
+						if ($httpRequest->getResponseHttpCode() == 200) {
+							$tmpFile = \OC_Helper::tmpFile($ext);
+							$data = $httpRequest->getResponseBody();
+							file_put_contents($tmpFile, $data);
+							return fopen($tmpFile, $mode);
+						}
+					}
 				}
+				return false;
 			case 'w':
 			case 'wb':
 			case 'a':
@@ -444,156 +416,106 @@ class Google extends \OC\Files\Storage\Common {
 			case 'x+':
 			case 'c':
 			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
 				$tmpFile = \OC_Helper::tmpFile($ext);
 				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
+					$source = $this->fopen($path, 'rb');
 					file_put_contents($tmpFile, $source);
 				}
 				self::$tempFiles[$tmpFile] = $path;
 				return fopen('close://'.$tmpFile, $mode);
 		}
-		return false;
 	}
 
 	public function writeBack($tmpFile) {
 		if (isset(self::$tempFiles[$tmpFile])) {
-			$this->uploadFile($tmpFile, self::$tempFiles[$tmpFile]);
-			unlink($tmpFile);
-		}
-	}
-
-	private function uploadFile($path, $target) {
-		$entry = $this->getResource($target);
-		if ( ! $entry) {
-			if (dirname($target) == '.' || dirname($target) == '/') {
-				$uploadUri = self::BASE_URI.'/upload/create-session/default/private/full/folder%3Aroot/contents';
-			} else {
-				$entry = $this->getResource(dirname($target));
-			}
-		}
-		if ( ! isset($uploadUri) && $entry) {
-			$links = $entry->getElementsByTagName('link');
-			foreach ($links as $link) {
-				if ($link->getAttribute('rel') == 'http://schemas.google.com/g/2005#resumable-create-media') {
-					$uploadUri = $link->getAttribute('href');
-					break;
-				}
-			}
-		}
-		if (isset($uploadUri) && $handle = fopen($path, 'r')) {
-			$uploadUri .= '?convert=false';
-			$mimetype = \OC_Helper::getMimeType($path);
-			$size = filesize($path);
-			$headers = array('X-Upload-Content-Type: ' => $mimetype, 'X-Upload-Content-Length: ' => $size);
-			$postData = '<?xml version="1.0" encoding="UTF-8"?>';
-			$postData .= '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007">';
-			$postData .= '<title>'.basename($target).'</title>';
-			$postData .= '</entry>';
-			$result = $this->sendRequest($uploadUri, 'POST', $postData, $headers, false, true);
-			if ($result) {
-				// Get location to upload file
-				if (preg_match('@^Location: (.*)$@m', $result, $matches)) {
-					$uploadUri = trim($matches[1]);
-				}
-			} else {
-				return false;
-			}
-			// 512 kB chunks
-			$chunkSize = 524288;
-			$i = 0;
-			while (!feof($handle)) {
-				if ($i + $chunkSize > $size) {
-					if ($i == 0) {
-						$chunkSize = $size;
-					} else {
-						$chunkSize = $size % $i;
-					}
-				}
-				$end = $i + $chunkSize - 1;
-				$headers = array('Content-Length: '.$chunkSize,
-								 'Content-Type: '.$mimetype,
-								 'Content-Range: bytes '.$i.'-'.$end.'/'.$size);
-				$postData = fread($handle, $chunkSize);
-				$result = $this->sendRequest($uploadUri, 'PUT', $postData, $headers, false, true, false, true);
-				if ($result['code'] == '308') {
-					if (preg_match('@^Location: (.*)$@m', $result['result'], $matches)) {
-						// Get next location to upload file chunk
-						$uploadUri = trim($matches[1]);
-					}
-					$i += $chunkSize;
+			$path = self::$tempFiles[$tmpFile];
+			$parentFolder = $this->getDriveFile(dirname($path));
+			if ($parentFolder) {
+				// TODO Research resumable upload
+				$mimetype = \OC_Helper::getMimeType($tmpFile);
+				$data = file_get_contents($tmpFile);
+				$params = array(
+					'data' => $data,
+					'mimeType' => $mimetype,
+				);
+				$result = false;
+				if ($this->file_exists($path)) {
+					$file = $this->getDriveFile($path);
+					$result = $this->service->files->update($file->getId(), $file, $params);
 				} else {
-					return false;
+					$file = new \Google_DriveFile();
+					$file->setTitle(basename($path));
+					$file->setMimeType($mimetype);
+					$parent = new \Google_ParentReference();
+					$parent->setId($parentFolder->getId());
+					$file->setParents(array($parent));
+					$result = $this->service->files->insert($file, $params);
+				}
+				if ($result) {
+					$this->setDriveFile($path, $result);
 				}
 			}
-			// TODO Wait for resource entry
+			unlink($tmpFile);
 		}
 	}
 
-	public function getMimeType($path, $entry = null) {
-		// Entry can be passed, because extension is required for opendir
-		// and the entry can't be cached without the extension
-		if ($entry == null) {
-			if ($path == '' || $path == '/') {
+	public function getMimeType($path) {
+		$file = $this->getDriveFile($path);
+		if ($file) {
+			$mimetype = $file->getMimeType();
+			// Convert Google Doc mimetypes, choosing Open Document formats for download
+			if ($mimetype === self::FOLDER) {
 				return 'httpd/unix-directory';
+			} else if ($mimetype === self::DOCUMENT) {
+				return 'application/vnd.oasis.opendocument.text';
+			} else if ($mimetype === self::SPREADSHEET) {
+				return 'application/x-vnd.oasis.opendocument.spreadsheet';
+			} else if ($mimetype === self::DRAWING) {
+				return 'image/jpeg';
+			} else if ($mimetype === self::PRESENTATION) {
+				// Download as .odp is not available
+				return 'application/pdf';
 			} else {
-				$entry = $this->getResource($path);
-			}
-		}
-		if ($entry) {
-			$mimetype = $entry->getElementsByTagName('content')->item(0)->getAttribute('type');
-			// Native Google Docs resources often default to text/html,
-			// but it may be more useful to default to a corresponding ODF mimetype
-			// Collections get reported as application/atom+xml,
-			// make sure it actually is a folder and fix the mimetype
-			if ($mimetype == 'text/html' || $mimetype == 'application/atom+xml;type=feed') {
-				$categories = $entry->getElementsByTagName('category');
-				foreach ($categories as $category) {
-					if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
-						$type = $category->getAttribute('label');
-						if (strlen(strstr($type, 'folder')) > 0) {
-							return 'httpd/unix-directory';
-						} else if (strlen(strstr($type, 'document')) > 0) {
-							return 'application/vnd.oasis.opendocument.text';
-						} else if (strlen(strstr($type, 'spreadsheet')) > 0) {
-							return 'application/vnd.oasis.opendocument.spreadsheet';
-						} else if (strlen(strstr($type, 'presentation')) > 0) {
-							return 'application/vnd.oasis.opendocument.presentation';
-						} else if (strlen(strstr($type, 'drawing')) > 0) {
-							return 'application/vnd.oasis.opendocument.graphics';
-						} else {
-							// If nothing matches return text/html,
-							// all native Google Docs resources can be exported as text/html
-							return 'text/html';
-						}
-					}
-				}
+				return $mimetype;
 			}
-			return $mimetype;
+		} else {
+			return false;
 		}
-		return false;
 	}
 
 	public function free_space($path) {
-		$dom = $this->getFeed(self::BASE_URI.'/metadata/default', 'GET');
-		if ($dom) {
-			// NOTE: Native Google Docs resources don't count towards quota
-			$total = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005',
-												  'quotaBytesTotal')->item(0)->nodeValue;
-			$used = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005',
-												  'quotaBytesUsed')->item(0)->nodeValue;
-			return $total - $used;
-		}
-		return false;
+		$about = $this->service->about->get();
+		return $about->getQuotaBytesTotal() - $about->getQuotaBytesUsed();
 	}
 
 	public function touch($path, $mtime = null) {
-
+		$file = $this->getDriveFile($path);
+		$result = false;
+		if ($file) {
+			if (isset($mtime)) {
+				$file->setModifiedDate($mtime);
+				$result = $this->service->files->patch($file->getId(), $file, array(
+					'setModifiedDate' => true,
+				));
+			} else {
+				$result = $this->service->files->touch($file->getId());
+			}
+		} else {
+			$parentFolder = $this->getDriveFile(dirname($path));
+			if ($parentFolder) {
+				$file = new \Google_DriveFile();
+				$file->setTitle(basename($path));
+				$parent = new \Google_ParentReference();
+				$parent->setId($parentFolder->getId());
+				$file->setParents(array($parent));
+				$result = $this->service->files->insert($file);
+			}
+		}
+		if ($result) {
+			$this->setDriveFile($path, $result);
+		}
+		return (bool)$result;
 	}
 
 	public function test() {
@@ -603,4 +525,66 @@ class Google extends \OC\Files\Storage\Common {
 		return false;
 	}
 
-}
+	public function hasUpdated($path, $time) {
+		if ($this->is_file($path)) {
+			return parent::hasUpdated($path, $time);
+		} else {
+			// Google Drive doesn't change modified times of folders when files inside are updated
+			// Instead we use the Changes API to see if folders have been updated, and it's a pain
+			$folder = $this->getDriveFile($path);
+			if ($folder) {
+				$result = false;
+				$folderId = $folder->getId();
+				$startChangeId = \OC_Appconfig::getValue('files_external', $this->getId().'cId');
+				$params = array(
+					'includeDeleted' => true,
+					'includeSubscribed' => true,
+				);
+				if (isset($startChangeId)) {
+					$startChangeId = (int)$startChangeId;
+					$largestChangeId = $startChangeId;
+					$params['startChangeId'] = $startChangeId + 1;
+				} else {
+					$largestChangeId = 0;
+				}
+				$pageToken = true;
+				while ($pageToken) {
+					if ($pageToken !== true) {
+						$params['pageToken'] = $pageToken;
+					}
+					$changes = $this->service->changes->listChanges($params);
+					if ($largestChangeId === 0 || $largestChangeId === $startChangeId) {
+						$largestChangeId = $changes->getLargestChangeId();
+					}
+					if (isset($startChangeId)) {
+						// Check if a file in this folder has been updated
+						// There is no way to filter by folder at the API level...
+						foreach ($changes->getItems() as $change) {
+							$file = $change->getFile();
+							if ($file) {
+								foreach ($file->getParents() as $parent) {
+									if ($parent->getId() === $folderId) {
+										$result = true;
+									// Check if there are changes in different folders
+									} else if ($change->getId() <= $largestChangeId) {
+										// Decrement id so this change is fetched when called again
+										$largestChangeId = $change->getId();
+										$largestChangeId--;
+									}
+								}
+							}
+						}
+						$pageToken = $changes->getNextPageToken();
+					} else {
+						// Assuming the initial scan just occurred and changes are negligible
+						break;
+					}
+				}
+				\OC_Appconfig::setValue('files_external', $this->getId().'cId', $largestChangeId);
+				return $result;
+			}
+		}
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php
new file mode 100644
index 0000000000000000000000000000000000000000..a343ac5fb273129d0308d66c9a6cbe210746cd17
--- /dev/null
+++ b/apps/files_external/lib/irods.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas MÃ¼ller <thomas.mueller@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+set_include_path(get_include_path() . PATH_SEPARATOR .
+	\OC_App::getAppPath('files_external') . '/3rdparty/irodsphp/prods/src');
+
+ob_start();
+require_once 'ProdsConfig.inc.php';
+require_once 'ProdsStreamer.class.php';
+ob_end_clean();
+
+class iRODS extends \OC\Files\Storage\StreamWrapper{
+	private $password;
+	private $user;
+	private $host;
+	private $port;
+	private $zone;
+	private $root;
+	private $use_logon_credentials;
+	private $auth_mode;
+
+	public function __construct($params) {
+		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+			$this->host = $params['host'];
+			$this->port = $params['port'];
+			$this->user = $params['user'];
+			$this->password = $params['password'];
+			$this->use_logon_credentials = $params['use_logon_credentials'];
+			$this->zone = $params['zone'];
+			$this->auth_mode = isset($params['auth_mode']) ? $params['auth_mode'] : '';
+
+			$this->root = isset($params['root']) ? $params['root'] : '/';
+			if ( ! $this->root || $this->root[0] !== '/') {
+				$this->root='/'.$this->root;
+			}
+
+			// take user and password from the session
+			if ($this->use_logon_credentials && isset($_SESSION['irods-credentials']) )
+			{
+				$this->user = $_SESSION['irods-credentials']['uid'];
+				$this->password = $_SESSION['irods-credentials']['password'];
+			}
+
+			//create the root folder if necessary
+			if ( ! $this->is_dir('')) {
+				$this->mkdir('');
+			}
+		} else {
+			throw new \Exception();
+		}
+		
+	}
+
+	public static function login( $params ) {
+		$_SESSION['irods-credentials'] = $params;
+	}
+
+	public function getId(){
+		return 'irods::' . $this->user . '@' . $this->host . '/' . $this->root;
+	}
+
+	/**
+	 * construct the rods url
+	 * @param string $path
+	 * @return string
+	 */
+	public function constructUrl($path) {
+		$path = rtrim($path,'/');
+		if ( $path === '' || $path[0] !== '/') {
+			$path = '/'.$path;
+		}
+
+		// adding auth method
+		$userWithZone = $this->user.'.'.$this->zone;
+		if ($this->auth_mode !== '') {
+			$userWithZone .= '.'.$this->auth_mode;
+		}
+
+		// url wrapper schema is named rods
+		return 'rods://'.$userWithZone.':'.$this->password.'@'.$this->host.':'.$this->port.$this->root.$path;
+	}
+
+	public function filetype($path) {
+		return @filetype($this->constructUrl($path));
+	}
+
+	public function mkdir($path) {
+		return @mkdir($this->constructUrl($path));
+	}
+
+	public function touch($path, $mtime=null) {
+
+		// we cannot set a time
+		if ($mtime != null) {
+			return false;
+		}
+
+		$path = $this->constructUrl($path);
+
+		// if the file doesn't exist we create it
+		if (!file_exists($path)) {
+			file_put_contents($path, '');
+			return true;
+		}
+
+		// mtime updates are not supported
+		return false;
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param string $path
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time) {
+		// this it a work around for folder mtimes -> we loop it's content
+		if ( $this->is_dir($path)) {
+			$actualTime=$this->collectionMTime($path);
+			return $actualTime>$time;
+		}
+
+		$actualTime=$this->filemtime($path);
+		return $actualTime>$time;
+	}
+
+	/**
+	 * get the best guess for the modification time of an iRODS collection
+	 */
+	private function collectionMTime($path) {
+		$dh = $this->opendir($path);
+		$lastCTime = $this->filemtime($path);
+		while ($file = readdir($dh)) {
+			if ($file != '.' and $file != '..') {
+				$time = $this->filemtime($file);
+				if ($time > $lastCTime) {
+					$lastCTime = $time;
+				}
+			}
+		}
+		return $lastCTime;
+	}
+
+}
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index 09041f335b46517a6076edb15f2db942a53aa9fc..beb4ec5605f47900c8a556ed6e42d3967cbc82f9 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -60,6 +60,8 @@ abstract class StreamWrapper extends Common{
 			$fh = $this->fopen($path, 'a');
 			fwrite($fh, '');
 			fclose($fh);
+
+			return true;
 		} else {
 			return false;//not supported
 		}
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index c2fe7c67b582e994f65e60215d797590327665a0..f98be318f1ce61b380459cb1dbb70880bb396a5e 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -173,6 +173,7 @@ class DAV extends \OC\Files\Storage\Common{
 				curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
 				curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path);
 				curl_setopt($curl, CURLOPT_FILE, $fp);
+				curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
 
 				curl_exec ($curl);
 				curl_close ($curl);
@@ -234,7 +235,13 @@ class DAV extends \OC\Files\Storage\Common{
 			$mtime=time();
 		}
 		$path=$this->cleanPath($path);
-		$this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime));
+
+		// if file exists, update the mtime, else create a new empty file
+		if ($this->file_exists($path)) {
+			$this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime));
+		} else {
+			$this->file_put_contents($path, '');
+		}
 	}
 
 	public function getFile($path, $target) {
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
index 6b3a942b5baec7c45833f798c68ed5599149336c..a73b6307b0147d0e632014415862abf1b627f3cc 100644
--- a/apps/files_external/tests/amazons3.php
+++ b/apps/files_external/tests/amazons3.php
@@ -4,7 +4,9 @@
  * ownCloud
  *
  * @author Michael Gapczynski
+ * @author Christian Berendt 
  * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ * @copyright 2013 Christian Berendt berendt@b1-systems.de
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -25,25 +27,40 @@ namespace Test\Files\Storage;
 class AmazonS3 extends Storage {
 
 	private $config;
-	private $id;
 
 	public function setUp() {
-		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
 		if ( ! is_array($this->config) or ! isset($this->config['amazons3']) or ! $this->config['amazons3']['run']) {
 			$this->markTestSkipped('AmazonS3 backend not configured');
 		}
-		$this->config['amazons3']['bucket'] = $id; // Make sure we have a new empty bucket to work in
 		$this->instance = new \OC\Files\Storage\AmazonS3($this->config['amazons3']);
 	}
 
 	public function tearDown() {
 		if ($this->instance) {
-			$s3 = new \AmazonS3(array('key' => $this->config['amazons3']['key'],
-									 'secret' => $this->config['amazons3']['secret']));
-			if ($s3->delete_all_objects($this->id)) {
-				$s3->delete_bucket($this->id);
+			$connection = $this->instance->getConnection();
+
+			try {
+				// NOTE(berendt): clearBucket() is not working with Ceph
+				$iterator = $connection->getIterator('ListObjects', array(
+					'Bucket' => $this->config['amazons3']['bucket']
+				));
+
+				foreach ($iterator as $object) {
+					$connection->deleteObject(array(
+						'Bucket' => $this->config['amazons3']['bucket'],
+						'Key' => $object['Key']
+					));
+				}
+			} catch (S3Exception $e) {
 			}
+
+			$connection->deleteBucket(array(
+				'Bucket' => $this->config['amazons3']['bucket']
+			));
+
+			//wait some seconds for completing the replication
+			sleep(30);
 		}
 	}
 }
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index bac594b485f36d25017f8cdea63ba72c30de6990..d4a69d29c0f54341aac18daef36d81c1ba4f1e60 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -24,12 +24,11 @@ return array(
 		'root'=>'/owncloud/files/webdav.php',
 	),
 	'google'=>array(
-		'run'=>false,
-		'consumer_key'=>'anonymous',
-		'consumer_secret'=>'anonymous',
-		'token'=>'test',
-		'token_secret'=>'test',
-		'root'=>'/google',
+		'run'=> false,
+		'configured' => 'true',
+		'client_id' => '',
+		'client_secret' => '',
+		'token' => '',
 	),
 	'swift'=>array(
 		'run'=>false,
@@ -50,7 +49,13 @@ return array(
 		'run'=>false,
 		'key'=>'test',
 		'secret'=>'test',
-		'bucket'=>'bucket',
+		'bucket'=>'bucket'
+		//'hostname' => 'your.host.name',
+		//'port' => '443',
+		//'use_ssl' => 'true',
+		//'region' => 'eu-west-1',
+		//'test'=>'true',
+		//'timeout'=>20
 	),
 	'dropbox' => array (
 		'run'=>false,
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index f344163a8b9a5ff2ef70c79519129947394bb1c6..12faabb902dbe7c5d39bc8efdd581cabbc6fb159 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * ownCloud
  *
@@ -22,22 +21,25 @@
 
 namespace Test\Files\Storage;
 
+require_once 'files_external/lib/google.php';
+
 class Google extends Storage {
+
 	private $config;
 
-	public function setUp() {
-		$id = uniqid();
+	protected function setUp() {
 		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['google']) or ! $this->config['google']['run']) {
-			$this->markTestSkipped('Google backend not configured');
+		if (!is_array($this->config) || !isset($this->config['google'])
+			|| !$this->config['google']['run']
+		) {
+			$this->markTestSkipped('Google Drive backend not configured');
 		}
-		$this->config['google']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
 		$this->instance = new \OC\Files\Storage\Google($this->config['google']);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			$this->instance->rmdir('/');
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/apps/files_external/tests/irods.php b/apps/files_external/tests/irods.php
new file mode 100644
index 0000000000000000000000000000000000000000..6aa9d3a3b0f1272a6b3b25c387e7331d4ea2e07f
--- /dev/null
+++ b/apps/files_external/tests/irods.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas MÃ¼ller <thomas.mueller@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Storage;
+
+class iRODS extends Storage {
+
+	protected $backupGlobals = FALSE;
+
+	private $config;
+
+	public function setUp() {
+		$id = uniqid();
+		$this->config = include('files_external/tests/config.php');
+		if ( ! is_array($this->config) or ! isset($this->config['irods']) or ! $this->config['irods']['run']) {
+			$this->markTestSkipped('irods backend not configured');
+		}
+		$this->config['irods']['root'] .= $id; //make sure we have an new empty folder to work in
+		$this->instance = new \OC\Files\Storage\iRODS($this->config['irods']);
+	}
+
+	public function tearDown() {
+		if ($this->instance) {
+			\OCP\Files::rmdirr($this->instance->constructUrl(''));
+		}
+	}
+}
diff --git a/apps/files_sharing/css/404.css b/apps/files_sharing/css/404.css
new file mode 100644
index 0000000000000000000000000000000000000000..2ed81df3b86fc50750c7ff0dad544043cb80ae28
--- /dev/null
+++ b/apps/files_sharing/css/404.css
@@ -0,0 +1,12 @@
+
+#body-login .error-broken-link{
+ text-align:left;color:#fff;
+}
+
+#body-login .error-broken-link ul{
+	margin:10px 0 10px 0;
+}
+
+#body-login .error-broken-link ul li{
+	list-style: disc;list-style-position:inside;cursor:default;	
+}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index eb5a6e8cb7fe27e001353a3e348757e60b4638a9..b2efafde4e78868fcd062582bdad7e6c2c15d685 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -4,6 +4,10 @@ $(document).ready(function() {
 
 	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined'  && !disableSharing) {
 
+		$('#fileList').one('fileActionsReady',function(){
+			OC.Share.loadIcons('file');
+		});
+
 		FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
 			if ($('#dir').val() == '/') {
 				var item = $('#dir').val() + filename;
@@ -33,6 +37,5 @@ $(document).ready(function() {
 				OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
 			}
 		});
-		OC.Share.loadIcons('file');
 	}
-});
+});
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/af_ZA.php b/apps/files_sharing/l10n/af_ZA.php
index 04e194530b1579dd85e08b1ccdacee1964f70d0e..946cc3a5bb81832b2ddb23908ff05bdb91ed2f2f 100644
--- a/apps/files_sharing/l10n/af_ZA.php
+++ b/apps/files_sharing/l10n/af_ZA.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Wagwoord"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index 043c7ee1b27781ea5ceb5be6fa4eec1430a0cd3b..ff7b40d16bcde171fa92ce65d9bb974706e660ea 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±",
 "Submit" => "ØªØ·Ø¨ÙŠÙ‚",
 "%s shared the folder %s with you" => "%s Ø´Ø§Ø±Ùƒ Ø§Ù„Ù…Ø¬Ù„Ø¯ %s Ù…Ø¹Ùƒ",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Ø¥Ù„ØºØ§Ø¡ Ø±ÙØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª",
 "No preview available for" => "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø¹Ø±Ø¶ Ù…Ø³Ø¨Ù‚ Ù„Ù€"
 );
+$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;";
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index 8e719ba23562924b2b957067e2416d615b9e1d0f..1094870fd0fc20648a87bbb25da2e6d50df77541 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "ÐŸÐ°Ñ€Ð¾Ð»Ð°",
 "Submit" => "ÐŸÐ¾Ñ‚Ð²ÑŠÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ",
 "%s shared the folder %s with you" => "%s ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð°Ð¿ÐºÐ°Ñ‚Ð° %s Ñ Ð’Ð°Ñ",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Ð¡Ð¿Ñ€Ð¸ ÐºÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾",
 "No preview available for" => "ÐÑÐ¼Ð° Ð½Ð°Ð»Ð¸Ñ‡ÐµÐ½ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´ Ð·Ð°"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index baa0c5c707c8af76dc77ab4de89a2cbcc53093f5..71b948e347ba311b6dd8b13ea07ef25a3d1dc841 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦",
 "Submit" => "à¦œà¦®à¦¾ à¦¦à¦¿à¦¨",
 "%s shared the folder %s with you" => "%s à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ %s à¦«à§‹à¦²à§à¦¡à¦¾à¦°à¦Ÿà¦¿ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨",
@@ -8,3 +9,4 @@
 "Cancel upload" => "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°",
 "No preview available for" => "à¦à¦° à¦œà¦¨à§à¦¯ à¦•à§‹à¦¨ à¦ªà§à¦°à¦¾à¦•à¦¬à§€à¦•à§à¦·à¦£ à¦¸à§à¦²à¦ à¦¨à§Ÿ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 9d2ab5031c13825586b84f108a69cc2b01812ce7..cbe8f86e253d8eb6aecfffa8b7c7ec1d8cea0882 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "la contrasenya Ã©s incorrecta. Intenteu-ho de nou.",
 "Password" => "Contrasenya",
 "Submit" => "Envia",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Aquest enllaÃ§ sembla que no funciona.",
+"Reasons might be:" => "Les raons podrien ser:",
+"the item was removed" => "l'element ha estat eliminat",
+"the link expired" => "l'enllaÃ§ ha venÃ§ut",
+"sharing is disabled" => "s'ha desactivat la comparticiÃ³",
+"For more info, please ask the person who sent this link." => "Per mÃ©s informaciÃ³ contacteu amb qui us ha enviat l'enllaÃ§.",
 "%s shared the folder %s with you" => "%s ha compartit la carpeta %s amb vÃ³s",
 "%s shared the file %s with you" => "%s ha compartit el fitxer %s amb vÃ³s",
 "Download" => "Baixa",
@@ -9,3 +16,4 @@
 "Cancel upload" => "CancelÂ·la la pujada",
 "No preview available for" => "No hi ha vista prÃ¨via disponible per a"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index a57764a18bc49a646370a74e12197b5486914a15..7258dedcf6d76c47e81942539cb89a8ca978ca29 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Heslo nenÃ sprÃ¡vnÃ©. Zkuste to znovu.",
 "Password" => "Heslo",
 "Submit" => "Odeslat",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Je nÃ¡m lÃto, ale tento odkaz jiÅ¾ nenÃ funkÄnÃ.",
+"Reasons might be:" => "MoÅ¾nÃ© dÅ¯vody:",
+"the item was removed" => "poloÅ¾ka byla odebrÃ¡na",
+"the link expired" => "platnost odkazu vyprÅ¡ela",
+"sharing is disabled" => "sdÃlenÃ je zakÃ¡zanÃ©",
+"For more info, please ask the person who sent this link." => "Pro vÃce informacÃ kontaktujte osobu, kterÃ¡ vÃ¡m zaslala tento odkaz.",
 "%s shared the folder %s with you" => "%s s VÃ¡mi sdÃlÃ sloÅ¾ku %s",
 "%s shared the file %s with you" => "%s s VÃ¡mi sdÃlÃ soubor %s",
 "Download" => "StÃ¡hnout",
@@ -8,3 +16,4 @@
 "Cancel upload" => "ZruÅ¡it odesÃlÃ¡nÃ",
 "No preview available for" => "NÃ¡hled nenÃ dostupnÃ½ pro"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index 6ff3e274c39af1ceaaf70d0ea43178bcb3ac90c5..66fbc4e1d1c3f249e88eacce8391967c75e78dbe 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Cyfrinair",
 "Submit" => "Cyflwyno",
 "%s shared the folder %s with you" => "Rhannodd %s blygell %s Ã¢ chi",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Diddymu llwytho i fyny",
 "No preview available for" => "Does dim rhagolwg ar gael ar gyfer"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index e3e469a4e51bce6edd12fc221806345b09873091..0ca0f38161a38836f4858b9dec22d062d2ac2015 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Kodeordet er forkert. PrÃ¸v igen.",
 "Password" => "Kodeord",
 "Submit" => "Send",
+"Sorry, this link doesnâ€™t seem to work anymore." => "DesvÃ¦rre, dette link ser ikke ud til at fungerer lÃ¦ngere.",
+"Reasons might be:" => "Ã…rsagen kan vÃ¦re:",
+"the item was removed" => "Filen blev fjernet",
+"the link expired" => "linket udlÃ¸b",
+"sharing is disabled" => "deling er deaktiveret",
+"For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ",
 "%s shared the folder %s with you" => "%s delte mappen %s med dig",
 "%s shared the file %s with you" => "%s delte filen %s med dig",
 "Download" => "Download",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Fortryd upload",
 "No preview available for" => "ForhÃ¥ndsvisning ikke tilgÃ¦ngelig for"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 0854152907df7c6827b239bed4104c7368f4f2ef..afed17d8839443916bbd9c10c2c899a57152017f 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Bitte Ã¼berprÃ¼fen sie Ihr Passwort und versuchen Sie es erneut.",
 "Password" => "Passwort",
 "Submit" => "Absenden",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
+"Reasons might be:" => "GrÃ¼nde kÃ¶nnten sein:",
+"the item was removed" => "Die Elemente wurden entfernt",
+"the link expired" => "Der Link ist abgelaufen",
+"sharing is disabled" => "Teilen ist deaktiviert",
+"For more info, please ask the person who sent this link." => "FÃ¼r mehr Informationen, frage bitte die Person, die dir diesen Link geschickt hat.",
 "%s shared the folder %s with you" => "%s hat den Ordner %s mit Dir geteilt",
 "%s shared the file %s with you" => "%s hat die Datei %s mit Dir geteilt",
 "Download" => "Download",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Upload abbrechen",
 "No preview available for" => "Es ist keine Vorschau verfÃ¼gbar fÃ¼r"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index cac7b7591d66f560cca368112db490c8c812310d..1bd24f9d9c4bf47ebb1020c2f4a14e3b256a617a 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
 "Submit" => "BestÃ¤tigen",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
+"Reasons might be:" => "GrÃ¼nde kÃ¶nnten sein:",
+"the item was removed" => "Das Element wurde entfernt",
+"the link expired" => "Der Link ist abgelaufen",
+"sharing is disabled" => "Teilen ist deaktiviert",
+"For more info, please ask the person who sent this link." => "FÃ¼r mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
 "%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
 "%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
 "Download" => "Herunterladen",
@@ -9,3 +16,4 @@
 "Cancel upload" => "Upload abbrechen",
 "No preview available for" => "Es ist keine Vorschau verfÃ¼gbar fÃ¼r"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index b7b893537186f831731d6491ee43e00c1a9b17bd..93486a831b1972921f716e5deeebfa5d83d7a928 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Î•ÏƒÏ†Î±Î»Î¼ÎÎ½Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ. Î ÏÎ¿ÏƒÏ€Î±Î¸Î®ÏƒÏ„Îµ Î¾Î±Î½Î¬.",
 "Password" => "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ",
 "Submit" => "ÎšÎ±Ï„Î±Ï‡ÏŽÏÎ·ÏƒÎ·",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Î£Ï…Î³Î³Î½ÏŽÎ¼Î·, Î±Ï…Ï„ÏŒÏ‚ Î¿ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ Î¼Î¿Î¹Î¬Î¶ÎµÎ¹ Î½Î± Î¼Î·Î½ Î¹ÏƒÏ‡ÏÎµÎ¹ Ï€Î¹Î±.",
+"Reasons might be:" => "ÎŸÎ¹ Î»ÏŒÎ³Î¿Î¹ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹:",
+"the item was removed" => "Ï„Î¿ Î±Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Î±Ï€Î¿Î¼Î±ÎºÏÏÎ½Î¸Î·ÎºÎµ",
+"the link expired" => "Î¿ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ ÎÎ»Î·Î¾Îµ",
+"sharing is disabled" => "Î¿ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ",
+"For more info, please ask the person who sent this link." => "Î“Î¹Î± Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏÏ‰Ï„Î®ÏƒÏ„Îµ Ï„Î¿ Î¬Ï„Î¿Î¼Î¿ Ï€Î¿Ï… ÏƒÎ±Ï‚ ÎÏƒÏ„ÎµÎ¹Î»Îµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿.",
 "%s shared the folder %s with you" => "%s Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Ï„Î¿Î½ Ï†Î¬ÎºÎµÎ»Î¿ %s Î¼Î±Î¶Î¯ ÏƒÎ±Ï‚",
 "%s shared the file %s with you" => "%s Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s Î¼Î±Î¶Î¯ ÏƒÎ±Ï‚",
 "Download" => "Î›Î®ÏˆÎ·",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚",
 "No preview available for" => "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î· Ï€ÏÎ¿ÎµÏ€Î¹ÏƒÎºÏŒÏ€Î·ÏƒÎ· Î³Î¹Î±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index cb40c5a168088bf194258df39224b23268a651ee..a60f1fe72f21bbd77cf7d26638589765ba881bb2 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Secret Code",
 "Submit" => "Submit",
 "%s shared the folder %s with you" => "%s shared the folder %s with you",
@@ -6,3 +7,4 @@
 "Download" => "Download",
 "No preview available for" => "No preview available for"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index d3ca5370a2c7947efa339341143c66b2d8ecbcf6..70e703bda91a9ad41709c0aa7614ffcc5e809d91 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Pasvorto",
 "Submit" => "Sendi",
 "%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Nuligi alÅuton",
 "No preview available for" => "Ne haveblas antaÅvido por"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 1b65cf0c1903b13b8df0c056805fc1c55ff51207..1f238d083fbdb07945ba2980ee1266b34f71c460 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "La contraseÃ±a introducida es errÃ³nea. IntÃ©ntelo de nuevo.",
 "Password" => "ContraseÃ±a",
 "Submit" => "Enviar",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Este enlace parece no funcionar mÃ¡s.",
+"Reasons might be:" => "Las causas podrÃan ser:",
+"the item was removed" => "el elemento fue eliminado",
+"the link expired" => "el enlace expirÃ³",
+"sharing is disabled" => "compartir estÃ¡ desactivado",
+"For more info, please ask the person who sent this link." => "Para mayor informaciÃ³n, contacte a la persona que le enviÃ³ el enlace.",
 "%s shared the folder %s with you" => "%s compartiÃ³ la carpeta %s contigo",
 "%s shared the file %s with you" => "%s compartiÃ³ el fichero %s contigo",
 "Download" => "Descargar",
@@ -9,3 +16,4 @@
 "Cancel upload" => "Cancelar subida",
 "No preview available for" => "No hay vista previa disponible para"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index defbaa7ff92e11964c42213e2803d97460cdb08b..fed0b1e7b30f9b4ed4520296b79b3ca1f23b14bb 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "La contraseÃ±a no es correcta. ProbÃ¡ de nuevo.",
 "Password" => "ContraseÃ±a",
 "Submit" => "Enviar",
 "%s shared the folder %s with you" => "%s compartiÃ³ la carpeta %s con vos",
@@ -8,3 +10,4 @@
 "Cancel upload" => "Cancelar subida",
 "No preview available for" => "La vista preliminar no estÃ¡ disponible para"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 78fe436398c7d652a5b07c69a85eaaee173ca1a7..fe230902ff1b9f75cb727b7094b41c04fbb9f8d1 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
 "Password" => "Parool",
 "Submit" => "Saada",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Vabandust, see link ei tundu enam toimivat.",
+"Reasons might be:" => "PÃµhjused vÃµivad olla:",
+"the item was removed" => "Ã¼ksus on eemaldatud",
+"the link expired" => "link on aegunud",
+"sharing is disabled" => "jagamine on peatatud",
+"For more info, please ask the person who sent this link." => "TÃ¤psema info saamiseks palun pÃ¶Ã¶rdu lingi saatnud isiku poole.",
 "%s shared the folder %s with you" => "%s jagas sinuga kausta %s",
 "%s shared the file %s with you" => "%s jagas sinuga faili %s",
 "Download" => "Lae alla",
@@ -9,3 +16,4 @@
 "Cancel upload" => "TÃ¼hista Ã¼leslaadimine",
 "No preview available for" => "Eelvaadet pole saadaval"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 7a4559cb6556582498caa6127dda0e24fa5b6fb2..8e13c24a9267bb5ba9425cbb0f1348b4388b8d7f 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Pasahitza ez da egokia. Saiatu berriro.",
 "Password" => "Pasahitza",
 "Submit" => "Bidali",
 "%s shared the folder %s with you" => "%sk zurekin %s karpeta elkarbanatu du",
@@ -8,3 +10,4 @@
 "Cancel upload" => "Ezeztatu igoera",
 "No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat "
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 7a744c8463d5cfd44fc1f9b553ad12f46699102f..48888f798a0a1e505b8ed09b1de3994d277c6b36 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø§Ø´ØªØ¨Ø§Ù‡ Ù…ÛŒ Ø¨Ø§Ø´Ø¯. Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø§Ù…ØªØØ§Ù† Ú©Ù†ÛŒØ¯.",
 "Password" => "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡",
 "Submit" => "Ø«Ø¨Øª",
@@ -9,3 +10,4 @@
 "Cancel upload" => "Ù…ØªÙˆÙ‚Ù Ú©Ø±Ø¯Ù† Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ",
 "No preview available for" => "Ù‡ÛŒÚ†Ú¯ÙˆÙ†Ù‡ Ù¾ÛŒØ´ Ù†Ù…Ø§ÛŒØ´ÛŒ Ù…ÙˆØ¬ÙˆØ¯ Ù†ÛŒØ³Øª"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 03931bf29868ed13bd8f95c2998fce8c4e609bca..42905be57a686d0e48c543442683b9c80a8c58be 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "VÃ¤Ã¤rÃ¤ salasana. YritÃ¤ uudelleen.",
 "Password" => "Salasana",
 "Submit" => "LÃ¤hetÃ¤",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Valitettavasti linkki ei vaikuta enÃ¤Ã¤ toimivan.",
+"Reasons might be:" => "Mahdollisia syitÃ¤:",
+"the item was removed" => "kohde poistettiin",
+"the link expired" => "linkki vanheni",
+"sharing is disabled" => "jakaminen on poistettu kÃ¤ytÃ¶stÃ¤",
+"For more info, please ask the person who sent this link." => "Kysy lisÃ¤tietoja henkilÃ¶ltÃ¤, jolta sait linkin.",
 "%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi",
 "%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi",
 "Download" => "Lataa",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Peru lÃ¤hetys",
 "No preview available for" => "Ei esikatselua kohteelle"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 145880b7e59614df8df99b29c377b9ab9eccb222..b263cd87959d17c21270c8e6b03ff3fea41826a1 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez rÃ©essayer.",
 "Password" => "Mot de passe",
 "Submit" => "Envoyer",
 "%s shared the folder %s with you" => "%s a partagÃ© le rÃ©pertoire %s avec vous",
@@ -8,3 +10,4 @@
 "Cancel upload" => "Annuler l'envoi",
 "No preview available for" => "Pas d'aperÃ§u disponible pour"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index 2d8de8e101972f8928909d8be11db12962e2da47..66b1f0e5ffce5aefa5e9e4fa23836c76c4abe83e 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "O contrasinal Ã© incorrecto. TÃ©nteo de novo.",
 "Password" => "Contrasinal",
 "Submit" => "Enviar",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Semella que esta ligazÃ³n non funciona.",
+"Reasons might be:" => "As razÃ³ns poderÃan ser:",
+"the item was removed" => "o elemento foi retirado",
+"the link expired" => "a ligazÃ³n caducou",
+"sharing is disabled" => "foi desactivada a comparticiÃ³n",
+"For more info, please ask the person who sent this link." => "Para obter mÃ¡is informaciÃ³n, pregÃºntelle Ã¡ persoa que lle enviou a ligazÃ³n.",
 "%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede",
 "%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede",
 "Download" => "Descargar",
@@ -9,3 +16,4 @@
 "Cancel upload" => "Cancelar o envÃo",
 "No preview available for" => "Sen vista previa dispoÃ±Ãbel para"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 41fc314f3c2c07bd266f116cc773b812dd7c26ab..f8b304898ce75dda95ca1b0c24f28e0387d17a9a 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "×¡×™×¡×ž×",
 "Submit" => "×©×œ×™×—×”",
 "%s shared the folder %s with you" => "%s ×©×™×ª×£ ×¢×ž×š ××ª ×”×ª×™×§×™×™×” %s",
@@ -8,3 +9,4 @@
 "Cancel upload" => "×‘×™×˜×•×œ ×”×”×¢×œ××”",
 "No preview available for" => "××™×Ÿ ×ª×¦×•×’×” ×ž×§×“×™×ž×” ×–×ž×™× ×” ×¢×‘×•×¨"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
index 560df54fc94879dc4a36194c970aa8fc1400a6a7..74a2c320438158d5d3dfb359556d07927acc09bc 100644
--- a/apps/files_sharing/l10n/hi.php
+++ b/apps/files_sharing/l10n/hi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index d5763a8ddb8f9ef48be2a8cac0016a7f484c9987..87eb9567067f2df42fbbaea6bd149c5e7adeb44f 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Lozinka",
 "Submit" => "PoÅ¡alji",
 "Download" => "Preuzimanje",
 "Upload" => "UÄitaj",
 "Cancel upload" => "Prekini upload"
 );
+$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;";
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 0b964379bb972b6da8dbe4839d70ee66b6294997..7ef69b1e0b67cb7a9a70bada4807c0f8f91918b6 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "A megadott jelszÃ³ nem megfelelÅ‘. PrÃ³bÃ¡lja Ãºjra!",
 "Password" => "JelszÃ³",
 "Submit" => "ElkÃ¼ld",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Sajnos Ãºgy tÅ±nik, ez a link mÃ¡r nem mÅ±kÃ¶dik.",
+"Reasons might be:" => "Ennek az oka a kÃ¶vetkezÅ‘ lehet:",
+"the item was removed" => "az Ã¡llomÃ¡nyt idÅ‘kÃ¶zben eltÃ¡volÃtottÃ¡k",
+"the link expired" => "lejÃ¡rt a link Ã©rvÃ©nyessÃ©gi ideje",
+"sharing is disabled" => "letiltÃ¡sra kerÃ¼lt a megosztÃ¡s",
+"For more info, please ask the person who sent this link." => "TovÃ¡bbi informÃ¡ciÃ³Ã©rt forduljon ahhoz, aki ezt a linket kÃ¼ldte Ã–nnek!",
 "%s shared the folder %s with you" => "%s megosztotta Ã–nnel ezt a mappÃ¡t: %s",
 "%s shared the file %s with you" => "%s megosztotta Ã–nnel ezt az Ã¡llomÃ¡nyt: %s",
 "Download" => "LetÃ¶ltÃ©s",
@@ -8,3 +16,4 @@
 "Cancel upload" => "A feltÃ¶ltÃ©s megszakÃtÃ¡sa",
 "No preview available for" => "Nem Ã¡ll rendelkezÃ©sre elÅ‘nÃ©zet ehhez: "
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
index 438e8a7433cfde7ccdab2b0e2a3c466fb56a415f..d4cb416f45a895f0c390032f0445d94956955488 100644
--- a/apps/files_sharing/l10n/hy.php
+++ b/apps/files_sharing/l10n/hy.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Submit" => "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬",
 "Download" => "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index 01acba5108a1826f84e46f9b971c566bec173b33..5112501073d965f6d1603eec60d9b855238936cc 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Contrasigno",
 "Submit" => "Submitter",
 "Download" => "Discargar",
 "Upload" => "Incargar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index cc6e591834ca19ec3db0aafa8ca420422d73bd4e..a4d73bd2b7527df7f490ba4b671aff7692dd42a0 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Sandi",
 "Submit" => "Kirim",
 "%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Batal pengunggahan",
 "No preview available for" => "Tidak ada pratinjau tersedia untuk"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index 222459f7a00aa366f407b6de219db6cf52f2cfd4..05241d3f9e6cc8c85ff67bcd6b3ac6193853daf9 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "LykilorÃ°",
 "Submit" => "Senda",
 "%s shared the folder %s with you" => "%s deildi mÃ¶ppunni %s meÃ° Ã¾Ã©r",
@@ -8,3 +9,4 @@
 "Cancel upload" => "HÃ¦tta viÃ° innsendingu",
 "No preview available for" => "Yfirlit ekki Ã boÃ°i fyrir"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index cf25c53ca388923aedaa8fa4d1e37c6f5cbf7613..a611e0641c8c09ca1b06a2ef3682e908fef4d14a 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "La password Ã¨ errata. Prova ancora.",
 "Password" => "Password",
 "Submit" => "Invia",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere piÃ¹ attivo.",
+"Reasons might be:" => "I motivi potrebbero essere:",
+"the item was removed" => "l'elemento Ã¨ stato rimosso",
+"the link expired" => "il collegamento Ã¨ scaduto",
+"sharing is disabled" => "la condivisione Ã¨ disabilitata",
+"For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
 "%s shared the folder %s with you" => "%s ha condiviso la cartella %s con te",
 "%s shared the file %s with you" => "%s ha condiviso il file %s con te",
 "Download" => "Scarica",
@@ -9,3 +16,4 @@
 "Cancel upload" => "Annulla il caricamento",
 "No preview available for" => "Nessuna anteprima disponibile per"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index d2bc2d11245a5c17f1f0470efd9a42db7ee9180f..4f7d5b31c2f70792133008f3a0b57128bd0173ed 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚å†è©¦è¡Œã—ã¦ãã ã•ã„ã€‚",
 "Password" => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰",
 "Submit" => "é€ä¿¡",
+"Sorry, this link doesnâ€™t seem to work anymore." => "ç”³ã—è¨³ã”ã–ã„ã¾ã›ã‚“ã€‚ã“ã®ãƒªãƒ³ã‚¯ã¯ã‚‚ã†åˆ©ç”¨ã§ãã¾ã›ã‚“ã€‚",
+"Reasons might be:" => "ç†ç”±ã¯ä»¥ä¸‹ã®é€šã‚Šã¨è€ƒãˆã‚‰ã‚Œã¾ã™ï¼š",
+"the item was removed" => "ã‚¢ã‚¤ãƒ†ãƒ ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ",
+"the link expired" => "ãƒªãƒ³ã‚¯ã®æœŸé™ãŒåˆ‡ã‚Œã¦ã„ã¾ã™",
+"sharing is disabled" => "å…±æœ‰ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™",
+"For more info, please ask the person who sent this link." => "ä¸æ˜Žãªç‚¹ã¯ã€ã“ã¡ã‚‰ã®ãƒªãƒ³ã‚¯ã®æä¾›è€…ã«ç¢ºèªã‚’ãŠé¡˜ã„ã—ã¾ã™ã€‚",
 "%s shared the folder %s with you" => "%s ã¯ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ %s ã‚’ã‚ãªãŸã¨å…±æœ‰ä¸ã§ã™",
 "%s shared the file %s with you" => "%s ã¯ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’ã‚ãªãŸã¨å…±æœ‰ä¸ã§ã™",
 "Download" => "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰",
@@ -9,3 +16,4 @@
 "Cancel upload" => "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«",
 "No preview available for" => "ãƒ—ãƒ¬ãƒ“ãƒ¥ãƒ¼ã¯ã‚ã‚Šã¾ã›ã‚“"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka.php b/apps/files_sharing/l10n/ka.php
index 0270d5d6f8c6a5516cb1e294839a69882573385e..a9b046e03b6d54a307afa37a01691770a20fd49c 100644
--- a/apps/files_sharing/l10n/ka.php
+++ b/apps/files_sharing/l10n/ka.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "áƒžáƒáƒ áƒáƒšáƒ˜",
 "Download" => "áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index c88cc59cf8dc88127a32640577f206814af037d3..a5a80b3c5a19a931ea15fae0ba861248f806d286 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "áƒžáƒáƒ áƒáƒšáƒ˜",
 "Submit" => "áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ",
 "%s shared the folder %s with you" => "%sâ€“áƒ›áƒ áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜ %s",
@@ -8,3 +9,4 @@
 "Cancel upload" => "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ",
 "No preview available for" => "áƒ¬áƒ˜áƒœáƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒ“áƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index d2cf52447f17cdd8f0fc02fa32c02e66cb65ebcb..f3a94a70979a25676f57553b41abb90b41c48446 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "ì•”í˜¸",
 "Submit" => "ì œì¶œ",
 "%s shared the folder %s with you" => "%s ë‹˜ì´ í´ë” %sì„(ë¥¼) ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤",
@@ -8,3 +9,4 @@
 "Cancel upload" => "ì—…ë¡œë“œ ì·¨ì†Œ",
 "No preview available for" => "ë‹¤ìŒ í•ëª©ì„ ë¯¸ë¦¬ ë³¼ ìˆ˜ ì—†ìŒ:"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 576671aaa754d8749db5f7ffdab06fdf49f0d660..55576a19c36d797a1723cb4c67bd8da8a28ce287 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ",
 "Submit" => "Ù†Ø§Ø±Ø¯Ù†",
 "%s shared the folder %s with you" => "%s Ø¯Ø§Ø¨Ù‡â€ŒØ´ÛŒ Ú©Ø±Ø¯ÙˆÙˆÙ‡â€Œ Ø¨ÙˆØ®Ú†Ù‡â€ŒÛŒ %s Ù„Ù‡â€ŒÚ¯Ù‡â€ŒÚµ ØªÛ†",
@@ -7,3 +8,4 @@
 "Upload" => "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†",
 "No preview available for" => "Ù‡ÛŒÚ† Ù¾ÛŽØ´Ø¨ÛŒÙ†ÛŒÙ‡â€ŒÙƒ Ø¦Ø§Ù…Ø§Ø¯Ù‡â€Œ Ù†ÛŒÙ‡ Ø¨Û†"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index a604affee64501a4c0ee7a60c36534e2e80a9eb9..d37a1d9d22a35b75c0a757520c549c8f9c7e0c54 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
 "Password" => "Passwuert",
 "Submit" => "FortschÃ©cken",
@@ -9,3 +10,4 @@
 "Cancel upload" => "Upload ofbriechen",
 "No preview available for" => "Keeng Preview do fir"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 0f9347377c9176dc60fc5a4ae288481ee6151a15..5d0e58e2fb295dc0023bd474c08b839542cb5aca 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "SlaptaÅ¾odis",
 "Submit" => "IÅ¡saugoti",
 "%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
@@ -8,3 +9,4 @@
 "Cancel upload" => "AtÅ¡aukti siuntimÄ…",
 "No preview available for" => "PerÅ¾iÅ«ra nÄ—ra galima"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index be021b8e7a04720373b1f22d676136194cb45bb3..0eb04fb966f34744d712a922116d2dec18355b66 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Parole",
 "Submit" => "Iesniegt",
 "%s shared the folder %s with you" => "%s ar jums dalÄ«jÄs ar mapi %s",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Atcelt augÅ¡upielÄdi",
 "No preview available for" => "Nav pieejams priekÅ¡skatÄ«jums priekÅ¡"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index ed04035ea5da9d6610efc80f1dd962c6d9cd0b96..c913b2beaf74494e6dfe22e3c5774cbac3250311 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°",
 "Submit" => "ÐŸÑ€Ð°Ñ‚Ð¸",
 "%s shared the folder %s with you" => "%s Ñ˜Ð° ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð°Ð¿ÐºÐ°Ñ‚Ð° %s ÑÐ¾ Ð’Ð°Ñ",
@@ -8,3 +9,4 @@
 "Cancel upload" => "ÐžÑ‚ÐºÐ°Ð¶Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÑƒÐ²Ð°ÑšÐµ",
 "No preview available for" => "ÐÐµÐ¼Ð° Ð´Ð¾ÑÑ‚Ð°Ð¿Ð½Ð¾ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´ Ð·Ð°"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 0a6a05b77815f008a1d80f28248182829b7fec5d..0a3d08bbc176d341a836176dd7de39a0d5dd9ee0 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Kata laluan",
 "Submit" => "Hantar",
 "Download" => "Muat turun",
 "Upload" => "Muat naik",
 "Cancel upload" => "Batal muat naik"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index 4b37ab8b48a75365370546eab07a0037df38d5f8..f44010004cdb04c290cf23b461e454370eac0ab1 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "á€…á€€á€¬á€¸á€á€¾á€€á€º",
 "Submit" => "á€‘á€Šá€·á€ºá€žá€½á€„á€ºá€¸á€™á€Šá€º",
 "Download" => "á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€º"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 9c736f97d788bcac5d2e8811145596e631c2a010..dd8a8edf31388bd0d34fb8e43c3b3cf4076fc8ff 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Passordet er feil. PrÃ¸v pÃ¥ nytt.",
 "Password" => "Passord",
 "Submit" => "Send inn",
 "%s shared the folder %s with you" => "%s delte mappen %s med deg",
@@ -8,3 +10,4 @@
 "Cancel upload" => "Avbryt opplasting",
 "No preview available for" => "ForhÃ¥ndsvisning ikke tilgjengelig for"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 6c1bf7a53f3682888d3bc4028d9050a3ba4b6c5a..9c46a1ab4b3225a5efa80674fd87eb8d8f68de15 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.",
 "Password" => "Wachtwoord",
 "Submit" => "Verzenden",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Sorry, deze link lijkt niet meer in gebruik te zijn.",
+"Reasons might be:" => "Redenen kunnen zijn:",
+"the item was removed" => "bestand was verwijderd",
+"the link expired" => "de link is verlopen",
+"sharing is disabled" => "delen is uitgeschakeld",
+"For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
 "%s shared the folder %s with you" => "%s deelt de map %s met u",
 "%s shared the file %s with you" => "%s deelt het bestand %s met u",
 "Download" => "Downloaden",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Upload afbreken",
 "No preview available for" => "Geen voorbeeldweergave beschikbaar voor"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index afa3eabe8cf3dafc4af74a89cf6063d533bfc5a8..bcb6538b09f22b1a6b880ff63f8eec2b56239185 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Passord",
 "Submit" => "Send",
 "%s shared the folder %s with you" => "%s delte mappa %s med deg",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Avbryt opplasting",
 "No preview available for" => "Inga fÃ¸rehandsvising tilgjengeleg for"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 4ec48b151a83a8809c00edb4e4dbbd712f485d18..493ddb4dfd3d31b038654563bbecca48ee16ab28 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Senhal",
 "Submit" => "Sosmetre",
 "Download" => "Avalcarga",
 "Upload" => "Amontcarga",
 "Cancel upload" => " Anulla l'amontcargar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 39039da77b6d73f8165c466b4f3b61b0b1dfde45..43c7e2e31447d69a92ecbccf4f37b96fb5d869f7 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "To hasÅ‚o jest niewÅ‚aÅ›ciwe. SprÃ³buj ponownie.",
 "Password" => "HasÅ‚o",
 "Submit" => "WyÅ›lij",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Przepraszamy ale wyglÄ…da na to, Å¼e ten link juÅ¼ nie dziaÅ‚a.",
+"Reasons might be:" => "MoÅ¼liwe powody:",
+"the item was removed" => "element zostaÅ‚ usuniÄ™ty",
+"the link expired" => "link wygasÅ‚",
+"sharing is disabled" => "UdostÄ™pnianie jest wyÅ‚Ä…czone",
+"For more info, please ask the person who sent this link." => "Aby uzyskaÄ‡ wiÄ™cej informacji proszÄ™ poprosiÄ‡ osobÄ™, ktÃ³ra wysÅ‚aÅ‚ ten link.",
 "%s shared the folder %s with you" => "%s wspÃ³Å‚dzieli folder z tobÄ… %s",
 "%s shared the file %s with you" => "%s wspÃ³Å‚dzieli z tobÄ… plik %s",
 "Download" => "Pobierz",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Anuluj wysyÅ‚anie",
 "No preview available for" => "PodglÄ…d nie jest dostÄ™pny dla"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index c82989857a9965b2958fc8672e54c88e3bcb2924..9fc1cacf7cbddcc42dc45a312d4dc497e3488fde 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
 "Password" => "Senha",
 "Submit" => "Submeter",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Desculpe, este link parece nÃ£o mais  funcionar.",
+"Reasons might be:" => "As razÃµes podem ser:",
+"the item was removed" => "o item foi removido",
+"the link expired" => "o link expirou",
+"sharing is disabled" => "compartilhamento estÃ¡ desativada",
+"For more info, please ask the person who sent this link." => "Para mais informaÃ§Ãµes, por favor, pergunte a pessoa que enviou este link.",
 "%s shared the folder %s with you" => "%s compartilhou a pasta %s com vocÃª",
 "%s shared the file %s with you" => "%s compartilhou o arquivo %s com vocÃª",
 "Download" => "Baixar",
@@ -9,3 +16,4 @@
 "Cancel upload" => "Cancelar upload",
 "No preview available for" => "Nenhuma visualizaÃ§Ã£o disponÃvel para"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 2f41abca1f5fcc648097a27946ab18b70cd24c7d..73dc2a3e1f35f742a803c79cb126d29da36d6c27 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Password errada, por favor tente de novo",
 "Password" => "Password",
 "Submit" => "Submeter",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Desculpe, mas este link parece nÃ£o estar a funcionar.",
+"Reasons might be:" => "As razÃµes poderÃ£o ser:",
+"the item was removed" => "O item foi removido",
+"the link expired" => "O link expirou",
+"sharing is disabled" => "A partilha estÃ¡ desativada",
+"For more info, please ask the person who sent this link." => "Para mais informaÃ§Ãµes, por favor questione a pessoa que lhe enviou este link",
 "%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
 "%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
 "Download" => "Transferir",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Cancelar envio",
 "No preview available for" => "NÃ£o hÃ¡ prÃ©-visualizaÃ§Ã£o para"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index 3197068cdd131f6ce16903f717915e1bb6e21572..d17152ff1b1b300f5cb1a39de7389448b8c096ab 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "Parola este incorectÄƒ. ÃŽncercaÅ£i din nou.",
 "Password" => "ParolÄƒ",
 "Submit" => "Trimite",
@@ -9,3 +10,4 @@
 "Cancel upload" => "AnuleazÄƒ Ã®ncÄƒrcarea",
 "No preview available for" => "Nici o previzualizare disponibilÄƒ pentru "
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 77332c183f64a75bbf3de9151c7c3cb6f8b9788d..f42f1d9aeb6af6cac2b77168b4d258322787a6ed 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "The password is wrong. Try again." => "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. ÐŸÐ¾Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ ÐµÑ‰Ðµ Ñ€Ð°Ð·.",
 "Password" => "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ",
 "Submit" => "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ",
+"Sorry, this link doesnâ€™t seem to work anymore." => "Ðš ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸ÑŽ, ÑÑ‚Ð° ÑÑÑ‹Ð»ÐºÐ°, Ð¿Ð¾Ñ…Ð¾Ð¶Ðµ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð±Ð¾Ð»ÑŒÑˆÐµ.",
+"Reasons might be:" => "ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð¾Ð¹ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ:",
+"the item was removed" => "Ð¾Ð±ÑŠÐµÐºÑ‚ Ð±Ñ‹Ð» ÑƒÐ´Ð°Ð»Ñ‘Ð½",
+"the link expired" => "ÑÑ€Ð¾Ðº ÑÑÑ‹Ð»ÐºÐ¸ Ð¸ÑÑ‚Ñ‘Ðº",
+"sharing is disabled" => "Ð¾Ð±Ð¼ÐµÐ½ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½",
+"For more info, please ask the person who sent this link." => "Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑÐ¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ñ‚Ð¾Ð³Ð¾ ÐºÑ‚Ð¾ Ð¾Ñ‚Ð¾ÑÐ»Ð°Ð» Ð´Ð°Ð½Ð½ÑƒÑŽ ÑÑÑ‹Ð»ÐºÑƒ.",
 "%s shared the folder %s with you" => "%s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ %s Ð´Ð»Ñ Ð’Ð°Ñ",
 "%s shared the file %s with you" => "%s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ñƒ %s Ð´Ð»Ñ Ð’Ð°Ñ",
 "Download" => "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ",
@@ -9,3 +16,4 @@
 "Cancel upload" => "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
 "No preview available for" => "ÐŸÑ€ÐµÐ´Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½ Ð´Ð»Ñ"
 );
+$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);";
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
index 2cadd163462aaa92e781eb415cde248d47a4d088..52a41b1f51353609692c51c4fe968f88919e78d8 100644
--- a/apps/files_sharing/l10n/ru_RU.php
+++ b/apps/files_sharing/l10n/ru_RU.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "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);";
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 27b9d649a0af5bccde4812ff61a83ce4b353d43a..6135f09213968e899ccfb91531fb17af32a8a381 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "à¶¸à·”à¶» à¶´à¶¯à¶º",
 "Submit" => "à¶ºà·œà¶¸à·” à¶šà¶»à¶±à·Šà¶±",
 "%s shared the folder %s with you" => "%s à¶”à¶¶à·€ %s à·†à·à¶½à·Šà¶©à¶»à¶ºà¶§ à·„à·€à·”à¶½à·Š à¶šà¶»à¶œà¶à·Šà¶à·šà¶º",
@@ -8,3 +9,4 @@
 "Cancel upload" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±",
 "No preview available for" => "à¶´à·–à¶»à·Šà·€à¶¯à¶»à·Šà·à¶±à¶ºà¶šà·Š à¶±à·œà¶¸à·à¶"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 77173b44345c5f3d6def6067d7a45e146f25e879..31ecb28b602f113ab6391df502ee45637a7911fd 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Heslo je chybnÃ©. SkÃºste to znova.",
 "Password" => "Heslo",
 "Submit" => "OdoslaÅ¥",
+"Sorry, this link doesnâ€™t seem to work anymore." => "To je neprÃjemnÃ©, ale tento odkaz uÅ¾ nie je funkÄnÃ½.",
+"Reasons might be:" => "MoÅ¾nÃ© dÃ´vody:",
+"the item was removed" => "poloÅ¾ka bola presunutÃ¡",
+"the link expired" => "linke vyprÅ¡ala platnosÅ¥",
+"sharing is disabled" => "zdieÄ¾anie je zakÃ¡zanÃ©",
+"For more info, please ask the person who sent this link." => "Pre viac informÃ¡ciÃ kontaktujte osobu, ktorÃ¡ vÃ¡m poslala tento odkaz.",
 "%s shared the folder %s with you" => "%s zdieÄ¾a s vami prieÄinok %s",
 "%s shared the file %s with you" => "%s zdieÄ¾a s vami sÃºbor %s",
 "Download" => "SÅ¥ahovanie",
@@ -8,3 +16,4 @@
 "Cancel upload" => "ZruÅ¡iÅ¥ odosielanie",
 "No preview available for" => "Å½iaden nÃ¡hÄ¾ad k dispozÃcii pre"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 39d2fca81cb25ca3fcb6aa55b5065edecccaf21f..cbd4f5fea2234b4262c28e0f856e0252dab73c95 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Geslo",
 "Submit" => "PoÅ¡lji",
 "%s shared the folder %s with you" => "Oseba %s je doloÄila mapo %s za souporabo",
@@ -8,3 +9,4 @@
 "Cancel upload" => "PrekliÄi poÅ¡iljanje",
 "No preview available for" => "Predogled ni na voljo za"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index 1c0e0aa2bd138347c466a4aa7b026201dce73744..ae29e5738ffdd8f67c3ad72b96a497e55cf09907 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Kodi",
 "Submit" => "Parashtro",
 "%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Anulo ngarkimin",
 "No preview available for" => "Shikimi paraprak nuk Ã«shtÃ« i mundur pÃ«r"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index f893ec0ab422f3139a249a2630a69577481dc8ea..3b97d15419a117e84b76619299eab7ea60e8841f 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°",
 "Submit" => "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸",
 "Download" => "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸",
 "Upload" => "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸",
 "Cancel upload" => "ÐŸÑ€ÐµÐºÐ¸Ð½Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ"
 );
+$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);";
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index c45f711e15f559c362bcfe68c2dd093695a067b7..1a6be6257616931897ee0fdc389ae857264ab058 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Lozinka",
 "Submit" => "PoÅ¡alji",
 "Download" => "Preuzmi",
 "Upload" => "PoÅ¡alji"
 );
+$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);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 21e4e542d8e4066690321c83949f84b94d3f148c..b8a5f8629a6ef8b3a2d13df1efa4bfbd5ab707da 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "LÃ¶senordet Ã¤r fel. FÃ¶rsÃ¶k igen.",
 "Password" => "LÃ¶senord",
 "Submit" => "Skicka",
+"Sorry, this link doesnâ€™t seem to work anymore." => "TyvÃ¤rr, denna lÃ¤nk verkar inte fungera lÃ¤ngre.",
+"Reasons might be:" => "Orsaker kan vara:",
+"the item was removed" => "objektet togs bort",
+"the link expired" => "giltighet fÃ¶r lÃ¤nken har gÃ¥tt ut",
+"sharing is disabled" => "delning Ã¤r inaktiverat",
+"For more info, please ask the person who sent this link." => "FÃ¶r mer information, kontakta den person som skickade den hÃ¤r lÃ¤nken.",
 "%s shared the folder %s with you" => "%s delade mappen %s med dig",
 "%s shared the file %s with you" => "%s delade filen %s med dig",
 "Download" => "Ladda ner",
@@ -8,3 +16,4 @@
 "Cancel upload" => "Avbryt uppladdning",
 "No preview available for" => "Ingen fÃ¶rhandsgranskning tillgÃ¤nglig fÃ¶r"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index 6e69855be11d34e8d84940ee5c410e4458bda74c..b4eb0fb7fb84914ce945a9220d6aafdefa541ab1 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯",
 "Submit" => "à®šà®®à®°à¯à®ªà¯à®ªà®¿à®•à¯à®•à¯à®•",
 "%s shared the folder %s with you" => "%s à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®¯à®¾à®©à®¤à¯ %s à®‰à®Ÿà®©à¯ à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
@@ -8,3 +9,4 @@
 "Cancel upload" => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•",
 "No preview available for" => "à®…à®¤à®±à¯à®•à¯ à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à¯ à®’à®©à¯à®±à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/te.php b/apps/files_sharing/l10n/te.php
index 1e2eedc684412607f66fba52489aef0edf896b6b..94ca7650e5ffe4b950b95c02dc4d23dfbbdf49ee 100644
--- a/apps/files_sharing/l10n/te.php
+++ b/apps/files_sharing/l10n/te.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 608c86d586a872640075786bb72dfc601a870ed4..060bd8bed9472307fa6733aafde4108818138e0b 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™",
 "Submit" => "à¸ªà¹ˆà¸‡",
 "%s shared the folder %s with you" => "%s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ %s à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“",
@@ -8,3 +9,4 @@
 "Cancel upload" => "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”",
 "No preview available for" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸¹à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¹„à¸”à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 4da9c17c7e8b72783b842cf9ddc2bafc92d55d5d..a5bcff82cf333989387942ca40546049e12352ca 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Parola",
 "Submit" => "GÃ¶nder",
 "%s shared the folder %s with you" => "%s sizinle paylaÅŸÄ±lan  %s klasÃ¶r",
@@ -8,3 +9,4 @@
 "Cancel upload" => "YÃ¼klemeyi iptal et",
 "No preview available for" => "KullanÄ±labilir Ã¶nizleme yok"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 9f9c7beb4105911ac014b4588e7a1c49421e0008..43ee9f77bcd8198244163019ca3323bb82d3bfdb 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Ø¦Ù‰Ù…",
 "Submit" => "ØªØ§Ù¾Ø´Û‡Ø±",
 "Download" => "Ú†ÛˆØ´ÛˆØ±",
 "Upload" => "ÙŠÛˆÙƒÙ„Û•",
 "Cancel upload" => "ÙŠÛˆÙƒÙ„Û•Ø´ØªÙ‰Ù† Û‹Ø§Ø² ÙƒÛ•Ú†"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 8ef7f1bd8adb32a0dd10bae742eac0d6722bdfba..b6a7784c6908ccb1cc16a2f53e3afa98262b4f08 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ",
 "Submit" => "ÐŸÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸",
 "%s shared the folder %s with you" => "%s Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ %s Ð´Ð»Ñ Ð’Ð°Ñ",
@@ -8,3 +9,4 @@
 "Cancel upload" => "ÐŸÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ",
 "No preview available for" => "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð´Ð»Ñ"
 );
+$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);";
diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
index 745f2f930d193b6c5ab9142a040ea800afa902a1..4f6767c26a136e2c22a894ee0ab5ecd31ccedb3b 100644
--- a/apps/files_sharing/l10n/ur_PK.php
+++ b/apps/files_sharing/l10n/ur_PK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Ù¾Ø§Ø³ÙˆØ±Úˆ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index d75fb1dc53f0e5223899b3c1ff4324ceaf9703e9..00e8e094c367ded734e2e3b9c352e6f78e678e42 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Máºt kháº©u",
 "Submit" => "XÃ¡c nháºn",
 "%s shared the folder %s with you" => "%s Ä‘Ã£ chia sáº» thÆ° má»¥c %s vá»›i báº¡n",
@@ -8,3 +9,4 @@
 "Cancel upload" => "Há»§y upload",
 "No preview available for" => "KhÃ´ng cÃ³ xem trÆ°á»›c cho"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
index 2dd79ec38d4fb8a3cf3255f36c286eceb9076d2d..206e1921faf1117faf350e54a486f6bf8cf9334b 100644
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ b/apps/files_sharing/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "å¯†ç ",
 "Submit" => "æäº¤",
 "%s shared the folder %s with you" => "%s ä¸Žæ‚¨åˆ†äº«äº†æ–‡ä»¶å¤¹ %s",
@@ -8,3 +9,4 @@
 "Cancel upload" => "å–æ¶ˆä¸Šä¼ ",
 "No preview available for" => "æ²¡æœ‰é¢„è§ˆå¯ç”¨äºŽ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index c7fa08b81f03277826543f42b244743c931087e9..37898a1cd0069be5fdead9e798e70ac72c11ccdf 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "å¯†ç ",
 "Submit" => "æäº¤",
 "%s shared the folder %s with you" => "%sä¸Žæ‚¨å…±äº«äº†%sæ–‡ä»¶å¤¹",
@@ -8,3 +9,4 @@
 "Cancel upload" => "å–æ¶ˆä¸Šä¼ ",
 "No preview available for" => "æ²¡æœ‰é¢„è§ˆ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
index 8f9b7900c2ccf2f839d665ec778b14d67121370c..434420264eade4bfc3a2d91b59d8ecf71ff9fde8 100644
--- a/apps/files_sharing/l10n/zh_HK.php
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "å¯†ç¢¼",
 "Download" => "ä¸‹è¼‰",
 "Upload" => "ä¸Šå‚³"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index b172879469fe1dffd90f686829d2a38b79d2782d..b950cbf8c9ec086644cf615e106988e347ec7125 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "å¯†ç¢¼",
 "Submit" => "é€å‡º",
 "%s shared the folder %s with you" => "%s å’Œæ‚¨åˆ†äº«äº†è³‡æ–™å¤¾ %s ",
@@ -8,3 +9,4 @@
 "Cancel upload" => "å–æ¶ˆä¸Šå‚³",
 "No preview available for" => "ç„¡æ³•é è¦½"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 9462844a82b7be7db8a54876744fc6fd57059f2c..741ab145384b3d2745613cab1b26001156809632 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -137,6 +137,9 @@ if (isset($path)) {
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$allowPublicUploadEnabled = false;
 		}
+		if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
+			$allowPublicUploadEnabled = false;
+		}
 		if ($linkItem['item_type'] !== 'folder') {
 			$allowPublicUploadEnabled = false;
 		}
@@ -202,6 +205,7 @@ if (isset($path)) {
 			$folder->assign('isCreatable', false);
 			$folder->assign('permissions', OCP\PERMISSION_READ);
 			$folder->assign('isPublic',true);
+			$folder->assign('publicUploadEnabled', 'no');
 			$folder->assign('files', $files);
 			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
 			$folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
@@ -230,6 +234,12 @@ if (isset($path)) {
 } else {
 	OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
 }
+
+$errorTemplate = new OCP\Template('files_sharing', 'part.404', '');
+$errorContent = $errorTemplate->fetchPage();
+
 header('HTTP/1.0 404 Not Found');
+OCP\Util::addStyle('files_sharing', '404');
 $tmpl = new OCP\Template('', '404', 'guest');
+$tmpl->assign('content', $errorContent);
 $tmpl->printPage();
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index fa03f41913060540c4da710336436b4f2adefa9b..2c89b5df3f6a5a90a4d99bb618d534225cf3fb2d 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,6 +1,6 @@
 <form action="<?php p($_['URL']); ?>" method="post">
 	<fieldset>
-		<?php if ($_['wrongpw']): ?>
+		<?php if (isset($_['wrongpw'])): ?>
 		<div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div>
 		<?php endif; ?>
 		<p class="infield">
diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php
new file mode 100644
index 0000000000000000000000000000000000000000..b5152e1511a988fdff7dff2e1a3f3dc3c96c7dea
--- /dev/null
+++ b/apps/files_sharing/templates/part.404.php
@@ -0,0 +1,12 @@
+<ul>
+	<li class="error error-broken-link">
+		<p><?php p($l->t('Sorry, this link doesnâ€™t seem to work anymore.')) ?></p>
+		<p><?php p($l->t('Reasons might be:')); ?></p>
+		<ul>
+			<li><?php p($l->t('the item was removed')); ?></li>
+			<li><?php p($l->t('the link expired')); ?></li>
+			<li><?php p($l->t('sharing is disabled')); ?></li>
+		</ul>
+		<p><?php p($l->t('For more info, please ask the person who sent this link.')); ?></p>
+	</li>
+</ul>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index e8bf80b8720b08fa224d136d8bb4fc1bc9fb069b..746a715f3cc3d95d6e523c348399e49ae9ab3684 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -2,16 +2,14 @@
 	<div id="notification" style="display: none;"></div>
 </div>
 
-<?php $defaults = new OCP\Defaults(); // initialize themable default strings and urls ?>
-
 <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL">
 <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
 <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
 <header><div id="header">
 		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
-		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-		<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
+		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
+		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 		<div class="header-right">
 			<?php if (isset($_['folder'])): ?>
 				<span id="details"><?php p($l->t('%s shared the folder %s with you',
@@ -95,6 +93,6 @@
 	</div>
 	<footer>
 		<p class="info">
-			<?php print_unescaped($defaults->getLongFooter()); ?>
+			<?php print_unescaped($theme->getLongFooter()); ?>
 		</p>
 	</footer>
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 16c39ab385382507cdd4a6069c31a2d4cca66805..92361b65f63e01fc7120d0cf6a622c53e2671d71 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -13,7 +13,7 @@ $success = array();
 
 $i = 0;
 foreach ($list as $file) {
-	if ( $dirlisting=='0') {
+	if ( $dirlisting === '0') {
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
 		$timestamp =  substr($file, $delimiter+2);
diff --git a/apps/files_trashbin/ajax/isEmpty.php b/apps/files_trashbin/ajax/isEmpty.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e54c7e77b989ec2c518201b76eea845d0930763
--- /dev/null
+++ b/apps/files_trashbin/ajax/isEmpty.php
@@ -0,0 +1,14 @@
+<?php
+
+/*
+ * Check if trash bin is empty to re-enable the deleted files button if needed
+ */
+
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$trashStatus = OCA\Files_Trashbin\Trashbin::isEmpty(OCP\User::getUser());
+
+OCP\JSON::success(array("data" => array("isEmpty" => $trashStatus)));
+
+
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 9d78f166765b13f44344bfb1a3361cd8aec6f7d2..e39004cc0d54ee5758e6d6251d0690b82d1c7f68 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -12,7 +12,7 @@ $success = array();
 
 $i = 0;
 foreach ($list as $file) {
-	if ( $dirlisting=='0') {
+	if ( $dirlisting === '0') {
 		$delimiter = strrpos($file, '.d');
 		$filename = substr($file, 0, $delimiter);
 		$timestamp =  substr($file, $delimiter+2);
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 6f1c364737e1939ba462bc7cfa9ace10ca3c68e7..2dbaefe7a78ebdca37331f3619f0a7db4e3b2bb1 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -24,7 +24,7 @@ if ($dir) {
 	$dirContent = $view->opendir($dir);
 	$i = 0;
 	while($entryName = readdir($dirContent)) {
-		if ( $entryName != '.' && $entryName != '..' ) {
+		if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
 			$pos = strpos($dir.'/', '/', 1);
 			$tmp = substr($dir, 0, $pos);
 			$pos = strrpos($tmp, '.d');
@@ -54,13 +54,13 @@ foreach ($result as $r) {
 	$i['timestamp'] = $r['timestamp'];
 	$i['mimetype'] = $r['mime'];
 	$i['type'] = $r['type'];
-	if ($i['type'] == 'file') {
+	if ($i['type'] === 'file') {
 		$fileinfo = pathinfo($r['id']);
 		$i['basename'] = $fileinfo['filename'];
 		$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
 	}
 	$i['directory'] = $r['location'];
-	if ($i['directory'] == '/') {
+	if ($i['directory'] === '/') {
 		$i['directory'] = '';
 	}
 	$i['permissions'] = OCP\PERMISSION_READ;
@@ -68,9 +68,9 @@ foreach ($result as $r) {
 }
 
 function fileCmp($a, $b) {
-	if ($a['type'] == 'dir' and $b['type'] != 'dir') {
+	if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
 		return -1;
-	} elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
+	} elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
 		return 1;
 	} else {
 		return strnatcasecmp($a['name'], $b['name']);
@@ -83,7 +83,7 @@ usort($files, "fileCmp");
 $pathtohere = '';
 $breadcrumb = array();
 foreach (explode('/', $dir) as $i) {
-	if ($i != '') {
+	if ($i !== '') {
 		if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
 			$name = $match[1];
 		} else {
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 87dfea491e76afd917c9ba0bcad616be57612b9f..b14a7240cbe5d0c211b9665492d302136b8e6428 100644
Binary files a/apps/files_trashbin/js/trash.js and b/apps/files_trashbin/js/trash.js differ
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index f36133db547948a97806359b82f8459cc7e232b2..710a9d14196ee4704c5265c2239fd03b76f35f38 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "ØªØ¹Ø°Ù‘Ø± ØØ°Ù%s Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…",
 "Couldn't restore %s" => "ØªØ¹Ø°Ù‘Ø± Ø§Ø³ØªØ±Ø¬Ø§Ø¹ %s ",
 "perform restore operation" => "Ø¥Ø¨Ø¯Ø¡ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ø¥Ø³ØªØ¹Ø§Ø¯Ø©",
@@ -7,12 +8,11 @@
 "Delete permanently" => "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…",
 "Name" => "Ø§Ø³Ù…",
 "Deleted" => "ØªÙ… Ø§Ù„ØØ°Ù",
-"1 folder" => "Ù…Ø¬Ù„Ø¯ Ø¹Ø¯Ø¯ 1",
-"{count} folders" => "{count} Ù…Ø¬Ù„Ø¯Ø§Øª",
-"1 file" => "Ù…Ù„Ù ÙˆØ§ØØ¯",
-"{count} files" => "{count} Ù…Ù„ÙØ§Øª",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
 "Nothing in here. Your trash bin is empty!" => "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´ÙŠØ¡ Ù‡Ù†Ø§. Ø³Ù„Ø© Ø§Ù„Ù…Ù‡Ù…Ù„Ø§Øª Ø®Ø§Ù„ÙŠÙ‡.",
 "Restore" => "Ø§Ø³ØªØ¹ÙŠØ¯",
 "Delete" => "Ø¥Ù„ØºØ§Ø¡",
 "Deleted Files" => "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…ØØ°ÙˆÙÙ‡"
 );
+$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;";
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 1e0953b013a5657a5b8d0f40baa7e1904435927b..3c12e6906ed661ef08bed666f120de9f40bc3d0d 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑ€Ð¼Ð°Ð½ÐµÐ½Ñ‚Ð½Ð¾Ñ‚Ð¾ Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° %s",
 "Couldn't restore %s" => "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° %s",
 "perform restore operation" => "Ð¸Ð·Ð²ÑŠÑ€ÑˆÐ²Ð°Ð½Ðµ Ð½Ð° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð¿Ð¾ Ð²ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸",
 "Name" => "Ð˜Ð¼Ðµ",
 "Deleted" => "Ð˜Ð·Ñ‚Ñ€Ð¸Ñ‚Ð¾",
-"1 folder" => "1 Ð¿Ð°Ð¿ÐºÐ°",
-"{count} folders" => "{count} Ð¿Ð°Ð¿ÐºÐ¸",
-"1 file" => "1 Ñ„Ð°Ð¹Ð»",
-"{count} files" => "{count} Ñ„Ð°Ð¹Ð»Ð°",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Nothing in here. Your trash bin is empty!" => "ÐÑÐ¼Ð° Ð½Ð¸Ñ‰Ð¾. ÐšÐ¾Ñ„Ð°Ñ‚Ð° Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°!",
 "Restore" => "Ð’ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ",
 "Delete" => "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ",
 "Deleted Files" => "Ð˜Ð·Ñ‚Ñ€Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
index 75b071bfa7432dab12c1303049c4b8a57ef9aee0..c3741dbd1dba4bf49cc903babc1217403cde6c30 100644
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ b/apps/files_trashbin/l10n/bn_BD.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à¦¸à¦®à¦¸à§à¦¯à¦¾",
 "Name" => "à¦°à¦¾à¦®",
-"1 folder" => "à§§à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
-"{count} folders" => "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
-"1 file" => "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²",
-"{count} files" => "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "à¦®à§à¦›à§‡"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index b7540f653d678d28fb17e1cfe0e36829293930d4..6e226b7fc8534b2aafab433cbccafddb964d8ab3 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
 "Couldn't restore %s" => "No s'ha pogut restaurar %s",
 "perform restore operation" => "executa l'operaciÃ³ de restauraciÃ³",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Esborra permanentment",
 "Name" => "Nom",
 "Deleted" => "Eliminat",
-"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("",""),
+"restored" => "restaurat",
 "Nothing in here. Your trash bin is empty!" => "La paperera estÃ  buida!",
 "Restore" => "Recupera",
 "Delete" => "Esborra",
 "Deleted Files" => "Fitxers eliminats"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index 416b6b231d5a63f5331aae8bdbcaf2db150e46b5..383d2a217f7c49d666a4fe8d4b39c1189491ae1a 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
 "Couldn't restore %s" => "Nelze obnovit %s",
 "perform restore operation" => "provÃ©st obnovu",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Trvale odstranit",
 "Name" => "NÃ¡zev",
 "Deleted" => "SmazÃ¡no",
-"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("","",""),
+"restored" => "obnoveno",
 "Nothing in here. Your trash bin is empty!" => "Å½Ã¡dnÃ½ obsah. VÃ¡Å¡ koÅ¡ je prÃ¡zdnÃ½.",
 "Restore" => "Obnovit",
 "Delete" => "Smazat",
 "Deleted Files" => "SmazanÃ© soubory"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
index 055e8d8654dd68ae2f0a22c0a17d6e61d5ce9b76..123a445c2c1d0697a615d2043f0e31b75c12c37f 100644
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
 "Couldn't restore %s" => "Methwyd adfer %s",
 "perform restore operation" => "gweithrediad adfer",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Dileu'n barhaol",
 "Name" => "Enw",
 "Deleted" => "Wedi dileu",
-"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("","","",""),
 "Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
 "Restore" => "Adfer",
 "Delete" => "Dileu",
 "Deleted Files" => "Ffeiliau Ddilewyd"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index 16f98baed7e879d806030dbb3ea0d497f8fb3074..d6753fd3c0bb2de8f58d0a2879c051ee4234e18e 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
 "Couldn't restore %s" => "Kunne ikke gendanne %s",
 "perform restore operation" => "udfÃ¸r gendannelsesoperation",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Slet permanent",
 "Name" => "Navn",
 "Deleted" => "Slettet",
-"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("",""),
+"restored" => "Gendannet",
 "Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
 "Restore" => "Gendan",
 "Delete" => "Slet",
 "Deleted Files" => "Slettede filer"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 4dd9033969e485482ec028e2f90530d3e7ed7a6a..6a30bcfbbbae81189c7e1ba435522fdc73191667 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft lÃ¶schen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
 "perform restore operation" => "Wiederherstellung ausfÃ¼hren",
@@ -7,12 +8,12 @@
 "Delete permanently" => "EndgÃ¼ltig lÃ¶schen",
 "Name" => "Name",
 "Deleted" => "gelÃ¶scht",
-"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("",""),
+"restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu lÃ¶schen, der Papierkorb ist leer!",
 "Restore" => "Wiederherstellen",
 "Delete" => "LÃ¶schen",
 "Deleted Files" => "GelÃ¶schte Dateien"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 829b5026e1a354d5fc07ec4a325d86422e0eef4d..5c2c515f7c1ec4a70ebeb390ab7c47a962969d26 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft lÃ¶schen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
 "perform restore operation" => "Wiederherstellung ausfÃ¼hren",
@@ -7,12 +8,12 @@
 "Delete permanently" => "EndgÃ¼ltig lÃ¶schen",
 "Name" => "Name",
 "Deleted" => "GelÃ¶scht",
-"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("",""),
+"restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu lÃ¶schen, Ihr Papierkorb ist leer!",
 "Restore" => "Wiederherstellen",
 "Delete" => "LÃ¶schen",
 "Deleted Files" => "GelÃ¶schte Dateien"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index f95d90ada6171ae224c1c3a90494bd4e5530b3c9..759e5299e4200c58acca5df8a0801e1d5f2f5ba8 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î¼ÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î¿Ï… %s",
 "Couldn't restore %s" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ %s",
 "perform restore operation" => "ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚",
@@ -7,12 +8,12 @@
 "Delete permanently" => "ÎœÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î®",
 "Name" => "ÎŒÎ½Î¿Î¼Î±",
 "Deleted" => "Î”Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ",
-"1 folder" => "1 Ï†Î¬ÎºÎµÎ»Î¿Ï‚",
-"{count} folders" => "{count} Ï†Î¬ÎºÎµÎ»Î¿Î¹",
-"1 file" => "1 Î±ÏÏ‡ÎµÎ¯Î¿",
-"{count} files" => "{count} Î±ÏÏ‡ÎµÎ¯Î±",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "ÎÎ³Î¹Î½Îµ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬",
 "Nothing in here. Your trash bin is empty!" => "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ. ÎŸ ÎºÎ¬Î´Î¿Ï‚ ÏƒÎ±Ï‚ ÎµÎ¯Î½Î±Î¹ Î¬Î´ÎµÎ¹Î¿Ï‚!",
 "Restore" => "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬",
 "Delete" => "Î”Î¹Î±Î³ÏÎ±Ï†Î®",
 "Deleted Files" => "Î”Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î± Î‘ÏÏ‡ÎµÎ¯Î±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index 161e9c3e88ac110eac7d7d2ec79938ed755a3506..d1e30cba58883a032b8e099d308a9cf8cafaf0e4 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,12 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Eraro",
 "Delete permanently" => "Forigi por Ä‰iam",
 "Name" => "Nomo",
-"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("",""),
 "Restore" => "RestaÅri",
 "Delete" => "Forigi",
 "Deleted Files" => "Forigitaj dosieroj"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index b2d5a2aed268320da0c79911173aeb4f2fce69b5..956d89ae6880d44befddef8290d8ea46c3947562 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
 "Couldn't restore %s" => "No se puede restaurar %s",
 "perform restore operation" => "restaurar",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nombre",
 "Deleted" => "Eliminado",
-"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("",""),
+"restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada aquÃ. Â¡Tu papelera esta vacÃa!",
 "Restore" => "Recuperar",
 "Delete" => "Eliminar",
 "Deleted Files" => "Archivos Eliminados"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index de7494ca69e879b7100ebcb96e3766d71c8ef57c..6f47255b50652bf06c450dc91f35bfc8df1d7385 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
 "Couldn't restore %s" => "No se pudo restaurar %s",
 "perform restore operation" => "Restaurar",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Borrar de manera permanente",
 "Name" => "Nombre",
 "Deleted" => "Borrado",
-"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("",""),
 "Nothing in here. Your trash bin is empty!" => "No hay nada acÃ¡. Â¡La papelera estÃ¡ vacÃa!",
 "Restore" => "Recuperar",
 "Delete" => "Borrar",
 "Deleted Files" => "Archivos eliminados"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 3d3b46a180823b469bfcf364ccaa548aaa0f2bf0..2cfcafa804e5bc6d6a65e96cbcfa7c906368f5fd 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s jÃ¤Ã¤davalt kustutamine ebaÃµnnestus",
 "Couldn't restore %s" => "%s ei saa taastada",
 "perform restore operation" => "soorita taastamine",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Kustuta jÃ¤Ã¤davalt",
 "Name" => "Nimi",
 "Deleted" => "Kustutatud",
-"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("",""),
+"restored" => "taastatud",
 "Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prÃ¼gikast on tÃ¼hi!",
 "Restore" => "Taasta",
 "Delete" => "Kustuta",
 "Deleted Files" => "Kustutatud failid"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 45b77b7990c23d6449f6090d5cb9ef17c99b8816..b114dc3386a3f3a7fd7c6391c356ded31b68d37d 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
 "Couldn't restore %s" => "Ezin izan da %s berreskuratu",
 "perform restore operation" => "berreskuratu",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Ezabatu betirako",
 "Name" => "Izena",
 "Deleted" => "Ezabatuta",
-"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("",""),
 "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
 "Restore" => "Berrezarri",
 "Delete" => "Ezabatu",
 "Deleted Files" => "Ezabatutako Fitxategiak"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 6ecc6feacbf8d7bf15750547cc75cc9094f95d46..654f20a5f1c7418a3cfd073db073a586099f8401 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ø¨Ø±Ø§ÛŒ Ù‡Ù…ÛŒØ´Ù‡ ØØ°Ù Ú©Ø±Ø¯",
 "Couldn't restore %s" => "%s Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯",
 "perform restore operation" => "Ø§Ù†Ø¬Ø§Ù… Ø¹Ù…Ù„ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯Ù†",
@@ -7,12 +8,11 @@
 "Delete permanently" => "ØØ°Ù Ù‚Ø·Ø¹ÛŒ",
 "Name" => "Ù†Ø§Ù…",
 "Deleted" => "ØØ°Ù Ø´Ø¯Ù‡",
-"1 folder" => "1 Ù¾ÙˆØ´Ù‡",
-"{count} folders" => "{ Ø´Ù…Ø§Ø±} Ù¾ÙˆØ´Ù‡ Ù‡Ø§",
-"1 file" => "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡",
-"{count} files" => "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "Ù‡ÛŒÚ† Ú†ÛŒØ²ÛŒ Ø§ÛŒÙ†Ø¬Ø§ Ù†ÛŒØ³Øª. Ø³Ø·Ù„ Ø²Ø¨Ø§Ù„Ù‡ ÛŒ Ø´Ù…Ø§ Ø®Ø§Ù„ÛŒ Ø§Ø³Øª.",
 "Restore" => "Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ",
 "Delete" => "ØØ°Ù",
 "Deleted Files" => "ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ ØØ°Ù Ø´Ø¯Ù‡"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index fd6edf398ea017164b971f00f955bf8748c6b8f4..0c18b774a972a4f5615f731dae9cfe2e18424d9d 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvÃ¤sti",
 "Couldn't restore %s" => "Kohteen %s palautus epÃ¤onnistui",
 "perform restore operation" => "suorita palautustoiminto",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Poista pysyvÃ¤sti",
 "Name" => "Nimi",
 "Deleted" => "Poistettu",
-"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("",""),
+"restored" => "palautettu",
 "Nothing in here. Your trash bin is empty!" => "TyhjÃ¤Ã¤ tÃ¤ynnÃ¤! Roskakorissa ei ole mitÃ¤Ã¤n.",
 "Restore" => "Palauta",
 "Delete" => "Poista",
 "Deleted Files" => "Poistetut tiedostot"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 8198e3e32a8287454400b8926b3b54341692bb1e..8854190e2ceb7827bc8d7e26ea85b96bbecad34f 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Impossible d'effacer %s de faÃ§on permanente",
 "Couldn't restore %s" => "Impossible de restaurer %s",
 "perform restore operation" => "effectuer l'opÃ©ration de restauration",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Supprimer de faÃ§on dÃ©finitive",
 "Name" => "Nom",
 "Deleted" => "EffacÃ©",
-"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("",""),
 "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
 "Restore" => "Restaurer",
 "Delete" => "Supprimer",
 "Deleted Files" => "Fichiers effacÃ©s"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index b9b3c8a1e5c73663530541360eb39d45459c230a..034ba13c3fea1e0dfdc350e65b4f5d1ca1f9388c 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Non foi posÃbel eliminar %s permanente",
 "Couldn't restore %s" => "Non foi posÃbel restaurar %s",
 "perform restore operation" => "realizar a operaciÃ³n de restauraciÃ³n",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nome",
 "Deleted" => "Eliminado",
-"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("",""),
+"restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "AquÃ non hai nada. O cesto do lixo estÃ¡ baleiro!",
 "Restore" => "Restablecer",
 "Delete" => "Eliminar",
 "Deleted Files" => "Ficheiros eliminados"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index 853d4e1925abe81b00b9ba51d8f5f122f74426b0..6aa6264a315914829450a6a1cc4069de9e12d92e 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "×œ× × ×™×ª×Ÿ ×œ×ž×—×•×§ ××ª %s ×œ×¦×ž×™×ª×•×ª",
 "Couldn't restore %s" => "×œ× × ×™×ª×Ÿ ×œ×©×—×–×¨ ××ª %s",
 "perform restore operation" => "×‘×™×¦×•×¢ ×¤×¢×•×œ×ª ×©×—×–×•×¨",
@@ -7,12 +8,11 @@
 "Delete permanently" => "×ž×—×™×§×” ×œ×¦×ž×™×ª×•×ª",
 "Name" => "×©×",
 "Deleted" => "× ×ž×—×§",
-"1 folder" => "×ª×™×§×™×™×” ××—×ª",
-"{count} folders" => "{count} ×ª×™×§×™×•×ª",
-"1 file" => "×§×•×‘×¥ ××—×“",
-"{count} files" => "{count} ×§×‘×¦×™×",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Nothing in here. Your trash bin is empty!" => "××™×Ÿ ×›××Ÿ ×©×•× ×“×‘×¨. ×¡×œ ×”×ž×™×—×–×•×¨ ×©×œ×š ×¨×™×§!",
 "Restore" => "×©×—×–×•×¨",
 "Delete" => "×ž×—×™×§×”",
 "Deleted Files" => "×§×‘×¦×™× ×©× ×ž×—×§×•"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
index a65d876e1f06311cbb151b7af98a2268ba6615bc..d227b4979aadbc0e0929e603a69b682b34c88469 100644
--- a/apps/files_trashbin/l10n/hr.php
+++ b/apps/files_trashbin/l10n/hr.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "GreÅ¡ka",
 "Name" => "Ime",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Delete" => "ObriÅ¡i"
 );
+$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;";
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 5e64bc04e03132ab36250716d23d24e2efd8eec0..aac6cf780001a1b143f0943ce40b8615616ecb2c 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nem sikerÃ¼lt %s vÃ©gleges tÃ¶rlÃ©se",
 "Couldn't restore %s" => "Nem sikerÃ¼lt %s visszaÃ¡llÃtÃ¡sa",
 "perform restore operation" => "a visszaÃ¡llÃtÃ¡s vÃ©grehajtÃ¡sa",
@@ -7,12 +8,12 @@
 "Delete permanently" => "VÃ©gleges tÃ¶rlÃ©s",
 "Name" => "NÃ©v",
 "Deleted" => "TÃ¶rÃ¶lve",
-"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("",""),
+"restored" => "visszaÃ¡llÃtva",
 "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ã–n szemetes mappÃ¡ja Ã¼res!",
 "Restore" => "VisszaÃ¡llÃtÃ¡s",
 "Delete" => "TÃ¶rlÃ©s",
 "Deleted Files" => "TÃ¶rÃ¶lt fÃ¡jlok"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php
index 3b80487278a16a8f1f7b407908ea855f3f5def10..6ff58b56202081827d5ef70cc85325aa7c0803e0 100644
--- a/apps/files_trashbin/l10n/hy.php
+++ b/apps/files_trashbin/l10n/hy.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "Õ‹Õ¶Õ»Õ¥Õ¬"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index dea25b30ba45adc3b79a7625bed071f62e29890f..c583344a81e1b624563f77b1be7ec8f0654082a2 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Error",
 "Name" => "Nomine",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "Deler"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 62a63d515a3749ac279aa642c8132f22d0a1da05..6aad1302f43e4442d7c50d3d2f7acbd5877e221a 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
 "Couldn't restore %s" => "Tidak dapat memulihkan %s",
 "perform restore operation" => "jalankan operasi pemulihan",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Hapus secara permanen",
 "Name" => "Nama",
 "Deleted" => "Dihapus",
-"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(""),
 "Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
 "Restore" => "Pulihkan",
 "Delete" => "Hapus",
 "Deleted Files" => "Berkas yang Dihapus"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
index 12267c6695a30511218476c545d50fc2d50e6ded..55ae433646147d0694d9324c949d3de602173718 100644
--- a/apps/files_trashbin/l10n/is.php
+++ b/apps/files_trashbin/l10n/is.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Villa",
 "Name" => "Nafn",
-"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("",""),
 "Delete" => "EyÃ°a"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 795fd6ea1674618537b7380e7040b98d77591300..0dc2b938f8a76769fe785d716e1d5f57e6c0db1f 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
 "Couldn't restore %s" => "Impossibile ripristinare %s",
 "perform restore operation" => "esegui operazione di ripristino",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Elimina definitivamente",
 "Name" => "Nome",
 "Deleted" => "Eliminati",
-"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("",""),
+"restored" => "ripristinati",
 "Nothing in here. Your trash bin is empty!" => "Qui non c'Ã¨ niente. Il tuo cestino Ã¨ vuoto.",
 "Restore" => "Ripristina",
 "Delete" => "Elimina",
 "Deleted Files" => "File eliminati"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index db5783bf4328a690bc12794794ed8d0f7873c6f9..62a541ea2b84ecc12b248ff3c5959a181d5e8576 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s ã‚’å®Œå…¨ã«å‰Šé™¤å‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ",
 "Couldn't restore %s" => "%s ã‚’å¾©å…ƒå‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ",
 "perform restore operation" => "å¾©å…ƒæ“ä½œã‚’å®Ÿè¡Œã™ã‚‹",
@@ -7,12 +8,12 @@
 "Delete permanently" => "å®Œå…¨ã«å‰Šé™¤ã™ã‚‹",
 "Name" => "åå‰",
 "Deleted" => "å‰Šé™¤æ¸ˆã¿",
-"1 folder" => "1 ãƒ•ã‚©ãƒ«ãƒ€",
-"{count} folders" => "{count} ãƒ•ã‚©ãƒ«ãƒ€",
-"1 file" => "1 ãƒ•ã‚¡ã‚¤ãƒ«",
-"{count} files" => "{count} ãƒ•ã‚¡ã‚¤ãƒ«",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"restored" => "å¾©å…ƒæ¸ˆ",
 "Nothing in here. Your trash bin is empty!" => "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ã‚´ãƒŸç®±ã¯ç©ºã§ã™ï¼",
 "Restore" => "å¾©å…ƒ",
 "Delete" => "å‰Šé™¤",
 "Deleted Files" => "å‰Šé™¤ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 667eb500eb9f11ea6e716a642849d582be03c466..236d8951e9dcf47368d21fab951bbd7b5e0a7967 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "áƒ¤áƒáƒ˜áƒšáƒ˜ %sâ€“áƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
 "Couldn't restore %s" => "%sâ€“áƒ˜áƒ¡ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
 "perform restore operation" => "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒáƒžáƒ”áƒ áƒáƒªáƒ˜áƒ",
@@ -7,12 +8,11 @@
 "Delete permanently" => "áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ",
 "Name" => "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜",
 "Deleted" => "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜",
-"1 folder" => "1 áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
-"{count} folders" => "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
-"1 file" => "1 áƒ¤áƒáƒ˜áƒšáƒ˜",
-"{count} files" => "{count} áƒ¤áƒáƒ˜áƒšáƒ˜",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡. áƒ¡áƒáƒœáƒáƒ’áƒ•áƒ” áƒ§áƒ£áƒ—áƒ˜ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜áƒ!",
 "Restore" => "áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ",
 "Delete" => "áƒ¬áƒáƒ¨áƒšáƒ",
 "Deleted Files" => "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index 42ad87e98d2247283f347a1df1e85f5de1e4f83e..f2e604d75915416e9825bae5b97db30f9f1883a7 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,11 +1,11 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "ì˜¤ë¥˜",
 "Delete permanently" => "ì˜ì›ížˆ ì‚ì œ",
 "Name" => "ì´ë¦„",
-"1 folder" => "í´ë” 1ê°œ",
-"{count} folders" => "í´ë” {count}ê°œ",
-"1 file" => "íŒŒì¼ 1ê°œ",
-"{count} files" => "íŒŒì¼ {count}ê°œ",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Restore" => "ë³µì›",
 "Delete" => "ì‚ì œ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ku_IQ.php b/apps/files_trashbin/l10n/ku_IQ.php
index 67fdd7d08fa910660052b87b9adaa4ba95746bdb..3f110f06002b4386638af1efde66098d4cd25096 100644
--- a/apps/files_trashbin/l10n/ku_IQ.php
+++ b/apps/files_trashbin/l10n/ku_IQ.php
@@ -1,4 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Ù‡Ù‡â€ŒÚµÙ‡",
-"Name" => "Ù†Ø§Ùˆ"
+"Name" => "Ù†Ø§Ùˆ",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
index 2065ee03d3204b97d1d4fa1552d85bc3f15cd55c..cbfd515a8b3fd2c335ae318a7eca8af7fe3b554f 100644
--- a/apps/files_trashbin/l10n/lb.php
+++ b/apps/files_trashbin/l10n/lb.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Fehler",
 "Name" => "Numm",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "LÃ¤schen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 7df63bd7f28b94c5bda6aa4cffdb1a10c8bbc5ed..c4a12ff21755aff9c89634d80665430c68699333 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nepavyko negrÄ¯Å¾tamai iÅ¡trinti %s",
 "Couldn't restore %s" => "Nepavyko atkurti %s",
 "perform restore operation" => "atkurti",
@@ -7,12 +8,11 @@
 "Delete permanently" => "IÅ¡trinti negrÄ¯Å¾tamai",
 "Name" => "Pavadinimas",
 "Deleted" => "IÅ¡trinti",
-"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("","",""),
 "Nothing in here. Your trash bin is empty!" => "Nieko nÄ—ra. JÅ«sÅ³ Å¡iukÅ¡liadÄ—Å¾Ä— tuÅ¡Äia!",
 "Restore" => "Atstatyti",
 "Delete" => "IÅ¡trinti",
 "Deleted Files" => "IÅ¡trinti failai"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index b1b8c3e6b03ab09e82f55a411a9395e0e0fdb8e1..ccbf117fdad7050a82bda7cb97b06f3bfdc739d8 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "NevarÄ“ja pilnÄ«bÄ izdzÄ“st %s",
 "Couldn't restore %s" => "NevarÄ“ja atjaunot %s",
 "perform restore operation" => "veikt atjaunoÅ¡anu",
@@ -7,12 +8,11 @@
 "Delete permanently" => "DzÄ“st pavisam",
 "Name" => "Nosaukums",
 "Deleted" => "DzÄ“sts",
-"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("","",""),
 "Nothing in here. Your trash bin is empty!" => "Å eit nekÄ nav. JÅ«su miskaste ir tukÅ¡a!",
 "Restore" => "Atjaunot",
 "Delete" => "DzÄ“st",
 "Deleted Files" => "DzÄ“stÄs datnes"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 175399249e55dd20bafb3a64e17b6b2f6d949fd2..965518dbc86e043c42cb8c7ac0246a9eb9365f54 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Name" => "Ð˜Ð¼Ðµ",
-"1 folder" => "1 Ð¿Ð°Ð¿ÐºÐ°",
-"{count} folders" => "{count} Ð¿Ð°Ð¿ÐºÐ¸",
-"1 file" => "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
-"{count} files" => "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index 52a997aab15678a8157171a982614f6a911c36cd..1b5ca07c70cff20792d903193d4cf04b1fa6b19f 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Ralat",
 "Name" => "Nama",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Delete" => "Padam"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 43ad018049447a8d0a1b6c1bcf98a031bf498680..8a69b3d87aa1d0f1f8d43dce3ae55a7c61f01eb5 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
 "Couldn't restore %s" => "Kunne ikke gjenopprette %s",
 "perform restore operation" => "utfÃ¸r gjenopprettings operasjon",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Slett permanent",
 "Name" => "Navn",
 "Deleted" => "Slettet",
-"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("",""),
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. SÃ¸ppelkassen din er tom!",
 "Restore" => "Gjenopprett",
 "Delete" => "Slett",
 "Deleted Files" => "Slettet filer"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index 91844a14b663eca3c3be1984becb1ecd6e7a9cbb..2c6dcb2fcbf2d2266001e6c7087c10c9da6003c1 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
 "Couldn't restore %s" => "Kon %s niet herstellen",
 "perform restore operation" => "uitvoeren restore operatie",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Verwijder definitief",
 "Name" => "Naam",
 "Deleted" => "Verwijderd",
-"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("",""),
+"restored" => "hersteld",
 "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
 "Restore" => "Herstellen",
 "Delete" => "Verwijder",
 "Deleted Files" => "Verwijderde bestanden"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 454ea2b05753198172040752659ff7bc99149290..9e351668e33626bd279e9638c59a2939bc8a27bf 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
 "Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
 "perform restore operation" => "utfÃ¸r gjenoppretting",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Slett for godt",
 "Name" => "Namn",
 "Deleted" => "Sletta",
-"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("",""),
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
 "Restore" => "Gjenopprett",
 "Delete" => "Slett",
 "Deleted Files" => "Sletta filer"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php
index fa9e097f6ca53fd35c4462ec4f9b2e3a26d95855..a62902c3b7e89ca6bc1d54f4a4c3d798d7bfc997 100644
--- a/apps/files_trashbin/l10n/oc.php
+++ b/apps/files_trashbin/l10n/oc.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Error",
 "Name" => "Nom",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "Escafa"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index 5c9f558f11fd610ed79046a6cd880493f05e0a6d..e8295e2ff038bd599cc2962ef918d8a3fac93018 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nie moÅ¼na trwale usunÄ…Ä‡ %s",
 "Couldn't restore %s" => "Nie moÅ¼na przywrÃ³ciÄ‡ %s",
 "perform restore operation" => "wykonywanie operacji przywracania",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Trwale usuÅ„",
 "Name" => "Nazwa",
 "Deleted" => "UsuniÄ™te",
-"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("","",""),
+"restored" => "przywrÃ³cony",
 "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. TwÃ³j kosz jest pusty!",
 "Restore" => "PrzywrÃ³Ä‡",
 "Delete" => "UsuÅ„",
 "Deleted Files" => "UsuniÄ™te pliki"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index 9dad8a40a85e4ab5abbae6e09579db6a7dc5d75a..1e3c67ba027a48389c527fa45287e80e0b9675eb 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "NÃ£o foi possÃvel excluir %s permanentemente",
 "Couldn't restore %s" => "NÃ£o foi possÃvel restaurar %s",
 "perform restore operation" => "realizar operaÃ§Ã£o de restauraÃ§Ã£o",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Excluir permanentemente",
 "Name" => "Nome",
 "Deleted" => "ExcluÃdo",
-"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("",""),
+"restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira estÃ¡ vazia!",
 "Restore" => "Restaurar",
 "Delete" => "Excluir",
 "Deleted Files" => "Arquivos Apagados"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index ba85158b70e1a4c3a098232f3e5595b5454409e5..0c88d132b5cc00eb299bbf25a4c7f1d975071b87 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "NÃ£o foi possÃvel eliminar %s de forma permanente",
 "Couldn't restore %s" => "NÃ£o foi possÃvel restaurar %s",
 "perform restore operation" => "executar a operaÃ§Ã£o de restauro",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Eliminar permanentemente",
 "Name" => "Nome",
 "Deleted" => "Apagado",
-"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("",""),
+"restored" => "Restaurado",
 "Nothing in here. Your trash bin is empty!" => "NÃ£o hÃ  ficheiros. O lixo estÃ¡ vazio!",
 "Restore" => "Restaurar",
 "Delete" => "Eliminar",
 "Deleted Files" => "Ficheiros Apagados"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 3af21b7e3f367ab670c38fa81358d1db4835668e..0b1d2cd9e179cb5020e2538fd02912daddaced54 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,10 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Eroare",
 "Delete permanently" => "Stergere permanenta",
 "Name" => "Nume",
-"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("","",""),
 "Delete" => "È˜terge"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index 0d55703cdc064b7e4ddfa58330e571f1fe60a936..909e4d7131fabe07aef9b7fe0d48b473718bcfe7 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°",
 "Couldn't restore %s" => "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½",
 "perform restore operation" => "Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸ÑŽ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°",
 "Name" => "Ð˜Ð¼Ñ",
 "Deleted" => "Ð£Ð´Ð°Ð»Ñ‘Ð½",
-"1 folder" => "1 Ð¿Ð°Ð¿ÐºÐ°",
-"{count} folders" => "{count} Ð¿Ð°Ð¿Ð¾Ðº",
-"1 file" => "1 Ñ„Ð°Ð¹Ð»",
-"{count} files" => "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð²",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"restored" => "Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½",
 "Nothing in here. Your trash bin is empty!" => "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð’Ð°ÑˆÐ° ÐºÐ¾Ñ€Ð·Ð¸Ð½Ð° Ð¿ÑƒÑÑ‚Ð°!",
 "Restore" => "Ð’Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ",
 "Delete" => "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ",
 "Deleted Files" => "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
 );
+$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);";
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 8636e417ecb207808d94e78c9acc8e05d51d1266..3fda38c66bf1cc2c354b13e522019130bd348085 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
 "Name" => "Ð˜Ð¼Ñ",
 "Delete" => "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 );
+$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);";
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
index 48ea423a4c4b3339e7e38dc8627d4d79c7847b3d..6dad84437cf37981ac08e7593a85c60e3a1d7739 100644
--- a/apps/files_trashbin/l10n/si_LK.php
+++ b/apps/files_trashbin/l10n/si_LK.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à¶¯à·à·‚à¶ºà¶šà·Š",
 "Name" => "à¶±à¶¸",
-"1 folder" => "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š",
-"1 file" => "1 à¶œà·œà¶±à·”à·€à¶šà·Š",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "à¶¸à¶šà· à¶¯à¶¸à¶±à·Šà¶±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 7cef36ef1c0805436aed68f7816bc32542f19f33..0f78da5fc3dc96e0d554b9467163777f68494437 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "NemoÅ¾no zmazaÅ¥ %s navÅ¾dy",
 "Couldn't restore %s" => "NemoÅ¾no obnoviÅ¥ %s",
 "perform restore operation" => "vykonaÅ¥ obnovu",
@@ -7,12 +8,12 @@
 "Delete permanently" => "ZmazaÅ¥  trvalo",
 "Name" => "NÃ¡zov",
 "Deleted" => "ZmazanÃ©",
-"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("","",""),
+"restored" => "obnovenÃ©",
 "Nothing in here. Your trash bin is empty!" => "Å½iadny obsah. KÃ´Å¡ je prÃ¡zdny!",
 "Restore" => "ObnoviÅ¥",
 "Delete" => "ZmazaÅ¥",
 "Deleted Files" => "ZmazanÃ© sÃºbory"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 8c8446d4e5b0d2ac2e762755b8801326769adfd0..eb2d42a18ff4d489d722c06fb06f630c10e505ab 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Datoteke %s ni mogoÄe dokonÄno izbrisati.",
 "Couldn't restore %s" => "Ni mogoÄe obnoviti %s",
 "perform restore operation" => "izvedi opravilo obnavljanja",
@@ -7,12 +8,11 @@
 "Delete permanently" => "IzbriÅ¡i dokonÄno",
 "Name" => "Ime",
 "Deleted" => "Izbrisano",
-"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("","","",""),
 "Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
 "Restore" => "Obnovi",
 "Delete" => "IzbriÅ¡i",
 "Deleted Files" => "Izbrisane datoteke"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index ce3ed947ccd57c106321d8150b3a484f2adca86d..1b7b5b828c81e08db327277b77d964d062fd0cfa 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nuk munda ta eliminoj pÃ«rfundimisht %s",
 "Couldn't restore %s" => "Nuk munda ta rivendos %s",
 "perform restore operation" => "ekzekuto operacionin e rivendosjes",
@@ -7,12 +8,11 @@
 "Delete permanently" => "Elimino pÃ«rfundimisht",
 "Name" => "Emri",
 "Deleted" => "Eliminuar",
-"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("",""),
 "Nothing in here. Your trash bin is empty!" => "KÃ«tu nuk ka asgjÃ«. Koshi juaj Ã«shtÃ« bosh!",
 "Restore" => "Rivendos",
 "Delete" => "Elimino",
 "Deleted Files" => "SkedarÃ« tÃ« eliminuar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 280c2b028204dcca9d3be74749416cdef968d070..7311e759f989ca7747c0a47533d6011c4a2efa82 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,14 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "perform restore operation" => "Ð²Ñ€Ð°Ñ‚Ð¸ Ñƒ Ð¿Ñ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¾ ÑÑ‚Ð°ÑšÐµ",
 "Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Delete permanently" => "ÐžÐ±Ñ€Ð¸ÑˆÐ¸ Ð·Ð° ÑÑ‚Ð°Ð»Ð½Ð¾",
 "Name" => "Ð˜Ð¼Ðµ",
 "Deleted" => "ÐžÐ±Ñ€Ð¸ÑÐ°Ð½Ð¾",
-"1 folder" => "1 Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°",
-"{count} folders" => "{count} Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ/Ð¸",
-"1 file" => "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
-"{count} files" => "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Nothing in here. Your trash bin is empty!" => "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸ÑˆÑ‚Ð°. ÐšÐ¾Ñ€Ð¿Ð° Ð·Ð° Ð¾Ñ‚Ð¿Ð°Ñ‚ÐºÐµ Ñ˜Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°.",
 "Restore" => "Ð’Ñ€Ð°Ñ‚Ð¸",
 "Delete" => "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
 );
+$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);";
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
index 2cb86adfd405423190d97c24b545ae11bc04795f..483d1e3ca2b89bb2451fc108921db95f82bbbdf7 100644
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ b/apps/files_trashbin/l10n/sr@latin.php
@@ -1,4 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Name" => "Ime",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
 "Delete" => "ObriÅ¡i"
 );
+$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);";
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index d56d8946f34d63602f5ed6eb903abe49aa2c3fd9..b0752cbbe8b5ea5e036dde2445716a9618b982b7 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
 "Couldn't restore %s" => "Kunde inte Ã¥terstÃ¤lla %s",
 "perform restore operation" => "utfÃ¶r Ã¥terstÃ¤llning",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Radera permanent",
 "Name" => "Namn",
 "Deleted" => "Raderad",
-"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("",""),
+"restored" => "Ã¥terstÃ¤lld",
 "Nothing in here. Your trash bin is empty!" => "Ingenting hÃ¤r. Din papperskorg Ã¤r tom!",
 "Restore" => "Ã…terskapa",
 "Delete" => "Radera",
 "Deleted Files" => "Raderade filer"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
index 2badaa8546772cbb10f2e49c63879a472209375c..ed93b459c7db36046316ae7af68f8c9cdd60a7fc 100644
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ b/apps/files_trashbin/l10n/ta_LK.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à®µà®´à¯",
 "Name" => "à®ªà¯†à®¯à®°à¯",
-"1 folder" => "1 à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ",
-"{count} folders" => "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®•à®³à¯",
-"1 file" => "1 à®•à¯‹à®ªà¯à®ªà¯",
-"{count} files" => "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "à®¨à¯€à®•à¯à®•à¯à®•"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/te.php b/apps/files_trashbin/l10n/te.php
index 9b36ac4272eff1e0af94a04ba38c519b27d98946..0d803a8e648535a642a395e14e6ea56dee5edc6f 100644
--- a/apps/files_trashbin/l10n/te.php
+++ b/apps/files_trashbin/l10n/te.php
@@ -1,6 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à°ªà±Šà°°à°ªà°¾à°Ÿà±",
 "Delete permanently" => "à°¶à°¾à°¶à±à°µà°¤à°‚à°—à°¾ à°¤à±Šà°²à°—à°¿à°‚à°šà±",
 "Name" => "à°ªà±‡à°°à±",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
 "Delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 82d3cd2353095a6244fec279cd1d589193440c1d..31caa11aac303bc0226b360145f37404b31858e7 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -1,14 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "perform restore operation" => "à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¸„à¸·à¸™à¸„à¹ˆà¸²",
 "Error" => "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”",
 "Name" => "à¸Šà¸·à¹ˆà¸",
 "Deleted" => "à¸¥à¸šà¹à¸¥à¹‰à¸§",
-"1 folder" => "1 à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ",
-"{count} folders" => "{count} à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ",
-"1 file" => "1 à¹„à¸Ÿà¸¥à¹Œ",
-"{count} files" => "{count} à¹„à¸Ÿà¸¥à¹Œ",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸°à¹„à¸£à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸™à¸µà¹‰ à¸–à¸±à¸‡à¸‚à¸¢à¸°à¸‚à¸à¸‡à¸„à¸¸à¸“à¸¢à¸±à¸‡à¸§à¹ˆà¸²à¸‡à¸à¸¢à¸¹à¹ˆ",
 "Restore" => "à¸„à¸·à¸™à¸„à¹ˆà¸²",
 "Delete" => "à¸¥à¸š",
 "Deleted Files" => "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸¥à¸šà¸—à¸´à¹‰à¸‡"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index 53c143c3a9d184ceaf3798472e0cff11be04f594..08fb0a02031716a31a5da74a104f711b53431835 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s KalÄ±cÄ± olarak silinemedi",
 "Couldn't restore %s" => "%s Geri yÃ¼klenemedi",
 "perform restore operation" => "Geri yÃ¼kleme iÅŸlemini gerÃ§ekleÅŸtir",
@@ -7,12 +8,11 @@
 "Delete permanently" => "KalÄ±cÄ± olarak sil",
 "Name" => "Ä°sim",
 "Deleted" => "Silindi",
-"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("",""),
 "Nothing in here. Your trash bin is empty!" => "BurasÄ± boÅŸ. Ã‡Ã¶p kutun tamamen boÅŸ.",
 "Restore" => "Geri yÃ¼kle",
 "Delete" => "Sil",
 "Deleted Files" => "Silinen Dosyalar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
index c369e385f740c1950fd7a105c8901054eecb10fd..ad983aee18b7cc425e530b0e0466355a18b9adfb 100644
--- a/apps/files_trashbin/l10n/ug.php
+++ b/apps/files_trashbin/l10n/ug.php
@@ -1,11 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Ø®Ø§ØªØ§Ù„Ù‰Ù‚",
 "Delete permanently" => "Ù…Û•ÚÚ¯ÛˆÙ„ÛˆÙƒ Ø¦Û†Ú†ÛˆØ±",
 "Name" => "Ø¦Ø§ØªÙ‰",
 "Deleted" => "Ø¦Û†Ú†ÛˆØ±ÛˆÙ„Ø¯Ù‰",
-"1 folder" => "1 Ù‚Ù‰Ø³Ù‚Û‡Ú†",
-"1 file" => "1 Ú¾Û†Ø¬Ø¬Û•Øª",
-"{count} files" => "{count} Ú¾Û†Ø¬Ø¬Û•Øª",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "Ø¨Û‡ Ø¬Ø§ÙŠØ¯Ø§ Ú¾ÛÚ†Ù†ÛÙ…Û• ÙŠÙˆÙ‚. Your trash bin is empty!",
 "Delete" => "Ø¦Û†Ú†ÛˆØ±"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index ffc9ab02f4895268910d613baaf119d1f12724c2..aa4b65950323fffba703987029b83c41ccf884d5 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸",
 "Couldn't restore %s" => "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ %s",
 "perform restore operation" => "Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–ÑŽ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ",
@@ -7,12 +8,12 @@
 "Delete permanently" => "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸",
 "Name" => "Ð†Ð¼'Ñ",
 "Deleted" => "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾",
-"1 folder" => "1 Ð¿Ð°Ð¿ÐºÐ°",
-"{count} folders" => "{count} Ð¿Ð°Ð¿Ð¾Ðº",
-"1 file" => "1 Ñ„Ð°Ð¹Ð»",
-"{count} files" => "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð²",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"restored" => "Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾",
 "Nothing in here. Your trash bin is empty!" => "ÐÑ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”. Ð’Ð°ÑˆÐ¸Ð¹ ÐºÐ¾ÑˆÐ¸Ðº Ð´Ð»Ñ ÑÐ¼Ñ–Ñ‚Ñ‚Ñ Ð¿ÑƒÑÑ‚Ð¸Ð¹!",
 "Restore" => "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸",
 "Delete" => "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸",
 "Deleted Files" => "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ Ð¤Ð°Ð¹Ð»Ñ–Ð²"
 );
+$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);";
diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
index e13a623fecc335ac65e09bcaeca82fe9abb71099..f6c6a3da3c84b3f5c08590b20530b8c2e84a5d01 100644
--- a/apps/files_trashbin/l10n/ur_PK.php
+++ b/apps/files_trashbin/l10n/ur_PK.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
-"Error" => "Ø§ÛŒØ±Ø±"
+<?php
+$TRANSLATIONS = array(
+"Error" => "Ø§ÛŒØ±Ø±",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index a8924c541f8fee86f3624037731ee8b6032b7f0b..072d799fa6819d0cedd041904f80463b338f9b83 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "KhÃ´ng thá»ƒ Ã³a %s vÄ©nh viá»…n",
 "Couldn't restore %s" => "KhÃ´ng thá»ƒ khÃ´i phá»¥c %s",
 "perform restore operation" => "thá»±c hiá»‡n phá»¥c há»“i",
@@ -7,12 +8,11 @@
 "Delete permanently" => "XÃ³a vÄ©nh vá»…n",
 "Name" => "TÃªn",
 "Deleted" => "ÄÃ£ xÃ³a",
-"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(""),
 "Nothing in here. Your trash bin is empty!" => "KhÃ´ng cÃ³ gÃ¬ á»Ÿ Ä‘Ã¢y. ThÃ¹ng rÃ¡c cá»§a báº¡n rá»—ng!",
 "Restore" => "KhÃ´i phá»¥c",
 "Delete" => "XÃ³a",
 "Deleted Files" => "File Ä‘Ã£ xÃ³a"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 4dda1e0433c9a0444115553f7c200f2871c2fd1b..4bd7cc2cee6b2d49225ed1e30d95cb8e2eac6e47 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -1,9 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "å‡ºé”™",
+"Delete permanently" => "æ°¸ä¹…åˆ é™¤",
 "Name" => "åç§°",
-"1 folder" => "1 ä¸ªæ–‡ä»¶å¤¹",
-"{count} folders" => "{count} ä¸ªæ–‡ä»¶å¤¹",
-"1 file" => "1 ä¸ªæ–‡ä»¶",
-"{count} files" => "{count} ä¸ªæ–‡ä»¶",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Delete" => "åˆ é™¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 9c0f0bb3b75186fd002fed1ffa292764f81ae3f7..6609f57d9cff1d1260524b9e5d19f30c6f901963 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "æ— æ³•å½»åº•åˆ é™¤æ–‡ä»¶%s",
 "Couldn't restore %s" => "æ— æ³•æ¢å¤%s",
 "perform restore operation" => "æ‰§è¡Œæ¢å¤æ“ä½œ",
@@ -7,12 +8,11 @@
 "Delete permanently" => "æ°¸ä¹…åˆ é™¤",
 "Name" => "åç§°",
 "Deleted" => "å·²åˆ é™¤",
-"1 folder" => "1ä¸ªæ–‡ä»¶å¤¹",
-"{count} folders" => "{count} ä¸ªæ–‡ä»¶å¤¹",
-"1 file" => "1 ä¸ªæ–‡ä»¶",
-"{count} files" => "{count} ä¸ªæ–‡ä»¶",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "è¿™é‡Œæ²¡æœ‰ä¸œè¥¿. ä½ çš„å›žæ”¶ç«™æ˜¯ç©ºçš„!",
 "Restore" => "æ¢å¤",
 "Delete" => "åˆ é™¤",
 "Deleted Files" => "å·²åˆ é™¤æ–‡ä»¶"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php
index 53dd9869219e08d2f69033b64c7b8fbc8545359b..3f0d663baeb10ee308c1ca65edae8e5bbd1a63c6 100644
--- a/apps/files_trashbin/l10n/zh_HK.php
+++ b/apps/files_trashbin/l10n/zh_HK.php
@@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "éŒ¯èª¤",
 "Name" => "åç¨±",
-"{count} folders" => "{}æ–‡ä»¶å¤¾",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Delete" => "åˆªé™¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index a9dcba8f7d73ea151c6cd6aff67bfdf2a0723a96..ab6b75c57848602a3621eda654ae14f73015fc81 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "ç„¡æ³•æ°¸ä¹…åˆªé™¤ %s",
 "Couldn't restore %s" => "ç„¡æ³•å¾©åŽŸ %s",
 "perform restore operation" => "é€²è¡Œå¾©åŽŸå‹•ä½œ",
@@ -7,12 +8,11 @@
 "Delete permanently" => "æ°¸ä¹…åˆªé™¤",
 "Name" => "åç¨±",
 "Deleted" => "å·²åˆªé™¤",
-"1 folder" => "1 å€‹è³‡æ–™å¤¾",
-"{count} folders" => "{count} å€‹è³‡æ–™å¤¾",
-"1 file" => "1 å€‹æª”æ¡ˆ",
-"{count} files" => "{count} å€‹æª”æ¡ˆ",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
 "Nothing in here. Your trash bin is empty!" => "æ‚¨çš„åžƒåœ¾æ¡¶æ˜¯ç©ºçš„ï¼",
 "Restore" => "å¾©åŽŸ",
 "Delete" => "åˆªé™¤",
 "Deleted Files" => "å·²åˆªé™¤çš„æª”æ¡ˆ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index f1df1d7ec77f9106e7b7ed4c1a2542d44b81118b..b2c6bc1df50988c960f5dfb54a96ab29f4aad8a2 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -56,4 +56,8 @@ class Hooks {
 			Trashbin::deleteUser($uid);
 			}
 	}
+	
+	public static function post_write_hook($params) {
+		Trashbin::resizeTrash(\OCP\User::getUser());
+	}
 }
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index b9d900dfab42b9b945c06fb0692fb2b54d7e4e3d..30913e00a473da3493dda9a8ca10b435773c7e28 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -25,7 +25,7 @@ namespace OCA\Files_Trashbin;
 class Trashbin {
 	// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
 
-	const DEFAULT_RETENTION_OBLIGATION = 180;
+	const DEFAULT_RETENTION_OBLIGATION = 30;
 
 	// unit: percentage; 50% of available disk space/quota
 	const DEFAULTMAXSIZE = 50;
@@ -72,6 +72,11 @@ class Trashbin {
 		$mime = $view->getMimeType('files' . $file_path);
 
 		if ($view->is_dir('files' . $file_path)) {
+			$dirContent = $view->getDirectoryContent('files' . $file_path);
+			// no need to move empty folders to the trash bin
+			if (empty($dirContent)) {
+				return true;
+			}
 			$type = 'dir';
 		} else {
 			$type = 'file';
@@ -100,8 +105,8 @@ class Trashbin {
 			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
 				'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp)));
 
-			$trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp);
-			$trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp);
+			$trashbinSize += self::retainVersions($file_path, $filename, $timestamp);
+			$trashbinSize += self::retainEncryptionKeys($file_path, $filename, $timestamp);
 		} else {
 			\OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR);
 		}
@@ -114,14 +119,13 @@ class Trashbin {
 	/**
 	 * Move file versions to trash so that they can be restored later
 	 *
-	 * @param \OC\Files\View $view
 	 * @param $file_path path to original file
 	 * @param $filename of deleted file
 	 * @param $timestamp when the file was deleted
 	 *
 	 * @return size of stored versions
 	 */
-	private static function retainVersions($view, $file_path, $filename, $timestamp) {
+	private static function retainVersions($file_path, $filename, $timestamp) {
 		$size = 0;
 		if (\OCP\App::isEnabled('files_versions')) {
 
@@ -154,14 +158,13 @@ class Trashbin {
 	/**
 	 * Move encryption keys to trash so that they can be restored later
 	 *
-	 * @param \OC\Files\View $view
 	 * @param $file_path path to original file
 	 * @param $filename of deleted file
 	 * @param $timestamp when the file was deleted
 	 *
 	 * @return size of encryption keys
 	 */
-	private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
+	private static function retainEncryptionKeys($file_path, $filename, $timestamp) {
 		$size = 0;
 
 		if (\OCP\App::isEnabled('files_encryption')) {
@@ -262,14 +265,14 @@ class Trashbin {
 			$query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
 					. ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
 			$result = $query->execute(array($user, $filename, $timestamp))->fetchAll();
-			if (count($result) != 1) {
+			if (count($result) !== 1) {
 				\OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
 				return false;
 			}
 
 			// if location no longer exists, restore file in the root directory
 			$location = $result[0]['location'];
-			if ($result[0]['location'] != '/' &&
+			if ($result[0]['location'] !== '/' &&
 				(!$view->is_dir('files' . $result[0]['location']) ||
 				!$view->isUpdatable('files' . $result[0]['location']))) {
 				$location = '';
@@ -283,11 +286,11 @@ class Trashbin {
 			$location = '';
 		}
 
-		$source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $file);
-		$target = \OC\Files\Filesystem::normalizePath('files/' . $location . '/' . $filename);
-
 		// we need a  extension in case a file/dir with the same name already exists
-		$ext = self::getUniqueExtension($location, $filename, $view);
+		$uniqueFilename = self::getUniqueFilename($location, $filename, $view);
+
+		$source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $file);
+		$target = \OC\Files\Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
 		$mtime = $view->filemtime($source);
 
 		// disable proxy to prevent recursive calls
@@ -295,24 +298,24 @@ class Trashbin {
 		\OC_FileProxy::$enabled = false;
 
 		// restore file
-		$restoreResult = $view->rename($source, $target . $ext);
+		$restoreResult = $view->rename($source, $target);
 
 		// handle the restore result
 		if ($restoreResult) {
 			$fakeRoot = $view->getRoot();
 			$view->chroot('/' . $user . '/files');
-			$view->touch('/' . $location . '/' . $filename . $ext, $mtime);
+			$view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
 			$view->chroot($fakeRoot);
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext),
+			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename),
 				'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
-			if ($view->is_dir($target . $ext)) {
-				$trashbinSize -= self::calculateSize(new \OC\Files\View('/' . $user . '/' . $target . $ext));
+			if ($view->is_dir($target)) {
+				$trashbinSize -= self::calculateSize(new \OC\Files\View('/' . $user . '/' . $target));
 			} else {
-				$trashbinSize -= $view->filesize($target . $ext);
+				$trashbinSize -= $view->filesize($target);
 			}
 
-			$trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
-			$trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
+			$trashbinSize -= self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
+			$trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp);
 
 			if ($timestamp) {
 				$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
@@ -338,15 +341,16 @@ class Trashbin {
 	 *
 	 * @param \OC\Files\View $view file view
 	 * @param $file complete path to file
-	 * @param $filename name of file
-	 * @param $ext file extension in case a file with the same $filename already exists
+	 * @param $filename name of file once it was deleted
+	 * @param $uniqueFilename new file name to restore the file without overwriting existing files
 	 * @param $location location if file
 	 * @param $timestamp deleteion time
 	 *
 	 * @return size of restored versions
 	 */
-	private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) {
+	private static function restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
 		$size = 0;
+
 		if (\OCP\App::isEnabled('files_versions')) {
 			// disable proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;
@@ -355,7 +359,7 @@ class Trashbin {
 			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
-			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
+			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
@@ -392,20 +396,20 @@ class Trashbin {
 	 * @param \OC\Files\View $view
 	 * @param $file complete path to file
 	 * @param $filename name of file
-	 * @param $ext file extension in case a file with the same $filename already exists
+	 * @param $uniqueFilename new file name to restore the file without overwriting existing files
 	 * @param $location location of file
 	 * @param $timestamp deleteion time
 	 *
 	 * @return size of restored encrypted file
 	 */
-	private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
+	private static function restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
 		// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
 		$size = 0;
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
-			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
+			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
@@ -482,14 +486,11 @@ class Trashbin {
 					// get current sharing state
 					$sharingEnabled = \OCP\Share::isEnabled();
 
-					// get the final filename
-					$target = \OC\Files\Filesystem::normalizePath($location . '/' . $filename);
-
 					// get users sharing this file
-					$usersSharing = $util->getSharingUsersArray($sharingEnabled, $target . $ext, $user);
+					$usersSharing = $util->getSharingUsersArray($sharingEnabled, $target, $user);
 
 					// Attempt to set shareKey
-					$util->setSharedFileKeyfiles($session, $usersSharing, $target . $ext);
+					$util->setSharedFileKeyfiles($session, $usersSharing, $target);
 				}
 			}
 
@@ -667,9 +668,32 @@ class Trashbin {
 		return $availableSpace;
 	}
 
+	/**
+	 * @brief resize trash bin if necessary after a new file was added to ownCloud
+	 * @param string $user user id
+	 */
+	public static function resizeTrash($user) {
+
+		$size = self::getTrashbinSize($user);
+
+		if ($size === false || $size < 0) {
+			$size = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
+		}
+
+		$freeSpace = self::calculateFreeSpace($size);
+
+		if ($freeSpace < 0) {
+			$newSize = $size - self::expire($size);
+			if ($newSize !== $size) {
+				self::setTrashbinSize($user, $newSize);
+			}
+		}
+	}
+	
 	/**
 	 * clean up the trash bin
 	 * @param current size of the trash bin
+	 * @return size of expired files
 	 */
 	private static function expire($trashbinSize) {
 
@@ -780,18 +804,28 @@ class Trashbin {
 	 * @param $view filesystem view relative to users root directory
 	 * @return string with unique extension
 	 */
-	private static function getUniqueExtension($location, $filename, $view) {
-		$ext = '';
+	private static function getUniqueFilename($location, $filename, $view) {
+		$ext = pathinfo($filename, PATHINFO_EXTENSION);
+		$name = pathinfo($filename, PATHINFO_FILENAME);
+		$l = \OC_L10N::get('files_trashbin');
+
+		// if extension is not empty we set a dot in front of it
+		if ($ext !== '') {
+			$ext = '.' . $ext;
+		}
+
 		if ($view->file_exists('files' . $location . '/' . $filename)) {
-			$tmpext = '.restored';
-			$ext = $tmpext;
-			$i = 1;
-			while ($view->file_exists('files' . $location . '/' . $filename . $ext)) {
-				$ext = $tmpext . $i;
+			$i = 2;
+			$uniqueName = $name . " (".$l->t("restored").")". $ext;
+			while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
+				$uniqueName = $name . " (".$l->t("restored") . " " . $i . ")" . $ext;
 				$i++;
 			}
+
+			return $uniqueName;
 		}
-		return $ext;
+
+		return $filename;
 	}
 
 	/**
@@ -827,7 +861,7 @@ class Trashbin {
 		$result = $query->execute(array($user))->fetchAll();
 
 		if ($result) {
-			return $result[0]['size'];
+			return (int)$result[0]['size'];
 		}
 		return false;
 	}
@@ -855,6 +889,23 @@ class Trashbin {
 		\OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
 		//Listen to delete user signal
 		\OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
+		//Listen to post write hook
+		\OCP\Util::connectHook('OC_Filesystem', 'post_write', "OCA\Files_Trashbin\Hooks", "post_write_hook");
+	}
+	
+	/**
+	 * @brief check if trash bin is empty for a given user
+	 * @param string $user
+	 */
+	public static function isEmpty($user) {
+
+		$trashSize = self::getTrashbinSize($user);
+
+		if ($trashSize !== false && $trashSize > 0) {
+			return false;
+		}
+
+		return true;
 	}
 
 }
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 66ec36df867093975df8de6193669c5e5e7f3a77..371765fa69a658783cef13020e8d8d5d167fe531 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -5,7 +5,7 @@
 </div>
 <div id='notification'></div>
 
-<?php if (isset($_['files']) && count($_['files'])==0 && $_['dirlisting'] == false):?>
+<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false):?>
 	<div id="emptyfolder"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
 <?php endif; ?>
 
diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
index 85bb16ffa2d2822a90d3d9e315e45256ce9680f0..8ecab58e5c809c462580d8e31f28fe3ad393b994 100644
--- a/apps/files_trashbin/templates/part.breadcrumb.php
+++ b/apps/files_trashbin/templates/part.breadcrumb.php
@@ -12,7 +12,7 @@
 <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
 	$crumb = $_["breadcrumb"][$i];
 	$dir = \OCP\Util::encodePath($crumb["dir"]); ?>
-	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
+	<div class="crumb <?php if($i === count($_["breadcrumb"])-1) p('last');?> svg"
 		 data-dir='<?php p($dir);?>'>
 	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
 	</div>
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 94a8eec9515669533f9846edb6c77b6bd3c98ef2..254b08dd36a31e39d0a289ef35e7ded6547fa255 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -7,7 +7,7 @@
 	$name = \OCP\Util::encodePath($file['name']);
 	$directory = \OCP\Util::encodePath($file['directory']); ?>
 	<tr data-filename="<?php p($file['name']);?>"
-		data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
+		data-type="<?php ($file['type'] === 'dir')?p('dir'):p('file')?>"
 		data-mime="<?php p($file['mimetype'])?>"
 		data-permissions='<?php p($file['permissions']); ?>'
 		<?php if ( $_['dirlisting'] ): ?>
@@ -22,14 +22,14 @@
 		data-dirlisting=0
 		<?php endif; ?>>
 		<td class="filename svg"
-		<?php if($file['type'] == 'dir'): ?>
+		<?php if($file['type'] === 'dir'): ?>
 			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
 		<?php else: ?>
 			style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 		<?php endif; ?>
 			>
 		<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
-		<?php if($file['type'] == 'dir'): ?>
+		<?php if($file['type'] === 'dir'): ?>
 			<?php if( $_['dirlisting'] ): ?>
 				<a class="name" href="<?php p($_['baseURL'].'/'.$name); ?>" title="">
 			<?php else: ?>
@@ -43,14 +43,14 @@
 			<?php endif; ?>
 		<?php endif; ?>
 			<span class="nametext">
-				<?php if($file['type'] == 'dir'):?>
+				<?php if($file['type'] === 'dir'):?>
 					<?php print_unescaped(htmlspecialchars($file['name']));?>
 				<?php else:?>
 					<?php print_unescaped(htmlspecialchars($file['basename']));?><span
 						class='extension'><?php p($file['extension']);?></span>
 				<?php endif;?>
 			</span>
-			<?php if($file['type'] == 'dir'):?>
+			<?php if($file['type'] === 'dir'):?>
 				<span class="uploadtext" currentUploads="0">
 				</span>
 			<?php endif;?>
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index f9174c45a650a2acd4f44c42c4f3fbc05c7f7749..4f48f71d8ca3b756e46c8066133e0b5bbb0130ca 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -2,24 +2,22 @@
 OCP\JSON::checkAppEnabled('files_versions');
 
 $source = $_GET['source'];
+$start = $_GET['start'];
 list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source);
 $count = 5; //show the newest revisions
-if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) {
+if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename)) ) {
 
-	$versionsFormatted = array();
-
-	foreach ( $versions AS $version ) {
-		$versionsFormatted[] = OCP\Util::formatDate( $version['version'] );
+	$endReached = false;
+	if (count($versions) <= $start+$count) {
+		$endReached = true;
 	}
 
-	$versionsSorted = array_reverse( $versions );
+	$versions = array_slice($versions, $start, $count);
 
-	if ( !empty( $versionsSorted ) ) {
-		OCP\JSON::encodedPrint($versionsSorted);
-	}
+	\OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
 
 } else {
 
-	return;
+	\OCP\JSON::success(array('data' => array('versions' => false, 'endReached' => true)));
 
 }
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 284b46ee09331867fea83d8d1f6e6f958ab6feab..900d8cd6e285d1995bd155dd8497b89c756e97ef 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -3,8 +3,6 @@
 OCP\JSON::checkAppEnabled('files_versions');
 OCP\JSON::callCheck();
 
-$userDirectory = "/".OCP\USER::getUser()."/files";
-
 $file = $_GET['file'];
 $revision=(int)$_GET['revision'];
 
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 0d0850e186432f2e037262826ab432a576b178d2..5b1e464ba6cadc72f861d86a7ae74f5d3dadb5fb 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -6,6 +6,7 @@ OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
 OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php';
 
 OCP\Util::addscript('files_versions', 'versions');
+OCP\Util::addStyle('files_versions', 'versions');
 
 // Listen to write signals
 OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook");
diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index a9b259ce1405ac7da4393a9baee111186f08c710..6146eda337246274b7055e7a90fb006167cb15df 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -1,16 +1,44 @@
-#history {
-	margin: 2em 2em 0;
+#found_versions li {
+	width: 100%;
+	cursor: default;
+	height: 36px;
+	float: left;
+	border-bottom: 1px solid rgba(100,100,100,.1);
+}
+#found_versions li:last-child {
+	border-bottom: none;
+}
+
+#found_versions li > * {
+	padding: 7px;
+	float: left;
+	vertical-align: top;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	filter: alpha(opacity=50);
+	opacity: .5;
+}
+#found_versions li > *:hover,
+#found_versions li > *:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
 }
 
-#feedback-messages h3 {
-	font-size: 1.3em;
-	font-style: italic;
+#found_versions img {
+	cursor: pointer;
+	padding-right: 4px;
 }
 
-.success {
-	color: green;
+#found_versions .versionDate {
+	min-width: 100px;
+	vertical-align: text-bottom;
 }
 
-.failure {
-	color: red;
-}
\ No newline at end of file
+#found_versions .revertVersion {
+	cursor: pointer;
+	float: right;
+}
+
+.drop-versions #makelink {
+	float: left;
+}
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
new file mode 100644
index 0000000000000000000000000000000000000000..040a662e61bf70511d7fdffa716d462d8d812a4e
--- /dev/null
+++ b/apps/files_versions/download.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+* ownCloud - Download versions directly from the versions drop-down
+*
+* @author Bjoern Schiessle
+* @copyright 2013 Bjoern Schiessle schiessle@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+OCP\JSON::checkAppEnabled('files_versions');
+//OCP\JSON::callCheck();
+
+$file = $_GET['file'];
+$revision=(int)$_GET['revision'];
+
+list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
+
+$versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision;
+
+$view = new OC\Files\View('/');
+
+$ftype = $view->getMimeType('/'.$uid.'/files/'.$filename);
+
+header('Content-Type:'.$ftype);
+if ( preg_match( "/MSIE/", $_SERVER["HTTP_USER_AGENT"] ) ) {
+	header( 'Content-Disposition: attachment; filename="' . rawurlencode( basename($filename) ) . '"' );
+} else {
+	header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . rawurlencode( basename($filename) )
+										 . '; filename="' . rawurlencode( basename($filename) ) . '"' );
+}
+OCP\Response::disableCaching();
+header('Content-Length: '.$view->filesize($versionName));
+
+OC_Util::obEnd();
+
+$view->readfile($versionName);
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
deleted file mode 100644
index 719a7208fedb1effff25b7b8366812279952fa73..0000000000000000000000000000000000000000
--- a/apps/files_versions/history.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * ownCloud - History page of the Versions App
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-OCP\User::checkLoggedIn( );
-OCP\Util::addStyle('files_versions', 'versions');
-$tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
-$l = OC_L10N::get('files_versions');
-
-if ( isset( $_GET['path'] ) ) {
-
-	$path = $_GET['path'];
-	$tmpl->assign( 'path', $path );
-	$versions = new OCA\Files_Versions\Storage();
-
-	// roll back to old version if button clicked
-	if( isset( $_GET['revert'] ) ) {
-
-		if( $versions->rollback( $path, $_GET['revert'] ) ) {
-
-			$tmpl->assign( 'outcome_stat', $l->t('success') );
-
-			$message = $l->t('File %s was reverted to version %s',
-				array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) );
-
-			$tmpl->assign( 'outcome_msg', $message);
-
-		} else {
-
-			$tmpl->assign( 'outcome_stat', $l->t('failure') );
-
-			$message = $l->t('File %s could not be reverted to version %s',
-				array($_GET['path'], OCP\Util::formatDate( doubleval($_GET['revert']) ) ) );
-
-			$tmpl->assign( 'outcome_msg', $message);
-
-		}
-
-	}
-
-	// show the history only if there is something to show
-	$count = 999; //show the newest revisions
-	list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($path);
-	if( ($versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $count)) ) {
-
-		$tmpl->assign( 'versions', array_reverse( $versions ) );
-
-	}else{
-
-		$tmpl->assign( 'message', $l->t('No old versions available') );
-
-	}
-}else{
-
-	$tmpl->assign( 'message', $l->t('No path specified') );
-
-}
-
-$tmpl->printPage( );
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index a5b244174831654ac1277f419943c7e561337383..ca479507d48d4183326aa81ceda64cc45aae46da 100644
Binary files a/apps/files_versions/js/versions.js and b/apps/files_versions/js/versions.js differ
diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php
index b84445972d35eb2ac6efca53e5a037366fffef6a..53eae8e9feed7c4202aff7eb430be3c8226fd3f3 100644
--- a/apps/files_versions/l10n/ar.php
+++ b/apps/files_versions/l10n/ar.php
@@ -1,3 +1,6 @@
-<?php $TRANSLATIONS = array(
-"Versions" => "Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª"
+<?php
+$TRANSLATIONS = array(
+"Versions" => "Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª",
+"Restore" => "Ø§Ø³ØªØ¹ÙŠØ¯"
 );
+$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;";
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index a03d9adcf079e30dbe53c46d398b9d98034153a2..6268f408f7a5d723987fbcbaa7af566e65f80ab2 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -1,5 +1,6 @@
-<?php $TRANSLATIONS = array(
-"success" => "ÑƒÑÐ¿ÐµÑˆÐ½Ð¾",
-"File %s was reverted to version %s" => "Ð¤Ð°Ð¹Ð»ÑŠÑ‚ %s Ð±Ðµ Ð²ÑŠÑ€Ð½Ð°Ñ‚ ÐºÑŠÐ¼ Ð²ÐµÑ€ÑÐ¸Ñ %s",
-"Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸"
+<?php
+$TRANSLATIONS = array(
+"Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸",
+"Restore" => "Ð’ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php
index f3b0071a356113deb1855f60080875bc13bff700..ce7f81b0095ff9d6fb227f11b1f235e3f8fdd436 100644
--- a/apps/files_versions/l10n/bn_BD.php
+++ b/apps/files_versions/l10n/bn_BD.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Versions" => "à¦à¦¾à¦°à§à¦¸à¦¨"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index 433d974c8cb041d24d11c6caf0324f407cd4afb9..e5c47a277f989ea1fdd89920bffcc183b42c8984 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "No s'ha pogut revertir: %s",
-"success" => "Ã¨xit",
-"File %s was reverted to version %s" => "El fitxer %s s'ha revertit a la versiÃ³ %s",
-"failure" => "fallada",
-"File %s could not be reverted to version %s" => "El fitxer %s no s'ha pogut revertir a la versiÃ³ %s",
-"No old versions available" => "No hi ha versiÃ³ns antigues disponibles",
-"No path specified" => "No heu especificat el camÃ",
 "Versions" => "Versions",
-"Revert a file to a previous version by clicking on its revert button" => "Reverteix un fitxer a una versiÃ³ anterior fent clic en el seu botÃ³ de reverteix"
+"Failed to revert {file} to revision {timestamp}." => "Ha fallat en retornar {file} a la revisiÃ³ {timestamp}",
+"More versions..." => "MÃ©s versions...",
+"No other versions available" => "No hi ha altres versions disponibles",
+"Restore" => "Recupera"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index 087d800137e7a1f5bf10c089ac5db8122a436e85..a2fc76d443d79a37f357d086891012a14391f297 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Nelze navrÃ¡tit: %s",
-"success" => "ÃºspÄ›ch",
-"File %s was reverted to version %s" => "Soubor %s byl navrÃ¡cen na verzi %s",
-"failure" => "sehlhÃ¡nÃ",
-"File %s could not be reverted to version %s" => "Soubor %s nemohl bÃ½t navrÃ¡cen na verzi %s",
-"No old versions available" => "Nejsou dostupnÃ© Å¾Ã¡dnÃ© starÅ¡Ã verze",
-"No path specified" => "NezadÃ¡na cesta",
 "Versions" => "Verze",
-"Revert a file to a previous version by clicking on its revert button" => "NavraÅ¥te soubor do pÅ™edchozÃ verze kliknutÃm na tlaÄÃtko navrÃ¡tit"
+"Failed to revert {file} to revision {timestamp}." => "Selhalo navrÃ¡cenÃ souboru {file} na verzi {timestamp}.",
+"More versions..." => "VÃce verzÃ...",
+"No other versions available" => "Å½Ã¡dnÃ© dalÅ¡Ã verze nejsou dostupnÃ©",
+"Restore" => "Obnovit"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
index 447a3d2b85df8f4e0367eef94eada8119f1b6e8c..a18bc7177081a67fba82e2aeb5cdfd739c5e6453 100644
--- a/apps/files_versions/l10n/da.php
+++ b/apps/files_versions/l10n/da.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Kunne ikke genskabe: %s",
-"success" => "success",
-"File %s was reverted to version %s" => "Filen %s blev genskabt til version: %s",
-"failure" => "fejl",
-"File %s could not be reverted to version %s" => "Filen %s blev genskabt til version: %s",
-"No old versions available" => "Ingen gamle version tilgÃ¦ngelige",
-"No path specified" => "Ingen sti specificeret",
 "Versions" => "Versioner",
-"Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke pÃ¥ denne genskab knap."
+"Failed to revert {file} to revision {timestamp}." => "Kunne ikke tilbagerulle {file} til den tidligere udgave: {timestamp}.",
+"More versions..." => "Flere versioner...",
+"No other versions available" => "Ingen andre versioner tilgÃ¦ngelig",
+"Restore" => "Gendan"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index c34a8c1fd3ed3e67291c3d79f44a7b31b2cc0672..c8b45eee5005516a2e916d685cf3f05645efa049 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Konnte %s nicht zurÃ¼cksetzen",
-"success" => "Erfolgreich",
-"File %s was reverted to version %s" => "Datei %s wurde auf Version %s zurÃ¼ckgesetzt",
-"failure" => "Fehlgeschlagen",
-"File %s could not be reverted to version %s" => "Datei %s konnte nicht auf Version %s zurÃ¼ckgesetzt werden",
-"No old versions available" => "Keine Ã¤lteren Versionen verfÃ¼gbar",
-"No path specified" => "Kein Pfad angegeben",
 "Versions" => "Versionen",
-"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch klicken auf den ZurÃ¼cksetzen Button zurÃ¼ck"
+"Failed to revert {file} to revision {timestamp}." => "Konnte {file} der Revision {timestamp} nicht rÃ¼ckgÃ¤nging machen.",
+"More versions..." => "Mehrere Versionen...",
+"No other versions available" => "Keine anderen Versionen verfÃ¼gbar",
+"Restore" => "Wiederherstellen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index 8354852a5b5e5c6a1da96fabe8737e7faebe9075..c8b45eee5005516a2e916d685cf3f05645efa049 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Konnte %s nicht zurÃ¼cksetzen",
-"success" => "Erfolgreich",
-"File %s was reverted to version %s" => "Die Datei %s wurde auf die Version %s zurÃ¼ckgesetzt",
-"failure" => "Fehlgeschlagen",
-"File %s could not be reverted to version %s" => "Die Datei %s konnte nicht auf die Version %s zurÃ¼ckgesetzt werden",
-"No old versions available" => "Keine Ã¤lteren Versionen verfÃ¼gbar",
-"No path specified" => "Kein Pfad angegeben",
 "Versions" => "Versionen",
-"Revert a file to a previous version by clicking on its revert button" => "Setze eine Datei durch Klicken auf den ZurÃ¼cksetzen-Button auf eine frÃ¼here Version zurÃ¼ck"
+"Failed to revert {file} to revision {timestamp}." => "Konnte {file} der Revision {timestamp} nicht rÃ¼ckgÃ¤nging machen.",
+"More versions..." => "Mehrere Versionen...",
+"No other versions available" => "Keine anderen Versionen verfÃ¼gbar",
+"Restore" => "Wiederherstellen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index 8b67e471a9ead7048954c81d13ef74d32a2d36e6..af608e7c04241e37f99a2bc39e7ea6ef2031bad1 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ Ï„Î¿Ï…: %s",
-"success" => "ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±",
-"File %s was reverted to version %s" => "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s ÎµÏ€Î±Î½Î±Ï†ÎÏÎ¸Î·ÎºÎµ ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s",
-"failure" => "Î±Ï€Î¿Ï„Ï…Ï‡Î¯Î±",
-"File %s could not be reverted to version %s" => "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„ÏŒ Î½Î± ÎµÏ€Î±Î½Î±Ï†ÎµÏÎ¸ÎµÎ¯ ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s",
-"No old versions available" => "ÎœÎ· Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚ Ï€Î±Î»Î¹ÎÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚",
-"No path specified" => "Î”ÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Î·ÎºÎµ Î´Î¹Î±Î´ÏÎ¿Î¼Î®",
 "Versions" => "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚",
-"Revert a file to a previous version by clicking on its revert button" => "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ ÎµÎ½ÏŒÏ‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÏƒÎµ Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· ÎÎºÎ´Î¿ÏƒÎ· Ï€Î±Ï„ÏŽÎ½Ï„Î±Ï‚ ÏƒÏ„Î¿ ÎºÎ¿Ï…Î¼Ï€Î¯ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚"
+"Failed to revert {file} to revision {timestamp}." => "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ Ï„Î¿Ï… {file} ÏƒÏ„Î·Î½ Î±Î½Î±Î¸ÎµÏŽÏÎ·ÏƒÎ· {timestamp}.",
+"More versions..." => "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚...",
+"No other versions available" => "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ Î¬Î»Î»ÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚",
+"Restore" => "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 17f97808578d71da24b6f2827c1bd714510743f1..c023d5fbc37cf3eaff556fb03e9cb94ec3ff3b30 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Ne eblas malfari: %s",
-"success" => "sukceso",
-"File %s was reverted to version %s" => "Dosiero %s estis malfarita al versio %s",
-"failure" => "malsukceso",
-"File %s could not be reverted to version %s" => "Ne eblis malfari dosieron %s al versio %s",
-"No old versions available" => "Neniu malnova versio disponeblas",
-"No path specified" => "Neniu vojo estas specifita",
 "Versions" => "Versioj",
-"Revert a file to a previous version by clicking on its revert button" => "Malfari dosieron al antaÅa versio per klako sur sia malfarad-butono"
+"Restore" => "RestaÅri"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index 8c1a30f822aeba4dbba2b3217cdce06a10d2bdb2..a6031698e06ba7b0944e638551ddf6f4d12033e8 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "No se puede revertir: %s",
-"success" => "exitoso",
-"File %s was reverted to version %s" => "El archivo %s fue revertido a la version %s",
-"failure" => "fallo",
-"File %s could not be reverted to version %s" => "El archivo %s no puede ser revertido a la version %s",
-"No old versions available" => "No hay versiones antiguas disponibles",
-"No path specified" => "Ruta no especificada",
 "Versions" => "Revisiones",
-"Revert a file to a previous version by clicking on its revert button" => "Revertir un archivo a una versiÃ³n anterior haciendo clic en el boton de revertir"
+"Failed to revert {file} to revision {timestamp}." => "No se ha podido revertir {archivo} a revisiÃ³n {timestamp}.",
+"More versions..." => "MÃ¡s...",
+"No other versions available" => "No hay otras versiones disponibles",
+"Restore" => "Recuperar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index 363693c913b86701f400256af6bef2289c1c7d77..068f835d0afe84dd2ae43a304ec118eeac5bc18f 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "No se pudo revertir: %s ",
-"success" => "Ã‰xito",
-"File %s was reverted to version %s" => "El archivo %s fue revertido a la versiÃ³n %s",
-"failure" => "error",
-"File %s could not be reverted to version %s" => "El archivo %s no pudo ser revertido a la versiÃ³n %s",
-"No old versions available" => "No hay versiones antiguas disponibles",
-"No path specified" => "Ruta de acceso no especificada",
 "Versions" => "Versiones",
-"Revert a file to a previous version by clicking on its revert button" => "RevertÃ un archivo a una versiÃ³n anterior haciendo click en su botÃ³n de \"revertir\""
+"Restore" => "Recuperar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index c8d2f7cfacdc289bce2ef79d46c63841de943149..ba8b516e85607db138934b2aed5ae96553b86268 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Ei suuda taastada faili: %s",
-"success" => "korras",
-"File %s was reverted to version %s" => "Fail %s taastati versioonile %s",
-"failure" => "ebaÃµnnestus",
-"File %s could not be reverted to version %s" => "Faili %s ei saa taastada versioonile %s",
-"No old versions available" => "Vanu versioone pole saadaval",
-"No path specified" => "Asukohta pole mÃ¤Ã¤ratud",
 "Versions" => "Versioonid",
-"Revert a file to a previous version by clicking on its revert button" => "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
+"Failed to revert {file} to revision {timestamp}." => "EbaÃµnnestus faili {file} taastamine revisjonile {timestamp}",
+"More versions..." => "Rohkem versioone...",
+"No other versions available" => "Muid versioone pole saadaval",
+"Restore" => "Taasta"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index 2a7f279af16ebe97f40838ec90b346496d915a4a..249ae096630ecd1e13e2dea68cda6bf77da3021d 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Ezin izan da leheneratu: %s",
-"success" => "arrakasta",
-"File %s was reverted to version %s" => "%s fitxategia %s bertsiora leheneratu da",
-"failure" => "errorea",
-"File %s could not be reverted to version %s" => "%s fitxategia ezin da %s bertsiora leheneratu",
-"No old versions available" => "Ez dago bertsio zaharrik eskuragarri",
-"No path specified" => "Ez da bidea zehaztu",
 "Versions" => "Bertsioak",
-"Revert a file to a previous version by clicking on its revert button" => "Itzuli fitxategi bat aurreko bertsio batera leheneratu bere leheneratu botoia sakatuz"
+"Failed to revert {file} to revision {timestamp}." => "Errore bat izan da {fitxategia} {timestamp} bertsiora leheneratzean.",
+"More versions..." => "Bertsio gehiago...",
+"No other versions available" => "Ez dago bertsio gehiago eskuragarri",
+"Restore" => "Berrezarri"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index 43f7d71eb55e32611a5b3f8050e9733f9e3d9d16..8edfc2ee265594b9a96d9c69b94975f87b9522c9 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -1,9 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ø§Ù…Ú©Ø§Ù† Ù†Ø§Ù¾Ø°ÛŒØ± Ø§Ø³Øª: %s",
-"success" => "Ù…ÙˆÙÙ‚ÛŒØª",
-"failure" => "Ø´Ú©Ø³Øª",
-"No old versions available" => "Ù‡ÛŒÚ† Ù†Ø³Ø®Ù‡ Ù‚Ø¯ÛŒÙ…ÛŒ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª",
-"No path specified" => "Ù‡ÛŒÚ† Ù…Ø³ÛŒØ±ÛŒ Ù…Ø´Ø®Øµ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª",
 "Versions" => "Ù†Ø³Ø®Ù‡ Ù‡Ø§",
-"Revert a file to a previous version by clicking on its revert button" => "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ ÛŒÚ© Ù¾Ø±ÙˆØ±Ù†Ø¯Ù‡ Ø¨Ù‡ Ù†Ø³Ø®Ù‡ Ù‚Ø¯ÛŒÙ…ÛŒ Ø§Ø´ Ø§Ø²  Ø·Ø±ÛŒÙ‚ Ø¯Ú©Ù…Ù‡ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ø§Ø³Øª"
+"Restore" => "Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 6f138e0f163650e0482945f793c91ae6594c2606..fb011df2a1321d1c2024ffb152c7d96c0a6b9a31 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Palautus epÃ¤onnistui: %s",
-"success" => "onnistui",
-"File %s was reverted to version %s" => "Tiedosto %s palautettiin versioon %s",
-"failure" => "epÃ¤onnistui",
-"File %s could not be reverted to version %s" => "Tiedoston %s palautus versioon %s epÃ¤onnistui",
-"No old versions available" => "Vanhoja versioita ei ole saatavilla",
-"No path specified" => "Polkua ei ole mÃ¤Ã¤ritetty",
 "Versions" => "Versiot",
-"Revert a file to a previous version by clicking on its revert button" => "Palauta tiedoston edellinen versio napsauttamalla palautuspainiketta"
+"Failed to revert {file} to revision {timestamp}." => "Tiedoston {file} palautus versioon {timestamp} epÃ¤onnistui.",
+"More versions..." => "LisÃ¤Ã¤ versioita...",
+"No other versions available" => "Ei muita versioita saatavilla",
+"Restore" => "Palauta"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index e2698c5c4aaeeeeb123bd02a15b1d8c23315b613..537783e6c9f867a3237f6c764344ac2a74192220 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Impossible de restaurer %s",
-"success" => "succÃ¨s",
-"File %s was reverted to version %s" => "Le fichier %s a Ã©tÃ© restaurÃ© dans sa version %s",
-"failure" => "Ã©chec",
-"File %s could not be reverted to version %s" => "Le fichier %s ne peut Ãªtre restaurÃ© dans sa version %s",
-"No old versions available" => "Aucune ancienne version n'est disponible",
-"No path specified" => "Aucun chemin spÃ©cifiÃ©",
 "Versions" => "Versions",
-"Revert a file to a previous version by clicking on its revert button" => "Restaurez un fichier dans une version antÃ©rieure en cliquant sur son bouton de restauration"
+"Restore" => "Restaurer"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
index 586ef8c3a68efafd303c8dc4daa7db15b676e139..1ccdc95f1eba50bfdbc47413898313a6f80ec5d2 100644
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Non foi posÃbel reverter: %s",
-"success" => "feito",
-"File %s was reverted to version %s" => "O ficheiro %s foi revertido Ã¡ versiÃ³n %s",
-"failure" => "produciuse un fallo",
-"File %s could not be reverted to version %s" => "Non foi posÃbel reverter o ficheiro %s Ã¡ versiÃ³n %s",
-"No old versions available" => "Non hai versiÃ³ns antigas dispoÃ±Ãbeis",
-"No path specified" => "Non foi indicada a ruta",
 "Versions" => "VersiÃ³ns",
-"Revert a file to a previous version by clicking on its revert button" => "Reverta un ficheiro a unha versiÃ³n anterior premendo no botÃ³n reversiÃ³n"
+"Failed to revert {file} to revision {timestamp}." => "Non foi posÃbel reverter {file} Ã¡ revisiÃ³n {timestamp}.",
+"More versions..." => "MÃ¡is versiÃ³ns...",
+"No other versions available" => "Non hai outras versiÃ³ns dispoÃ±Ãbeis",
+"Restore" => "Restablecer"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index 577389eb0817ddbf0a3df890e91126142f68dc12..848e47122764e20b291b2f68893c77c71eb1104c 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "×œ× × ×™×ª×Ÿ ×œ×”×—×–×™×¨: %s",
-"success" => "×”×•×©×œ×",
-"File %s was reverted to version %s" => "×”×§×•×‘×¥ %s ×”×•×—×–×¨ ×œ×’×¨×¡×” %s",
-"failure" => "× ×›×©×œ",
-"File %s could not be reverted to version %s" => "×œ× × ×™×ª×Ÿ ×œ×”×—×–×™×¨ ××ª ×”×§×•×‘×¥ %s ×œ×’×¨×¡×” %s",
-"No old versions available" => "××™×Ÿ ×’×¨×¡××•×ª ×™×©× ×•×ª ×–×ž×™× ×•×ª",
-"No path specified" => "×œ× ×¦×•×™×Ÿ × ×ª×™×‘",
 "Versions" => "×’×¨×¡××•×ª",
-"Revert a file to a previous version by clicking on its revert button" => "× ×™×ª×Ÿ ×œ×”×—×–×™×¨ ×§×•×‘×¥ ×œ×’×¨×¡×” ×§×•×“×ž×ª ×¢×œ ×™×“×™ ×œ×—×™×¦×” ×¢×œ ×œ×—×¦×Ÿ ×”×”×—×–×¨×” ×©×œ×•"
+"Restore" => "×©×—×–×•×¨"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php
index 9f7420157e1a683619a8eee153e88e5bb49bd19f..13b3fe7cace1bcc507be6fc03bea587b519ceba6 100644
--- a/apps/files_versions/l10n/hu_HU.php
+++ b/apps/files_versions/l10n/hu_HU.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Nem sikerÃ¼lt Ã¡tÃ¡llni a vÃ¡ltozatra: %s",
-"success" => "sikerÃ¼lt",
-"File %s was reverted to version %s" => "%s Ã¡llomÃ¡nyt Ã¡tÃ¡llÃtottuk erre a vÃ¡ltozatra: %s",
-"failure" => "nem sikerÃ¼lt",
-"File %s could not be reverted to version %s" => "%s Ã¡llomÃ¡nyt nem sikerÃ¼lt Ã¡tÃ¡llÃtani erre a vÃ¡ltozatra: %s",
-"No old versions available" => "Nincs rÃ©gebbi vÃ¡ltozat",
-"No path specified" => "Nincs megadva az Ãºtvonal",
 "Versions" => "Az Ã¡llomÃ¡nyok korÃ¡bbi vÃ¡ltozatai",
-"Revert a file to a previous version by clicking on its revert button" => "Az Ã¡llomÃ¡ny Ã¡tÃ¡llÃthatÃ³ egy rÃ©gebbi vÃ¡ltozatra, ha a gombra kattint"
+"Failed to revert {file} to revision {timestamp}." => "Nem sikerÃ¼lt a(z) {file} Ã¡llomÃ¡nyt erre visszaÃ¡llÃtani: {timestamp}.",
+"More versions..." => "TovÃ¡bbi vÃ¡ltozatok...",
+"No other versions available" => "Az Ã¡llomÃ¡nynak nincs tÃ¶bb vÃ¡ltozata",
+"Restore" => "VisszaÃ¡llÃtÃ¡s"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
index 48ae5ad622325d10d972ccdcaece69ed37b9d785..ee7061805ba102e618650a8cc027bc137469364a 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Tidak dapat mengembalikan: %s",
-"success" => "sukses",
-"File %s was reverted to version %s" => "Berkas %s telah dikembalikan ke versi %s",
-"failure" => "gagal",
-"File %s could not be reverted to version %s" => "Berkas %s gagal dikembalikan ke versi %s",
-"No old versions available" => "Versi lama tidak tersedia",
-"No path specified" => "Lokasi tidak ditentukan",
 "Versions" => "Versi",
-"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengeklik tombol kembalikan"
+"Restore" => "Pulihkan"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php
index d165a78c31ef2c7b51d222bc2f657d16c42bb037..0f643122ad03950f75bd4fdb08963d8807eb20f5 100644
--- a/apps/files_versions/l10n/is.php
+++ b/apps/files_versions/l10n/is.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Versions" => "ÃštgÃ¡fur"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index bca00879993cd8b8d25ba51fb5ffe5df59e367af..6e4aee450a61c8fe68d539dd984be6822b72f73e 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
-"Could not revert: %s" => "Impossibild ripristinare: %s",
-"success" => "completata",
-"File %s was reverted to version %s" => "Il file %s Ã¨ stato ripristinato alla versione %s",
-"failure" => "non riuscita",
-"File %s could not be reverted to version %s" => "Il file %s non puÃ² essere ripristinato alla versione %s",
-"No old versions available" => "Non sono disponibili versioni precedenti",
-"No path specified" => "Nessun percorso specificato",
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "Impossibile ripristinare: %s",
 "Versions" => "Versioni",
-"Revert a file to a previous version by clicking on its revert button" => "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino"
+"Failed to revert {file} to revision {timestamp}." => "Ripristino di {file} alla revisione {timestamp} non riuscito.",
+"More versions..." => "Altre versioni...",
+"No other versions available" => "Non sono disponibili altre versioni",
+"Restore" => "Ripristina"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index 0c2dbd401c4eb1950686a7c5844ff1e6db2102d0..ec2601aafbd301f1d750242487f95be8ff5c7269 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "å…ƒã«æˆ»ã›ã¾ã›ã‚“ã§ã—ãŸ: %s",
-"success" => "æˆåŠŸ",
-"File %s was reverted to version %s" => "ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æˆ»ã—ã¾ã—ãŸ",
-"failure" => "å¤±æ•—",
-"File %s could not be reverted to version %s" => "ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æˆ»ã›ã¾ã›ã‚“ã§ã—ãŸ",
-"No old versions available" => "åˆ©ç”¨å¯èƒ½ãªå¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚ã‚Šã¾ã›ã‚“",
-"No path specified" => "ãƒ‘ã‚¹ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“",
 "Versions" => "ãƒãƒ¼ã‚¸ãƒ§ãƒ³",
-"Revert a file to a previous version by clicking on its revert button" => "ã‚‚ã¨ã«æˆ»ã™ãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã¨ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’éŽåŽ»ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«æˆ»ã—ã¾ã™"
+"Failed to revert {file} to revision {timestamp}." => "{file} ã‚’ {timestamp} ã®ãƒªãƒ´ã‚£ã‚¸ãƒ§ãƒ³ã«æˆ»ã™ã“ã¨ãŒã§ãã¾ã›ã‚“ã€‚",
+"More versions..." => "ã‚‚ã£ã¨ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³...",
+"No other versions available" => "åˆ©ç”¨å¯èƒ½ãªä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚ã‚Šã¾ã›ã‚“",
+"Restore" => "å¾©å…ƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ka_GE.php b/apps/files_versions/l10n/ka_GE.php
index 6856d647dae57d226a2012ec2c5167ae80816bec..41e65903b65008af2da4b87a5a7c8e5ffd00c5de 100644
--- a/apps/files_versions/l10n/ka_GE.php
+++ b/apps/files_versions/l10n/ka_GE.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ áƒ£áƒ™áƒáƒœ áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ: %s",
-"success" => "áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ",
-"File %s was reverted to version %s" => "áƒ¤áƒáƒ˜áƒšáƒ˜ %s áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ“áƒ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” %s",
-"failure" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ",
-"File %s could not be reverted to version %s" => "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ %s áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ %s áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ",
-"No old versions available" => "áƒ«áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡",
-"No path specified" => "áƒ’áƒ–áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜",
 "Versions" => "áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜",
-"Revert a file to a previous version by clicking on its revert button" => "áƒ“áƒáƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ— áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ¬áƒ˜áƒœáƒ áƒžáƒáƒ–áƒ˜áƒªáƒ˜áƒáƒ–áƒ” revert áƒ¦áƒ˜áƒšáƒáƒ™áƒ–áƒ” áƒ“áƒáƒáƒ”áƒ áƒ˜áƒ—"
+"Restore" => "áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index df34e4681b421549ec75181338cbcacd2e69bbe1..365adc25115977ce91d91d504df6e14c398cbf87 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "ë˜ëŒë¦´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤: %s",
-"success" => "ì„±ê³µ",
-"File %s was reverted to version %s" => "íŒŒì¼ %sì„(ë¥¼) ë²„ì „ %s(ìœ¼)ë¡œ ë˜ëŒë¦¼",
-"failure" => "ì‹¤íŒ¨",
-"File %s could not be reverted to version %s" => "íŒŒì¼ %sì„(ë¥¼) ë²„ì „ %s(ìœ¼)ë¡œ ë˜ëŒë¦¬ì§€ ëª»í–ˆìŒ",
-"No old versions available" => "ì˜¤ëž˜ëœ ë²„ì „ì„ ì‚¬ìš©í•  ìˆ˜ ì—†ìŒ",
-"No path specified" => "ê²½ë¡œê°€ ì§€ì •ë˜ì§€ ì•Šì•˜ìŒ",
 "Versions" => "ë²„ì „",
-"Revert a file to a previous version by clicking on its revert button" => "ë³€ê²½ ë‹¨ì¶”ë¥¼ ëˆŒëŸ¬ ì´ì „ ë²„ì „ì˜ íŒŒì¼ë¡œ ë˜ëŒë¦´ ìˆ˜ ìžˆìŠµë‹ˆë‹¤"
+"Restore" => "ë³µì›"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
index 9132caf75e3123387298d67c5a24794245dd23bb..de2696509bb778960e65b2b54ae497683c4582d8 100644
--- a/apps/files_versions/l10n/ku_IQ.php
+++ b/apps/files_versions/l10n/ku_IQ.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Versions" => "ÙˆÙ‡â€ŒØ´Ø§Ù†"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index fb4574c106a4557f10ea95cbd1657de6ac359efb..4e1af5fcc29ce58b7c82cb7e2cbba0fc42542b74 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Nepavyko atstatyti: %s",
-"success" => "pavyko",
-"File %s was reverted to version %s" => "Dokumentas %s buvo atstatytas Ä¯ versijÄ… %s",
-"failure" => "klaida",
-"File %s could not be reverted to version %s" => "Dokumento %s nepavyko atstatyti Ä¯ versijÄ… %s",
-"No old versions available" => "NÄ—ra senÅ³ versijÅ³",
-"No path specified" => "Nenurodytas kelias",
 "Versions" => "Versijos",
-"Revert a file to a previous version by clicking on its revert button" => "Atstatykite dokumentÄ… Ä¯ prieÅ¡ tai buvusiÄ… versijÄ… spausdami ant jo atstatymo mygtuko"
+"Restore" => "Atstatyti"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_versions/l10n/lv.php b/apps/files_versions/l10n/lv.php
index bf8d40fa0f0b6fca378602ff349d4b40501bccef..c686370ac3102697b81778992b5e0dbcb495f783 100644
--- a/apps/files_versions/l10n/lv.php
+++ b/apps/files_versions/l10n/lv.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "NevarÄ“ja atgriezt â€” %s",
-"success" => "veiksme",
-"File %s was reverted to version %s" => "Datne %s tika atgriezt uz versiju %s",
-"failure" => "neveiksme",
-"File %s could not be reverted to version %s" => "Datni %s nevarÄ“ja atgriezt uz versiju %s",
-"No old versions available" => "Nav pieejamu vecÄku versiju",
-"No path specified" => "Nav norÄdÄ«ts ceÄ¼Å¡",
 "Versions" => "Versijas",
-"Revert a file to a previous version by clicking on its revert button" => "Atgriez datni uz iepriekÅ¡Ä“ju versiju, spieÅ¾ot uz tÄs atgrieÅ¡anas pogu"
+"Restore" => "Atjaunot"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
index 6a1882c2bfddb954b77451753f671f4cabc45ef9..01a98808cfffc6e516e3529a359cf5b6bc2ecc6b 100644
--- a/apps/files_versions/l10n/mk.php
+++ b/apps/files_versions/l10n/mk.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index df59dfe4c8c094872bd470a2d08de9c326dc9430..2a0a6d8a76d8013cf31e7179b68b2c679885967d 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,3 +1,6 @@
-<?php $TRANSLATIONS = array(
-"Versions" => "Versjoner"
+<?php
+$TRANSLATIONS = array(
+"Versions" => "Versjoner",
+"Restore" => "Gjenopprett"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index 9208852212180edef43fa67dedaf884a4dbacf31..ec7551d9596e338db99952ab13d04e5d6baf50cc 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Kon niet terugdraaien: %s",
-"success" => "succes",
-"File %s was reverted to version %s" => "Bestand %s is teruggedraaid naar versie %s",
-"failure" => "mislukking",
-"File %s could not be reverted to version %s" => "Bestand %s kon niet worden teruggedraaid naar versie %s",
-"No old versions available" => "Geen oudere versies beschikbaar",
-"No path specified" => "Geen pad opgegeven",
 "Versions" => "Versies",
-"Revert a file to a previous version by clicking on its revert button" => "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop"
+"Failed to revert {file} to revision {timestamp}." => "Kon {file} niet terugdraaien naar revisie {timestamp}.",
+"More versions..." => "Meer versies...",
+"No other versions available" => "Geen andere versies beschikbaar",
+"Restore" => "Herstellen"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
index 940cc2371a107918df31404f5cd3d4504eaa9e71..79b518bc18d0ec398ad66195c63640318bccbe32 100644
--- a/apps/files_versions/l10n/nn_NO.php
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Klarte ikkje Ã¥ tilbakestilla: %s",
-"success" => "vellukka",
-"File %s was reverted to version %s" => "Tilbakestilte fila %s til utgÃ¥va %s",
-"failure" => "feil",
-"File %s could not be reverted to version %s" => "Klarte ikkje tilbakestilla fila %s til utgÃ¥va %s",
-"No old versions available" => "Ingen eldre utgÃ¥ver tilgjengelege",
-"No path specified" => "Ingen sti gjeve",
 "Versions" => "UtgÃ¥ver",
-"Revert a file to a previous version by clicking on its revert button" => "Tilbakestill ei fil til ei tidlegare utgÃ¥ve ved Ã¥ klikka tilbakestill-knappen"
+"Restore" => "Gjenopprett"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index 68944e86760cec54b3c80094ea8e4acd5c409d39..3d6be24a63d7aecb67be81b50f7c5fdd6276870d 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Nie moÅ¼na byÅ‚o przywrÃ³ciÄ‡: %s",
-"success" => "sukces",
-"File %s was reverted to version %s" => "Plik %s zostaÅ‚ przywrÃ³cony do wersji %s",
-"failure" => "poraÅ¼ka",
-"File %s could not be reverted to version %s" => "Plik %s nie mÃ³gÅ‚ byÄ‡ przywrÃ³cony do wersji %s",
-"No old versions available" => "Nie sÄ… dostÄ™pne Å¼adne starsze wersje",
-"No path specified" => "Nie podano Å›cieÅ¼ki",
 "Versions" => "Wersje",
-"Revert a file to a previous version by clicking on its revert button" => "PrzywrÃ³Ä‡ plik do poprzedniej wersji klikajÄ…c w jego przycisk przywrÃ³cenia"
+"Failed to revert {file} to revision {timestamp}." => "Nie udaÅ‚o siÄ™ przywrÃ³ciÄ‡ zmiany {sygnatura czasowa} {plik}.",
+"More versions..." => "WiÄ™cej wersji...",
+"No other versions available" => "Nie sÄ… dostÄ™pne Å¼adne inne wersje",
+"Restore" => "PrzywrÃ³Ä‡"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
index f13b7931d4b7cfe0f38775578f4ce71e02e925a9..b1958825b4765947e701417f8612517f99a6ebd0 100644
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "ImpossÃvel reverter: %s",
-"success" => "sucesso",
-"File %s was reverted to version %s" => "Arquivo %s revertido Ã  versÃ£o %s",
-"failure" => "falha",
-"File %s could not be reverted to version %s" => "Arquivo %s nÃ£o pÃ´de ser revertido Ã  versÃ£o %s",
-"No old versions available" => "Nenhuma versÃ£o antiga disponÃvel",
-"No path specified" => "Nenhum caminho especificado",
 "Versions" => "VersÃµes",
-"Revert a file to a previous version by clicking on its revert button" => "Reverta um arquivo a uma versÃ£o anterior clicando no botÃ£o reverter"
+"Failed to revert {file} to revision {timestamp}." => "Falha ao reverter {file} para a revisÃ£o {timestamp}.",
+"More versions..." => "Mais versÃµes...",
+"No other versions available" => "Nenhuma outra versÃ£o disponÃvel",
+"Restore" => "Restaurar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
index 93379547295fc4d6fc9c64167d5ccf5e2790e50e..e4371f53409858590b67d197be7964d27d6e9d07 100644
--- a/apps/files_versions/l10n/pt_PT.php
+++ b/apps/files_versions/l10n/pt_PT.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "NÃ£o foi possÃvel reverter: %s",
-"success" => "Sucesso",
-"File %s was reverted to version %s" => "O ficheiro %s foi revertido para a versÃ£o %s",
-"failure" => "Falha",
-"File %s could not be reverted to version %s" => "NÃ£o foi possÃvel reverter o ficheiro %s para a versÃ£o %s",
-"No old versions available" => "NÃ£o existem versÃµes mais antigas",
-"No path specified" => "Nenhum caminho especificado",
 "Versions" => "VersÃµes",
-"Revert a file to a previous version by clicking on its revert button" => "Reverter um ficheiro para uma versÃ£o anterior clicando no seu botÃ£o reverter."
+"Failed to revert {file} to revision {timestamp}." => "Falhou a recuperaÃ§Ã£o do ficheiro {file} para a revisÃ£o {timestamp}.",
+"More versions..." => "Mais versÃµes...",
+"No other versions available" => "NÃ£o existem versÃµes mais antigas",
+"Restore" => "Restaurar"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index cd9fc89dcc6bb545bdbec800d9713c25ef65f5d5..5151b1dceb9522dd740906b09aeb1b83165db2f4 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,11 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Nu a putut reveni: %s",
-"success" => "success",
-"File %s was reverted to version %s" => "Fisierul %s a revenit la versiunea %s",
-"failure" => "eÈ™ec",
-"File %s could not be reverted to version %s" => "Fisierele %s nu au putut reveni la versiunea %s",
-"No old versions available" => "Versiunile vechi nu sunt disponibile",
-"No path specified" => "Nici un dosar specificat",
-"Versions" => "Versiuni",
-"Revert a file to a previous version by clicking on its revert button" => "Readuceti un fiÈ™ier la o versiune anterioarÄƒ, fÄƒcÃ¢nd clic pe butonul revenire"
+"Versions" => "Versiuni"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index 7377fbb5382e1ace08f0a9e2c5fca494e84e7f9d..12f9f77b94d3dc1dc4cc2dc4cc2869af8ff5382b 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "ÐÐµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ñ‘Ð½: %s",
-"success" => "ÑƒÑÐ¿ÐµÑ…",
-"File %s was reverted to version %s" => "Ð¤Ð°Ð¹Ð» %s Ð±Ñ‹Ð» Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ñ‘Ð½ Ðº Ð²ÐµÑ€ÑÐ¸Ð¸ %s",
-"failure" => "Ð¿Ñ€Ð¾Ð²Ð°Ð»",
-"File %s could not be reverted to version %s" => "Ð¤Ð°Ð¹Ð» %s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ñ‘Ð½ Ðº Ð²ÐµÑ€ÑÐ¸Ð¸ %s",
-"No old versions available" => "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… ÑÑ‚Ð°Ñ€Ñ‹Ñ… Ð²ÐµÑ€ÑÐ¸Ð¹",
-"No path specified" => "ÐŸÑƒÑ‚ÑŒ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½",
 "Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸",
-"Revert a file to a previous version by clicking on its revert button" => "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ñ„Ð°Ð¹Ð» Ðº Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½Ð°Ð¶Ð°Ñ‚Ð¸ÐµÐ¼ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°"
+"Failed to revert {file} to revision {timestamp}." => "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ {file} Ðº Ñ€ÐµÐ²Ð¸Ð·Ð¸Ð¸ {timestamp}.",
+"More versions..." => "Ð•Ñ‰Ñ‘ Ð²ÐµÑ€ÑÐ¸Ð¸...",
+"No other versions available" => "Ð”Ñ€ÑƒÐ³Ð¸Ñ… Ð²ÐµÑ€ÑÐ¸Ð¹ Ð½Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾",
+"Restore" => "Ð’Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 );
+$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);";
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
index c7ee63d8ef637ca2775906527634bb3f94ee3509..7ee8da049b76117ae9ce127b273b423875867b6c 100644
--- a/apps/files_versions/l10n/si_LK.php
+++ b/apps/files_versions/l10n/si_LK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Versions" => "à¶…à¶±à·”à·€à·à¶¯"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
index 50e4af4d96490bbedccaa27af135cd2ddac3acaf..5edcea3606c5687166c5780b74acf5c60660f149 100644
--- a/apps/files_versions/l10n/sk_SK.php
+++ b/apps/files_versions/l10n/sk_SK.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "NemoÅ¾no obnoviÅ¥: %s",
-"success" => "Ãºspech",
-"File %s was reverted to version %s" => "SÃºbor %s bol obnovenÃ½ na verziu %s",
-"failure" => "chyba",
-"File %s could not be reverted to version %s" => "SÃºbor %s nemohol byÅ¥ obnovenÃ½ na verziu %s",
-"No old versions available" => "Nie sÃº dostupnÃ© Å¾iadne starÅ¡ie verzie",
-"No path specified" => "Nevybrali ste cestu",
 "Versions" => "Verzie",
-"Revert a file to a previous version by clicking on its revert button" => "Obnovte sÃºbor do predoÅ¡lej verzie kliknutÃm na tlaÄÃtko obnoviÅ¥"
+"Failed to revert {file} to revision {timestamp}." => "Zlyhalo obnovenie sÃºboru {file} na verziu {timestamp}.",
+"More versions..." => "Viac verziÃ...",
+"No other versions available" => "Å½iadne ÄalÅ¡ie verzie nie sÃº dostupnÃ©",
+"Restore" => "ObnoviÅ¥"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index 2df00fc8264e2f74f59fbdce3cd494b754312269..809ab34c2621938346b31abfd4c8ea28df7f013c 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Ni mogoÄe povrniti: %s",
-"success" => "uspeÅ¡no",
-"File %s was reverted to version %s" => "Datoteka %s je povrnjena na razliÄico %s.",
-"failure" => "spodletelo",
-"File %s could not be reverted to version %s" => "Datoteke %s ni mogoÄe povrniti na razliÄico %s.",
-"No old versions available" => "Ni starejÅ¡ih razliÄic.",
-"No path specified" => "Ni doloÄene poti",
 "Versions" => "RazliÄice",
-"Revert a file to a previous version by clicking on its revert button" => "Povrni datoteko na predhodno razliÄico s klikom na gumb za povrnitev."
+"Restore" => "Obnovi"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_versions/l10n/sr.php b/apps/files_versions/l10n/sr.php
index 0195f84567fe36d7eecba06cd6f5c752a7d7abd5..d4eb0be19cb0fbd386669f2202df00210275510c 100644
--- a/apps/files_versions/l10n/sr.php
+++ b/apps/files_versions/l10n/sr.php
@@ -1,5 +1,5 @@
-<?php $TRANSLATIONS = array(
-"History" => "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°",
-"Files Versioning" => "ÐŸÑ€Ð°Ð²Ñ™ÐµÑšÐµ Ð²ÐµÑ€Ð·Ð¸Ñ˜Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
-"Enable" => "ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸"
+<?php
+$TRANSLATIONS = array(
+"Restore" => "Ð’Ñ€Ð°Ñ‚Ð¸"
 );
+$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);";
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index 83170976309cf99cd964a8dcabcb04a7a2ae9b6a..0fd073d5cbe99ee2bbe7eb6ce518ab174e51c589 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -1,11 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Kunde inte Ã¥terstÃ¤lla: %s",
-"success" => "lyckades",
-"File %s was reverted to version %s" => "Filen %s Ã¥terstÃ¤lldes till version %s",
-"failure" => "misslyckades",
-"File %s could not be reverted to version %s" => "Filen %s kunde inte Ã¥terstÃ¤llas till version %s",
-"No old versions available" => "Inga gamla versioner finns tillgÃ¤ngliga",
-"No path specified" => "Ingen sÃ¶kvÃ¤g angiven",
 "Versions" => "Versioner",
-"Revert a file to a previous version by clicking on its revert button" => "Ã…terstÃ¤ll en fil till en tidigare version genom att klicka pÃ¥ Ã¥terstÃ¤llningsknappen"
+"Failed to revert {file} to revision {timestamp}." => "Kunde inte Ã¥terstÃ¤lla {file} till revision {timestamp}.",
+"More versions..." => "Fler versioner...",
+"No other versions available" => "Inga andra versioner tillgÃ¤ngliga",
+"Restore" => "Ã…terskapa"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
index 61a47e42f0a13eac7636bf9408137adacaad908c..3c21735fa8448d237c3a8d6949cd26e8afc97f04 100644
--- a/apps/files_versions/l10n/ta_LK.php
+++ b/apps/files_versions/l10n/ta_LK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Versions" => "à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index 2998f74838991e12191754b17f30c93c4bac2d4d..97c89b2f8095f1319a8ea45b871e288b47f36d37 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,3 +1,6 @@
-<?php $TRANSLATIONS = array(
-"Versions" => "à¸£à¸¸à¹ˆà¸™"
+<?php
+$TRANSLATIONS = array(
+"Versions" => "à¸£à¸¸à¹ˆà¸™",
+"Restore" => "à¸„à¸·à¸™à¸„à¹ˆà¸²"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
index 40d276da807fde815eb3256246cae082164eb71b..f2bc1e6c0aa7924b8c2c7e787354bbf9ae59dfbe 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Geri alÄ±namÄ±yor: %s",
-"success" => "BaÅŸarÄ±lÄ±.",
-"File %s was reverted to version %s" => "Dosya %s, %s versiyonuna dÃ¶ndÃ¼rÃ¼ldÃ¼",
-"failure" => "hata",
-"File %s could not be reverted to version %s" => "Dosya %s, %s versiyonuna dÃ¶ndÃ¼rÃ¼lemedi.",
-"No old versions available" => "Eski versiyonlar mevcut deÄŸil.",
-"No path specified" => "Yama belirtilmemiÅŸ",
 "Versions" => "SÃ¼rÃ¼mler",
-"Revert a file to a previous version by clicking on its revert button" => "DosyanÄ±n Ã¶nceki sÃ¼rÃ¼mÃ¼ne geri dÃ¶nmek iÃ§in, deÄŸiÅŸiklikleri geri al butonuna tÄ±klayÄ±n"
+"Restore" => "Geri yÃ¼kle"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/ug.php b/apps/files_versions/l10n/ug.php
index 024f326b032a9574b864cdda14d9a70df2298aaf..984e6c314c78117350428491c239cec06f67eb77 100644
--- a/apps/files_versions/l10n/ug.php
+++ b/apps/files_versions/l10n/ug.php
@@ -1,9 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "Ø¦Û•Ø³Ù„Ù‰Ú¯Û• Ù‚Ø§ÙŠØªÛ‡Ø±Ø§Ù„Ù…Ø§ÙŠØ¯Û‡: %s",
-"success" => "Ù…Û‡Û‹Û•Ù¾Ù¾Û•Ù‚Ù‰ÙŠÛ•ØªÙ„Ù‰Ùƒ",
-"File %s was reverted to version %s" => "Ú¾Û†Ø¬Ø¬Û•Øª %s Ù†Ù‰ %s Ù†Û•Ø´Ø±Ù‰Ú¯Û• Ø¦Û•Ø³Ù„Ù‰Ú¯Û• Ù‚Ø§ÙŠØªÛ‡Ø±Ø¯Ù‰",
-"failure" => "Ù…Û•ØºÙ„Û‡Ù¾ Ø¨ÙˆÙ„Ø¯Ù‰",
-"No old versions available" => "ÙƒÙˆÙ†Ø§ Ù†Û•Ø´Ø±Ù‰ ÙŠÙˆÙ‚",
-"No path specified" => "ÙŠÙˆÙ„ Ø¨Û•Ù„Ú¯Ù‰Ù„Û•Ù†Ù…Ù‰Ú¯Û•Ù†",
 "Versions" => "Ù†Û•Ø´Ø±Ù‰"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php
index e722d95497b290ba8568c3379669d1d7db6e1980..d75160f2864232e2a875ba0c7d12be0a4b65b151 100644
--- a/apps/files_versions/l10n/uk.php
+++ b/apps/files_versions/l10n/uk.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸: %s",
-"success" => "ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾",
-"File %s was reverted to version %s" => "Ð¤Ð°Ð¹Ð» %s Ð±ÑƒÐ² Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð´Ð¾ Ð²ÐµÑ€ÑÑ–Ñ— %s",
-"failure" => "Ð½ÐµÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾",
-"File %s could not be reverted to version %s" => "Ð¤Ð°Ð¹Ð» %s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð´Ð¾ Ð²ÐµÑ€ÑÑ–Ñ— %s",
-"No old versions available" => "Ð¡Ñ‚Ð°Ñ€Ñ– Ð²ÐµÑ€ÑÑ–Ñ— Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–",
-"No path specified" => "Ð¨Ð»ÑÑ… Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹",
 "Versions" => "Ð’ÐµÑ€ÑÑ–Ñ—",
-"Revert a file to a previous version by clicking on its revert button" => "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð½Ð° Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŽ Ð²ÐµÑ€ÑÑ–ÑŽ, Ð½Ð°Ñ‚Ð¸ÑÐ½ÑƒÐ²ÑˆÐ¸ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
+"Restore" => "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
 );
+$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);";
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 33b045f2e3e859a6e99d3a73ed29bcef23d3e8d9..9d72612c2ad9a831c2fdd931d9003d9976f090f6 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "KhÃ´ng thá»ƒ khÃ´i phá»¥c: %s",
-"success" => "thÃ nh cÃ´ng",
-"File %s was reverted to version %s" => "File %s Ä‘Ã£ Ä‘Æ°á»£c khÃ´i phá»¥c vá» phiÃªn báº£n %s",
-"failure" => "Tháº¥t báº¡i",
-"File %s could not be reverted to version %s" => "File %s khÃ´ng thá»ƒ khÃ´i phá»¥c vá» phiÃªn báº£n %s",
-"No old versions available" => "KhÃ´ng cÃ³ phiÃªn báº£n cÅ© nÃ o",
-"No path specified" => "KhÃ´ng chá»‰ ra Ä‘Æ°á»ng dáº«n rÃµ rÃ ng",
 "Versions" => "PhiÃªn báº£n",
-"Revert a file to a previous version by clicking on its revert button" => "KhÃ´i phá»¥c má»™t file vá» phiÃªn báº£n trÆ°á»›c Ä‘Ã³ báº±ng cÃ¡ch click vÃ o nÃºt KhÃ´i phá»¥c tÆ°Æ¡ng á»©ng"
+"Restore" => "KhÃ´i phá»¥c"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
index a5285180e6c857eac565b8ba6740bdad3f12e098..aa0a59b71a3b9d70b182af8abf6dc830318dace5 100644
--- a/apps/files_versions/l10n/zh_CN.GB2312.php
+++ b/apps/files_versions/l10n/zh_CN.GB2312.php
@@ -1,11 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "æ— æ³•æ¢å¤ï¼š%s",
-"success" => "æˆåŠŸ",
-"File %s was reverted to version %s" => "æ–‡ä»¶ %s å·²è¢«æ¢å¤ä¸º %s çš„ç‰ˆæœ¬",
-"failure" => "å¤±è´¥",
-"File %s could not be reverted to version %s" => "æ–‡ä»¶ %s æ— æ³•æ¢å¤ä¸º %s çš„ç‰ˆæœ¬",
-"No old versions available" => "æ²¡æœ‰å¯ç”¨çš„æ—§ç‰ˆæœ¬",
-"No path specified" => "æœªæŒ‡å®šè·¯å¾„",
-"Versions" => "ç‰ˆæœ¬",
-"Revert a file to a previous version by clicking on its revert button" => "è¯·ç‚¹å‡»â€œæ¢å¤â€æŒ‰é’®æŠŠæ–‡ä»¶æ¢å¤åˆ°æ—©å‰çš„ç‰ˆæœ¬"
+"Versions" => "ç‰ˆæœ¬"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 65d0d284a076f4fe67bcaf7bf2f0902f6c07d66a..767ca1cf6465398c8b7367a88b5761ef05e08382 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "æ— æ³•æ¢å¤: %s",
-"success" => "æˆåŠŸ",
-"File %s was reverted to version %s" => "æ–‡ä»¶ %s å·²è¢«æ¢å¤åˆ°åŽ†å²ç‰ˆæœ¬ %s",
-"failure" => "å¤±è´¥",
-"File %s could not be reverted to version %s" => "æ–‡ä»¶ %s æ— æ³•è¢«æ¢å¤åˆ°åŽ†å²ç‰ˆæœ¬ %s",
-"No old versions available" => "è¯¥æ–‡ä»¶æ²¡æœ‰åŽ†å²ç‰ˆæœ¬",
-"No path specified" => "æœªæŒ‡å®šè·¯å¾„",
 "Versions" => "ç‰ˆæœ¬",
-"Revert a file to a previous version by clicking on its revert button" => "ç‚¹å‡»æ¢å¤æŒ‰é’®å¯å°†æ–‡ä»¶æ¢å¤åˆ°ä¹‹å‰çš„ç‰ˆæœ¬"
+"Restore" => "æ¢å¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_HK.php b/apps/files_versions/l10n/zh_HK.php
index 71bd3bbbd944449b811455a941564b3365253b2f..6d249af4b169cdd5b41a2bece6b58ca64afbb3d5 100644
--- a/apps/files_versions/l10n/zh_HK.php
+++ b/apps/files_versions/l10n/zh_HK.php
@@ -1,6 +1,5 @@
-<?php $TRANSLATIONS = array(
-"success" => "æˆåŠŸ",
-"failure" => "å¤±æ•—",
-"No old versions available" => "æ²’æœ‰ä»¥å¾€ç‰ˆæœ¬",
+<?php
+$TRANSLATIONS = array(
 "Versions" => "ç‰ˆæœ¬"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index 2ae9ce657ceec2d379c69eaab4ef5933900367c6..55a3dca3c3289965f3d343c8a6c94eafd8befa5a 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -1,11 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Could not revert: %s" => "ç„¡æ³•é‚„åŽŸï¼š%s",
-"success" => "æˆåŠŸ",
-"File %s was reverted to version %s" => "æª”æ¡ˆ %s å·²è¢«å¾©åŽŸè‡³ç‰ˆæœ¬ %s",
-"failure" => "å¤±æ•—",
-"File %s could not be reverted to version %s" => "æª”æ¡ˆ %s ç„¡æ³•å¾©åŽŸè‡³ç‰ˆæœ¬ %s",
-"No old versions available" => "æ²’æœ‰èˆŠçš„ç‰ˆæœ¬",
-"No path specified" => "æ²’æœ‰æŒ‡å®šè·¯å¾‘",
 "Versions" => "ç‰ˆæœ¬",
-"Revert a file to a previous version by clicking on its revert button" => "æŒ‰ä¸€ä¸‹å¾©åŽŸçš„æŒ‰éˆ•å³å¯æŠŠæª”æ¡ˆå¾©åŽŸè‡³ä»¥å‰çš„ç‰ˆæœ¬"
+"Restore" => "å¾©åŽŸ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 2f8262475b44e6f774b88863df60168c2600c390..70b8f30be5cdf232c1c93b4595d5b79bcb7b3930 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -101,8 +101,11 @@ class Storage {
 				return false;
 			}
 
-			// we should have a source file to work with
-			if (!$files_view->file_exists($filename)) {
+			// we should have a source file to work with, and the file shouldn't
+			// be empty
+			$fileExists = $files_view->file_exists($filename);
+			$fileSize = $files_view->filesize($filename);
+			if ($fileExists === false || $fileSize === 0) {
 				return false;
 			}
 
@@ -113,6 +116,18 @@ class Storage {
 				mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
 			}
 
+			$versionsSize = self::getVersionsSize($uid);
+			if (  $versionsSize === false || $versionsSize < 0 ) {
+				$versionsSize = self::calculateSize($uid);
+			}
+
+			// assumption: we need filesize($filename) for the new version +
+			// some more free space for the modified file which might be
+			// 1.5 times as large as the current version -> 2.5
+			$neededSpace = $files_view->filesize($filename) * 2.5;
+
+			$versionsSize = self::expire($filename, $versionsSize, $neededSpace);
+
 			// disable proxy to prevent multiple fopen calls
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
@@ -123,19 +138,9 @@ class Storage {
 			// reset proxy state
 			\OC_FileProxy::$enabled = $proxyStatus;
 
-			$versionsSize = self::getVersionsSize($uid);
-			if (  $versionsSize === false || $versionsSize < 0 ) {
-				$versionsSize = self::calculateSize($uid);
-			}
-
 			$versionsSize += $users_view->filesize('files'.$filename);
 
-			// expire old revisions if necessary
-			$newSize = self::expire($filename, $versionsSize);
-
-			if ( $newSize != $versionsSize ) {
-				self::setVersionsSize($uid, $newSize);
-			}
+			self::setVersionsSize($uid, $versionsSize);
 		}
 	}
 
@@ -175,12 +180,14 @@ class Storage {
 		if ($files_view->file_exists($newpath)) {
 			return self::store($new_path);
 		}
-		
+
+		self::expire($newpath);
+
 		$abs_newpath = $versions_view->getLocalFile($newpath);
 
 		if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
 			$versions_view->rename($oldpath, $newpath);
-		} else 	if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
+		} else  if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
 			$info=pathinfo($abs_newpath);
 			if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true);
 			foreach ($versions as $v) {
@@ -235,10 +242,9 @@ class Storage {
 	 * @brief get a list of all available versions of a file in descending chronological order
 	 * @param $uid user id from the owner of the file
 	 * @param $filename file to find versions of, relative to the user files dir
-	 * @param $count number of versions to return
 	 * @returns array
 	 */
-	public static function getVersions($uid, $filename, $count = 0 ) {
+	public static function getVersions($uid, $filename ) {
 		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
 			$versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions');
 			$versionsName = $versions_fileview->getLocalFile($filename).'.v';
@@ -264,6 +270,7 @@ class Storage {
 				$key = $version.'#'.$filename;
 				$versions[$key]['cur'] = 0;
 				$versions[$key]['version'] = $version;
+				$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($version);
 				$versions[$key]['path'] = $filename;
 				$versions[$key]['size'] = $versions_fileview->filesize($filename.'.v'.$version);
 
@@ -272,6 +279,7 @@ class Storage {
 
 			}
 
+			// newest versions first
 			$versions = array_reverse( $versions );
 
 			foreach( $versions as $key => $value ) {
@@ -282,13 +290,6 @@ class Storage {
 				}
 			}
 
-			$versions = array_reverse( $versions );
-
-			// only show the newest commits
-			if( $count != 0 and ( count( $versions )>$count ) ) {
-				$versions = array_slice( $versions, count( $versions ) - $count );
-			}
-
 			return( $versions );
 
 		} else {
@@ -298,6 +299,32 @@ class Storage {
 
 	}
 
+	/**
+	 * @brief translate a timestamp into a string like "5 days ago"
+	 * @param int $timestamp
+	 * @return string for example "5 days ago"
+	 */
+	private static function getHumanReadableTimestamp($timestamp) {
+
+		$diff = time() - $timestamp;
+
+		if ($diff < 60) { // first minute
+			return  $diff . " seconds ago";
+		} elseif ($diff < 3600) { //first hour
+			return round($diff / 60) . " minutes ago";
+		} elseif ($diff < 86400) { // first day
+			return round($diff / 3600) . " hours ago";
+		} elseif ($diff < 604800) { //first week
+			return round($diff / 86400) . " days ago";
+		} elseif ($diff < 2419200) { //first month
+			return round($diff / 604800) . " weeks ago";
+		} elseif ($diff < 29030400) { // first year
+			return round($diff / 2419200) . " months ago";
+		} else {
+			return round($diff / 29030400) . " years ago";
+		}
+
+	}
 
 	/**
 	 * @brief deletes used space for files versions in db if user was deleted
@@ -391,10 +418,10 @@ class Storage {
 	/**
 	 * @brief Erase a file's versions which exceed the set quota
 	 */
-	private static function expire($filename, $versionsSize = null) {
+	private static function expire($filename, $versionsSize = null, $offset = 0) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 			list($uid, $filename) = self::getUidAndFilename($filename);
-			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+			$versionsFileview = new \OC\Files\View('/'.$uid.'/files_versions');
 
 			// get available disk space for user
 			$softQuota = true;
@@ -424,87 +451,52 @@ class Storage {
 				$rootInfo = $files_view->getFileInfo('/');
 				$free = $quota-$rootInfo['size']; // remaining free space for user
 				if ( $free > 0 ) {
-					$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+					$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - ($versionsSize + $offset); // how much space can be used for versions
 				} else {
-					$availableSpace = $free-$versionsSize;
+					$availableSpace = $free - $versionsSize - $offset;
 				}
 			} else {
-				$availableSpace = $quota;
+				$availableSpace = $quota - $offset;
 			}
 
 
-			// after every 1000s run reduce the number of all versions not only for the current file
+			// with the  probability of 0.1% we reduce the number of all versions not only for the current file
 			$random = rand(0, 1000);
 			if ($random == 0) {
-				$result = Storage::getAllVersions($uid);
-				$versions_by_file = $result['by_file'];
-				$all_versions = $result['all'];
+				$allFiles = true;
 			} else {
-				$all_versions = Storage::getVersions($uid, $filename);
-				$versions_by_file[$filename] = $all_versions;
+				$allFiles = false;
 			}
 
-			$time = time();
+			$allVersions = Storage::getVersions($uid, $filename);
+			$versionsByFile[$filename] = $allVersions;
 
-			// it is possible to expire versions from more than one file
-			// iterate through all given files
-			foreach ($versions_by_file as $filename => $versions) {
-				$versions = array_reverse($versions);	// newest version first
+			$sizeOfDeletedVersions = self::delOldVersions($versionsByFile, $allVersions, $versionsFileview);
+			$availableSpace = $availableSpace + $sizeOfDeletedVersions;
+			$versionsSize = $versionsSize - $sizeOfDeletedVersions;
 
-				$interval = 1;
-				$step = Storage::$max_versions_per_interval[$interval]['step'];
-				if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
-					$nextInterval = -1;
-				} else {
-					$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
-				}
+			// if still not enough free space we rearrange the versions from all files
+			if ($availableSpace <= 0 || $allFiles) {
+				$result = Storage::getAllVersions($uid);
+				$versionsByFile = $result['by_file'];
+				$allVersions = $result['all'];
 
-				$firstVersion = reset($versions);
-				$firstKey = key($versions);
-				$prevTimestamp = $firstVersion['version'];
-				$nextVersion = $firstVersion['version'] - $step;
-				$remaining_versions[$firstKey] = $firstVersion;
-				unset($versions[$firstKey]);
-
-				foreach ($versions as $key => $version) {
-					$newInterval = true;
-					while ( $newInterval ) {
-						if ( $nextInterval == -1 || $version['version'] >= $nextInterval ) {
-							if ( $version['version'] > $nextVersion ) {
-								//distance between two version too small, delete version
-								$versions_fileview->unlink($version['path'].'.v'.$version['version']);
-								$availableSpace += $version['size'];
-								$versionsSize -= $version['size'];
-								unset($all_versions[$key]); // update array with all versions
-							} else {
-								$nextVersion = $version['version'] - $step;
-							}
-							$newInterval = false; // version checked so we can move to the next one
-						} else { // time to move on to the next interval
-							$interval++;
-							$step = Storage::$max_versions_per_interval[$interval]['step'];
-							$nextVersion = $prevTimestamp - $step;
-							if ( Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1 ) {
-								$nextInterval = -1;
-							} else {
-								$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
-							}
-							$newInterval = true; // we changed the interval -> check same version with new interval
-						}
-					}
-					$prevTimestamp = $version['version'];
-				}
+				$sizeOfDeletedVersions = self::delOldVersions($versionsByFile, $allVersions, $versionsFileview);
+				$availableSpace = $availableSpace + $sizeOfDeletedVersions;
+				$versionsSize = $versionsSize - $sizeOfDeletedVersions;
 			}
 
 			// Check if enough space is available after versions are rearranged.
 			// If not we delete the oldest versions until we meet the size limit for versions,
 			// but always keep the two latest versions
-			$numOfVersions = count($all_versions) -2 ;
+			$numOfVersions = count($allVersions) -2 ;
 			$i = 0;
 			while ($availableSpace < 0 && $i < $numOfVersions) {
-				$versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']);
-				$versionsSize -= $all_versions[$i]['size'];
-				$availableSpace += $all_versions[$i]['size'];
+				$version = current($allVersions);
+				$versionsFileview->unlink($version['path'].'.v'.$version['version']);
+				$versionsSize -= $version['size'];
+				$availableSpace += $version['size'];
+				next($allVersions);
 				$i++;
 			}
 
@@ -513,4 +505,67 @@ class Storage {
 
 		return false;
 	}
+
+	/**
+	 * @brief delete old version from a given list of versions
+	 *
+	 * @param array $versionsByFile list of versions ordered by files
+	 * @param array $allVversions all versions accross multiple files
+	 * @param $versionsFileview OC\Files\View on data/user/files_versions
+	 * @return size of releted versions
+	 */
+	private static function delOldVersions($versionsByFile, &$allVersions, $versionsFileview) {
+
+		$time = time();
+		$size = 0;
+
+		// delete old versions for every given file
+		foreach ($versionsByFile as $versions) {
+			$versions = array_reverse($versions); // newest version first
+
+			$interval = 1;
+			$step = Storage::$max_versions_per_interval[$interval]['step'];
+			if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
+				$nextInterval = -1;
+			} else {
+				$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+			}
+
+			$firstVersion = reset($versions);
+			$firstKey = key($versions);
+			$prevTimestamp = $firstVersion['version'];
+			$nextVersion = $firstVersion['version'] - $step;
+			unset($versions[$firstKey]);
+
+			foreach ($versions as $key => $version) {
+				$newInterval = true;
+				while ($newInterval) {
+					if ($nextInterval == -1 || $version['version'] >= $nextInterval) {
+						if ($version['version'] > $nextVersion) {
+							//distance between two version too small, delete version
+							$versionsFileview->unlink($version['path'] . '.v' . $version['version']);
+							$size += $version['size'];
+							unset($allVersions[$key]); // update array with all versions
+						} else {
+							$nextVersion = $version['version'] - $step;
+						}
+						$newInterval = false; // version checked so we can move to the next one
+					} else { // time to move on to the next interval
+						$interval++;
+						$step = Storage::$max_versions_per_interval[$interval]['step'];
+						$nextVersion = $prevTimestamp - $step;
+						if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
+							$nextInterval = -1;
+						} else {
+							$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+						}
+						$newInterval = true; // we changed the interval -> check same version with new interval
+					}
+				}
+				$prevTimestamp = $version['version'];
+			}
+		}
+		return $size;
+	}
+
 }
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
deleted file mode 100644
index 3a6d5f0c9e7baaae22bf7d94be22553ff10546fe..0000000000000000000000000000000000000000
--- a/apps/files_versions/templates/history.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="history">
-
-<?php
-
-if( isset( $_['message'] ) ) {
-
-
-	if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
-	print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) .'</strong><br>');
-
-}else{
-
-	if( isset( $_['outcome_stat'] ) ) {
-
-		print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']).'</h3></div><br>');
-
-	}
-
-	print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
-	print_unescaped('<p><em>'.OC_Util::sanitizeHTML($l->t('Revert a file to a previous version by clicking on its revert button')).'</em></p><br />');
-
-	foreach ( $_['versions'] as $v ) {
-		p(' ');
-		p(OCP\Util::formatDate( doubleval($v['version'])));
-		print_unescaped(' <a href="'.OCP\Util::linkTo('files_versions', 'history.php',
-			array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />');
-		if ( $v['cur'] ) {
-			print_unescaped('  (<b>Current</b>)');
-		}
-		print_unescaped('<br /><br />');
-	}
-
-}
-
-?>
-</div>
diff --git a/apps/user_ldap/l10n/af_ZA.php b/apps/user_ldap/l10n/af_ZA.php
index 944495f3869bbc67552ced6933d235a29d4eb9fb..32feab61b497601c5161eaa962cd5cddf01edad6 100644
--- a/apps/user_ldap/l10n/af_ZA.php
+++ b/apps/user_ldap/l10n/af_ZA.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Wagwoord",
 "Help" => "Hulp"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 5f8b6b8145514e00aabda1c4908a04848c0c0544..3dd88eb265598659936c636fdf776a50548c4a07 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "ÙØ´Ù„ Ø§Ù„ØØ°Ù",
 "Error" => "Ø®Ø·Ø£",
 "Password" => "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±",
 "Help" => "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©"
 );
+$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;";
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index 0330046d80e00c6018e5b427823472148acbc26f..b750884e9debf294df518873b36943b5408600c1 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Password" => "ÐŸÐ°Ñ€Ð¾Ð»Ð°",
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñ‰"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 4cee35777df353a724ad0ed574a27d7ede63f7ff..ae8571e3d8713a22f50bf7d66628a5c2500a85f7 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à¦¸à¦®à¦¸à§à¦¯à¦¾",
 "Host" => "à¦¹à§‹à¦¸à§à¦Ÿ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL à¦†à¦¬à¦¶à§à¦¯à¦•  à¦¨à¦¾ à¦¹à¦²à§‡  à¦†à¦ªà¦¨à¦¿ à¦à¦‡ à¦ªà§à¦°à¦Ÿà§‹à¦•à¦²à¦Ÿà¦¿ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨ à¥¤ à¦à¦°à¦ªà¦° à¦¶à§à¦°à§ à¦•à¦°à§à¦¨ à¦à¦Ÿà¦¾ à¦¦à¦¿à§Ÿà§‡ ldaps://",
@@ -21,17 +22,15 @@
 "Use TLS" => "TLS à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°",
 "Case insensitve LDAP server (Windows)" => "à¦¬à¦°à§à¦£ à¦…à¦¸à¦‚à¦¬à§‡à¦¦à§€ LDAP  à¦¸à¦¾à¦°à§à¦à¦¾à¦° (à¦‰à¦‡à¦¨à§à¦¡à§‹à¦œ)",
 "Turn off SSL certificate validation." => "SSL à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦° à¦¯à¦¾à¦šà¦¾à¦‡à¦•à¦°à¦£ à¦¬à¦¨à§à¦§ à¦°à¦¾à¦•à¥¤",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦¯à¦¦à¦¿ à¦à¦‡ à¦¬à¦¿à¦•à¦²à§à¦ªà¦Ÿà¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à§‡à¦‡ à¦¸à¦‚à¦¯à§‹à¦— à¦•à¦¾à¦°à§à¦¯à¦•à¦°à§€ à¦¹à§Ÿ à¦¤à¦¬à§‡ à¦†à¦ªà¦¨à¦¾à¦° ownCloud à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡ LDAP à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° SSL à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦°à¦Ÿà¦¿ à¦†à¦®à¦¦à¦¾à¦¨à¦¿ à¦•à¦°à§à¦¨à¥¤",
 "Not recommended, use for testing only." => "à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à§Ÿ, à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦ªà¦°à§€à¦•à§à¦·à¦¾à¦®à§‚à¦²à¦• à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° à¦œà¦¨à§à¦¯à¥¤",
 "in seconds. A change empties the cache." => "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡à§‡à¥¤ à¦•à§‹à¦¨ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à§à¦¯à¦¾à¦¸à§‡ à¦–à¦¾à¦²à¦¿ à¦•à¦°à¦¬à§‡à¥¤",
 "User Display Name Field" => "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤à¦¬à§à¦¯ à¦¨à¦¾à¦®à§‡à¦° à¦•à§à¦·à§‡à¦¤à§à¦°",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° ownCloud à¦¨à¦¾à¦® à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¬à§à¦¯à¦à¦¹à§ƒà¦¤ LDAP à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯à¥¤",
 "Base User Tree" => "à¦à¦¿à¦¤à§à¦¤à¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦¬à§ƒà¦•à§à¦·à¦¾à¦•à¦¾à¦°à§‡",
 "Group Display Name Field" => "à¦—à§‹à¦·à§à¦ à§€à¦° à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤à¦¬à§à¦¯ à¦¨à¦¾à¦®à§‡à¦° à¦•à§à¦·à§‡à¦¤à§à¦°",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "à¦—à§‹à¦·à§à¦ à§€à¦° ownCloud à¦¨à¦¾à¦® à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¬à§à¦¯à¦à¦¹à§ƒà¦¤ LDAP à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯à¥¤",
 "Base Group Tree" => "à¦à¦¿à¦¤à§à¦¤à¦¿ à¦—à§‹à¦·à§à¦ à§€ à¦¬à§ƒà¦•à§à¦·à¦¾à¦•à¦¾à¦°à§‡",
 "Group-Member association" => "à¦—à§‹à¦·à§à¦ à§€-à¦¸à¦¦à¦¸à§à¦¯ à¦¸à¦‚à¦¸à§à¦¥à¦¾à¦ªà¦¨",
 "in bytes" => "à¦¬à¦¾à¦‡à¦Ÿà§‡",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ à¦¨à¦¾à¦®à§‡à¦° à¦œà¦¨à§à¦¯ à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à§à¦¨ (à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤)à¥¤ à¦…à¦¨à§à¦¯à¦¥à¦¾à§Ÿ, LDAP/AD à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯ à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à§à¦¨à¥¤",
 "Help" => "à¦¸à¦¹à¦¾à§Ÿà¦¿à¦•à¦¾"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 7f0849b2382e3b5c9616c7e219652ea3a8d6bd3a..a6b34399cd47e6f4709a6087c1f70f735181f65a 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Ha fallat en eliminar els mapatges",
 "Failed to delete the server configuration" => "Ha fallat en eliminar la configuraciÃ³ del servidor",
 "The configuration is valid and the connection could be established!" => "La configuraciÃ³ Ã©s vÃ lida i s'ha pogut establir la comunicaciÃ³!",
@@ -15,7 +16,7 @@
 "Connection test failed" => "La prova de connexiÃ³ ha fallat",
 "Do you really want to delete the current Server Configuration?" => "Voleu eliminar la configuraciÃ³ actual del servidor?",
 "Confirm Deletion" => "Confirma l'eliminaciÃ³",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth sÃ³n incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth sÃ³n incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi una.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AvÃs:</b> El mÃ²dul PHP LDAP no estÃ  instalÂ·lat, el dorsal no funcionarÃ . Demaneu a l'administrador del sistema que l'instalÂ·li.",
 "Server configuration" => "ConfiguraciÃ³ del servidor",
 "Add Server Configuration" => "Afegeix la configuraciÃ³ del servidor",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Afegiu una mÃ quina de cÃ²pia de seguretat opcional. Ha de ser una rÃ¨plica del servidor LDAP/AD principal.",
 "Backup (Replica) Port" => "Port de la cÃ²pia de seguretat (rÃ¨plica)",
 "Disable Main Server" => "Desactiva el servidor principal",
-"When switched on, ownCloud will only connect to the replica server." => "Quan estÃ  connectat, ownCloud nomÃ©s es connecta al servidor de la rÃ¨plica.",
+"Only connect to the replica server." => "Connecta nomÃ©s al servidor rÃ¨plica.",
 "Use TLS" => "Usa TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarÃ .",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinciÃ³ entre majÃºscules i minÃºscules (Windows)",
 "Turn off SSL certificate validation." => "Desactiva la validaciÃ³ de certificat SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexiÃ³ nomÃ©s funciona amb aquesta opciÃ³, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Si la connexiÃ³ nomÃ©s funciona amb aquesta opciÃ³, importeu el certificat SSL del servidor LDAP en el vostre servidor %s.",
 "Not recommended, use for testing only." => "No recomanat, Ãºs nomÃ©s per proves.",
 "Cache Time-To-Live" => "MemÃ²ria de cau Time-To-Live",
 "in seconds. A change empties the cache." => "en segons. Un canvi buidarÃ  la memÃ²ria de cau.",
 "Directory Settings" => "Arranjaments de carpetes",
 "User Display Name Field" => "Camp per mostrar el nom d'usuari",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP a usar per generar el nom d'usuari ownCloud.",
+"The LDAP attribute to use to generate the user's display name." => "Atribut LDAP a usar per generar el nom a mostrar de l'usuari.",
 "Base User Tree" => "Arbre base d'usuaris",
 "One User Base DN per line" => "Una DN Base d'Usuari per lÃnia",
 "User Search Attributes" => "Atributs de cerca d'usuari",
 "Optional; one attribute per line" => "Opcional; Un atribut per lÃnia",
 "Group Display Name Field" => "Camp per mostrar el nom del grup",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP a usar per generar el nom de grup ownCloud.",
+"The LDAP attribute to use to generate the groups's display name." => "Atribut LDAP a usar per generar el nom a mostrar del grup.",
 "Base Group Tree" => "Arbre base de grups",
 "One Group Base DN per line" => "Una DN Base de Grup per lÃnia",
 "Group Search Attributes" => "Atributs de cerca de grup",
@@ -75,15 +76,16 @@
 "User Home Folder Naming Rule" => "Norma per anomenar la carpeta arrel d'usuari",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
 "Internal Username" => "Nom d'usuari intern",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Per defecte el nom d'usuari intern es crearÃ  a partir de l'atribut UUID. AixÃ² assegura que el nom d'usuari Ã©s Ãºnic i que els carÃ cters no s'han de convertir. El nom d'usuari intern tÃ© la restricciÃ³ que nomÃ©s estan permesos els carÃ cters: [ a-zA-Z0-9_.@- ]. Els altres carÃ cters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de colÂ·lisiÃ³ s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. TambÃ© Ã©s el nom per defecte de la carpeta home a ownCloud. Ã‰s tambÃ© un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp segÃ¼ent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte nomÃ©s en els nous usuaris LDAP mapats (afegits).",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Per defecte el nom d'usuari intern es crearÃ  a partir de l'atribut UUID. AixÃ² assegura que el nom d'usuari Ã©s Ãºnic i que els carÃ cters no s'han de convertir. El nom d'usuari intern tÃ© la restricciÃ³ que nomÃ©s estan permesos els carÃ cters: [ a-zA-Z0-9_.@- ]. Els altres carÃ cters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de colÂ·lisiÃ³ s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. TambÃ© Ã©s el nom per defecte de la carpeta home d'usuari. Ã‰s tambÃ© un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp segÃ¼ent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte nomÃ©s en els nous usuaris LDAP mapats (afegits).",
 "Internal Username Attribute:" => "Atribut nom d'usuari intern:",
 "Override UUID detection" => "Sobrescriu la detecciÃ³ UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. TambÃ© el nom d'usuari intern es crearÃ  en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que Ã©s Ãºnic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits).",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. TambÃ© el nom d'usuari intern es crearÃ  en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que Ã©s Ãºnic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits).",
 "UUID Attribute:" => "Atribut UUID:",
 "Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrÃ  un nom d'usuari intern. AixÃ² requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memÃ²ria de cau per reduÃ¯r la interacciÃ³ LDAP, perÃ² no s'usa per a identificaciÃ³. Si la DN canvia, els canvis sÃ³n detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrÃ  efectues per tot arreu. L'eliminaciÃ³ dels mapatges no Ã©s sensible a la configuraciÃ³, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producciÃ³. Elimineu-los nomÃ©s en un estadi experimental o de prova.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisiÃ³ i reconÃ¨ixer els usuaris, cada usuari LDAP tindrÃ  un nom d'usuari intern. AixÃ² requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A mÃ©s, la DN es posa a la memÃ²ria de cau per reduir la interacciÃ³ LDAP, perÃ² no s'usa per identificaciÃ³. En cas que la DN canvÃ¯i, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no Ã©s sensible a la configuraciÃ³, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producciÃ³, nomÃ©s en un estadi de prova o experimental.",
 "Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP",
 "Test Configuration" => "ComprovaciÃ³ de la configuraciÃ³",
 "Help" => "Ajuda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 65c7c76b5d7811438a8b3b4292c8896def208941..165946a3b3040c466660c966cf48ab73fc94ae71 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Selhalo zruÅ¡enÃ mapovÃ¡nÃ.",
 "Failed to delete the server configuration" => "Selhalo smazÃ¡nÃ nastavenÃ serveru",
 "The configuration is valid and the connection could be established!" => "NastavenÃ je v poÅ™Ã¡dku a spojenÃ bylo navÃ¡zÃ¡no.",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Test spojenÃ selhal",
 "Do you really want to delete the current Server Configuration?" => "Opravdu si pÅ™ejete smazat souÄasnÃ© nastavenÃ serveru?",
 "Confirm Deletion" => "Potvrdit smazÃ¡nÃ",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>VarovÃ¡nÃ:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilnÃ. MÅ¯Å¾e nastÃ¡vat neoÄekÃ¡vanÃ© chovÃ¡nÃ. PoÅ¾Ã¡dejte, prosÃm, sprÃ¡vce systÃ©mu aby jednu z nich zakÃ¡zal.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>VarovÃ¡nÃ:</b> Aplikace user_ldap a user_webdavauth jsou vzÃ¡jemnÄ› nekompatibilnÃ. MÅ¯Å¾ete zaznamenat neoÄekÃ¡vanÃ© chovÃ¡nÃ. PoÅ¾Ã¡dejte prosÃm vaÅ¡eho systÃ©movÃ©ho administrÃ¡tora o zakÃ¡zÃ¡nÃ jednoho z nich.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡n LDAP modul pro PHP, podpÅ¯rnÃ¡ vrstva nebude fungovat. PoÅ¾Ã¡dejte, prosÃm, sprÃ¡vce systÃ©mu aby jej nainstaloval.",
 "Server configuration" => "NastavenÃ serveru",
 "Add Server Configuration" => "PÅ™idat nastavenÃ serveru",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Zadejte volitelnÃ©ho zÃ¡loÅ¾nÃho hostitele. MusÃ to bÃ½t kopie hlavnÃho serveru LDAP/AD.",
 "Backup (Replica) Port" => "ZÃ¡loÅ¾nÃ (kopie) port",
 "Disable Main Server" => "ZakÃ¡zat hlavnÃ serveru",
-"When switched on, ownCloud will only connect to the replica server." => "PÅ™i zapnutÃ se ownCloud pÅ™ipojÃ pouze k zÃ¡loÅ¾nÃmu serveru",
+"Only connect to the replica server." => "PÅ™ipojit jen k replikujÃcÃmu serveru.",
 "Use TLS" => "PouÅ¾Ãt TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "NepouÅ¾Ãvejte pro spojenÃ LDAP, selÅ¾e.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozliÅ¡ujÃcÃ velikost znakÅ¯ (Windows)",
 "Turn off SSL certificate validation." => "Vypnout ovÄ›Å™ovÃ¡nÃ SSL certifikÃ¡tu.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Pokud pÅ™ipojenÃ pracuje pouze s touto moÅ¾nostÃ, tak importujte SSL certifikÃ¡t SSL serveru do VaÅ¡eho serveru ownCloud",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Pokud spojenÃ funguje jen s touto volbou, importujte SSL certifikÃ¡t vaÅ¡eho LDAP serveru na server %s.",
 "Not recommended, use for testing only." => "NenÃ doporuÄeno, pouze pro testovacÃ ÃºÄely.",
 "Cache Time-To-Live" => "TTL vyrovnÃ¡vacÃ pamÄ›ti",
 "in seconds. A change empties the cache." => "ve vteÅ™inÃ¡ch. ZmÄ›na vyprÃ¡zdnÃ vyrovnÃ¡vacÃ pamÄ›Å¥.",
 "Directory Settings" => "NastavenÃ adresÃ¡Å™e",
-"User Display Name Field" => "Pole pro zobrazovanÃ© jmÃ©no uÅ¾ivatele",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP pouÅ¾itÃ½ k vytvoÅ™enÃ jmÃ©na uÅ¾ivatele ownCloud",
+"User Display Name Field" => "Pole zobrazovanÃ©ho jmÃ©na uÅ¾ivatele",
+"The LDAP attribute to use to generate the user's display name." => "LDAP atribut pouÅ¾itÃ½ k vytvoÅ™enÃ zobrazovanÃ©ho jmÃ©na uÅ¾ivatele.",
 "Base User Tree" => "ZÃ¡kladnÃ uÅ¾ivatelskÃ½ strom",
 "One User Base DN per line" => "Jedna uÅ¾ivatelskÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku",
 "User Search Attributes" => "Atributy vyhledÃ¡vÃ¡nÃ uÅ¾ivatelÅ¯",
 "Optional; one attribute per line" => "VolitelnÃ©, atribut na Å™Ã¡dku",
-"Group Display Name Field" => "Pole pro zobrazenÃ jmÃ©na skupiny",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP pouÅ¾itÃ½ k vytvoÅ™enÃ jmÃ©na skupiny ownCloud",
+"Group Display Name Field" => "Pole zobrazovanÃ©ho jmÃ©na skupiny",
+"The LDAP attribute to use to generate the groups's display name." => "LDAP atribut pouÅ¾itÃ½ k vytvoÅ™enÃ zobrazovanÃ©ho jmÃ©na skupiny.",
 "Base Group Tree" => "ZÃ¡kladnÃ skupinovÃ½ strom",
 "One Group Base DN per line" => "Jedna skupinovÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku",
 "Group Search Attributes" => "Atributy vyhledÃ¡vÃ¡nÃ skupin",
@@ -75,12 +76,16 @@
 "User Home Folder Naming Rule" => "Pravidlo pojmenovÃ¡nÃ domovskÃ© sloÅ¾ky uÅ¾ivatele",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prÃ¡zdnÃ© pro uÅ¾ivatelskÃ© jmÃ©no (vÃ½chozÃ). Jinak uveÄte LDAP/AD parametr.",
 "Internal Username" => "InternÃ uÅ¾ivatelskÃ© jmÃ©no",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Ve vÃ½chozÃm nastavenÃ bude uÅ¾ivatelskÃ© jmÃ©no vytvoÅ™eno z UUID atributu. To zajistÃ unikÃ¡tnost uÅ¾ivatelskÃ©ho jmÃ©na bez potÅ™eby konverze znakÅ¯. InternÃ uÅ¾ivatelskÃ© jmÃ©no je omezena na znaky: [ a-zA-Z0-9_.@- ]. OstatnÃ znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduÅ¡e vynechÃ¡ny. V pÅ™ÃpadÄ› kolize uÅ¾ivatelskÃ½ch jmen bude pÅ™idÃ¡no/navÃ½Å¡eno ÄÃslo. InternÃ uÅ¾ivatelskÃ© jmÃ©no je pouÅ¾ÃvÃ¡no k internÃ identifikaci uÅ¾ivatele. Je takÃ© vÃ½chozÃm nÃ¡zvem uÅ¾ivatelskÃ©ho domovskÃ©ho adresÃ¡Å™e. Je takÃ© souÄÃ¡stÃ URL pro vzdÃ¡lenÃ½ pÅ™Ãstup, napÅ™Ãklad vÅ¡ech *DAV sluÅ¾eb. S tÃmto nastavenÃm bude vÃ½chozÃ chovÃ¡nÃ pÅ™epsÃ¡no. Pro dosaÅ¾enÃ podobnÃ©ho chovÃ¡nÃ jako pÅ™ed ownCloudem 5 uveÄte atribut zobrazovanÃ©ho jmÃ©na do pole nÃÅ¾e. Ponechte prÃ¡zdnÃ© pro vÃ½chozÃ chovÃ¡nÃ. ZmÄ›na bude mÃt vliv jen na novÄ› namapovanÃ© (pÅ™idanÃ©) uÅ¾ivatele z LDAP.",
 "Internal Username Attribute:" => "Atribut internÃho uÅ¾ivatelskÃ©ho jmÃ©na:",
 "Override UUID detection" => "Nastavit ruÄnÄ› UUID atribut",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Ve vÃ½chozÃm nastavenÃ je UUID atribut nalezen automaticky. UUID atribut je pouÅ¾ÃvÃ¡n pro nezpochybnitelnou identifikaci uÅ¾ivatelÅ¯ a skupin z LDAP. NavÃc je na zÃ¡kladÄ› UUID tvoÅ™eno takÃ© internÃ uÅ¾ivatelskÃ© jmÃ©no, pokud nenÃ nastaveno jinak. MÅ¯Å¾ete vÃ½chozÃ nastavenÃ pÅ™epsat a pouÅ¾Ãt atribut kterÃ½ sami zvolÃte. MusÃte se ale ujistit Å¾e atribut kterÃ½ vyberete bude uveden jak u uÅ¾ivatelÅ¯, tak i u skupin a je unikÃ¡tnÃ. Ponechte prÃ¡zdnÃ© pro vÃ½chozÃ chovÃ¡nÃ. ZmÄ›na bude mÃt vliv jen na novÄ› namapovanÃ© (pÅ™idanÃ©) uÅ¾ivatele a skupiny z LDAP.",
 "UUID Attribute:" => "Atribut UUID:",
 "Username-LDAP User Mapping" => "MapovÃ¡nÃ uÅ¾ivatelskÃ½ch jmen z LDAPu",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "UÅ¾ivatelskÃ¡ jmÃ©na jsou pouÅ¾ÃvÃ¡ny pro uchovÃ¡vÃ¡nÃ a pÅ™iÅ™azovÃ¡nÃ (meta)dat. Pro sprÃ¡vnou identifikaci a rozpoznÃ¡nÃ uÅ¾ivatelÅ¯ bude mÃt kaÅ¾dÃ½ uÅ¾ivatel z LDAP internÃ uÅ¾ivatelskÃ© jmÃ©no. To je nezbytnÃ© pro mapovÃ¡nÃ uÅ¾ivatelskÃ½ch jmen na uÅ¾ivatele LDAP. VytvoÅ™enÃ© uÅ¾ivatelskÃ© jmÃ©no je mapovÃ¡no na UUID uÅ¾ivatele v LDAP. NavÃc je cachovÃ¡na DN pro reprodukci interakce s LDAP, ale nenÃ pouÅ¾ÃvÃ¡na pro identifikaci. Pokud se DN zmÄ›nÃ, bude to sprÃ¡vnÄ› rozpoznÃ¡no. VyÄiÅ¡tÄ›nÃ mapovÃ¡nÃ zanechÃ¡ zbytky vÅ¡ude. VyÄiÅ¡tÄ›nÃ navÃc nenÃ specifickÃ© konfiguraci, bude mÃt vliv na vÅ¡echny LDAP konfigurace! Nikdy neÄistÄ›te mapovÃ¡nÃ v produkÄnÃm prostÅ™edÃ, jen v testovacÃ nebo experimentÃ¡lnÃ fÃ¡zi.",
 "Clear Username-LDAP User Mapping" => "ZruÅ¡it mapovÃ¡nÃ uÅ¾ivatelskÃ½ch jmen LDAPu",
 "Clear Groupname-LDAP Group Mapping" => "ZruÅ¡it mapovÃ¡nÃ nÃ¡zvÅ¯ skupin LDAPu",
 "Test Configuration" => "VyzkouÅ¡et nastavenÃ",
 "Help" => "NÃ¡povÄ›da"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index abe2336b2ba8c9fdbd5e9ca74a0d95030b2746dc..71a38fad25dbfc4acbce44cb5bcbc2c2b750ab07 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Methwyd dileu",
 "Error" => "Gwall",
 "Password" => "Cyfrinair",
 "Help" => "Cymorth"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 0a77f46647977050177d02cbb51c4977986611f4..ab59d3ed506a73898e85412af44aa6886206e82b 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -1,7 +1,19 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Kunne ikke slette server konfigurationen",
+"The configuration is valid and the connection could be established!" => "Konfigurationen er korrekt og forbindelsen kunne etableres!",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurationen er ugyldig. Se venligst ownCloud loggen for yderligere detaljer.",
 "Deletion failed" => "Fejl ved sletning",
+"Keep settings?" => "Behold indstillinger?",
+"Cannot add server configuration" => "Kan ikke tilfÃ¸je serverkonfiguration",
 "Success" => "Succes",
 "Error" => "Fejl",
+"Connection test succeeded" => "Forbindelsestest lykkedes",
+"Connection test failed" => "Forbindelsestest mislykkedes",
+"Do you really want to delete the current Server Configuration?" => "Ã˜nsker du virkelig at slette den nuvÃ¦rende Server Konfiguration?",
+"Confirm Deletion" => "BekrÃ¦ft Sletning",
+"Server configuration" => "Server konfiguration",
+"Add Server Configuration" => "TilfÃ¸j Server Konfiguration",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i sÃ¥ fald med ldaps://",
 "Base DN" => "Base DN",
@@ -12,10 +24,19 @@
 "User Login Filter" => "Bruger Login Filter",
 "User List Filter" => "Brugerliste Filter",
 "Defines the filter to apply, when retrieving users." => "Definere filteret der bruges ved indlÃ¦sning af brugere.",
+"without any placeholder, e.g. \"objectClass=person\"." => "Uden stedfortrÃ¦der, f.eks. \"objectClass=person\".",
 "Group Filter" => "Gruppe Filter",
 "Defines the filter to apply, when retrieving groups." => "Definere filteret der bruges nÃ¥r der indlÃ¦ses grupper.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Uden stedfortrÃ¦der, f.eks. \"objectClass=posixGroup\".",
+"Connection Settings" => "Forbindelsesindstillinger ",
+"Configuration Active" => "Konfiguration Aktiv",
 "Port" => "Port",
+"Backup (Replica) Host" => "Backup (Replika) VÃ¦rt",
+"Backup (Replica) Port" => "Backup (Replika) Port",
+"Disable Main Server" => "Deaktiver Hovedserver",
+"Only connect to the replica server." => "Forbind kun til replika serveren.",
 "Use TLS" => "Brug TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Benyt ikke flere LDAPS forbindelser, det vil mislykkeds. ",
 "Turn off SSL certificate validation." => "Deaktiver SSL certifikat validering",
 "Not recommended, use for testing only." => "Anbefales ikke, brug kun for at teste.",
 "User Display Name Field" => "User Display Name Field",
@@ -23,5 +44,9 @@
 "Base Group Tree" => "Base Group Tree",
 "Group-Member association" => "Group-Member association",
 "in bytes" => "i bytes",
+"Email Field" => "Email Felt",
+"Internal Username" => "Internt Brugernavn",
+"Test Configuration" => "Test Konfiguration",
 "Help" => "HjÃ¦lp"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index f00108184214f9c959315ec7100f66ce7316d276..73649f7c0ac2879bfba550e5bd2e3128612a4643 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Failed to clear the mappings." => "LÃ¶schen der Zuordnung fehlgeschlagen.",
 "Failed to delete the server configuration" => "LÃ¶schen der Serverkonfiguration fehlgeschlagen",
 "The configuration is valid and the connection could be established!" => "Die Konfiguration ist gÃ¼ltig und die Verbindung konnte hergestellt werden!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gÃ¼ltig aber die Verbindung ist fehlgeschlagen. Bitte Ã¼berprÃ¼fe die Servereinstellungen und Anmeldeinformationen.",
@@ -7,13 +9,14 @@
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration Ã¼bernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
 "Cannot add server configuration" => "Das HinzufÃ¼gen der Serverkonfiguration schlug fehl",
+"mappings cleared" => "Zuordnungen gelÃ¶scht",
 "Success" => "Erfolgreich",
 "Error" => "Fehler",
 "Connection test succeeded" => "Verbindungstest erfolgreich",
 "Connection test failed" => "Verbindungstest fehlgeschlagen",
 "Do you really want to delete the current Server Configuration?" => "MÃ¶chtest Du die aktuelle Serverkonfiguration wirklich lÃ¶schen?",
 "Confirm Deletion" => "LÃ¶schung bestÃ¤tigen",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte\ndeinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul fÃ¼r LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.",
 "Server configuration" => "Serverkonfiguration",
 "Add Server Configuration" => "Serverkonfiguration hinzufÃ¼gen",
@@ -43,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
 "Backup (Replica) Port" => "Backup Port",
 "Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschlieÃŸlich den Backupserver verwenden.",
+"Only connect to the replica server." => "Nur zum Replikat-Server verbinden.",
 "Use TLS" => "Nutze TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: GroÃŸ- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalte die SSL-ZertifikatsprÃ¼fung aus.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
 "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Ã„nderung leert den Cache.",
 "Directory Settings" => "Ordnereinstellungen",
 "User Display Name Field" => "Feld fÃ¼r den Anzeigenamen des Benutzers",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut fÃ¼r die Generierung des Benutzernamens in ownCloud. ",
+"The LDAP attribute to use to generate the user's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
 "Base User Tree" => "Basis-Benutzerbaum",
 "One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
 "User Search Attributes" => "Benutzersucheigenschaften",
 "Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
 "Group Display Name Field" => "Feld fÃ¼r den Anzeigenamen der Gruppe",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut fÃ¼r die Generierung des Gruppennamens in ownCloud. ",
+"The LDAP attribute to use to generate the groups's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
 "Base Group Tree" => "Basis-Gruppenbaum",
 "One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
 "Group Search Attributes" => "Gruppensucheigenschaften",
@@ -72,6 +75,17 @@
 "Email Field" => "E-Mail Feld",
 "User Home Folder Naming Rule" => "Benennungsregel fÃ¼r das Home-Verzeichnis des Benutzers",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
+"Internal Username" => "Interner Benutzername",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "StandardmÃ¤ÃŸig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden mÃ¼ssen. Der interne Benutzername unterliegt BeschrÃ¤nkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein ZÃ¤hler hinzugefÃ¼gt bzw. der ZÃ¤hler um einen Wert erhÃ¶ht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmÃ¤ÃŸig vorausgewÃ¤hlte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel fÃ¼r alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten Ã¼berschrieben werden. Um ein Ã¤hnliches Verhalten wie vor ownCloud 5 zu erzielen, fÃ¼gen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen fÃ¼r das Standardverhalten leer. Die Ã„nderungen werden sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer auswirken.",
+"Internal Username Attribute:" => "Attribut fÃ¼r interne Benutzernamen:",
+"Override UUID detection" => "UUID-Erkennung Ã¼berschreiben",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "StandardmÃ¤ÃŸig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. AuÃŸerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewÃ¤hlten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden kÃ¶nnen. Lasse es frei, um es beim Standardverhalten zu belassen. Ã„nderungen wirken sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer und -Gruppen aus.",
+"UUID Attribute:" => "UUID-Attribut:",
+"Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und prÃ¤zise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. ZusÃ¤tzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ã„ndert sich der DN, werden die Ã„nderungen durch gefunden. Der interne Benutzername, wird in Ã¼berall verwendet. Werden die Zuordnungen gelÃ¶scht, bleiben Ã¼berall Reste zurÃ¼ck. Die LÃ¶schung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! LÃ¶schen Sie niemals die Zuordnungen in einer produktiven Umgebung. LÃ¶sche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+"Clear Username-LDAP User Mapping" => "LÃ¶sche LDAP-Benutzernamenzuordnung",
+"Clear Groupname-LDAP Group Mapping" => "LÃ¶sche LDAP-Gruppennamenzuordnung",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 605c75f288aca16ac4d06d78ed28f107a99d0117..0052b75b33a994993e2e08a99692d319114c6c5a 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "LÃ¶schen der Zuordnung fehlgeschlagen.",
 "Failed to delete the server configuration" => "LÃ¶schen der Serverkonfiguration fehlgeschlagen",
 "The configuration is valid and the connection could be established!" => "Die Konfiguration ist gÃ¼ltig und die Verbindung konnte hergestellt werden!",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Verbindungstest fehlgeschlagen",
 "Do you really want to delete the current Server Configuration?" => "MÃ¶chten Sie die aktuelle Serverkonfiguration wirklich lÃ¶schen?",
 "Confirm Deletion" => "LÃ¶schung bestÃ¤tigen",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul fÃ¼r LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Server configuration" => "Serverkonfiguration",
 "Add Server Configuration" => "Serverkonfiguration hinzufÃ¼gen",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
 "Backup (Replica) Port" => "Backup Port",
 "Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschlieÃŸlich den Backupserver verwenden.",
+"Only connect to the replica server." => "Nur zum Replikat-Server verbinden.",
 "Use TLS" => "Nutze TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: GroÃŸ- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalten Sie die SSL-ZertifikatsprÃ¼fung aus.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
 "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Ã„nderung leert den Cache.",
 "Directory Settings" => "Ordnereinstellungen",
 "User Display Name Field" => "Feld fÃ¼r den Anzeigenamen des Benutzers",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut fÃ¼r die Generierung des Benutzernamens in ownCloud. ",
+"The LDAP attribute to use to generate the user's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
 "Base User Tree" => "Basis-Benutzerbaum",
 "One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
 "User Search Attributes" => "Benutzersucheigenschaften",
 "Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
 "Group Display Name Field" => "Feld fÃ¼r den Anzeigenamen der Gruppe",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut fÃ¼r die Generierung des Gruppennamens in ownCloud. ",
+"The LDAP attribute to use to generate the groups's display name." => "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
 "Base Group Tree" => "Basis-Gruppenbaum",
 "One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
 "Group Search Attributes" => "Gruppensucheigenschaften",
@@ -75,14 +76,16 @@
 "User Home Folder Naming Rule" => "Benennungsregel fÃ¼r das Home-Verzeichnis des Benutzers",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
 "Internal Username" => "Interner Benutzername",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "StandardmÃ¤ÃŸig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden mÃ¼ssen. Der interne Benutzername unterliegt BeschrÃ¤nkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Ãœbereinstimmungen wird ein ZÃ¤hler hinzugefÃ¼gt bzw. der ZÃ¤hler um einen Wert erhÃ¶ht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmÃ¤ÃŸig vorausgewÃ¤hlte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port fÃ¼r Remote-URLs - zum Beispiel fÃ¼r alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten Ã¼berschrieben werden. Um ein Ã¤hnliches Verhalten wie vor ownCloud 5 zu erzielen, fÃ¼gen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen fÃ¼r das Standardverhalten leer. Die Ã„nderungen werden sich einzig und allein nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer auswirken.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "StandardmÃ¤ÃŸig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden mÃ¼ssen. Der interne Benutzername unterliegt BeschrÃ¤nkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein ZÃ¤hler hinzugefÃ¼gt bzw. der ZÃ¤hler um einen Wert erhÃ¶ht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmÃ¤ÃŸig vorausgewÃ¤hlte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel fÃ¼r alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten Ã¼berschrieben werden. Um ein Ã¤hnliches Verhalten wie vor ownCloud 5 zu erzielen, fÃ¼gen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen fÃ¼r das Standardverhalten leer. Die Ã„nderungen werden sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer auswirken.",
 "Internal Username Attribute:" => "Interne Eigenschaften des Benutzers:",
 "Override UUID detection" => "UUID-Erkennung Ã¼berschreiben",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "StandardmÃ¤ÃŸig erkennt OwnCloud die UUID-Eigenschaften des Benutzers selbststÃ¤ndig. Die UUID-Eigenschaften werden genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. AuÃŸerdem wird ein interner Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie kÃ¶nnen diese Eigenschaften Ã¼berschreiben und selbst Eigenschaften nach Wahl vorgeben. Sie mÃ¼ssen allerdings sicherstellen, dass die Eigenschaften zur Identifikation fÃ¼r Benutzer und Gruppen eindeutig sind. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Ã„nderungen wirken sich nur auf neu zugeordnete (neu erstellte) LDAP-Benutzer und -Gruppen aus.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "StandardmÃ¤ÃŸig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. AuÃŸerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie mÃ¼ssen allerdings sicherstellen, dass Ihre gewÃ¤hlten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden kÃ¶nnen. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Ã„nderungen wirken sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer und -Gruppen aus.",
 "UUID Attribute:" => "UUID-Attribut:",
 "Username-LDAP User Mapping" => "LDAP-Benutzernamenzuordnung",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und prÃ¤zise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. ZusÃ¤tzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ã„ndert sich der DN, werden die Ã„nderungen durch gefunden. Der interne Benutzername, wird in Ã¼berall verwendet. Werden die Zuordnungen gelÃ¶scht, bleiben Ã¼berall Reste zurÃ¼ck. Die LÃ¶schung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! LÃ¶schen Sie niemals die Zuordnungen in einer produktiven Umgebung. LÃ¶schen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
 "Clear Username-LDAP User Mapping" => "LÃ¶sche LDAP-Benutzernamenzuordnung",
 "Clear Groupname-LDAP Group Mapping" => "LÃ¶sche LDAP-Gruppennamenzuordnung",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index acecf27125f1a2287c37402ca570016dd5c68539..140925f61266a13ffb595fe78c675d111e62daf2 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®",
 "The configuration is valid and the connection could be established!" => "ÎŸÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎµÏ‚ ÎºÎ±Î¹ Î· ÏƒÏÎ½Î´ÎµÏƒÎ· Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÏÎ±Î³Î¼Î±Ï„Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "ÎŸÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎµÏ‚, Î±Î»Î»Î¬ Î±Ï€ÎÏ„Ï…Ï‡Îµ Î· ÏƒÏÎ½Î´ÎµÏƒÎ·. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ»ÎÎ³Î¾Ï„Îµ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÎºÎ±Î¹ Ï„Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î±.",
@@ -13,7 +14,6 @@
 "Connection test failed" => "Î‘Ï€Î¿Ï„Ï…Ï‡Î·Î¼ÎÎ½Î· Î´Î¿ÎºÎ¹Î¼Î±ÏƒÏ„Î¹ÎºÎ® ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚.",
 "Do you really want to delete the current Server Configuration?" => "Î˜ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Ï„Î¹Ï‚ Ï„ÏÎÏ‡Î¿Ï…ÏƒÎµÏ‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®;",
 "Confirm Deletion" => "Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ· Î”Î¹Î±Î³ÏÎ±Ï†Î®Ï‚",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> ÎŸÎ¹ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ user_ldap ÎºÎ±Î¹ user_webdavauth ÎµÎ¯Î½Î±Î¹ Î±ÏƒÏÎ¼Î²Î±Ï„ÎµÏ‚. ÎœÏ€Î¿ÏÎµÎ¯ Î½Î± Î±Î½Ï„Î¹Î¼ÎµÏ„Ï‰Ï€Î¯ÏƒÎµÏ„Îµ Î±Ï€ÏÏŒÎ²Î»ÎµÏ€Ï„Î· ÏƒÏ…Î¼Ï€ÎµÏÎ¹Ï†Î¿ÏÎ¬. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Î¶Î·Ï„Î®ÏƒÏ„Îµ Î±Ï€ÏŒ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ Î¼Î¯Î± Î±Ï€ÏŒ Î±Ï…Ï„ÎÏ‚.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> Î¤Î¿ Î¬ÏÎ¸ÏÏ‰Î¼Î± PHP LDAP Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ ÎºÎ±Î¹ Ï„Î¿ ÏƒÏÏƒÏ„Î·Î¼Î± Ï…Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î·Ï‚ Î´ÎµÎ½ Î¸Î± Î´Î¿Ï…Î»ÎÏˆÎµÎ¹. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Î¶Î·Ï„Î®ÏƒÏ„Îµ Î±Ï€ÏŒ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Ï„Î¿ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹.",
 "Server configuration" => "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®",
 "Add Server Configuration" => "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î¡Ï…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®",
@@ -43,24 +43,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Î”ÏŽÏƒÏ„Îµ Î¼Î¹Î± Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÎ® ÎµÏ†ÎµÎ´ÏÎ¹ÎºÎ® Ï…Ï€Î¿Î´Î¿Ï‡Î®. Î ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± Î±Î½Ï„Î¯Î³ÏÎ±Ï†Î¿ Ï„Î¿Ï… ÎºÏÏÎ¹Î¿Ï… LDAP / AD Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·.",
 "Backup (Replica) Port" => "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Ï‰Î½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ (Replica) Î¥Ï€Î¿Î´Î¿Ï‡Î·",
 "Disable Main Server" => "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·ÏƒÎ· Ï„Î¿Ï… ÎºÎµÎ½Ï„ÏÎ¹ÎºÎ¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·",
-"When switched on, ownCloud will only connect to the replica server." => "ÎŒÏ„Î±Î½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯, Î¼Îµ Ï„Î¿ ownCloud Î¸Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î¼Îµ Ï„Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏÎµÏ€Î»Î¯ÎºÎ±.",
 "Use TLS" => "Î§ÏÎ®ÏƒÎ· TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "ÎœÎ·Î½ Ï„Î¿ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ ÎµÏ€Î¹Ï€ÏÎ¿ÏƒÎ¸ÎÏ„Ï‰Ï‚, Î³Î¹Î± LDAPS ÏƒÏ…Î½Î´ÎÏƒÎµÎ¹Ï‚ , Î¸Î± Î±Ï€Î¿Ï„ÏÏ‡ÎµÎ¹.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) Î¼Îµ Î´Î¹Î¬ÎºÏÎ¹ÏƒÎ· Ï€ÎµÎ¶ÏŽÎ½-ÎšÎ•Î¦Î‘Î›Î‘Î™Î©Î",
 "Turn off SSL certificate validation." => "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÏ€Î¹ÎºÏÏÏ‰ÏƒÎ·Ï‚ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Î•Î¬Î½ Î· ÏƒÏÎ½Î´ÎµÏƒÎ· Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Î¼ÏŒÎ½Î¿ Î¼Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î®, ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Ï„Î¿ LDAP SSL Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÏ„Î¿Î½ ownCloud server ÏƒÎ±Ï‚.",
 "Not recommended, use for testing only." => "Î”ÎµÎ½ Ï€ÏÎ¿Ï„ÎµÎ¯Î½ÎµÏ„Î±Î¹, Ï‡ÏÎ®ÏƒÎ· Î¼ÏŒÎ½Î¿ Î³Î¹Î± Î´Î¿ÎºÎ¹Î¼ÎÏ‚.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î±. ÎœÎ¹Î± Î±Î»Î»Î±Î³Î® Î±Î´ÎµÎ¹Î¬Î¶ÎµÎ¹ Ï„Î·Î½ Î¼Î½Î®Î¼Î· cache.",
 "Directory Settings" => "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÎšÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï…",
 "User Display Name Field" => "Î ÎµÎ´Î¯Î¿ ÎŸÎ½ÏŒÎ¼Î±Ï„Î¿Ï‚ Î§ÏÎ®ÏƒÏ„Î·",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Î— Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± LDAP Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î· Ï„Î¿Ï… ownCloud.",
 "Base User Tree" => "Base User Tree",
 "One User Base DN per line" => "ÎˆÎ½Î± DN Î²Î¬ÏƒÎ·Ï‚ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î®",
 "User Search Attributes" => "Î§Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚ Ï„Ï‰Î½ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ ",
 "Optional; one attribute per line" => "Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÎ¬? ÎˆÎ½Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î® ",
 "Group Display Name Field" => "Group Display Name Field",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Î— Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± LDAP Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ Ï„Î¿Ï… ownCloud.",
 "Base Group Tree" => "Base Group Tree",
 "One Group Base DN per line" => "ÎœÎ¹Î± Î¿Î¼Î±Î´Î¹ÎºÎ· Î’Î¬ÏƒÎ· DN Î±Î½Î¬ Î³ÏÎ±Î¼Î¼Î®",
 "Group Search Attributes" => "ÎŸÎ¼Î¬Î´Î± Î§Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÏ‰Î½ Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ·",
@@ -75,3 +71,4 @@
 "Test Configuration" => "Î”Î¿ÎºÎ¹Î¼Î±ÏƒÏ„Î¹ÎºÎµÏ‚ ÏÏ…Î¸Î¼Î¹ÏƒÎµÎ¹Ï‚",
 "Help" => "Î’Î¿Î®Î¸ÎµÎ¹Î±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/en@pirate.php b/apps/user_ldap/l10n/en@pirate.php
index 482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c..e269c57c3d0ab870cda3a02975dc40af05fac9a0 100644
--- a/apps/user_ldap/l10n/en@pirate.php
+++ b/apps/user_ldap/l10n/en@pirate.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Passcode"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index c9a9ba130c6fbd2c9bcaa49127fb61f473c6b490..2973e05388b43a2f5f70a0c37b9534d9f1131a69 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Forigo malsukcesis",
 "Success" => "Sukceso",
 "Error" => "Eraro",
@@ -21,17 +22,15 @@
 "Use TLS" => "Uzi TLS-on",
 "Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)",
 "Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la konekto nur funkcias kun Ä‰i tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo.",
 "Not recommended, use for testing only." => "Ne rekomendata, uzu Äin nur por testoj.",
 "in seconds. A change empties the cache." => "sekunde. Ajna ÅanÄo malplenigas la kaÅmemoron.",
 "User Display Name Field" => "Kampo de vidignomo de uzanto",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto.",
 "Base User Tree" => "Baza uzantarbo",
 "Group Display Name Field" => "Kampo de vidignomo de grupo",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo.",
 "Base Group Tree" => "Baza gruparbo",
 "Group-Member association" => "Asocio de grupo kaj membro",
 "in bytes" => "duumoke",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lasu malplena por uzantonomo (defaÅlto). Alie, specifu LDAP/AD-atributon.",
 "Help" => "Helpo"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 31d43288e5bc0ce25e6ea3bbd5bf8eb158f1b65c..ca59e2f3eada96ca0716b63a616a9ae94a2774be 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,12 +1,13 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "OcurriÃ³ un fallo al borrar las asignaciones.",
 "Failed to delete the server configuration" => "No se pudo borrar la configuraciÃ³n del servidor",
-"The configuration is valid and the connection could be established!" => "La configuraciÃ³n es vÃ¡lida y la conexiÃ³n puede establecerse!",
+"The configuration is valid and the connection could be established!" => "Â¡La configuraciÃ³n es vÃ¡lida y la conexiÃ³n puede establecerse!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuraciÃ³n es vÃ¡lida, pero fallÃ³ el Enlace. Por favor, compruebe la configuraciÃ³n del servidor y las credenciales.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "La configuraciÃ³n no es vÃ¡lida. Por favor, busque en el log de ownCloud para mÃ¡s detalles.",
 "Deletion failed" => "FallÃ³ el borrado",
 "Take over settings from recent server configuration?" => "Â¿Asumir los ajustes actuales de la configuraciÃ³n del servidor?",
-"Keep settings?" => "Mantener la configuraciÃ³n?",
+"Keep settings?" => "Â¿Mantener la configuraciÃ³n?",
 "Cannot add server configuration" => "No se puede aÃ±adir la configuraciÃ³n del servidor",
 "mappings cleared" => "Asignaciones borradas",
 "Success" => "Ã‰xito",
@@ -15,7 +16,6 @@
 "Connection test failed" => "La prueba de conexiÃ³n fallÃ³",
 "Do you really want to delete the current Server Configuration?" => "Â¿Realmente desea eliminar la configuraciÃ³n actual del servidor?",
 "Confirm Deletion" => "Confirmar eliminaciÃ³n",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El mÃ³dulo LDAP de PHP no estÃ¡ instalado, el sistema no funcionarÃ¡. Por favor consulte al administrador del sistema para instalarlo.",
 "Server configuration" => "ConfiguraciÃ³n del Servidor",
 "Add Server Configuration" => "Agregar configuracion del servidor",
@@ -45,24 +45,21 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una rÃ©plica del servidor principal LDAP / AD.",
 "Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
 "Disable Main Server" => "Deshabilitar servidor principal",
-"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente conectarÃ¡ al servidor replica",
 "Use TLS" => "Usar TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, FallarÃ¡.",
 "Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayÃºsculas/minÃºsculas (Windows)",
 "Turn off SSL certificate validation." => "Apagar la validaciÃ³n por certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexiÃ³n sÃ³lo funciona con esta opciÃ³n, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Si la conexiÃ³n funciona sÃ³lo con esta opciÃ³n, importe el certificado SSL del servidor LDAP en su servidor %s.",
 "Not recommended, use for testing only." => "No recomendado, sÃ³lo para pruebas.",
 "Cache Time-To-Live" => "Cache TTL",
 "in seconds. A change empties the cache." => "en segundos. Un cambio vacÃa la cachÃ©.",
 "Directory Settings" => "Configuracion de directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
 "Base User Tree" => "Ãrbol base de usuario",
 "One User Base DN per line" => "Un DN Base de Usuario por lÃnea",
 "User Search Attributes" => "Atributos de la busqueda de usuario",
 "Optional; one attribute per line" => "Opcional; un atributo por linea",
 "Group Display Name Field" => "Campo de nombre de grupo a mostrar",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud.",
 "Base Group Tree" => "Ãrbol base de grupo",
 "One Group Base DN per line" => "Un DN Base de Grupo por lÃnea",
 "Group Search Attributes" => "Atributos de busqueda de grupo",
@@ -75,15 +72,13 @@
 "User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "VacÃo para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
 "Internal Username" => "Nombre de usuario interno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto el nombre de usuario interno serÃ¡ creado desde el atributo UUID. Esto asegura que el nombre de usuario es Ãºnico y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sÃ³lo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente quitados. En coincidencias un nÃºmero serÃ¡ aÃ±adido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es tambiÃ©n el nombre por defecto para la carpeta personal del usuario in ownCloud. TambiÃ©n es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuraciÃ³n el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. DÃ©jalo vacÃo para el comportamiento por defecto. Los cambios solo tendrÃ¡n efecto en los nuevos usuarios LDAP.",
 "Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
 "Override UUID detection" => "Sobrescribir la detecciÃ³n UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. AdemÃ¡s, el nombre de usuario interno serÃ¡ creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuraciÃ³n y pasar un atributo de tu elecciÃ³n. Debes asegurarte de que el atributo de tu elecciÃ³n sea accesible por los usuarios y grupos y ser Ãºnico. DÃ©jalo en blanco para usar el comportamiento por defecto. Los cambios tendrÃ¡n efecto solo en los nuevos usuarios y grupos de LDAP.",
 "UUID Attribute:" => "Atributo UUID:",
 "Username-LDAP User Mapping" => "AsignaciÃ³n del Nombre de usuario de un usuario LDAP",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisiÃ³n y reconocer usuarios, cada usuario LDAP tendrÃ¡ un nombre de usuario interno. Esto requiere una asignaciÃ³n de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. AdemÃ¡s el DN se almacena en cachÃ© mÃ¡s bien para reducir la interacciÃ³n de LDAP, pero no se utiliza para la identificaciÃ³n. Si la DN cambia, los cambios serÃ¡n encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrÃ¡ restos por todas partes. Eliminando las asignaciones no es sensible a la configuraciÃ³n, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producciÃ³n. SÃ³lo borrar asignaciones en una situaciÃ³n de prueba o experimental.",
 "Clear Username-LDAP User Mapping" => "Borrar la asignaciÃ³n de los Nombres de usuario de los usuarios LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Borrar la asignaciÃ³n de los Nombres de grupo de los grupos de LDAP",
 "Test Configuration" => "ConfiguraciÃ³n de prueba",
 "Help" => "Ayuda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 6925ea89a0cafbd02a2a7acdc2af438cfff7f799..c4f339f76bb4ebbdad2bf0581271be76e6a22f30 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Hubo un error al borrar las asignaciones.",
 "Failed to delete the server configuration" => "Fallo al borrar la configuraciÃ³n del servidor",
 "The configuration is valid and the connection could be established!" => "La configuraciÃ³n es vÃ¡lida y la conexiÃ³n pudo ser establecida.",
@@ -15,7 +16,6 @@
 "Connection test failed" => "FallÃ³ es test de conexiÃ³n",
 "Do you really want to delete the current Server Configuration?" => "Â¿Realmente desea borrar la configuraciÃ³n actual del servidor?",
 "Confirm Deletion" => "Confirmar borrado",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AtenciÃ³n:</b> El mÃ³dulo PHP LDAP no estÃ¡ instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
 "Server configuration" => "ConfiguraciÃ³n del Servidor",
 "Add Server Configuration" => "AÃ±adir ConfiguraciÃ³n del Servidor",
@@ -45,24 +45,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una rÃ©plica del servidor principal LDAP/AD.",
 "Backup (Replica) Port" => "Puerto para copia de seguridad (rÃ©plica)",
 "Disable Main Server" => "Deshabilitar el Servidor Principal",
-"When switched on, ownCloud will only connect to the replica server." => "Al comenzar, ownCloud se conectarÃ¡ Ãºnicamente al servidor rÃ©plica",
 "Use TLS" => "Usar TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conexiones LDAPS, las mismas fallarÃ¡n",
 "Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayÃºsculas/minÃºsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactivar la validaciÃ³n por certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexiÃ³n sÃ³lo funciona con esta opciÃ³n, importÃ¡ el certificado SSL del servidor LDAP en tu servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomendado, sÃ³lo para pruebas.",
 "Cache Time-To-Live" => "Tiempo de vida del cachÃ©",
 "in seconds. A change empties the cache." => "en segundos. Cambiarlo vacÃa la cache.",
 "Directory Settings" => "ConfiguraciÃ³n de Directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
 "Base User Tree" => "Ãrbol base de usuario",
 "One User Base DN per line" => "Una DN base de usuario por lÃnea",
 "User Search Attributes" => "Atributos de la bÃºsqueda de usuario",
 "Optional; one attribute per line" => "Opcional; un atributo por linea",
 "Group Display Name Field" => "Campo de nombre de grupo a mostrar",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud.",
 "Base Group Tree" => "Ãrbol base de grupo",
 "One Group Base DN per line" => "Una DN base de grupo por lÃnea",
 "Group Search Attributes" => "Atributos de bÃºsqueda de grupo",
@@ -75,15 +71,13 @@
 "User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "VacÃo para el nombre de usuario (por defecto). En otro caso, especificÃ¡ un atributo LDAP/AD.",
 "Internal Username" => "Nombre interno de usuario",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es Ãºnico y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sÃ³lo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un nÃºmero serÃ¡ aÃ±adido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es tambiÃ©n el nombre por defecto para el directorio personal del usuario in ownCloud. TambiÃ©n es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuraciÃ³n el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresÃ¡ el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacÃo para el comportamiento por defecto. Los cambios solo tendrÃ¡n efecto para los nuevos usuarios LDAP.",
 "Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
 "Override UUID detection" => "Sobrescribir la detecciÃ³n UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud detecta automÃ¡ticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. AdemÃ¡s, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. PodÃ©s sobrescribir la configuraciÃ³n y pasar un atributo de tu elecciÃ³n. TenÃ©s que asegurarte de que el atributo de tu elecciÃ³n sea accesible por los usuarios y grupos y ser Ãºnico. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrÃ¡n efecto sÃ³lo en los nuevos usuarios y grupos de LDAP.",
 "UUID Attribute:" => "Atributo UUID:",
 "Username-LDAP User Mapping" => "AsignaciÃ³n del Nombre de usuario de un usuario LDAP",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisiÃ³n y reconocer usuarios, cada usuario LDAP tendrÃ¡ un nombre de usuario interno. Esto requiere una asignaciÃ³n de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. AdemÃ¡s el DN se almacena en cachÃ© principalmente para reducir la interacciÃ³n de LDAP, pero no se utiliza para la identificaciÃ³n. Si la DN cambia, los cambios serÃ¡n encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejarÃ¡ restos en distintos lugares. Borrar las asignaciones no depende de la configuraciÃ³n, Â¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producciÃ³n. SÃ³lo borrar asignaciones en una situaciÃ³n de prueba o experimental.",
 "Clear Username-LDAP User Mapping" => "Borrar la asignaciÃ³n de los Nombres de usuario de los usuarios LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Borrar la asignaciÃ³n de los Nombres de grupo de los grupos de LDAP",
 "Test Configuration" => "Probar configuraciÃ³n",
 "Help" => "Ayuda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 39346def039f056196426f3f0965df2cb217b9c1..f97a1ad740609b42cc53d4dfff1d78e62bc77fb7 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Vastendususte puhastamine ebaÃµnnestus.",
 "Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaÃµnnestus",
 "The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning Ã¼hendus on olemas!",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Ãœhenduse testimine ebaÃµnnestus",
 "Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
 "Confirm Deletion" => "Kinnita kustutamine",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole Ã¼hilduvad. TÃ¶Ã¶s vÃµib esineda ootamatuid tÃµrkeid.\nPalu oma sÃ¼steemihalduril Ã¼ks neist rakendustest kasutusest eemaldada.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole Ã¼hilduvad. TÃ¶Ã¶s vÃµib esineda ootamatuid tÃµrkeid.\nPalu oma sÃ¼steemihalduril Ã¼ks neist rakendustest kasutusest eemaldada.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole vÃµimalik. Palu oma sÃ¼steeihaldurit see paigaldada.",
 "Server configuration" => "Serveri seadistus",
 "Add Server Configuration" => "Lisa serveri seadistus",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Lisa tÃ¤iendav LDAP/AD server, mida replikeeritakse peaserveriga.",
 "Backup (Replica) Port" => "Varuserveri (replika) port",
 "Disable Main Server" => "Ã„ra kasuta peaserverit",
-"When switched on, ownCloud will only connect to the replica server." => "MÃ¤rgituna ownCloud Ã¼hendub ainult varuserverisse.",
+"Only connect to the replica server." => "Ãœhendu ainult replitseeriva serveriga.",
 "Use TLS" => "Kasuta TLS-i",
 "Do not use it additionally for LDAPS connections, it will fail." => "LDAPS puhul Ã¤ra kasuta. Ãœhendus ei toimi.",
 "Case insensitve LDAP server (Windows)" => "MittetÃµstutundlik LDAP server (Windows)",
 "Turn off SSL certificate validation." => "LÃ¼lita SSL sertifikaadi kontrollimine vÃ¤lja.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kui Ã¼hendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Kui Ã¼hendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
 "Not recommended, use for testing only." => "Pole soovitatav, kasuta ainult testimiseks.",
 "Cache Time-To-Live" => "Puhvri iga",
 "in seconds. A change empties the cache." => "sekundites. Muudatus tÃ¼hjendab vahemÃ¤lu.",
 "Directory Settings" => "Kataloogi seaded",
 "User Display Name Field" => "Kasutaja nÃ¤idatava nime vÃ¤li",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks.",
+"The LDAP attribute to use to generate the user's display name." => "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks.",
 "Base User Tree" => "Baaskasutaja puu",
 "One User Base DN per line" => "Ãœks kasutajate baas-DN rea kohta",
 "User Search Attributes" => "Kasutaja otsingu atribuudid",
 "Optional; one attribute per line" => "Valikuline; Ã¼ks atribuut rea kohta",
 "Group Display Name Field" => "Grupi nÃ¤idatava nime vÃ¤li",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks.",
+"The LDAP attribute to use to generate the groups's display name." => "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks.",
 "Base Group Tree" => "Baasgrupi puu",
 "One Group Base DN per line" => "Ãœks grupi baas-DN rea kohta",
 "Group Search Attributes" => "Grupi otsingu atribuudid",
@@ -75,15 +76,16 @@
 "User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikevÃ¤Ã¤rtus) kasutamiseks jÃ¤ta tÃ¼hjaks. Vastasel juhul mÃ¤Ã¤ra LDAP/AD omadus.",
 "Internal Username" => "Sisemine kasutajanimi",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sÃ¼mboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult jÃ¤rgmised sÃ¼mbolid: [ a-zA-Z0-9_.@- ]. Muud sÃ¼mbolid asendatakse nende ASCII vastega vÃµi lihtsalt hÃ¼ljatakse. TÃµrgete korral lisatakse number vÃµi suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ãœhtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, nÃ¤iteks kÃµikidel *DAV teenustel.Selle seadistusega saab tÃ¼histada vaikimisi kÃ¤itumise. Saavutamaks sarnast kÃ¤itumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut jÃ¤rgnevale vÃ¤ljale. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sÃ¼mboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult jÃ¤rgmised sÃ¼mbolid: [ a-zA-Z0-9_.@- ]. Muud sÃ¼mbolid asendatakse nende ASCII vastega vÃµi lihtsalt hÃ¼ljatakse. TÃµrgete korral lisatakse number vÃµi suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ãœhtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, nÃ¤iteks kÃµikidel *DAV teenustel. Selle seadistusega saab tÃ¼histada vaikimisi kÃ¤itumise. Saavutamaks sarnast kÃ¤itumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut jÃ¤rgnevale vÃ¤ljale. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
 "Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
 "Override UUID detection" => "TÃ¼hista UUID tuvastus",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole mÃ¤Ã¤ratud teisiti. Sa saad tÃ¼histada selle seadistuse ning mÃ¤Ã¤rata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole mÃ¤Ã¤ratud teisiti. Sa saad tÃ¼histada selle seadistuse ning mÃ¤Ã¤rata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
 "UUID Attribute:" => "UUID atribuut:",
 "Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et tÃ¤pselt tuvastada ja mÃ¤Ã¤ratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vÃ¤hendamaks LDAP pÃ¤ringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse Ã¼le kogu ownCloudi. Eemaldates vastenduse tekivad kÃµikjal andmejÃ¤Ã¤gid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mÃµjutab kÃµiki LDAP seadistusi! Ã„ra kunagi eemalda vastendusi produktsioonis! Seda vÃµid teha ainult testis vÃµi katsetuste masinas.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et tÃ¤pselt tuvastada ja mÃ¤Ã¤ratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vÃ¤hendamaks LDAP pÃ¤ringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse Ã¼le kogu ownCloudi. Eemaldates vastenduse tekivad kÃµikjal andmejÃ¤Ã¤gid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mÃµjutab kÃµiki LDAP seadistusi! Ã„ra kunagi eemalda vastendusi produktsioonis! Seda vÃµid teha ainult testis vÃµi katsetuste masinas.",
 "Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
 "Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
 "Test Configuration" => "Testi seadistust",
 "Help" => "Abiinfo"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 42f184e53902efa1b5af5bec74247e2a255bf8ed..59e8371d9c21e4f535aba11f426f5484f829bb86 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Zerbitzariaren konfigurazioa ezabatzeak huts egin du",
 "The configuration is valid and the connection could be established!" => "Konfigurazioa egokia da eta konexioa ezarri daiteke!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
@@ -13,7 +14,6 @@
 "Connection test failed" => "Konexio frogak huts egin du",
 "Do you really want to delete the current Server Configuration?" => "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
 "Confirm Deletion" => "Baieztatu Ezabatzea",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
 "Server configuration" => "Zerbitzariaren konfigurazioa",
 "Add Server Configuration" => "Gehitu Zerbitzariaren Konfigurazioa",
@@ -43,24 +43,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da.",
 "Backup (Replica) Port" => "Babeskopia (Replica) Ataka",
 "Disable Main Server" => "Desgaitu Zerbitzari Nagusia",
-"When switched on, ownCloud will only connect to the replica server." => "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da.",
 "Use TLS" => "Erabili TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Ez erabili LDAPS konexioetarako, huts egingo du.",
 "Case insensitve LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)",
 "Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian.",
 "Not recommended, use for testing only." => "Ez da aholkatzen, erabili bakarrik frogak egiteko.",
 "Cache Time-To-Live" => "Katxearen Bizi-Iraupena",
 "in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
 "Directory Settings" => "Karpetaren Ezarpenak",
 "User Display Name Field" => "Erabiltzaileen bistaratzeko izena duen eremua",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua",
 "Base User Tree" => "Oinarrizko Erabiltzaile Zuhaitza",
 "One User Base DN per line" => "Erabiltzaile DN Oinarri bat lerroko",
 "User Search Attributes" => "Erabili Bilaketa Atributuak ",
 "Optional; one attribute per line" => "Aukerakoa; atributu bat lerro bakoitzeko",
 "Group Display Name Field" => "Taldeen bistaratzeko izena duen eremua",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua",
 "Base Group Tree" => "Oinarrizko Talde Zuhaitza",
 "One Group Base DN per line" => "Talde DN Oinarri bat lerroko",
 "Group Search Attributes" => "Taldekatu Bilaketa Atributuak ",
@@ -72,6 +68,8 @@
 "Email Field" => "Eposta eremua",
 "User Home Folder Naming Rule" => "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
+"Internal Username" => "Barneko erabiltzaile izena",
 "Test Configuration" => "Egiaztatu Konfigurazioa",
 "Help" => "Laguntza"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index bef13457adb7cc80bae02c2464a5aa7a84aa7e71..7b65c798d823c123b2746a39de8bd1d73ac34a0d 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -1,8 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ø¹Ø¯Ù… Ù…ÙˆÙÙ‚ÛŒØª Ø¯Ø± Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ú¯Ø§Ø´Øª.",
 "Failed to delete the server configuration" => "Ø¹Ù…Ù„ÛŒØ§Øª ØØ°Ù Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ø³Ø±ÙˆØ± Ù†Ø§Ù…ÙˆÙÙ‚ Ù…Ø§Ù†Ø¯",
 "The configuration is valid and the connection could be established!" => "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª Ùˆ Ø§Ø±ØªØ¨Ø§Ø· Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø¨Ø±Ù‚Ø±Ø§Ø± Ø´ÙˆØ¯",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù…Ø¹ØªØ¨Ø±Ø§Ø³ØªØŒ Ø§Ù…Ø§ Ø§ØªØµØ§Ù„ Ø´Ú©Ø³Øª Ø®ÙˆØ±Ø¯. Ù„Ø·ÙØ§ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ùˆ Ø§Ø¹ØªØ¨Ø§Ø±Ù‡Ø§ÛŒ Ø³Ø±ÙˆØ± Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯.",
 "Deletion failed" => "ØØ°Ù Ú©Ø±Ø¯Ù† Ø§Ù†Ø¬Ø§Ù… Ù†Ø´Ø¯",
 "Keep settings?" => "Ø¢ÛŒØ§ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø°Ø®ÛŒØ±Ù‡ Ø´ÙˆØ¯ ØŸ",
+"Cannot add server configuration" => "Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ø³Ø±ÙˆØ± Ø±Ø§ Ø§Ø¶Ø§ÙÙ‡ Ù†Ù…ÙˆØ¯",
+"mappings cleared" => "Ù†Ú¯Ø§Ø´Øª Ù¾Ø§Ú© Ø´Ø¯Ù‡ Ø§Ø³Øª",
+"Success" => "Ù…ÙˆÙÙ‚ÛŒØª",
 "Error" => "Ø®Ø·Ø§",
 "Connection test succeeded" => "ØªØ³Øª Ø§ØªØµØ§Ù„ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø§Ù†Ø¬Ø§Ù… Ú¯Ø±Ø¯ÛŒØ¯",
 "Connection test failed" => "ØªØ³Øª Ø§ØªØµØ§Ù„ Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯",
@@ -11,9 +17,53 @@
 "Server configuration" => "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ø³Ø±ÙˆØ±",
 "Add Server Configuration" => "Ø§ÙØ²ÙˆØ¯Ù† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ø³Ø±ÙˆØ±",
 "Host" => "Ù…ÛŒØ²Ø¨Ø§Ù†ÛŒ",
+"Base DN" => "Ù¾Ø§ÛŒÙ‡ DN",
+"One Base DN per line" => "ÛŒÚ© Ù¾Ø§ÛŒÙ‡ DN Ø¯Ø± Ù‡Ø± Ø®Ø·",
+"You can specify Base DN for users and groups in the Advanced tab" => "Ø´Ù…Ø§ Ù…ÛŒ ØªÙˆØ§Ù†ÛŒØ¯ Ù¾Ø§ÛŒÙ‡ DN Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ùˆ Ú¯Ø±ÙˆÙ‡ Ù‡Ø§ Ø¯Ø± Ø²Ø¨Ø§Ù†Ù‡ Advanced Ù…Ø´Ø®Øµ Ú©Ù†ÛŒØ¯.",
+"User DN" => "Ú©Ø§Ø±Ø¨Ø± DN",
 "Password" => "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡",
+"For anonymous access, leave DN and Password empty." => "Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªØ±Ø³ÛŒ Ù†Ø§Ø´Ù†Ø§Ø³ØŒ DN Ø±Ø§ Ø±Ù‡Ø§ Ù†Ù…ÙˆØ¯Ù‡ Ùˆ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø±Ø§ Ø®Ø§Ù„ÛŒ Ø¨Ú¯Ø°Ø§Ø±ÛŒØ¯.",
+"User Login Filter" => "ÙÛŒÙ„ØªØ± ÙˆØ±ÙˆØ¯ÛŒ Ú©Ø§Ø±Ø¨Ø±",
 "Group Filter" => "ÙÛŒÙ„ØªØ± Ú¯Ø±ÙˆÙ‡",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Ø¨Ø¯ÙˆÙ† Ù‡ÛŒÚ† Ú¯ÙˆÙ†Ù‡ ØÙØ±Ù‡ ÛŒØ§ Ø³ÙˆØ±Ø§Ø®ØŒ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø«Ø§Ù„ØŒ \"objectClass = posixGroup\".",
+"Connection Settings" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø§ØªØµØ§Ù„",
+"Configuration Active" => "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ ÙØ¹Ø§Ù„",
+"When unchecked, this configuration will be skipped." => "Ø²Ù…Ø§Ù†ÛŒÚ©Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ù†Ø´ÙˆØ¯ØŒ Ø§ÛŒÙ† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯.",
 "Port" => "Ø¯Ø±Ú¯Ø§Ù‡",
+"Backup (Replica) Host" => "Ù¾Ø´ØªÛŒØ¨Ø§Ù† Ú¯ÛŒØ±ÛŒ (Ø¨Ø¯Ù„) Ù…ÛŒØ²Ø¨Ø§Ù†",
+"Backup (Replica) Port" => "Ù¾Ø´ØªÛŒØ¨Ø§Ù† Ú¯ÛŒØ±ÛŒ (Ø¨Ø¯Ù„) Ù¾ÙˆØ±Øª",
+"Disable Main Server" => "ØºÛŒØ± ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø³Ø±ÙˆØ± Ø§ØµÙ„ÛŒ",
+"Use TLS" => "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø²TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Ø¹Ù„Ø§ÙˆÙ‡ Ø¨Ø± Ø§ÛŒÙ† Ø¨Ø±Ø§ÛŒ Ø§ØªØµØ§Ù„Ø§Øª LDAPS  Ø§Ø² Ø¢Ù† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù†Ú©Ù†ÛŒØ¯ØŒ Ø¨Ø§ Ø´Ú©Ø³Øª Ù…ÙˆØ§Ø¬Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯.",
+"Case insensitve LDAP server (Windows)" => "ØºÛŒØ± ØØ³Ø§Ø³ Ø¨Ù‡ Ø¨Ø²Ø±Ú¯ÛŒ Ùˆ Ú©ÙˆÚ†Ú©ÛŒ ØØ±ÙˆÙ LDAP Ø³Ø±ÙˆØ± (ÙˆÛŒÙ†Ø¯ÙˆØ²)",
+"Turn off SSL certificate validation." => "ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø§Ø¹ØªØ¨Ø§Ø± Ú¯ÙˆØ§Ù‡ÛŒ Ù†Ø§Ù…Ù‡ SSL .",
+"Not recommended, use for testing only." => "ØªÙˆØµÛŒÙ‡ Ù†Ù…ÛŒ Ø´ÙˆØ¯ØŒ ØªÙ†Ù‡Ø§ Ø¨Ø±Ø§ÛŒ Ø¢Ø²Ù…Ø§ÛŒØ´ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯.",
+"Directory Settings" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ù¾ÙˆØ´Ù‡",
+"User Display Name Field" => "ÙÛŒÙ„Ø¯ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±",
+"Base User Tree" => "Ú©Ø§Ø±Ø¨Ø± Ø¯Ø±Ø®Øª Ù¾Ø§ÛŒÙ‡",
+"One User Base DN per line" => "ÛŒÚ© Ú©Ø§Ø±Ø¨Ø± Ù¾Ø§ÛŒÙ‡ DN Ø¯Ø± Ù‡Ø± Ø®Ø·",
+"User Search Attributes" => "ÙˆÛŒÚ˜Ú¯ÛŒ Ù‡Ø§ÛŒ Ø¬Ø³ØªØ¬ÙˆÛŒ Ú©Ø§Ø±Ø¨Ø±",
+"Optional; one attribute per line" => "Ø§Ø®ØªÛŒØ§Ø±ÛŒØ› ÛŒÚ© ÙˆÛŒÚ˜Ú¯ÛŒ Ø¯Ø± Ù‡Ø± Ø®Ø·",
+"Group Display Name Field" => "ÙÛŒÙ„Ø¯ Ù†Ø§Ù… Ú¯Ø±ÙˆÙ‡",
+"Base Group Tree" => "Ú¯Ø±ÙˆÙ‡ Ø¯Ø±Ø®Øª Ù¾Ø§ÛŒÙ‡ ",
+"One Group Base DN per line" => "ÛŒÚ© Ú¯Ø±ÙˆÙ‡ Ù¾Ø§ÛŒÙ‡ DN Ø¯Ø± Ù‡Ø± Ø®Ø·",
+"Group Search Attributes" => "Ú¯Ø±ÙˆÙ‡ ØµÙØ§Øª Ø¬Ø³ØªØ¬Ùˆ",
+"Group-Member association" => "Ø§Ù†Ø¬Ù…Ù† Ú¯Ø±ÙˆÙ‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù†",
+"Special Attributes" => "ÙˆÛŒÚ˜Ú¯ÛŒ Ù‡Ø§ÛŒ Ù…Ø®ØµÙˆØµ",
+"Quota Field" => "Ø³Ù‡Ù…ÛŒÙ‡ Ø¨Ù†Ø¯ÛŒ Ø§Ù†Ø¬Ø§Ù… Ù†Ø´Ø¯.",
+"Quota Default" => "Ø³Ù‡Ù…ÛŒÙ‡ Ø¨Ù†Ø¯ÛŒ Ù¾ÛŒØ´ ÙØ±Ø¶",
 "in bytes" => "Ø¯Ø± Ø¨Ø§ÛŒØª",
+"Email Field" => "Ø§ÛŒÙ…ÛŒÙ„ Ø§Ø±Ø³Ø§Ù„ Ù†Ø´Ø¯.",
+"User Home Folder Naming Rule" => "Ù‚Ø§Ù†ÙˆÙ† Ù†Ø§Ù…Ú¯Ø°Ø§Ø±ÛŒ Ù¾ÙˆØ´Ù‡ Ø®Ø§Ù†Ù‡ Ú©Ø§Ø±Ø¨Ø±",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ø®Ø§Ù„ÛŒ Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ (Ù¾ÛŒØ´ ÙØ±Ø¶). Ø¯Ø± ØºÛŒØ± Ø§ÛŒÙ† ØµÙˆØ±ØªØŒ ØªØ¹ÛŒÛŒÙ† ÛŒÚ© ÙˆÛŒÚ˜Ú¯ÛŒ LDAP/AD.",
+"Internal Username" => "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¯Ø§Ø®Ù„ÛŒ",
+"Internal Username Attribute:" => "ÙˆÛŒÚ˜Ú¯ÛŒ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¯Ø§Ø®Ù„ÛŒ:",
+"Override UUID detection" => "Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ† ØªØ´Ø®ÛŒØµ UUID ",
+"UUID Attribute:" => "ØµÙØª UUID:",
+"Username-LDAP User Mapping" => "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ - Ù†Ú¯Ø§Ø´Øª Ú©Ø§Ø±Ø¨Ø± LDAP ",
+"Clear Username-LDAP User Mapping" => "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ- LDAP  Ù†Ú¯Ø§Ø´Øª Ú©Ø§Ø±Ø¨Ø± ",
+"Clear Groupname-LDAP Group Mapping" => "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ø§Ù… Ú¯Ø±ÙˆÙ‡ -LDAP Ú¯Ø±ÙˆÙ‡ Ù†Ù‚Ø´Ù‡ Ø¨Ø±Ø¯Ø§Ø±ÛŒ",
+"Test Configuration" => "Ø§Ù…ØªØØ§Ù† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ",
 "Help" => "Ø±Ø§Ù‡â€ŒÙ†Ù…Ø§"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 38a8b99cf7e5424a0fd82fba75cb240869b265a3..744833ff7b3b05af8d4c36ef4293901361813727 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Poisto epÃ¤onnistui",
 "Keep settings?" => "SÃ¤ilytetÃ¤Ã¤nkÃ¶ asetukset?",
 "Cannot add server configuration" => "Palvelinasetusten lisÃ¤ys epÃ¤onnistui",
@@ -30,15 +31,12 @@
 "Use TLS" => "KÃ¤ytÃ¤ TLS:Ã¤Ã¤",
 "Case insensitve LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
 "Turn off SSL certificate validation." => "Poista kÃ¤ytÃ¶stÃ¤ SSL-varmenteen vahvistus",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jos yhteys toimii vain tÃ¤llÃ¤ valinnalla, siirrÃ¤ LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi.",
 "Not recommended, use for testing only." => "Ei suositella, kÃ¤ytÃ¤ vain testausta varten.",
 "in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentÃ¤Ã¤ vÃ¤limuistin.",
 "Directory Settings" => "Hakemistoasetukset",
 "User Display Name Field" => "KÃ¤yttÃ¤jÃ¤n nÃ¤ytettÃ¤vÃ¤n nimen kenttÃ¤",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP-attribuutti, jota kÃ¤ytetÃ¤Ã¤n kÃ¤yttÃ¤jÃ¤n ownCloud-kÃ¤yttÃ¤jÃ¤nimenÃ¤ ",
 "Base User Tree" => "OletuskÃ¤yttÃ¤jÃ¤puu",
 "Group Display Name Field" => "RyhmÃ¤n \"nÃ¤ytettÃ¤vÃ¤ nimi\"-kenttÃ¤",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP-attribuutti, jota kÃ¤ytetÃ¤Ã¤n luomaan ryhmÃ¤n ownCloud-nimi",
 "Base Group Tree" => "Ryhmien juuri",
 "Group-Member association" => "RyhmÃ¤n ja jÃ¤senen assosiaatio (yhteys)",
 "in bytes" => "tavuissa",
@@ -46,3 +44,4 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "JÃ¤tÃ¤ tyhjÃ¤ksi kÃ¤yttÃ¤jÃ¤nimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
 "Help" => "Ohje"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 11f8fbaaf4483ec1f1fb8507a81f8c0f946f7505..5fc02e583721794d2bea0ea39cd6141fa27ecd20 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Erreur lors de la suppression des associations.",
 "Failed to delete the server configuration" => "Ã‰chec de la suppression de la configuration du serveur",
 "The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut Ãªtre Ã©tablie !",
@@ -15,7 +16,6 @@
 "Connection test failed" => "Test de connexion Ã©chouÃ©",
 "Do you really want to delete the current Server Configuration?" => "ÃŠtes-vous vraiment sÃ»r de vouloir effacer la configuration actuelle du serveur ?",
 "Confirm Deletion" => "Confirmer la suppression",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur systÃ¨me pour qu'il dÃ©sactive l'une d'elles.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Attention :</b> Le module php LDAP n'est pas installÃ©, par consÃ©quent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur systÃ¨me afin qu'il l'installe.",
 "Server configuration" => "Configuration du serveur",
 "Add Server Configuration" => "Ajouter une configuration du serveur",
@@ -45,24 +45,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fournir un serveur de backup optionnel.  Il doit s'agir d'une rÃ©plique du serveur LDAP/AD principal.",
 "Backup (Replica) Port" => "Port du serveur de backup (rÃ©plique)",
 "Disable Main Server" => "DÃ©sactiver le serveur principal",
-"When switched on, ownCloud will only connect to the replica server." => "Lorsqu'activÃ©, ownCloud ne se connectera qu'au serveur rÃ©pliquÃ©.",
 "Use TLS" => "Utiliser TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Ã€ ne pas utiliser pour les connexions LDAPS (cela Ã©chouera).",
 "Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible Ã  la casse (Windows)",
 "Turn off SSL certificate validation." => "DÃ©sactiver la validation du certificat SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud.",
 "Not recommended, use for testing only." => "Non recommandÃ©, utilisation pour tests uniquement.",
 "Cache Time-To-Live" => "DurÃ©e de vie du cache",
 "in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
 "Directory Settings" => "ParamÃ¨tres du rÃ©pertoire",
 "User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attribut LDAP utilisÃ© pour gÃ©nÃ©rer les noms d'utilisateurs d'ownCloud.",
 "Base User Tree" => "DN racine de l'arbre utilisateurs",
 "One User Base DN per line" => "Un DN racine utilisateur par ligne",
 "User Search Attributes" => "Recherche des attributs utilisateur",
 "Optional; one attribute per line" => "Optionnel, un attribut par ligne",
 "Group Display Name Field" => "Champ \"nom d'affichage\" du groupe",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attribut LDAP utilisÃ© pour gÃ©nÃ©rer les noms de groupes d'ownCloud.",
 "Base Group Tree" => "DN racine de l'arbre groupes",
 "One Group Base DN per line" => "Un DN racine groupe par ligne",
 "Group Search Attributes" => "Recherche des attributs du groupe",
@@ -75,15 +71,13 @@
 "User Home Folder Naming Rule" => "Convention de nommage du rÃ©pertoire utilisateur",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
 "Internal Username" => "Nom d'utilisateur interne",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Par dÃ©faut le nom d'utilisateur interne sera crÃ©Ã© Ã  partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractÃ¨res ne nÃ©cessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractÃ¨res suivants: [ a-zA-Z0-9_.@- ]. Les autres caractÃ¨res sont remplacÃ©s par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrÃ©mentÃ©/dÃ©crÃ©mentÃ©. Le nom d'utilisateur interne est utilisÃ© pour identifier l'utilisateur au sein du systÃ¨me. C'est aussi le nom par dÃ©faut du rÃ©pertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par dÃ©faut peut Ãªtre modifiÃ© Ã  l'aide de ce paramÃ¨tre. Pour obtenir un comportement similaire aux versions prÃ©cÃ©dentes Ã  ownCloud 5, saisir le nom d'utilisateur Ã  afficher dans le champ suivant. Laissez Ã  blanc pour le comportement par dÃ©faut. Les modifications prendront effet seulement pour les nouveaux (ajoutÃ©s) utilisateurs LDAP.",
 "Internal Username Attribute:" => "Nom d'utilisateur interne:",
 "Override UUID detection" => "Surcharger la dÃ©tection d'UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Par dÃ©faut, ownCloud dÃ©tecte automatiquement l'attribut UUID. L'attribut UUID est utilisÃ© pour identifier les utilisateurs et groupes de faÃ§on prÃ©dictive. De plus, le nom d'utilisateur interne sera crÃ©Ã© basÃ© sur l'UUID s'il n'est pas explicitÃ© ci-dessus. Vous pouvez modifier ce comportement et dÃ©finir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut Ãªtre rÃ©cupÃ©rÃ© pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser Ã  blanc pour le comportement par dÃ©faut. Les modifications seront effectives uniquement pour les nouveaux (ajoutÃ©s) utilisateurs et groupes LDAP.",
 "UUID Attribute:" => "Attribut UUID :",
 "Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre prÃ©cisÃ©ment les utilisateurs, chaque utilisateur aura un nom interne spÃ©cifique. Cela requiert l'association d'un nom d'utilisateur ownCloud Ã  un nom d'utilisateur LDAP. Le nom d'utilisateur crÃ©Ã© est associÃ© Ã  l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mÃ©morisÃ© en cache pour limiter les interactions LDAP mais il n'est pas utilisÃ© pour l'identification. ownCloud dÃ©tectera le changement de DN, le cas Ã©chÃ©ant. Seul le nom interne Ã  ownCloud est utilisÃ© au sein du produit. Supprimer les associations crÃ©era des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expÃ©rimentation.",
 "Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
 "Test Configuration" => "Tester la configuration",
 "Help" => "Aide"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 3f44ccd9bd1a0a95a2b87ec43f4dd1894f7a9897..ce4967f8b8c3117ed299ca2186e867d1f8d367c6 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Non foi posÃbel limpar as asignaciÃ³ns.",
 "Failed to delete the server configuration" => "Non foi posÃbel eliminar a configuraciÃ³n do servidor",
 "The configuration is valid and the connection could be established!" => "A configuraciÃ³n Ã© correcta e pode estabelecerse a conexiÃ³n.",
@@ -15,7 +16,7 @@
 "Connection test failed" => "A proba de conexiÃ³n fracasou",
 "Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuraciÃ³n actual do servidor?",
 "Confirm Deletion" => "Confirmar a eliminaciÃ³n",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatÃbeis. Pode acontecer un comportamento estraÃ±o. Consulte co administrador do sistema para desactivar un deles.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatÃbeis. Pode acontecer un comportamento estraÃ±o. Consulte co administrador do sistema para desactivar un deles.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O mÃ³dulo PHP LDAP non estÃ¡ instalado, o servidor non funcionarÃ¡. Consulte co administrador do sistema para instalalo.",
 "Server configuration" => "ConfiguraciÃ³n do servidor",
 "Add Server Configuration" => "Engadir a configuraciÃ³n do servidor",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Indicar un servidor de copia de seguranza opcional. Debe ser unha rÃ©plica do servidor principal LDAP/AD.",
 "Backup (Replica) Port" => "Porto da copia de seguranza (RÃ©plica)",
 "Disable Main Server" => "Desactivar o servidor principal",
-"When switched on, ownCloud will only connect to the replica server." => "Cando estÃ¡ activado, ownCloud sÃ³ se conectarÃ¡ ao servidor de rÃ©plica.",
+"Only connect to the replica server." => "Conectar sÃ³ co servidor de rÃ©plica.",
 "Use TLS" => "Usar TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Non utilizalo ademais para conexiÃ³ns LDAPS xa que fallarÃ¡.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiÃºsculas e minÃºsculas (Windows)",
 "Turn off SSL certificate validation." => "Desactiva a validaciÃ³n do certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexiÃ³n sÃ³ funciona con esta opciÃ³n importe o certificado SSL do servidor LDAP no seu servidor ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se a conexiÃ³n sÃ³ funciona con esta opciÃ³n importa o certificado SSL do servidor LDAP no teu servidor %s.",
 "Not recommended, use for testing only." => "Non se recomenda. SÃ³ para probas.",
 "Cache Time-To-Live" => "Tempo de persistencia da cachÃ©",
 "in seconds. A change empties the cache." => "en segundos. Calquera cambio baleira a cachÃ©.",
 "Directory Settings" => "Axustes do directorio",
 "User Display Name Field" => "Campo de mostra do nome de usuario",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud.",
+"The LDAP attribute to use to generate the user's display name." => "O atributo LDAP a empregar para xerar o nome de usuario para amosar.",
 "Base User Tree" => "Base da Ã¡rbore de usuarios",
 "One User Base DN per line" => "Un DN base de usuario por liÃ±a",
 "User Search Attributes" => "Atributos de busca do usuario",
 "Optional; one attribute per line" => "Opcional; un atributo por liÃ±a",
 "Group Display Name Field" => "Campo de mostra do nome de grupo",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP Ãºsase para xerar os nomes dos grupos de ownCloud.",
+"The LDAP attribute to use to generate the groups's display name." => "O atributo LDAP Ãºsase para xerar os nomes dos grupos que amosar.",
 "Base Group Tree" => "Base da Ã¡rbore de grupo",
 "One Group Base DN per line" => "Un DN base de grupo por liÃ±a",
 "Group Search Attributes" => "Atributos de busca do grupo",
@@ -75,15 +76,16 @@
 "User Home Folder Naming Rule" => "Regra de nomeado do cartafol do usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
 "Internal Username" => "Nome de usuario interno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario Ã© Ãºnico e de non ter que converter os caracteres. O nome de usuario interno ten a limitaciÃ³n de que sÃ³ estÃ¡n permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitÃºense pola sÃºa correspondencia ASCII ou simplemente omÃtense. Nas colisiÃ³ns engadirase/incrementarase un nÃºmero. O nome de usuario interno utilizase para identificar a un usuario interno. Ã‰ tamÃ©n o nome predeterminado do cartafol persoal do usuario en ownCloud. TamÃ©n Ã© un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario Ã© Ãºnico e de non ter que converter os caracteres. O nome de usuario interno ten a limitaciÃ³n de que sÃ³ estÃ¡n permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitÃºense pola sÃºa correspondencia ASCII ou simplemente omÃtense. Nas colisiÃ³ns engadirase/incrementarase un nÃºmero. O nome de usuario interno utilizase para identificar a un usuario interno. Ã‰ tamÃ©n o nome predeterminado do cartafol persoal do usuario. TamÃ©n Ã© parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP.",
 "Internal Username Attribute:" => "Atributo do nome de usuario interno:",
 "Override UUID detection" => "Ignorar a detecciÃ³n do UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dÃºbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuraciÃ³n e pasar un atributo da sÃºa escolla. Vostede debe asegurarse de que o atributo da sÃºa escolla pode ser recuperado polos usuarios e grupos e de que Ã© Ãºnico. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "De xeito predeterminado, o atributo UUID Ã© detectado automaticamente. O atributo UUID utilizase para identificar, sen dÃºbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuraciÃ³n e pasar un atributo da sÃºa escolla. Vostede debe asegurarse de que o atributo da sÃºa escolla pode ser recuperado polos usuarios e grupos e de que Ã© Ãºnico. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP.",
 "UUID Attribute:" => "Atributo do UUID:",
 "Username-LDAP User Mapping" => "AsignaciÃ³n do usuario ao Â«nome de usuario LDAPÂ»",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisiÃ³n e recoÃ±ecer aos usuarios, cada usuario LDAP terÃ¡ un nome de usuario interno. Isto require unha asignaciÃ³n de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na cachÃ©, para asÃ reducir a interacciÃ³n do LDAP, mais non se utiliza para a identificaciÃ³n. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignaciÃ³ns deixarÃ¡ rastros en todas partes. A limpeza das asignaciÃ³ns non Ã© sensÃbel Ã¡ configuraciÃ³n, afecta a todas as configuraciÃ³ns de LDAP! Non limpar nunca as asignaciÃ³ns nun entorno de produciÃ³n. Limpar as asignaciÃ³ns sÃ³ en fases de proba ou experimentais.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisiÃ³n e recoÃ±ecer aos usuarios, cada usuario LDAP terÃ¡ un nome de usuario interno. Isto require unha asignaciÃ³n de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na cachÃ©, para asÃ reducir a interacciÃ³n do LDAP, mais non se utiliza para a identificaciÃ³n. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignaciÃ³ns deixarÃ¡ rastros en todas partes. A limpeza das asignaciÃ³ns non Ã© sensÃbel Ã¡ configuraciÃ³n, afecta a todas as configuraciÃ³ns de LDAP! Non limpar nunca as asignaciÃ³ns nun entorno de produciÃ³n. Limpar as asignaciÃ³ns sÃ³ en fases de proba ou experimentais.",
 "Clear Username-LDAP User Mapping" => "Limpar a asignaciÃ³n do usuario ao Â«nome de usuario LDAPÂ»",
 "Clear Groupname-LDAP Group Mapping" => "Limpar a asignaciÃ³n do grupo ao Â«nome de grupo LDAPÂ»",
 "Test Configuration" => "Probar a configuraciÃ³n",
 "Help" => "Axuda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 0d60768dcfccc232f58642638c133aceed661bce..b39a4277078cea08b736e4d046d0bd77f5e5b4be 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "×ž×—×™×§×” × ×›×©×œ×”",
 "Keep settings?" => "×”×× ×œ×©×ž×•×¨ ××ª ×”×”×’×“×¨×•×ª?",
 "Cannot add server configuration" => "×œ× × ×™×ª×Ÿ ×œ×”×•×¡×™×£ ××ª ×”×’×“×¨×•×ª ×”×©×¨×ª",
@@ -21,3 +22,4 @@
 "in bytes" => "×‘×‘×ª×™×",
 "Help" => "×¢×–×¨×”"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 8e8e4e8ff69d23faefc27d0d66033b1a6c7f1c29..24ae7a0217604bd79aca3e3728ba0b33053c59f2 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à¤¤à¥à¤°à¥à¤Ÿà¤¿",
 "Password" => "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡",
 "Help" => "à¤¸à¤¹à¤¯à¥‹à¤—"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index cc8918301f5e955b179f81bc7e044cf75e0f304c..c9445de0dfc97871ef4ae83f9d9db3d9cbd9f37a 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "GreÅ¡ka",
 "Password" => "Lozinka",
 "Help" => "PomoÄ‡"
 );
+$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;";
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 361ae5e0403152cb86e1aad06104744065fc636e..61fa37ed95cf4ab95b60944235191b594cacaa1a 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Nem sikerÃ¼lt tÃ¶rÃ¶lni a hozzÃ¡rendelÃ©seket.",
 "Failed to delete the server configuration" => "Nem sikerÃ¼lt tÃ¶rÃ¶lni a kiszolgÃ¡lÃ³ konfigurÃ¡ciÃ³jÃ¡t",
 "The configuration is valid and the connection could be established!" => "A konfigurÃ¡ciÃ³ Ã©rvÃ©nyes, Ã©s a kapcsolat lÃ©trehozhatÃ³!",
@@ -15,7 +16,6 @@
 "Connection test failed" => "A kapcsolatellenÅ‘rzÃ©s eredmÃ©nye: nem sikerÃ¼lt",
 "Do you really want to delete the current Server Configuration?" => "TÃ©nyleg tÃ¶rÃ¶lni szeretnÃ© a kiszolgÃ¡lÃ³ beÃ¡llÃtÃ¡sait?",
 "Confirm Deletion" => "A tÃ¶rlÃ©s megerÅ‘sÃtÃ©se",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Figyelem:</b> a user_ldap Ã©s user_webdavauth alkalmazÃ¡sok nem kompatibilisek. EgyÃ¼ttes hasznÃ¡latuk vÃ¡ratlan eredmÃ©nyekhez vezethet. KÃ©rje meg a rendszergazdÃ¡t, hogy a kettÅ‘ kÃ¶zÃ¼l kapcsolja ki az egyiket.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>FigyelmeztetÃ©s:</b> Az LDAP PHP modul nincs telepÃtve, ezÃ©rt ez az alrendszer nem fog mÅ±kÃ¶dni. KÃ©rje meg a rendszergazdÃ¡t, hogy telepÃtse!",
 "Server configuration" => "A kiszolgÃ¡lÃ³k beÃ¡llÃtÃ¡sai",
 "Add Server Configuration" => "Ãšj kiszolgÃ¡lÃ³ beÃ¡llÃtÃ¡sÃ¡nak hozzÃ¡adÃ¡sa",
@@ -45,24 +45,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Adjon meg egy opcionÃ¡lis mÃ¡sodkiszolgÃ¡lÃ³t. Ez a fÅ‘ LDAP/AD kiszolgÃ¡lÃ³ szinkron mÃ¡solata (replikÃ¡ja) kell legyen.",
 "Backup (Replica) Port" => "A mÃ¡sodkiszolgÃ¡lÃ³ (replika) portszÃ¡ma",
 "Disable Main Server" => "A fÅ‘ szerver kihagyÃ¡sa",
-"When switched on, ownCloud will only connect to the replica server." => "Ha ezt bekapcsoljuk, akkor az ownCloud csak a mÃ¡sodszerverekhez kapcsolÃ³dik.",
 "Use TLS" => "HasznÃ¡ljunk TLS-t",
 "Do not use it additionally for LDAPS connections, it will fail." => "LDAPS kapcsolatok esetÃ©n ne kapcsoljuk be, mert nem fog mÅ±kÃ¶dni.",
 "Case insensitve LDAP server (Windows)" => "Az LDAP-kiszolgÃ¡lÃ³ nem tesz kÃ¼lÃ¶nbsÃ©get a kis- Ã©s nagybetÅ±k kÃ¶zÃ¶tt (Windows)",
 "Turn off SSL certificate validation." => "Ne ellenÅ‘rizzÃ¼k az SSL-tanÃºsÃtvÃ¡ny Ã©rvÃ©nyessÃ©gÃ©t",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ha a kapcsolat csak ezzel a beÃ¡llÃtÃ¡ssal mÅ±kÃ¶dik, akkor importÃ¡lja az LDAP-kiszolgÃ¡lÃ³ SSL tanÃºsÃtvÃ¡nyÃ¡t az ownCloud kiszolgÃ¡lÃ³ra!",
 "Not recommended, use for testing only." => "Nem javasolt, csak tesztelÃ©sre Ã©rdemes hasznÃ¡lni.",
 "Cache Time-To-Live" => "A gyorsÃtÃ³tÃ¡r tÃ¡rolÃ¡si idÅ‘tartama",
 "in seconds. A change empties the cache." => "mÃ¡sodpercben. A vÃ¡ltoztatÃ¡s tÃ¶rli a cache tartalmÃ¡t.",
 "Directory Settings" => "CÃmtÃ¡r beÃ¡llÃtÃ¡sok",
 "User Display Name Field" => "A felhasznÃ¡lÃ³nÃ©v mezÅ‘je",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "EbbÅ‘l az LDAP attribÃºtumbÃ³l kÃ©pzÅ‘dik a felhasznÃ¡lÃ³ elnevezÃ©se, ami megjelenik az ownCloudban.",
 "Base User Tree" => "A felhasznÃ¡lÃ³i fa gyÃ¶kere",
 "One User Base DN per line" => "SoronkÃ©nt egy felhasznÃ¡lÃ³i fa gyÃ¶kerÃ©t adhatjuk meg",
 "User Search Attributes" => "A felhasznÃ¡lÃ³k lekÃ©rdezett attribÃºtumai",
 "Optional; one attribute per line" => "Nem kÃ¶telezÅ‘ megadni, soronkÃ©nt egy attribÃºtum",
 "Group Display Name Field" => "A csoport nevÃ©nek mezÅ‘je",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "EbbÅ‘l az LDAP attribÃºtumbÃ³l kÃ©pzÅ‘dik a csoport elnevezÃ©se, ami megjelenik az ownCloudban.",
 "Base Group Tree" => "A csoportfa gyÃ¶kere",
 "One Group Base DN per line" => "SoronkÃ©nt egy csoportfa gyÃ¶kerÃ©t adhatjuk meg",
 "Group Search Attributes" => "A csoportok lekÃ©rdezett attribÃºtumai",
@@ -84,3 +80,4 @@
 "Test Configuration" => "A beÃ¡llÃtÃ¡sok tesztelÃ©se",
 "Help" => "SÃºgÃ³"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 624fd4fa0eb460d3e1053c539407864a390208ed..9de7344f15fc70c311268e7cd49ce1291e438825 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Error",
 "Password" => "Contrasigno",
 "Help" => "Adjuta"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index c04d09fc671b0f531b856845cf33e5f5f27480fc..efaf8e3c92669147e2f31a5f7bb584d23c98b10e 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Gagal menghapus konfigurasi server",
 "The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
@@ -13,7 +14,6 @@
 "Connection test failed" => "Tes koneksi gagal",
 "Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?",
 "Confirm Deletion" => "Konfirmasi Penghapusan",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
 "Server configuration" => "Konfigurasi server",
 "Add Server Configuration" => "Tambah Konfigurasi Server",
@@ -43,24 +43,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.",
 "Backup (Replica) Port" => "Port Cadangan (Replika)",
 "Disable Main Server" => "Nonaktifkan Server Utama",
-"When switched on, ownCloud will only connect to the replica server." => "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika.",
 "Use TLS" => "gunakan TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal.",
 "Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)",
 "Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda.",
 "Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.",
 "Cache Time-To-Live" => "Gunakan Tembolok untuk Time-To-Live",
 "in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
 "Directory Settings" => "Pengaturan Direktori",
 "User Display Name Field" => "Bidang Tampilan Nama Pengguna",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud.",
 "Base User Tree" => "Pohon Pengguna Dasar",
 "One User Base DN per line" => "Satu Pengguna Base DN per baris",
 "User Search Attributes" => "Atribut Pencarian Pengguna",
 "Optional; one attribute per line" => "Pilihan; satu atribut per baris",
 "Group Display Name Field" => "Bidang Tampilan Nama Grup",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud.",
 "Base Group Tree" => "Pohon Grup Dasar",
 "One Group Base DN per line" => "Satu Grup Base DN per baris",
 "Group Search Attributes" => "Atribut Pencarian Grup",
@@ -75,3 +71,4 @@
 "Test Configuration" => "Uji Konfigurasi",
 "Help" => "Bantuan"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index 6ea474f56df6dd8b6a077eff7eb466d82ec90e4b..70c6bb615702430cbd0c874a9576ab430524a415 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Keep settings?" => "Geyma stillingar ?",
 "Error" => "Villa",
 "Host" => "NetÃ¾jÃ³nn",
@@ -6,3 +7,4 @@
 "Test Configuration" => "PrÃºfa uppsetningu",
 "Help" => "HjÃ¡lp"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 48bcbdf589a17a16d42851bf96b822ef165a759e..0a44850fdb02aa0f9cd5909b2c06a388cba62fd4 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Cancellazione delle associazioni non riuscita.",
 "Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
 "The configuration is valid and the connection could be established!" => "La configurazione Ã¨ valida e la connessione puÃ² essere stabilita.",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Prova di connessione non riuscita",
 "Do you really want to delete the current Server Configuration?" => "Vuoi davvero eliminare la configurazione attuale del server?",
 "Confirm Deletion" => "Conferma l'eliminazione",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP non Ã¨ installato, il motore non funzionerÃ . Chiedi al tuo amministratore di sistema di installarlo.",
 "Server configuration" => "Configurazione del server",
 "Add Server Configuration" => "Aggiungi configurazione del server",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale.",
 "Backup (Replica) Port" => "Porta di backup (Replica)",
 "Disable Main Server" => "Disabilita server principale",
-"When switched on, ownCloud will only connect to the replica server." => "Se abilitata, ownCloud si collegherÃ  solo al server di replica.",
+"Only connect to the replica server." => "Collegati solo al server di replica.",
 "Use TLS" => "Usa TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Da non utilizzare per le connessioni LDAPS, non funzionerÃ .",
 "Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server %s.",
 "Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
 "Cache Time-To-Live" => "Tempo di vita della cache",
 "in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
 "Directory Settings" => "Impostazioni delle cartelle",
 "User Display Name Field" => "Campo per la visualizzazione del nome utente",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "L'attributo LDAP da usare per generare il nome dell'utente ownCloud.",
+"The LDAP attribute to use to generate the user's display name." => "L'attributo LDAP da usare per generare il nome visualizzato dell'utente.",
 "Base User Tree" => "Struttura base dell'utente",
 "One User Base DN per line" => "Un DN base utente per riga",
 "User Search Attributes" => "Attributi di ricerca utente",
 "Optional; one attribute per line" => "Opzionale; un attributo per riga",
 "Group Display Name Field" => "Campo per la visualizzazione del nome del gruppo",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "L'attributo LDAP da usare per generare il nome del gruppo ownCloud.",
+"The LDAP attribute to use to generate the groups's display name." => "L'attributo LDAP da usare per generare il nome visualizzato del gruppo.",
 "Base Group Tree" => "Struttura base del gruppo",
 "One Group Base DN per line" => "Un DN base gruppo per riga",
 "Group Search Attributes" => "Attributi di ricerca gruppo",
@@ -75,15 +76,16 @@
 "User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
 "Internal Username" => "Nome utente interno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "In modo predefinito, il nome utente interno sarÃ  creato dall'attributo UUID. CiÃ² assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarÃ  incrementato/decrementato un numero. Il nome utente interno Ã¨ utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito puÃ² essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "In modo predefinito, il nome utente interno sarÃ  creato dall'attributo UUID. CiÃ² assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarÃ  aggiunto/incrementato un numero. Il nome utente interno Ã¨ utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito puÃ² essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
 "Internal Username Attribute:" => "Attributo nome utente interno:",
 "Override UUID detection" => "Ignora rilevamento UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID Ã¨ utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarÃ  creato sulla base dell'UUID, se non Ã¨ specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID Ã¨ utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarÃ  creato sulla base dell'UUID, se non Ã¨ specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
 "UUID Attribute:" => "Attributo UUID:",
 "Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrÃ  un nome utente interno. CiÃ² richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non Ã¨ utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud Ã¨ utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerÃ  tracce residue ovunque e interesserÃ  esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrÃ  un nome utente interno. CiÃ² richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non Ã¨ utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno Ã¨ utilizzato dappertutto. La cancellazione delle associazioni lascerÃ  tracce residue ovunque e interesserÃ  esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test.",
 "Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP",
 "Test Configuration" => "Prova configurazione",
 "Help" => "Aiuto"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 53fa9ae697df3760b086c28d249b71168440f19f..d87a0f065b38d825cfbec3b2c3141f75ccf3931e 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã«å¤±æ•—ã—ã¾ã—ãŸã€‚",
 "Failed to delete the server configuration" => "ã‚µãƒ¼ãƒè¨å®šã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ",
 "The configuration is valid and the connection could be established!" => "è¨å®šã¯æœ‰åŠ¹ã§ã‚ã‚Šã€æŽ¥ç¶šã‚’ç¢ºç«‹ã—ã¾ã—ãŸï¼",
@@ -15,7 +16,7 @@
 "Connection test failed" => "æŽ¥ç¶šãƒ†ã‚¹ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸ",
 "Do you really want to delete the current Server Configuration?" => "ç¾åœ¨ã®ã‚µãƒ¼ãƒè¨å®šã‚’æœ¬å½“ã«å‰Šé™¤ã—ã¦ã‚‚ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ",
 "Confirm Deletion" => "å‰Šé™¤ã®ç¢ºèª",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>è¦å‘Š:</b> user_ldap ã¨ user_webdavauth ã®ã‚¢ãƒ—ãƒªã«ã¯äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“ã€‚äºˆæœŸã›ã¬å‹•ä½œã‚’ã™ã‚‹å¯èƒ½å§“ãŒã‚ã‚Šã¾ã™ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã©ã¡ã‚‰ã‹ã‚’ç„¡åŠ¹ã«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>è¦å‘Š:</b> user_ldap ã¨ user_webdavauth ã®ã‚¢ãƒ—ãƒªã«ã¯äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“ã€‚äºˆæœŸã›ã¬å‹•ä½œã‚’ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã©ã¡ã‚‰ã‹ã‚’ç„¡åŠ¹ã«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Š:</b> PHP LDAP ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒæ£ã—ãå‹•ä½œã—ã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚",
 "Server configuration" => "ã‚µãƒ¼ãƒè¨å®š",
 "Add Server Configuration" => "ã‚µãƒ¼ãƒè¨å®šã‚’è¿½åŠ ",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãƒ›ã‚¹ãƒˆã‚’ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãƒ¡ã‚¤ãƒ³ã®LDAP/ADã‚µãƒ¼ãƒã®ãƒ¬ãƒ—ãƒªã‚«ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
 "Backup (Replica) Port" => "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ï¼ˆãƒ¬ãƒ—ãƒªã‚«ï¼‰ãƒãƒ¼ãƒˆ",
 "Disable Main Server" => "ãƒ¡ã‚¤ãƒ³ã‚µãƒ¼ãƒã‚’ç„¡åŠ¹ã«ã™ã‚‹",
-"When switched on, ownCloud will only connect to the replica server." => "æœ‰åŠ¹ã«ã™ã‚‹ã¨ã€ownCloudã¯ãƒ¬ãƒ—ãƒªã‚«ã‚µãƒ¼ãƒã«ã®ã¿æŽ¥ç¶šã—ã¾ã™ã€‚",
+"Only connect to the replica server." => "ãƒ¬ãƒ—ãƒªã‚«ã‚µãƒ¼ãƒãƒ¼ã«ã®ã¿æŽ¥ç¶šã—ã¾ã™ã€‚",
 "Use TLS" => "TLSã‚’åˆ©ç”¨",
 "Do not use it additionally for LDAPS connections, it will fail." => "LDAPSæŽ¥ç¶šã®ãŸã‚ã«è¿½åŠ ã§ãã‚Œã‚’åˆ©ç”¨ã—ãªã„ã§ä¸‹ã•ã„ã€‚å¤±æ•—ã—ã¾ã™ã€‚",
 "Case insensitve LDAP server (Windows)" => "å¤§æ–‡å—ï¼å°æ–‡å—ã‚’åŒºåˆ¥ã—ãªã„LDAPã‚µãƒ¼ãƒï¼ˆWindowsï¼‰",
 "Turn off SSL certificate validation." => "SSLè¨¼æ˜Žæ›¸ã®ç¢ºèªã‚’ç„¡åŠ¹ã«ã™ã‚‹ã€‚",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "æŽ¥ç¶šãŒã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã®ã¿å‹•ä½œã™ã‚‹å ´åˆã¯ã€LDAPã‚µãƒ¼ãƒã®SSLè¨¼æ˜Žæ›¸ã‚’ownCloudã‚µãƒ¼ãƒã«ã‚¤ãƒ³ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "æŽ¥ç¶šãŒã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã®ã¿å‹•ä½œã™ã‚‹å ´åˆã¯ã€LDAPã‚µãƒ¼ãƒã®SSLè¨¼æ˜Žæ›¸ã‚’ %s ã‚µãƒ¼ãƒã«ã‚¤ãƒ³ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚",
 "Not recommended, use for testing only." => "æŽ¨å¥¨ã—ã¾ã›ã‚“ã€ãƒ†ã‚¹ãƒˆç›®çš„ã§ã®ã¿åˆ©ç”¨ã—ã¦ãã ã•ã„ã€‚",
 "Cache Time-To-Live" => "ã‚ãƒ£ãƒƒã‚·ãƒ¥ã®TTL",
 "in seconds. A change empties the cache." => "ç§’ã€‚å¤‰æ›´å¾Œã«ã‚ãƒ£ãƒƒã‚·ãƒ¥ãŒã‚¯ãƒªã‚¢ã•ã‚Œã¾ã™ã€‚",
 "Directory Settings" => "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªè¨å®š",
 "User Display Name Field" => "ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "ãƒ¦ãƒ¼ã‚¶ã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§ã€‚",
+"The LDAP attribute to use to generate the user's display name." => "ãƒ¦ãƒ¼ã‚¶ã®è¡¨ç¤ºåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§",
 "Base User Tree" => "ãƒ™ãƒ¼ã‚¹ãƒ¦ãƒ¼ã‚¶ãƒ„ãƒªãƒ¼",
 "One User Base DN per line" => "1è¡Œã«1ã¤ã®ãƒ¦ãƒ¼ã‚¶ãƒ™ãƒ¼ã‚¹DN",
 "User Search Attributes" => "ãƒ¦ãƒ¼ã‚¶æ¤œç´¢å±žæ€§",
 "Optional; one attribute per line" => "ã‚ªãƒ—ã‚·ãƒ§ãƒ³ï¼š1è¡Œã«1å±žæ€§",
 "Group Display Name Field" => "ã‚°ãƒ«ãƒ¼ãƒ—è¡¨ç¤ºåã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "ã‚°ãƒ«ãƒ¼ãƒ—ã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§ã€‚",
+"The LDAP attribute to use to generate the groups's display name." => "ãƒ¦ãƒ¼ã‚¶ã®ã‚°ãƒ«ãƒ¼ãƒ—è¡¨ç¤ºåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§",
 "Base Group Tree" => "ãƒ™ãƒ¼ã‚¹ã‚°ãƒ«ãƒ¼ãƒ—ãƒ„ãƒªãƒ¼",
 "One Group Base DN per line" => "1è¡Œã«1ã¤ã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒ™ãƒ¼ã‚¹DN",
 "Group Search Attributes" => "ã‚°ãƒ«ãƒ¼ãƒ—æ¤œç´¢å±žæ€§",
@@ -75,15 +76,16 @@
 "User Home Folder Naming Rule" => "ãƒ¦ãƒ¼ã‚¶ã®ãƒ›ãƒ¼ãƒ ãƒ•ã‚©ãƒ«ãƒ€å‘½åè¦å‰‡",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ãƒ¦ãƒ¼ã‚¶åã‚’ç©ºã®ã¾ã¾ã«ã—ã¦ãã ã•ã„ï¼ˆãƒ‡ãƒ•ã‚©ãƒ«ãƒˆï¼‰ã€‚ãã†ã§ãªã„å ´åˆã¯ã€LDAPã‚‚ã—ãã¯ADã®å±žæ€§ã‚’æŒ‡å®šã—ã¦ãã ã•ã„ã€‚",
 "Internal Username" => "å†…éƒ¨ãƒ¦ãƒ¼ã‚¶å",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDå±žæ€§ã‹ã‚‰ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶åãŒãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚Šã€ã‹ã¤æ–‡å—ã®å¤‰æ›ãŒå¿…è¦ãªã„ã“ã¨ã‚’ä¿è¨¼ã—ã¾ã™ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã«ã¯ã€[ a-zA-Z0-9_.@- ] ã®æ–‡å—ã®ã¿ãŒæœ‰åŠ¹ã§ã‚ã‚‹ã¨ã„ã†åˆ¶é™ãŒã‚ã‚Šã€ãã®ä»–ã®æ–‡å—ã¯å¯¾å¿œã™ã‚‹ ASCII ã‚³ãƒ¼ãƒ‰ã«å¤‰æ›ã•ã‚Œã‚‹ã‹å˜ã«ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ãã®ãŸã‚ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶åã¨ã®è¡çªã®å›žæ•°ãŒå¢—åŠ ã™ã‚‹ã§ã—ã‚‡ã†ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯ã€å†…éƒ¨çš„ã«ãƒ¦ãƒ¼ã‚¶ã‚’è˜åˆ¥ã™ã‚‹ãŸã‚ã«ç”¨ã„ã‚‰ã‚Œã€ã¾ãŸã€ownCloudã«ãŠã‘ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ›ãƒ¼ãƒ ãƒ•ã‚©ãƒ«ãƒ€åã¨ã—ã¦ã‚‚ç”¨ã„ã‚‰ã‚Œã¾ã™ã€‚ä¾‹ãˆã°*DAVã‚µãƒ¼ãƒ“ã‚¹ã®ã‚ˆã†ã«ã€ãƒªãƒ¢ãƒ¼ãƒˆURLã®ãƒãƒ¼ãƒˆã§ã‚‚ã‚ã‚Šã¾ã™ã€‚ã“ã®è¨å®šã«ã‚ˆã‚Šã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã‚’å†å®šç¾©ã—ã¾ã™ã€‚ownCloud 5 ä»¥å‰ã¨åŒã˜ã‚ˆã†ãªæŒ¯ã‚‹èˆžã„ã«ã™ã‚‹ãŸã‚ã«ã¯ã€ä»¥ä¸‹ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®å±žæ€§ã‚’å…¥åŠ›ã—ã¾ã™ã€‚ç©ºã«ã™ã‚‹ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã«ãŠã„ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDå±žæ€§ã‹ã‚‰ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶åãŒãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚Šã€ã‹ã¤æ–‡å—ã®å¤‰æ›ãŒä¸è¦ã§ã‚ã‚‹ã“ã¨ã‚’ä¿è¨¼ã—ã¾ã™ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã«ã¯ã€[ a-zA-Z0-9_.@- ] ã®æ–‡å—ã®ã¿ãŒæœ‰åŠ¹ã§ã‚ã‚‹ã¨ã„ã†åˆ¶é™ãŒã‚ã‚Šã€ãã®ä»–ã®æ–‡å—ã¯å¯¾å¿œã™ã‚‹ ASCII ã‚³ãƒ¼ãƒ‰ã«å¤‰æ›ã•ã‚Œã‚‹ã‹å˜ã«ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ãã®ãŸã‚ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶åã¨ã®è¡çªã®å›žæ•°ãŒå¢—åŠ ã™ã‚‹ã§ã—ã‚‡ã†ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯ã€å†…éƒ¨çš„ã«ãƒ¦ãƒ¼ã‚¶ã‚’è˜åˆ¥ã™ã‚‹ãŸã‚ã«ç”¨ã„ã‚‰ã‚Œã€ã¾ãŸã€ownCloudã«ãŠã‘ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ›ãƒ¼ãƒ ãƒ•ã‚©ãƒ«ãƒ€åã¨ã—ã¦ã‚‚ç”¨ã„ã‚‰ã‚Œã¾ã™ã€‚ä¾‹ãˆã°*DAVã‚µãƒ¼ãƒ“ã‚¹ã®ã‚ˆã†ã«ã€ãƒªãƒ¢ãƒ¼ãƒˆURLã®ä¸€éƒ¨ã§ã‚‚ã‚ã‚Šã¾ã™ã€‚ã“ã®è¨å®šã«ã‚ˆã‚Šã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã‚’å†å®šç¾©ã—ã¾ã™ã€‚ownCloud 5 ä»¥å‰ã¨åŒã˜ã‚ˆã†ãªæŒ¯ã‚‹èˆžã„ã«ã™ã‚‹ãŸã‚ã«ã¯ã€ä»¥ä¸‹ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®å±žæ€§ã‚’å…¥åŠ›ã—ã¾ã™ã€‚ç©ºã«ã™ã‚‹ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã«ãŠã„ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚",
 "Internal Username Attribute:" => "å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åå±žæ€§:",
 "Override UUID detection" => "UUIDæ¤œå‡ºã‚’å†å®šç¾©ã™ã‚‹",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€ownCloud ã¯ UUID å±žæ€§ã‚’è‡ªå‹•çš„ã«æ¤œå‡ºã—ã¾ã™ã€‚UUIDå±žæ€§ã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã‚’é–“é•ã„ãªãè˜åˆ¥ã™ã‚‹ãŸã‚ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€ã‚‚ã—ã“ã‚Œã‚’æŒ‡å®šã—ãªã„å ´åˆã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDã«åŸºã¥ã„ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã®è¨å®šã¯å†å®šç¾©ã™ã‚‹ã“ã¨ãŒã§ãã€ã‚ãªãŸã®é¸æŠžã—ãŸå±žæ€§ã‚’ç”¨ã„ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚é¸æŠžã—ãŸå±žæ€§ãŒãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸¡æ–¹ã«å¯¾ã—ã¦é©ç”¨ã§ãã€ã‹ã¤ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚‹ã“ã¨ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚ç©ºã§ã‚ã‚Œã°ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯ã€æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€UUID å±žæ€§ã¯è‡ªå‹•çš„ã«æ¤œå‡ºã•ã‚Œã¾ã™ã€‚UUIDå±žæ€§ã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã‚’é–“é•ã„ãªãè˜åˆ¥ã™ã‚‹ãŸã‚ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€ã‚‚ã—ã“ã‚Œã‚’æŒ‡å®šã—ãªã„å ´åˆã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDã«åŸºã¥ã„ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã®è¨å®šã¯å†å®šç¾©ã™ã‚‹ã“ã¨ãŒã§ãã€ã‚ãªãŸã®é¸æŠžã—ãŸå±žæ€§ã‚’ç”¨ã„ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚é¸æŠžã—ãŸå±žæ€§ãŒãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸¡æ–¹ã«å¯¾ã—ã¦é©ç”¨ã§ãã€ã‹ã¤ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚‹ã“ã¨ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚ç©ºã§ã‚ã‚Œã°ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯ã€æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚",
 "UUID Attribute:" => "UUIDå±žæ€§:",
 "Username-LDAP User Mapping" => "ãƒ¦ãƒ¼ã‚¶åã¨LDAPãƒ¦ãƒ¼ã‚¶ã®ãƒžãƒƒãƒ”ãƒ³ã‚°",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloudã¯ï¼ˆãƒ¡ã‚¿ï¼‰ ãƒ‡ãƒ¼ã‚¿ã®ä¿å˜ã¨å‰²ã‚Šå½“ã¦ã«ãƒ¦ãƒ¼ã‚¶åã‚’ä½¿ç”¨ã—ã¾ã™ã€‚ãƒ¦ãƒ¼ã‚¶ã‚’æ£ç¢ºã«è˜åˆ¥ã—ã¦èªè˜ã™ã‚‹ãŸã‚ã«ã€å€‹ã€…ã®LDAPãƒ¦ãƒ¼ã‚¶ã¯å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã‚’æŒã£ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€ownCloudãƒ¦ãƒ¼ã‚¶åã¨LDAPãƒ¦ãƒ¼ã‚¶åã®é–“ã®ãƒžãƒƒãƒ”ãƒ³ã‚°ãŒå¿…è¦ã§ã‚ã‚‹ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚ç”Ÿæˆã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶åã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã®UUIDã¨ãƒžãƒƒãƒ”ãƒ³ã‚°ã•ã‚Œã¾ã™ã€‚åŠ ãˆã¦ã€DNãŒLDAPã¨ã®ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ã‚·ãƒ§ãƒ³ã‚’å‰Šæ¸›ã™ã‚‹ãŸã‚ã«ã‚ãƒ£ãƒƒã‚·ãƒ¥ã•ã‚Œã¾ã™ãŒã€è˜åˆ¥ã«ã¯åˆ©ç”¨ã•ã‚Œã¾ã›ã‚“ã€‚DNãŒå¤‰ã‚ã£ãŸå ´åˆã¯ã€å¤‰æ›´ã‚’ownCloudãŒè¦‹ã¤ã‘ã¾ã™ã€‚å†…éƒ¨ã®ownCloudåã¯ownCloudå…¨ä½“ã«äº˜ã£ã¦åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹ã¨ã€ã„ãŸã‚‹ã¨ã“ã‚ã«ä½¿ã‚ã‚Œãªã„ã¾ã¾ã®ç‰©ãŒæ®‹ã‚‹ã§ã—ã‚‡ã†ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã¯è¨å®šã«æ•æ„Ÿã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å…¨ã¦ã®LDAPã®è¨å®šã«å½±éŸ¿ã‚’ä¸Žãˆã¾ã™ï¼æœ¬ç•ªã®ç’°å¢ƒã§ã¯æ±ºã—ã¦ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã—ãªã„ã§ãã ã•ã„ã€‚ãƒ†ã‚¹ãƒˆã‚‚ã—ãã¯å®Ÿé¨“ã®æ®µéšŽã§ã®ã¿ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã‚’è¡Œãªã£ã¦ãã ã•ã„ã€‚",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ãƒ¦ãƒ¼ã‚¶åã¯ï¼ˆãƒ¡ã‚¿ï¼‰ãƒ‡ãƒ¼ã‚¿ã®ä¿å˜ã¨å‰²ã‚Šå½“ã¦ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ãƒ¦ãƒ¼ã‚¶ã‚’æ£ç¢ºã«è˜åˆ¥ã—ã¦èªè˜ã™ã‚‹ãŸã‚ã«ã€å€‹ã€…ã®LDAPãƒ¦ãƒ¼ã‚¶ã¯å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã‚’æŒã£ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€ãƒ¦ãƒ¼ã‚¶åã‹ã‚‰LDAPãƒ¦ãƒ¼ã‚¶ã¸ã®ãƒžãƒƒãƒ”ãƒ³ã‚°ãŒå¿…è¦ã§ã‚ã‚‹ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚ã“ã®ç”Ÿæˆã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶åã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã®UUIDã«ãƒžãƒƒãƒ”ãƒ³ã‚°ã•ã‚Œã¾ã™ã€‚åŠ ãˆã¦ã€DNãŒLDAPã¨ã®ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ã‚·ãƒ§ãƒ³ã‚’å‰Šæ¸›ã™ã‚‹ãŸã‚ã«ã‚ãƒ£ãƒƒã‚·ãƒ¥ã•ã‚Œã¾ã™ãŒã€è˜åˆ¥ã«ã¯åˆ©ç”¨ã•ã‚Œã¾ã›ã‚“ã€‚DNãŒå¤‰ã‚ã£ãŸå ´åˆã¯ã€å¤‰æ›´ãŒæ¤œå‡ºã•ã‚Œã¾ã™ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯å…¨ä½“ã«äº˜ã£ã¦åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹ã¨ã€ã„ãŸã‚‹ã¨ã“ã‚ã«ä½¿ã‚ã‚Œãªã„ã¾ã¾ã®ç‰©ãŒæ®‹ã‚‹ã§ã—ã‚‡ã†ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã¯è¨å®šã«æ•æ„Ÿã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å…¨ã¦ã®LDAPã®è¨å®šã«å½±éŸ¿ã‚’ä¸Žãˆã¾ã™ï¼æœ¬ç•ªã®ç’°å¢ƒã§ã¯æ±ºã—ã¦ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã—ãªã„ã§ãã ã•ã„ã€‚ãƒ†ã‚¹ãƒˆã‚‚ã—ãã¯å®Ÿé¨“ã®æ®µéšŽã§ã®ã¿ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã‚’è¡Œãªã£ã¦ãã ã•ã„ã€‚",
 "Clear Username-LDAP User Mapping" => "ãƒ¦ãƒ¼ã‚¶åã¨LDAPãƒ¦ãƒ¼ã‚¶ã®ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹",
 "Clear Groupname-LDAP Group Mapping" => "ã‚°ãƒ«ãƒ¼ãƒ—åã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹",
 "Test Configuration" => "è¨å®šã‚’ãƒ†ã‚¹ãƒˆ",
 "Help" => "ãƒ˜ãƒ«ãƒ—"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ka.php b/apps/user_ldap/l10n/ka.php
index 169926283e9a39b2a4de635e76e739143a1cdf3b..3de4d3c722a85ca2ba02712f49129d9f520a72f7 100644
--- a/apps/user_ldap/l10n/ka.php
+++ b/apps/user_ldap/l10n/ka.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "áƒžáƒáƒ áƒáƒšáƒ˜",
 "Help" => "áƒ¨áƒ•áƒ”áƒšáƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index 8057f7c845550bdb99e486cf344c5dc9dca4b5c6..7317a257dafdcb4e47286d91341ef3b2be90f3b6 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ˜áƒ¡áƒáƒ¡",
 "The configuration is valid and the connection could be established!" => "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ áƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ áƒ“áƒ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒ“áƒáƒ›áƒ§áƒáƒ áƒ“áƒ”áƒ‘áƒ!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ áƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ, áƒ›áƒáƒ’áƒ áƒáƒ› áƒ›áƒ˜áƒ”áƒ áƒ—áƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒáƒ›áƒáƒ¬áƒ›áƒáƒ— áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜ áƒ“áƒ áƒáƒ£áƒ—áƒ”áƒœáƒ—áƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜.",
@@ -13,7 +14,6 @@
 "Connection test failed" => "áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ¡ áƒ¢áƒ”áƒ¡áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
 "Do you really want to delete the current Server Configuration?" => "áƒœáƒáƒ›áƒ“áƒ•áƒ˜áƒšáƒáƒ“ áƒ’áƒ˜áƒœáƒ“áƒáƒ— áƒ¬áƒáƒ¨áƒáƒšáƒáƒ— áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜?",
 "Confirm Deletion" => "áƒ¬áƒáƒ¨áƒšáƒ˜áƒ¡ áƒ“áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ‘áƒ",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ:</b>  áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ user_ldap áƒ“áƒ user_webdavauth áƒáƒ áƒáƒ—áƒáƒ•áƒ¡áƒ”áƒ‘áƒáƒ“áƒ˜áƒ. áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ¨áƒ”áƒ”áƒ©áƒ”áƒ®áƒáƒ— áƒ›áƒáƒ£áƒšáƒáƒ“áƒœáƒ”áƒš áƒ¨áƒ¨áƒ”áƒ“áƒ”áƒ’áƒ”áƒ‘áƒ¡. áƒ—áƒ®áƒáƒ•áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ¡ áƒ©áƒáƒ—áƒ˜áƒ¨áƒáƒ¡ áƒ”áƒ áƒ—áƒ”áƒ áƒ—áƒ˜.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ:</b> PHP LDAP áƒ›áƒáƒ“áƒ£áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜, áƒ‘áƒ”áƒ¥áƒ”áƒœáƒ“áƒ˜ áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ—áƒ®áƒáƒ•áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ¡ áƒ“áƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ áƒ˜áƒ¡.",
 "Server configuration" => "áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜",
 "Add Server Configuration" => "áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
@@ -43,24 +43,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ”áƒ— áƒ áƒáƒ˜áƒ›áƒ” áƒ‘áƒ”áƒ¥áƒáƒ¤ áƒ°áƒáƒ¡áƒ¢áƒ˜. áƒ˜áƒ¡ áƒ£áƒœáƒ“áƒ áƒ˜áƒ§áƒáƒ¡ áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“áƒ˜ LDAP/AD áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ áƒ”áƒžáƒšáƒ˜áƒ™áƒ.",
 "Backup (Replica) Port" => "áƒ‘áƒ”áƒ¥áƒáƒ¤ (áƒ áƒ”áƒžáƒšáƒ˜áƒ™áƒ) áƒžáƒáƒ áƒ¢áƒ˜",
 "Disable Main Server" => "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ”áƒ— áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“áƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜",
-"When switched on, ownCloud will only connect to the replica server." => "áƒ áƒáƒªáƒ áƒ›áƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜áƒ, ownCloud áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ‘áƒ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ áƒ”áƒžáƒšáƒ˜áƒ™áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ¡.",
 "Use TLS" => "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ”áƒ— TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "áƒáƒ  áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ— áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— LDAPS áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜. áƒ˜áƒ¡ áƒ¬áƒáƒ áƒ£áƒ›áƒáƒ¢áƒ”áƒ‘áƒšáƒáƒ“ áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ”áƒ‘áƒ.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows)",
 "Turn off SSL certificate validation." => "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ”áƒ— SSL áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜áƒ¡ áƒ•áƒáƒšáƒ˜áƒ“áƒáƒªáƒ˜áƒ.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "áƒ˜áƒ› áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒáƒ¨áƒ˜ áƒ—áƒ£ áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ”áƒ¡ áƒáƒ¤áƒªáƒ˜áƒ, áƒ“áƒáƒáƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ”áƒ— LDAP áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ SSL áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ–áƒ”.",
 "Not recommended, use for testing only." => "áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ áƒ”áƒ™áƒáƒ›áƒ”áƒœáƒ“áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜, áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ”áƒ— áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ¡áƒáƒ¢áƒ”áƒ¡áƒ¢áƒáƒ“.",
 "Cache Time-To-Live" => "áƒ¥áƒ”áƒ¨áƒ˜áƒ¡ áƒ¡áƒ˜áƒªáƒáƒªáƒ®áƒšáƒ˜áƒ¡ áƒ®áƒáƒœáƒ’áƒ áƒ«áƒšáƒ˜áƒ•áƒáƒ‘áƒ",
 "in seconds. A change empties the cache." => "áƒ¬áƒáƒ›áƒ”áƒ‘áƒ¨áƒ˜. áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ áƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”áƒ‘áƒ¡ áƒ¥áƒ”áƒ¨áƒ¡.",
 "Directory Settings" => "áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜",
 "User Display Name Field" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ“áƒ˜",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡  ownCloud áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡.",
 "Base User Tree" => "áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ—áƒ áƒ¡áƒ˜áƒ",
 "One User Base DN per line" => "áƒ”áƒ áƒ—áƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN áƒ”áƒ áƒ— áƒ®áƒáƒ–áƒ–áƒ”",
 "User Search Attributes" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ«áƒ”áƒ‘áƒœáƒ˜áƒ¡ áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜",
 "Optional; one attribute per line" => "áƒáƒ¤áƒªáƒ˜áƒáƒœáƒáƒšáƒ£áƒ áƒ˜; áƒ—áƒ˜áƒ—áƒ áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ—áƒ˜áƒ—áƒ áƒ®áƒáƒ–áƒ–áƒ”",
 "Group Display Name Field" => "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ“áƒ˜",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡  ownCloud áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡.",
 "Base Group Tree" => "áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“ áƒ¯áƒ’áƒ£áƒ¤áƒ—áƒ áƒ¡áƒ˜áƒ",
 "One Group Base DN per line" => "áƒ”áƒ áƒ—áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN áƒ”áƒ áƒ— áƒ®áƒáƒ–áƒ–áƒ”",
 "Group Search Attributes" => "áƒ¯áƒ’áƒ£áƒ¤áƒ£áƒ áƒ˜ áƒ«áƒ”áƒ‘áƒœáƒ˜áƒ¡ áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜",
@@ -75,3 +71,4 @@
 "Test Configuration" => "áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ¡ áƒ¢áƒ”áƒ¡áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ",
 "Help" => "áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index b8196e09d09a93f9e4adf0915b35466de90718b2..650781fe4a22fc0fac34248ed7f4041074347f3e 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,10 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "ì‚ì œ ì‹¤íŒ¨",
 "Keep settings?" => "ì„¤ì •ì„ ìœ ì§€í•©ë‹ˆê¹Œ?",
 "Error" => "ì˜¤ë¥˜",
 "Connection test succeeded" => "ì—°ê²° ì‹œí—˜ ì„±ê³µ",
 "Connection test failed" => "ì—°ê²° ì‹œí—˜ ì‹¤íŒ¨",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>ê²½ê³ :</b> user_ldap ì•±ê³¼ user_webdavauth ì•±ì€ í˜¸í™˜ë˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì˜¤ë™ìž‘ì„ ì¼ìœ¼í‚¬ ìˆ˜ ìžˆìœ¼ë¯€ë¡œ, ì‹œìŠ¤í…œ ê´€ë¦¬ìžì—ê²Œ ìš”ì²í•˜ì—¬ ë‘˜ ì¤‘ í•˜ë‚˜ë§Œ ì‚¬ìš©í•˜ë„ë¡ í•˜ì‹ì‹œì˜¤.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>ê²½ê³ :</b> PHP LDAP ëª¨ë“ˆì´ ë¹„í™œì„±í™”ë˜ì–´ ìžˆê±°ë‚˜ ì„¤ì¹˜ë˜ì–´ ìžˆì§€ ì•ŠìŠµë‹ˆë‹¤. ë°±ì—”ë“œë¥¼ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì‹œìŠ¤í…œ ê´€ë¦¬ìžì—ê²Œ ì„¤ì¹˜ë¥¼ ìš”ì²í•˜ì‹ì‹œì˜¤.",
 "Host" => "í˜¸ìŠ¤íŠ¸",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSLì„ ì‚¬ìš©í•˜ëŠ” ê²½ìš°ê°€ ì•„ë‹ˆë¼ë©´ í”„ë¡œí† ì½œì„ ìž…ë ¥í•˜ì§€ ì•Šì•„ë„ ë©ë‹ˆë‹¤. SSLì„ ì‚¬ìš©í•˜ë ¤ë©´ ldaps://ë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤.",
@@ -33,17 +33,14 @@
 "Use TLS" => "TLS ì‚¬ìš©",
 "Case insensitve LDAP server (Windows)" => "ì„œë²„ì—ì„œ ëŒ€ì†Œë¬¸ìžë¥¼ êµ¬ë¶„í•˜ì§€ ì•ŠìŒ (Windows)",
 "Turn off SSL certificate validation." => "SSL ì¸ì¦ì„œ ìœ íš¨ì„± ê²€ì‚¬ë¥¼ í•´ì œí•©ë‹ˆë‹¤.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "ì´ ì˜µì…˜ì„ ì‚¬ìš©í•´ì•¼ ì—°ê²°í•  ìˆ˜ ìžˆëŠ” ê²½ìš°ì—ëŠ” LDAP ì„œë²„ì˜ SSL ì¸ì¦ì„œë¥¼ ownCloudë¡œ ê°€ì ¸ì˜¬ ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
 "Not recommended, use for testing only." => "ì¶”ì²œí•˜ì§€ ì•ŠìŒ, í…ŒìŠ¤íŠ¸ë¡œë§Œ ì‚¬ìš©í•˜ì‹ì‹œì˜¤.",
 "in seconds. A change empties the cache." => "ì´ˆ. í•ëª© ë³€ê²½ ì‹œ ìºì‹œê°€ ê°±ì‹ ë©ë‹ˆë‹¤.",
 "Directory Settings" => "ë””ë ‰í† ë¦¬ ì„¤ì •",
 "User Display Name Field" => "ì‚¬ìš©ìžì˜ í‘œì‹œ ì´ë¦„ í•„ë“œ",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP ì†ì„±ì€ ì‚¬ìš©ìžì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° ìœ„í•´ ì‚¬ìš©í•©ë‹ˆë‹¤.",
 "Base User Tree" => "ê¸°ë³¸ ì‚¬ìš©ìž íŠ¸ë¦¬",
 "One User Base DN per line" => "ì‚¬ìš©ìž DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤",
 "User Search Attributes" => "ì‚¬ìš©ìž ê²€ìƒ‰ ì†ì„±",
 "Group Display Name Field" => "ê·¸ë£¹ì˜ í‘œì‹œ ì´ë¦„ í•„ë“œ",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP ì†ì„±ì€ ê·¸ë£¹ì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° ìœ„í•´ ì‚¬ìš©í•©ë‹ˆë‹¤.",
 "Base Group Tree" => "ê¸°ë³¸ ê·¸ë£¹ íŠ¸ë¦¬",
 "One Group Base DN per line" => "ê·¸ë£¹ ê¸°ë³¸ DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤",
 "Group Search Attributes" => "ê·¸ë£¹ ê²€ìƒ‰ ì†ì„±",
@@ -52,3 +49,4 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ì‚¬ìš©ìž ì´ë¦„ì„ ì‚¬ìš©í•˜ë ¤ë©´ ë¹„ì›Œ ë‘ì‹ì‹œì˜¤(ê¸°ë³¸ê°’). ê¸°íƒ€ ê²½ìš° LDAP/AD ì†ì„±ì„ ì§€ì •í•˜ì‹ì‹œì˜¤.",
 "Help" => "ë„ì›€ë§"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index 00602ae5d79c4b80e14384f64f43c4499fa08486..d211e9554a8e625db1f3a30470aa7259e9117dad 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Success" => "Ø³Ù‡â€ŒØ±Ú©Ù‡â€ŒÙˆØªÙ†",
 "Error" => "Ù‡Ù‡â€ŒÚµÙ‡",
 "Password" => "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ",
 "Help" => "ÛŒØ§Ø±Ù…Û•ØªÛŒ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index cf58c9ec5be9c0ba08f0b2bf0898f229ae1037ff..0a268bbb3919bf9722788c115559f8f18cd58007 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Konnt net lÃ¤schen",
 "Error" => "Fehler",
 "Password" => "Passwuert",
 "Help" => "HÃ«llef"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index 6f396847b8efeb640890231ca1ad4c8b979b6407..3046824e6c111332712e6d0304cb31c22456ef70 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "IÅ¡trinti nepavyko",
 "Error" => "Klaida",
 "Password" => "SlaptaÅ¾odis",
@@ -9,3 +10,4 @@
 "Not recommended, use for testing only." => "Nerekomenduojama, naudokite tik testavimui.",
 "Help" => "Pagalba"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 73ffedcb134637416ea928d11bbc11911020824b..7d3d088b40af981ed075123ad233c4d25d040340 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "NeizdevÄs izdzÄ“st servera konfigurÄciju",
 "The configuration is valid and the connection could be established!" => "KonfigurÄcija ir derÄ«ga un varÄ“ja izveidot savienojumu!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "KonfigurÄcija ir derÄ«ga, bet sasaiste neizdevÄs. LÅ«dzu, pÄrbaudiet servera iestatÄ«jumus un akreditÄcijas datus.",
@@ -12,7 +13,6 @@
 "Connection test failed" => "Savienojuma tests cieta neveiksmi",
 "Do you really want to delete the current Server Configuration?" => "Vai tieÅ¡Äm vÄ“laties dzÄ“st paÅ¡reizÄ“jo servera konfigurÄciju?",
 "Confirm Deletion" => "ApstiprinÄt dzÄ“Å¡anu",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>BrÄ«dinÄjums:</b> lietotnes user_ldap un user_webdavauth ir nesavietojamas. TÄs var izraisÄ«t negaidÄ«tu uzvedÄ«bu. LÅ«dzu, prasiet savam sistÄ“mas administratoram kÄdu no tÄm deaktivÄ“t.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>BrÄ«dinÄjums:</b> PHP LDAP modulis nav uzinstalÄ“ts, aizmugure nedarbosies. LÅ«dzu, prasiet savam sistÄ“mas administratoram kÄdu no tÄm deaktivÄ“t.",
 "Server configuration" => "Servera konfigurÄcija",
 "Add Server Configuration" => "Pievienot servera konfigurÄciju",
@@ -42,24 +42,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "NorÄdi rezerves serveri (nav obligÄti). Tam ir jÄbÅ«t galvenÄ LDAP/AD servera kopijai.",
 "Backup (Replica) Port" => "Rezerves (kopijas) ports",
 "Disable Main Server" => "DeaktivÄ“t galveno serveri",
-"When switched on, ownCloud will only connect to the replica server." => "Kad ieslÄ“gts, ownCloud savienosies tikai ar kopijas serveri.",
 "Use TLS" => "Lietot TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Neizmanto papildu LDAPS savienojumus! Tas nestrÄdÄs.",
 "Case insensitve LDAP server (Windows)" => "ReÄ£istrnejutÄ«gs LDAP serveris (Windows)",
 "Turn off SSL certificate validation." => "IzslÄ“gt SSL sertifikÄtu validÄ“Å¡anu.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ja savienojums darbojas ar Å¡o opciju, importÄ“ LDAP serveru SSL sertifikÄtu savÄ ownCloud serverÄ«.",
 "Not recommended, use for testing only." => "Nav ieteicams, izmanto tikai testÄ“Å¡anai!",
 "Cache Time-To-Live" => "KeÅ¡atmiÅ†as dzÄ«vlaiks",
 "in seconds. A change empties the cache." => "sekundÄ“s. IzmaiÅ†as iztukÅ¡os keÅ¡atmiÅ†u.",
 "Directory Settings" => "Direktorijas iestatÄ«jumi",
 "User Display Name Field" => "LietotÄja redzamÄ vÄrda lauks",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP atribÅ«ts, ko izmantot lietotÄja ownCloud vÄrda veidoÅ¡anai.",
 "Base User Tree" => "BÄzes lietotÄju koks",
 "One User Base DN per line" => "Viena lietotÄju bÄzes DN rindÄ",
 "User Search Attributes" => "LietotÄju meklÄ“Å¡anas atribÅ«ts",
 "Optional; one attribute per line" => "NeobligÄti; viens atribÅ«ts rindÄ",
 "Group Display Name Field" => "Grupas redzamÄ nosaukuma lauks",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP atribÅ«ts, ko izmantot grupas ownCloud nosaukuma veidoÅ¡anai.",
 "Base Group Tree" => "BÄzes grupu koks",
 "One Group Base DN per line" => "Viena grupu bÄzes DN rindÄ",
 "Group Search Attributes" => "Grupu meklÄ“Å¡anas atribÅ«ts",
@@ -74,3 +70,4 @@
 "Test Configuration" => "Testa konfigurÄcija",
 "Help" => "PalÄ«dzÄ«ba"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 6a060aca415cc55fd885e95b60da06258b2546fe..3d261c3d80c4edec34ecae44e3d9935e73e0b3de 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Ð‘Ñ€Ð¸ÑˆÐµÑšÐµÑ‚Ð¾ Ðµ Ð½ÐµÑƒÑÐ¿ÐµÑˆÐ½Ð¾",
 "Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Host" => "Ð”Ð¾Ð¼Ð°ÑœÐ¸Ð½",
@@ -6,3 +7,4 @@
 "Password" => "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°",
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñˆ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index b3004028c58a2c83fff365ee58520103376636cb..5d3f8019cebd835aa02bfe5eb724c9f7e5eb19bc 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Pemadaman gagal",
 "Error" => "Ralat",
 "Password" => "Kata laluan",
 "Help" => "Bantuan"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/my_MM.php b/apps/user_ldap/l10n/my_MM.php
index ee8d3dd26fa873eab8252b207db2e52f80d080e4..3d9c248f66a844d83296b6709de585e0587f32fa 100644
--- a/apps/user_ldap/l10n/my_MM.php
+++ b/apps/user_ldap/l10n/my_MM.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "á€…á€€á€¬á€¸á€á€¾á€€á€º",
 "Help" => "á€¡á€€á€°á€¡á€Šá€®"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index f8cdf694ff6f2d392f90dbcda07db766a0cee9aa..8f1c338b124f850df320b5bb55067ece111be958 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Klarte ikke Ã¥ slette tjener-konfigurasjonen.",
 "The configuration is valid and the connection could be established!" => "Konfigurasjonen er i orden og tilkoblingen skal vÃ¦re etablert!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og pÃ¥loggingsinformasjonen.",
@@ -13,7 +14,6 @@
 "Connection test failed" => "Tilkoblingstest mislyktes",
 "Do you really want to delete the current Server Configuration?" => "Er du sikker pÃ¥ at du vil slette aktiv tjener-konfigurasjon?",
 "Confirm Deletion" => "Bekreft sletting",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advarsel:</b>Apps user_ldap og user_webdavauth er ikke kompatible. Du kan oppleve uventet atferd fra systemet. Vennligst spÃ¸r din system-administrator om Ã¥ deaktivere en av dem.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om Ã¥ installere den.",
 "Server configuration" => "Tjener-konfigurasjon",
 "Add Server Configuration" => "Legg til tjener-konfigurasjon",
@@ -42,15 +42,12 @@
 "Use TLS" => "Bruk TLS",
 "Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)",
 "Turn off SSL certificate validation." => "SlÃ¥ av SSL-sertifikat validering",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener.",
 "Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing",
 "in seconds. A change empties the cache." => "i sekunder. En endring tÃ¸mmer bufferen.",
 "User Display Name Field" => "Vis brukerens navnfelt",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP-attributen Ã¥ bruke for Ã¥ generere brukers ownCloud navn.",
 "Base User Tree" => "Hovedbruker tre",
 "One User Base DN per line" => "En Bruker Base DN pr. linje",
 "Group Display Name Field" => "Vis gruppens navnfelt",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP-attributen Ã¥ bruke for Ã¥ generere gruppens ownCloud navn.",
 "Base Group Tree" => "Hovedgruppe tre",
 "One Group Base DN per line" => "En gruppe hoved-DN pr. linje",
 "Group-Member association" => "gruppe-medlem assosiasjon",
@@ -58,3 +55,4 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "La stÃ¥ tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
 "Help" => "Hjelp"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index c75aae3ea4f57fe2e0e43cc2d5e1e7af3f8b7ad4..1a67cd409dcfb261544abbddf1bbedaf419295a8 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Niet gelukt de vertalingen leeg te maken.",
 "Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
 "The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Verbindingstest mislukt",
 "Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
 "Confirm Deletion" => "Bevestig verwijderen",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geÃ¯nstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
 "Server configuration" => "Serverconfiguratie",
 "Add Server Configuration" => "Toevoegen serverconfiguratie",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server.",
 "Backup (Replica) Port" => "Backup (Replica) Poort",
 "Disable Main Server" => "Deactiveren hoofdserver",
-"When switched on, ownCloud will only connect to the replica server." => "Wanneer ingeschakeld, zal ownCloud allen verbinden met de replicaserver.",
+"Only connect to the replica server." => "Maak alleen een verbinding met de replica server.",
 "Use TLS" => "Gebruik TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken.",
 "Case insensitve LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar de %s server.",
 "Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.",
 "Cache Time-To-Live" => "Cache time-to-live",
 "in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
 "Directory Settings" => "Mapinstellingen",
 "User Display Name Field" => "Gebruikers Schermnaam Veld",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers.",
+"The LDAP attribute to use to generate the user's display name." => "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.",
 "Base User Tree" => "Basis Gebruikers Structuur",
 "One User Base DN per line" => "Een User Base DN per regel",
 "User Search Attributes" => "Attributen voor gebruikerszoekopdrachten",
 "Optional; one attribute per line" => "Optioneel; Ã©Ã©n attribuut per regel",
 "Group Display Name Field" => "Groep Schermnaam Veld",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen.",
+"The LDAP attribute to use to generate the groups's display name." => "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.",
 "Base Group Tree" => "Basis Groupen Structuur",
 "One Group Base DN per line" => "Een Group Base DN per regel",
 "Group Search Attributes" => "Attributen voor groepszoekopdrachten",
@@ -75,15 +76,13 @@
 "User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
 "Internal Username" => "Interne gebruikersnaam",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaanâ€‹â€‹: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een â€‹â€‹gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers.",
 "Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
 "Override UUID detection" => "Negeren UUID detectie",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen.",
 "UUID Attribute:" => "UUID Attribuut:",
 "Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een â€‹â€‹LDAP-gebruiker. De gecreÃ«erde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving.",
 "Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
 "Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
 "Test Configuration" => "Test configuratie",
 "Help" => "Help"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 459100228035b1ecbc424f6fc9bb06e0613ca3a1..5e584aa31e35e07ffb8bcf5f755867d0476d7864 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Feil ved sletting",
 "Error" => "Feil",
 "Password" => "Passord",
 "Help" => "Hjelp"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 95ab51caadd798298171fce3ddd897a38e458115..81df26117f10d412b688cfe1b82abe0447a2cfc0 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "FracÃ s d'escafatge",
 "Error" => "Error",
 "Password" => "Senhal",
 "Help" => "Ajuda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 5495ab994042601e6afab97101927c4aba4e5927..87dfe41a3179913be437cac97fdb4872b1bc981f 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Nie udaÅ‚o siÄ™ wyczyÅ›ciÄ‡ mapowania.",
 "Failed to delete the server configuration" => "Nie moÅ¼na usunÄ…Ä‡ konfiguracji serwera",
 "The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidÅ‚owa i moÅ¼na ustanowiÄ‡ poÅ‚Ä…czenie!",
@@ -15,7 +16,6 @@
 "Connection test failed" => "Test poÅ‚Ä…czenia nie udany",
 "Do you really want to delete the current Server Configuration?" => "Czy chcesz usunÄ…Ä‡ bieÅ¼Ä…cÄ… konfiguracjÄ™ serwera?",
 "Confirm Deletion" => "PotwierdÅº usuniÄ™cie",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>OstrzeÅ¼enie:</b> Aplikacje user_ldap i user_webdavauth nie sÄ…  kompatybilne. MogÄ… powodowaÄ‡ nieoczekiwane zachowanie. PoproÅ› administratora o wyÅ‚Ä…czenie jednej z nich.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>OstrzeÅ¼enie:</b>  ModuÅ‚ PHP LDAP nie jest zainstalowany i nie bÄ™dzie dziaÅ‚aÅ‚. PoproÅ› administratora o wÅ‚Ä…czenie go.",
 "Server configuration" => "Konfiguracja servera",
 "Add Server Configuration" => "Dodaj konfiguracjÄ™ servera",
@@ -45,24 +45,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "DaÄ‡ opcjonalnie  hosta kopii zapasowej . To musi byÄ‡ replikÄ… gÅ‚Ã³wnego serwera LDAP/AD.",
 "Backup (Replica) Port" => "Kopia zapasowa (repliki) Port",
 "Disable Main Server" => "WyÅ‚Ä…cz serwer gÅ‚Ã³wny",
-"When switched on, ownCloud will only connect to the replica server." => "Po wÅ‚Ä…czeniu, ownCloud tylko poÅ‚Ä…czy siÄ™ z serwerem repliki.",
 "Use TLS" => "UÅ¼yj TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Nie uÅ¼ywaj go dodatkowo dla poÅ‚Ä…czeÅ„ protokoÅ‚u LDAPS, zakoÅ„czy siÄ™ niepowodzeniem.",
 "Case insensitve LDAP server (Windows)" => "WielkoÅ›Ä‡ liter serwera LDAP (Windows)",
 "Turn off SSL certificate validation." => "WyÅ‚Ä…czyÄ‡ sprawdzanie poprawnoÅ›ci certyfikatu SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "JeÅ›li poÅ‚Ä…czenie dziaÅ‚a tylko z tÄ… opcjÄ…, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud.",
 "Not recommended, use for testing only." => "Niezalecane, uÅ¼yj tylko testowo.",
 "Cache Time-To-Live" => "Przechowuj czas Å¼ycia",
 "in seconds. A change empties the cache." => "w sekundach. Zmiana oprÃ³Å¼nia pamiÄ™Ä‡ podrÄ™cznÄ….",
 "Directory Settings" => "Ustawienia katalogÃ³w",
 "User Display Name Field" => "Pole wyÅ›wietlanej nazwy uÅ¼ytkownika",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Atrybut LDAP sÅ‚uÅ¼y do generowania nazwy uÅ¼ytkownika ownCloud.",
 "Base User Tree" => "Drzewo bazy uÅ¼ytkownikÃ³w",
 "One User Base DN per line" => "Jeden uÅ¼ytkownik Bazy DN na liniÄ™",
 "User Search Attributes" => "Szukaj atrybutÃ³w",
 "Optional; one attribute per line" => "Opcjonalnie; jeden atrybut w wierszu",
 "Group Display Name Field" => "Pole wyÅ›wietlanej nazwy grupy",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atrybut LDAP sÅ‚uÅ¼y do generowania nazwy grup ownCloud.",
 "Base Group Tree" => "Drzewo bazy grup",
 "One Group Base DN per line" => "Jedna grupa bazy DN na liniÄ™",
 "Group Search Attributes" => "Grupa atrybutÃ³w wyszukaj",
@@ -75,7 +71,6 @@
 "User Home Folder Naming Rule" => "ReguÅ‚y nazewnictwa folderu domowego uÅ¼ytkownika",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyÅ›lnie). W przeciwnym razie podaj atrybut LDAP/AD.",
 "Internal Username" => "WewnÄ™trzna nazwa uÅ¼ytkownika",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "DomyÅ›lnie, wewnÄ™trzna nazwa uÅ¼ytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator uÅ¼ytkownika. To daje pewnoÅ›Ä‡, Å¼e nazwa uÅ¼ytkownika jest niepowtarzalna a znaki nie muszÄ… byÄ‡ konwertowane. WewnÄ™trzna nazwa uÅ¼ytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. PozostaÅ‚e znaki zamieniane sÄ… na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa siÄ™ powtarza na koÅ„cu dodawana / zwiÄ™kszana jest cyfra. WewnÄ™trzna nazwa uÅ¼ytkownika sÅ‚uÅ¼y do wewnÄ™trznej identyfikacji uÅ¼ytkownika. Jest to rÃ³wnieÅ¼ domyÅ›lna nazwa gÅ‚Ã³wnego folderu w ownCloud. Jest to rÃ³wnieÅ¼ klucz zdalnego URL, na przykÅ‚ad dla wszystkich usÅ‚ug *DAV. DziÄ™ki temu ustawieniu moÅ¼na modyfikowaÄ‡ domyÅ›lne zachowania. Aby osiÄ…gnÄ…Ä‡ podobny efekt jak w ownCloud 5 wpisz atrybut nazwy uÅ¼ytkownika w poniÅ¼szym polu. Pozostaw puste dla domyÅ›lnego zachowania. Zmiany bÄ™dÄ… miaÅ‚y wpÅ‚yw tylko na nowo stworzonych (dodane) uÅ¼ytkownikÃ³w LDAP.",
 "Internal Username Attribute:" => "WewnÄ™trzny atrybut nazwy uzÅ¼ytkownika:",
 "Override UUID detection" => "ZastÄ…p wykrywanie UUID",
 "UUID Attribute:" => "Atrybuty UUID:",
@@ -85,3 +80,4 @@
 "Test Configuration" => "Konfiguracja testowa",
 "Help" => "Pomoc"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 22247b81005b43eb620917c4b2f4186963285777..0145e8fe2a4b0caec7f9f3581a8143212a8552e0 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Falha ao limpar os mapeamentos.",
 "Failed to delete the server configuration" => "Falha ao deletar a configuraÃ§Ã£o do servidor",
 "The configuration is valid and the connection could be established!" => "A configuraÃ§Ã£o Ã© vÃ¡lida e a conexÃ£o foi estabelecida!",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Teste de conexÃ£o falhou",
 "Do you really want to delete the current Server Configuration?" => "VocÃª quer realmente deletar as atuais ConfiguraÃ§Ãµes de Servidor?",
 "Confirm Deletion" => "Confirmar ExclusÃ£o",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth sÃ£o incompatÃveis. VocÃª deverÃ¡ experienciar comportamento inesperado. Por favor, peÃ§a ao seu administrador do sistema para desabilitar um deles.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth sÃ£o incompatÃveis. VocÃª pode experimentar comportamento inesperado. Por favor, peÃ§a ao seu administrador do sistema para desabilitar um deles.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O mÃ³dulo PHP LDAP nÃ£o estÃ¡ instalado, o backend nÃ£o funcionarÃ¡. Por favor, peÃ§a ao seu administrador do sistema para instalÃ¡-lo.",
 "Server configuration" => "ConfiguraÃ§Ã£o de servidor",
 "Add Server Configuration" => "Adicionar ConfiguraÃ§Ã£o de Servidor",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Defina um servidor de backup opcional. Ele deverÃ¡ ser uma rÃ©plica do servidor LDAP/AD principal.",
 "Backup (Replica) Port" => "Porta do Backup (RÃ©plica)",
 "Disable Main Server" => "Desativar Servidor Principal",
-"When switched on, ownCloud will only connect to the replica server." => "Quando ativado, ownCloud somente se conectarÃ¡ ao servidor de rÃ©plica.",
+"Only connect to the replica server." => "Conectar-se somente ao servidor de rÃ©plica.",
 "Use TLS" => "Usar TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "NÃ£o use adicionalmente para conexÃµes LDAPS, pois falharÃ¡.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensÃvel Ã  caixa alta (Windows)",
 "Turn off SSL certificate validation." => "Desligar validaÃ§Ã£o de certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexÃ£o sÃ³ funciona com essa opÃ§Ã£o, importe o certificado SSL do servidor LDAP no seu servidor ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se a conexÃ£o sÃ³ funciona com esta opÃ§Ã£o, importe o certificado SSL do servidor LDAP no seu servidor %s.",
 "Not recommended, use for testing only." => "NÃ£o recomendado, use somente para testes.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "em segundos. Uma mudanÃ§a esvaziarÃ¡ o cache.",
 "Directory Settings" => "ConfiguraÃ§Ãµes de DiretÃ³rio",
 "User Display Name Field" => "Campo Nome de ExibiÃ§Ã£o de UsuÃ¡rio",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do usuÃ¡rio.",
+"The LDAP attribute to use to generate the user's display name." => "O atributo LDAP para usar para gerar o nome de exibiÃ§Ã£o do usuÃ¡rio.",
 "Base User Tree" => "Ãrvore de UsuÃ¡rio Base",
 "One User Base DN per line" => "Um usuÃ¡rio-base DN por linha",
 "User Search Attributes" => "Atributos de Busca de UsuÃ¡rio",
 "Optional; one attribute per line" => "Opcional; um atributo por linha",
 "Group Display Name Field" => "Campo Nome de ExibiÃ§Ã£o de Grupo",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do grupo.",
+"The LDAP attribute to use to generate the groups's display name." => "O atributo LDAP para usar para gerar o nome de apresentaÃ§Ã£o do grupo.",
 "Base Group Tree" => "Ãrvore de Grupo Base",
 "One Group Base DN per line" => "Um grupo-base DN por linha",
 "Group Search Attributes" => "Atributos de Busca de Grupo",
@@ -75,15 +76,16 @@
 "User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do UsuÃ¡rio",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuÃ¡rio (padrÃ£o). Caso contrÃ¡rio, especifique um atributo LDAP/AD.",
 "Internal Username" => "Nome de usuÃ¡rio interno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrÃ£o, o nome de usuÃ¡rio interno serÃ¡ criado a partir do atributo UUID. Ele garante que o nome de usuÃ¡rio Ã© Ãºnica e personagens nÃ£o precisam ser convertidos. O nome de usuÃ¡rio interno tem a restriÃ§Ã£o de que apenas estes caracteres sÃ£o permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres sÃ£o substituÃdas por seu correspondente ASCII ou simplesmente serÃ£o omitidos. Em colisÃµes um nÃºmero serÃ¡ adicionado/aumentado. O nome de utilizador interna Ã© usada para identificar um utilizador internamente. Ã‰ tambÃ©m o nome padrÃ£o para a pasta home do usuÃ¡rio em ownCloud. Ã‰ tambÃ©m um porto de URLs remoto, por exemplo, para todos os serviÃ§os de *DAV. Com esta definiÃ§Ã£o, o comportamento padrÃ£o pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuÃ¡rio no campo seguinte. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas no recÃ©m mapeados (adicionado) de usuÃ¡rios LDAP. ",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrÃ£o, o nome de usuÃ¡rio interno serÃ¡ criado a partir do atributo UUID. Ele garante que o nome de usuÃ¡rio Ã© Ãºnico e que caracteres nÃ£o precisam ser convertidos. O nome de usuÃ¡rio interno tem a restriÃ§Ã£o de que apenas estes caracteres sÃ£o permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres sÃ£o substituÃdos por seus correspondentes em ASCII ou simplesmente serÃ£o omitidos. Em caso de colisÃ£o um nÃºmero serÃ¡ adicionado/aumentado. O nome de usuÃ¡rio interno Ã© usado para identificar um usuÃ¡rio internamente. Ã‰ tambÃ©m o nome padrÃ£o da pasta \"home\" do usuÃ¡rio. Ã‰ tambÃ©m parte de URLs remotas, por exemplo, para todos as instÃ¢ncias *DAV. Com esta definiÃ§Ã£o, o comportamento padrÃ£o pode ser sobrescrito. Para alcanÃ§ar um comportamento semelhante ao de antes do ownCloud 5, forneÃ§a o atributo do nome de exibiÃ§Ã£o do usuÃ¡rio no campo seguinte. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas para usuÃ¡rios LDAP recÃ©m mapeados (adicionados).",
 "Internal Username Attribute:" => "Atributo Interno de Nome de UsuÃ¡rio:",
 "Override UUID detection" => "Substituir detecÃ§Ã£o UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por padrÃ£o, ownCloud detecta automaticamente o atributo UUID. O atributo UUID Ã© usado para identificar, sem dÃºvida, os usuÃ¡rios e grupos LDAP. AlÃ©m disso, o nome de usuÃ¡rio interno serÃ¡ criado com base no UUID, se nÃ£o especificada acima. VocÃª pode substituir a configuraÃ§Ã£o e passar um atributo de sua escolha. VocÃª deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuÃ¡rios e grupos e Ã© Ãºnico. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas no recÃ©m mapeados (adicionado) de usuÃ¡rios e grupos LDAP.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por padrÃ£o, o atributo UUID Ã© detectado automaticamente. O atributo UUID Ã© usado para identificar, sem dÃºvidas, os usuÃ¡rios e grupos LDAP. AlÃ©m disso, o nome de usuÃ¡rio interno serÃ¡ criado com base no UUID, se nÃ£o especificado acima. VocÃª pode substituir a configuraÃ§Ã£o e passar um atributo de sua escolha. VocÃª deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuÃ¡rios como para grupos, e que seja Ãºnico. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas para usuÃ¡rios e grupos LDAP recÃ©m mapeados (adicionados).",
 "UUID Attribute:" => "Atributo UUID:",
 "Username-LDAP User Mapping" => "UsuÃ¡rio-LDAP Mapeamento de UsuÃ¡rio",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nomes de usuÃ¡rios para armazenar e atribuir (meta) dados. A fim de identificar com precisÃ£o e reconhecer usuÃ¡rios, cada usuÃ¡rio LDAP terÃ¡ um nome de usuÃ¡rio interno. Isso requer um mapeamento de ownCloud do nome de usuÃ¡rio para usuÃ¡rio LDAP. O nome de usuÃ¡rio criado Ã© mapeado para o UUID do usuÃ¡rio LDAP. AlÃ©m disso, o DN estÃ¡ em cache, assim como para reduzir a interaÃ§Ã£o LDAP, mas que nÃ£o Ã© utilizado para a identificaÃ§Ã£o. Se a DN muda, as mudanÃ§as serÃ£o encontradas pelo ownCloud. O nome ownCloud interno Ã© utilizado em todo ownCloud. Limpando os mapeamentos terÃ¡ sobras em todos os lugares. Limpeza dos mapeamentos nÃ£o sÃ£o sensÃveis a configuraÃ§Ã£o, isso afeta todas as configuraÃ§Ãµes LDAP! Nunca limpar os mapeamentos em um ambiente de produÃ§Ã£o. Somente limpe os mapeamentos em uma fase de testes ou experimental.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Nomes de usuÃ¡rios sÃ£i usados para armazenar e atribuir (meta) dados. A fim de identificar com precisÃ£o e reconhecer usuÃ¡rios, cada usuÃ¡rio LDAP terÃ¡ um nome de usuÃ¡rio interno. Isso requer um mapeamento nome de usuÃ¡rio para usuÃ¡rio LDAP. O nome de usuÃ¡rio criado Ã© mapeado para o UUID do usuÃ¡rio LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interaÃ§Ã£o LDAP, mas nÃ£o Ã© utilizado para a identificaÃ§Ã£o. Se o DN muda, as mudanÃ§as serÃ£o encontradas. O nome de usuÃ¡rio interno Ã© utilizado em todo lugar. Limpar os mapeamentos nÃ£o influencia a configuraÃ§Ã£o. Limpar os mapeamentos deixarÃ¡ rastros em todo lugar. Limpar os mapeamentos nÃ£o influencia a configuraÃ§Ã£o, mas afeta as configuraÃ§Ãµes LDAP! Somente limpe os mapeamentos em embiente de testes ou em estÃ¡gio experimental.",
 "Clear Username-LDAP User Mapping" => "Limpar Mapeamento de UsuÃ¡rio Nome de UsuÃ¡rio-LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Limpar NomedoGrupo-LDAP Mapeamento do Grupo",
 "Test Configuration" => "Teste de ConfiguraÃ§Ã£o",
 "Help" => "Ajuda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 308fd34760aaee037f4a5890a7efaac920f2e771..0abb049a1558c281cbcec720dee7613e435a7070 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Falhou a limpar os mapas",
 "Failed to delete the server configuration" => "Erro ao eliminar as configuraÃ§Ãµes do servidor",
 "The configuration is valid and the connection could be established!" => "A configuraÃ§Ã£o estÃ¡ correcta e foi possÃvel estabelecer a ligaÃ§Ã£o!",
@@ -15,7 +16,6 @@
 "Connection test failed" => "Erro no teste de conecÃ§Ã£o.",
 "Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configuraÃ§Ãµes de servidor actuais?",
 "Confirm Deletion" => "Confirmar a operaÃ§Ã£o de apagar",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> A aplicaÃ§Ã£o user_ldap e user_webdavauth sÃ£o incompativeis. A aplicaÃ§Ã£o pode tornar-se instÃ¡vel. Por favor, peÃ§a ao seu administrador para desactivar uma das aplicaÃ§Ãµes.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O mÃ³dulo PHP LDAP nÃ£o estÃ¡ instalado, logo nÃ£o irÃ¡ funcionar. Por favor peÃ§a ao administrador para o instalar.",
 "Server configuration" => "ConfiguraÃ§Ãµes do servidor",
 "Add Server Configuration" => "Adicionar configuraÃ§Ãµes do servidor",
@@ -45,24 +45,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "ForneÃ§a um servidor (anfitriÃ£o) de backup. Deve ser uma rÃ©plica do servidor principal de LDAP/AD ",
 "Backup (Replica) Port" => "Porta do servidor de backup (Replica)",
 "Disable Main Server" => "Desactivar servidor principal",
-"When switched on, ownCloud will only connect to the replica server." => "Se estiver ligado, o ownCloud vai somente ligar-se a este servidor de rÃ©plicas.",
 "Use TLS" => "Usar TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "NÃ£o utilize para adicionar ligaÃ§Ãµes LDAP, irÃ¡ falhar!",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP (Windows) nÃ£o sensÃvel a maiÃºsculas.",
 "Turn off SSL certificate validation." => "Desligar a validaÃ§Ã£o de certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a ligaÃ§Ã£o apenas funcionar com estÃ¡ opÃ§Ã£o, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud.",
 "Not recommended, use for testing only." => "NÃ£o recomendado, utilizado apenas para testes!",
 "Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
 "in seconds. A change empties the cache." => "em segundos. Uma alteraÃ§Ã£o esvazia a cache.",
 "Directory Settings" => "DefiniÃ§Ãµes de directorias",
 "User Display Name Field" => "Mostrador do nome de utilizador.",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Atributo LDAP para gerar o nome de utilizador do ownCloud.",
 "Base User Tree" => "Base da Ã¡rvore de utilizadores.",
 "One User Base DN per line" => "Uma base de utilizador DN por linha",
 "User Search Attributes" => "Utilizar atributos de pesquisa",
 "Optional; one attribute per line" => "Opcional; Um atributo por linha",
 "Group Display Name Field" => "Mostrador do nome do grupo.",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atributo LDAP para gerar o nome do grupo do ownCloud.",
 "Base Group Tree" => "Base da Ã¡rvore de grupos.",
 "One Group Base DN per line" => "Uma base de grupo DN por linha",
 "Group Search Attributes" => "Atributos de pesquisa de grupo",
@@ -84,3 +80,4 @@
 "Test Configuration" => "Testar a configuraÃ§Ã£o",
 "Help" => "Ajuda"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 260ee610639b4b0066d0f5f6d76abd803763108a..cdc94e6a4939532dbb2ebc83317a61f9a5367511 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,8 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "È˜tergerea a eÈ™uat",
 "Success" => "Succes",
 "Error" => "Eroare",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. VÄƒ rugÄƒm sÄƒ Ã®ntrebaÈ›i administratorul de sistem pentru a dezactiva una dintre ele.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AtenÈ›ie</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcÈ›iona. ContacteazÄƒ administratorul sistemului pentru al instala.",
 "Host" => "GazdÄƒ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "PuteÈ›i omite protocolul, decÃ¢t dacÄƒ folosiÈ›i SSL. Atunci se Ã®ncepe cu ldaps://",
@@ -26,15 +26,12 @@
 "Use TLS" => "UtilizeazÄƒ TLS",
 "Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)",
 "Turn off SSL certificate validation." => "OpreÈ™te validarea certificatelor SSL ",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "DacÄƒ conexiunea lucreazÄƒ doar cu aceastÄƒ opÈ›iune, importeazÄƒ certificatul SSL al serverului LDAP Ã®n serverul ownCloud.",
 "Not recommended, use for testing only." => "Nu este recomandat, a se utiliza doar pentru testare.",
 "in seconds. A change empties the cache." => "Ã®n secunde. O schimbare curÄƒÈ›Äƒ memoria tampon.",
 "User Display Name Field" => "CÃ¢mpul cu numele vizibil al utilizatorului",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud.",
 "Base User Tree" => "Arborele de bazÄƒ al Utilizatorilor",
 "One User Base DN per line" => "Un User Base DN pe linie",
 "Group Display Name Field" => "CÃ¢mpul cu numele grupului",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud",
 "Base Group Tree" => "Arborele de bazÄƒ al Grupurilor",
 "One Group Base DN per line" => "Un Group Base DN pe linie",
 "Group-Member association" => "Asocierea Grup-Membru",
@@ -42,3 +39,4 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "LÄƒsaÈ›i gol pentru numele de utilizator (implicit). ÃŽn caz contrar, specificaÈ›i un atribut LDAP / AD.",
 "Help" => "Ajutor"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index d88b20dc46912ff228c30c8485211d3e2974f90e..ef115f6bbd76e06f0758136af3eb9571a99fbb90 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑÑ‚Ð²Ð¸Ñ.",
 "Failed to delete the server configuration" => "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ ÑÐµÑ€Ð²ÐµÑ€Ð°",
 "The configuration is valid and the connection could be established!" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾!",
@@ -15,7 +16,7 @@
 "Connection test failed" => "ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ",
 "Do you really want to delete the current Server Configuration?" => "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰ÑƒÑŽ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ ÑÐµÑ€Ð²ÐµÑ€Ð°?",
 "Confirm Deletion" => "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b>ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap Ð¸ user_webdavauth Ð½ÐµÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ñ‹. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÑ‚Ð¾Ð»ÐºÐ½ÑƒÑ‚ÑŒÑÑ Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¼ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸ÐµÐ¼. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð¸Ð· Ð½Ð¸Ñ….",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap Ð¸ user_webdavauth Ð½Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ñ‹. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð½Ð°Ð±Ð»ÑŽÐ´Ð°Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ðµ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ð’Ð°ÑˆÐµÐ³Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð¸Ð· Ð½Ð¸Ñ….",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> ÐœÐ¾Ð´ÑƒÐ»ÑŒ LDAP Ð´Ð»Ñ PHP Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð±ÑÐºÐµÐ½Ð´ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ð²Ð°ÑˆÐµÐ³Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° ÐµÐ³Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ. ",
 "Server configuration" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°",
 "Add Server Configuration" => "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ ÑÐµÑ€Ð²ÐµÑ€Ð°",
@@ -45,24 +46,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€. ÐžÐ½ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ€ÐµÐ¿Ð»Ð¸ÐºÐ¾Ð¹ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ LDAP/AD ÑÐµÑ€Ð²ÐµÑ€Ð°.",
 "Backup (Replica) Port" => "ÐŸÐ¾Ñ€Ñ‚ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°",
 "Disable Main Server" => "ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°",
-"When switched on, ownCloud will only connect to the replica server." => "ÐšÐ¾Ð³Ð´Ð° Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, ownCloud Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾ÐµÐ´Ð¸Ð½ÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼.",
 "Use TLS" => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "ÐÐµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð½Ð¾ Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ñ‹Ð¼Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÑÐ¼Ð¸ (LDAPS), ÑÑ‚Ð¾ Ð½Ðµ ÑÑ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚.",
 "Case insensitve LDAP server (Windows)" => "ÐÐµÑ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ðº Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ñƒ ÑÐµÑ€Ð²ÐµÑ€ LDAP (Windows)",
 "Turn off SSL certificate validation." => "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÑƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ð•ÑÐ»Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ ÑÑ‚Ð¾Ð¹ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹, Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ Ð½Ð° Ð²Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€ ownCloud ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ SSL ÑÐµÑ€Ð²ÐµÑ€Ð° LDAP.",
 "Not recommended, use for testing only." => "ÐÐµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ñ‚ÐµÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ.",
 "Cache Time-To-Live" => "ÐšÑÑˆ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸ Ð¶Ð¸Ð·Ð½Ð¸",
 "in seconds. A change empties the cache." => "Ð² ÑÐµÐºÑƒÐ½Ð´Ð°Ñ…. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ ÐºÑÑˆ.",
 "Directory Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°",
 "User Display Name Field" => "ÐŸÐ¾Ð»Ðµ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud.",
 "Base User Tree" => "Ð‘Ð°Ð·Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ð³Ð¾ Ð´ÐµÑ€ÐµÐ²Ð°",
 "One User Base DN per line" => "ÐŸÐ¾ Ð¾Ð´Ð½Ð¾Ð¹ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¼Ñƒ DN Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ.",
 "User Search Attributes" => "ÐŸÐ¾Ð¸ÑÐºÐ¾Ð²Ñ‹Ðµ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ñ‹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
 "Optional; one attribute per line" => "ÐžÐ¿Ñ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾; Ð¾Ð´Ð¸Ð½ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ",
 "Group Display Name Field" => "ÐŸÐ¾Ð»Ðµ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ownCloud.",
 "Base Group Tree" => "Ð‘Ð°Ð·Ð° Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ð³Ð¾ Ð´ÐµÑ€ÐµÐ²Ð°",
 "One Group Base DN per line" => "ÐŸÐ¾ Ð¾Ð´Ð½Ð¾Ð¹ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¼Ñƒ DN Ð³Ñ€ÑƒÐ¿Ð¿ Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ.",
 "Group Search Attributes" => "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ñ‹ Ð¿Ð¾Ð¸ÑÐºÐ° Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹",
@@ -75,15 +72,13 @@
 "User Home Folder Naming Rule" => "ÐŸÑ€Ð°Ð²Ð¸Ð»Ð¾ Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð”Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ ÐŸÐ°Ð¿ÐºÐ¸ ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ÐžÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ (Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ). Ð˜Ð½Ð°Ñ‡Ðµ ÑƒÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP/AD.",
 "Internal Username" => "Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "ÐŸÐ¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Ð¸Ð· Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð° UUID. ÐÑ‚Ð¾ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±Ñ‹Ð»Ð¾ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼ Ð¸ Ð½Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð»Ð¾ Ð² ÑÐµÐ±Ðµ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð½Ñ‹Ñ… ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð². Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ ÑÐ¾ÑÑ‚Ð¾ÑÑ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¸Ð· ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ñ… ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²: [ a-zA-Z0-9_.@- ]. ÐžÑÑ‚Ð°Ð»ÑŒÐ½Ñ‹Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð·Ð°Ð¼ÐµÑ‰Ð°ÑŽÑ‚ÑÑ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸ÑÐ¼Ð¸ Ð¸Ð· Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ ASCII Ð¸Ð»Ð¸ Ð¶Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ð¾ Ð¿Ñ€Ð¾Ð¿ÑƒÑÐºÐ°ÑŽÑ‚ÑÑ. ÐŸÑ€Ð¸ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¸ Ðº Ð¸Ð¼ÐµÐ½Ð¸ Ð±ÑƒÐ´ÐµÑ‚ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ Ñ‡Ð¸ÑÐ»Ð¾. Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ¹ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. Ð¢Ð°ÐºÐ¶Ðµ Ð¾Ð½Ð¾ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ownCloud. ÐžÐ½Ð¾ Ñ‚Ð°ÐºÐ¶Ðµ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð¼ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ñ‹Ñ… ÑÑÑ‹Ð»Ð¾Ðº, Ðº Ð¿Ñ€Ð¸Ð¼ÐµÑ€Ñƒ, Ð´Ð»Ñ Ð²ÑÐµÑ… ÑÐµÑ€Ð²Ð¸ÑÐ¾Ð² *DAV. Ð¡ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ÑŽ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð§Ñ‚Ð¾Ð±Ñ‹ Ð´Ð¾ÑÑ‚Ð¸Ñ‡ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ, ÐºÐ°Ðº Ð±Ñ‹Ð»Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¾ Ð´Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ, ownCloud 5 Ð²Ñ‹Ð²Ð¾Ð´Ð¸Ñ‚ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ÑÑ‚Ð¾Ð¼ Ð¿Ð¾Ð»Ðµ. ÐžÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ ÐµÐ³Ð¾ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ Ð¸Ð¼ÐµÑ‚ÑŒ ÑÑ„Ñ„ÐµÐºÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ñ… (Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ…) Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ LDAP.",
 "Internal Username Attribute:" => "ÐÑ‚Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸:",
 "Override UUID detection" => "ÐŸÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "ÐŸÐ¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ, ownCloud Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÐµÑ‚ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ UUID Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸. ÐÑ‚Ð¾Ñ‚ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ð¾ Ð¸Ð½Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ LDAP. Ð¢Ð°ÐºÐ¶Ðµ, Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð° UUID ÑÐ¾Ð·Ð´Ð°ÐµÑ‚ÑÑ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, ÐµÑÐ»Ð¸ Ð²Ñ‹ÑˆÐµ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ Ð¸Ð½Ð°Ñ‡Ðµ. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿ÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ ÑÑ‚Ñƒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ Ð¸ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¿Ð¾ Ð²Ñ‹Ð±Ð¾Ñ€Ñƒ. Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑƒÐ´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒÑÑ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ð²Ð°Ð¼Ð¸ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿, Ð° Ñ‚Ð°ÐºÐ¶Ðµ Ñ‚Ð¾, Ñ‡Ñ‚Ð¾ Ð¾Ð½ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹. ÐžÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ðµ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ Ð´Ð»Ñ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²ÑÑ‚ÑƒÐ¿ÑÑ‚ Ð² ÑÐ¸Ð»Ñƒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ñ… (Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ…) Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿ LDAP.",
 "UUID Attribute:" => "ÐÑ‚Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð´Ð»Ñ UUID:",
 "Username-LDAP User Mapping" => "Ð¡Ð¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ LDAP",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¸ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð°Ð´Ð°Ð½Ð½Ñ‹Ñ…. Ð”Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð¸ Ñ€Ð°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, ÐºÐ°Ð¶Ð´Ñ‹Ð¹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ LDAP Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð¼ÐµÑ‚ÑŒ ÑÐ²Ð¾Ðµ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. ÐÑ‚Ð¾ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ñ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud Ðº Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŽ LDAP. ÐŸÑ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚ÑÑ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ñƒ UUID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ LDAP. ÐŸÐ¾Ð¼Ð¸Ð¼Ð¾ ÑÑ‚Ð¾Ð³Ð¾ ÐºÑÑˆÐ¸Ñ€ÑƒÐµÑ‚ÑÑ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ (DN) Ð´Ð»Ñ ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ LDAP, Ð¾Ð´Ð½Ð°ÐºÐ¾ Ð¾Ð½Ð¾ Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸. Ð•ÑÐ»Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾, Ð¾Ð± ÑÑ‚Ð¾Ð¼ ÑÑ‚Ð°Ð½ÐµÑ‚ Ð¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾ ownCloud. Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ ownCloud Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð¿Ð¾Ð²ÑÐµÐ¼ÐµÑÑ‚Ð½Ð¾ Ð² ownCloud. ÐŸÑ€Ð¸ Ð¾Ñ‡Ð¸ÑÑ‚ÐºÐµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ð¹ Ð¿Ð¾Ð²ÑÑŽÐ´Ñƒ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾ÑÑ‚Ð°Ð²Ð°Ñ‚ÑŒÑÑ \"Ñ…Ð²Ð¾ÑÑ‚Ñ‹\". ÐžÑ‡Ð¸ÑÑ‚ÐºÐ° ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ð¹ Ð½Ðµ Ð¿Ñ€Ð¸Ð²ÑÐ·Ð°Ð½Ð° Ðº ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ð¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸, Ð¾Ð½Ð° Ð²Ð»Ð¸ÑÐµÑ‚ Ð½Ð° Ð²ÑÐµ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ LDAP! ÐÐ¸ÐºÐ¾Ð³Ð´Ð° Ð½Ðµ Ð¾Ñ‡Ð¸Ñ‰Ð°Ð¹Ñ‚Ðµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð² Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¼ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ð¸. ÐžÑ‡Ð¸Ñ‰Ð°Ð¹Ñ‚Ðµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ñ‚ÐµÑÑ‚Ð¾Ð² Ð¸Ð»Ð¸ Ð² ÑÐºÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑÑ….",
 "Clear Username-LDAP User Mapping" => "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ LDAP",
 "Clear Groupname-LDAP Group Mapping" => "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-Ð“Ñ€ÑƒÐ¿Ð¿Ð° LDAP",
 "Test Configuration" => "Ð¢ÐµÑÑ‚Ð¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ",
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
 );
+$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);";
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index 7b6833ebf8cd2d6827a929379fb7de529b0d18ee..623d8f2d8ecbe96e3c0c5117d551dd2866e53963 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Success" => "Ð£ÑÐ¿ÐµÑ…",
 "Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°"
 );
+$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);";
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 1d81b341b46242d9567de7ef2b2ac2780f50d70e..21c8f047ff6df7047e98b1e242747c3803d6a7ee 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "à¶¸à¶šà·à¶¯à·à¶¸à·“à¶¸ à¶…à·ƒà·à¶»à·Šà¶®à¶šà¶ºà·’",
 "Success" => "à·ƒà·à¶»à·Šà¶®à¶šà¶ºà·’",
 "Error" => "à¶¯à·à·‚à¶ºà¶šà·Š",
@@ -14,3 +15,4 @@
 "Not recommended, use for testing only." => "à¶±à·’à¶»à·Šà¶¯à·šà· à¶šà·… à¶±à·œà·„à·à¶š. à¶´à¶»à·“à¶šà·Šà·‚à¶« à·ƒà¶³à·„à· à¶´à¶¸à¶«à¶šà·Š à¶·à·à·€à·’à¶ à¶šà¶»à¶±à·Šà¶±",
 "Help" => "à¶‹à¶¯à·€à·Š"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index fe1e14ea6fd80de1eb33be91a4992d7aa5e608d5..f02828daf70429bad4704e339a4c4f1f9f9a866b 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Nepodarilo sa vymazaÅ¥ mapovania.",
 "Failed to delete the server configuration" => "Zlyhalo zmazanie nastavenia servera.",
 "The configuration is valid and the connection could be established!" => "Nastavenie je v poriadku a pripojenie je stabilnÃ©.",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Test pripojenia zlyhal",
 "Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazaÅ¥ sÃºÄasnÃ© nastavenie servera?",
 "Confirm Deletion" => "PotvrdiÅ¥ vymazanie",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Upozornenie:</b> AplikÃ¡cie user_ldap a user_webdavauth nie sÃº kompatibilnÃ©. MÃ´Å¾e nastÃ¡vaÅ¥ neoÄakÃ¡vanÃ© sprÃ¡vanie. PoÅ¾iadajte administrÃ¡tora systÃ©mu aby jednu z nich zakÃ¡zal.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Upozornenie:</b> AplikÃ¡cie user_ldap a user_webdavauth sÃº navzÃ¡jom nekompatibilnÃ©. MÃ´Å¾ete zaznamenaÅ¥ neoÄakÃ¡vanÃ© sprÃ¡vanie. PoÅ¾iadajte prosÃm vÃ¡Å¡ho systÃ©movÃ©ho administrÃ¡tora pre zakÃ¡zanie jednÃ©ho z nich.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainÅ¡talovanÃ½ LDAP modul pre PHP, backend vrstva nebude fungovaÅ¥. PoÅ¾Ã¡dejte administrÃ¡tora systÃ©mu aby ho nainÅ¡taloval.",
 "Server configuration" => "Nastavenia servera",
 "Add Server Configuration" => "PridaÅ¥ nastavenia servera.",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Zadajte zÃ¡loÅ¾nÃ½ LDAP/AD. MusÃ to byÅ¥ kÃ³pia hlavnÃ©ho LDAP/AD servera.",
 "Backup (Replica) Port" => "ZÃ¡loÅ¾nÃ½ server (kÃ³pia) port",
 "Disable Main Server" => "ZakÃ¡zaÅ¥ hlavnÃ½ server",
-"When switched on, ownCloud will only connect to the replica server." => "Pri zapnutÃ sa ownCloud pripojÃ len k zÃ¡loÅ¾nÃ©mu serveru.",
+"Only connect to the replica server." => "PripojiÅ¥ sa len k zÃ¡loÅ¾nÃ©mu serveru.",
 "Use TLS" => "PouÅ¾i TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "NepouÅ¾Ãvajte pre pripojenie LDAPS, zlyhÃ¡.",
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozliÅ¡uje veÄ¾kosÅ¥ znakov (Windows)",
 "Turn off SSL certificate validation." => "VypnÃºÅ¥ overovanie SSL certifikÃ¡tu.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ak pripojenie pracuje len s touto moÅ¾nosÅ¥ou, tak importujte SSL certifikÃ¡t LDAP serveru do vÃ¡Å¡ho servera ownCloud.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Ak pripojenie pracuje len s touto moÅ¾nosÅ¥ou, tak naimportujte SSL certifikÃ¡t LDAP servera do vÃ¡Å¡ho %s servera.",
 "Not recommended, use for testing only." => "Nie je doporuÄovanÃ©, len pre testovacie ÃºÄely.",
 "Cache Time-To-Live" => "Å½ivotnosÅ¥ objektov v cache",
 "in seconds. A change empties the cache." => "v sekundÃ¡ch. Zmena vyprÃ¡zdni vyrovnÃ¡vaciu pamÃ¤Å¥.",
 "Directory Settings" => "Nastavenie prieÄinka",
 "User Display Name Field" => "Pole pre zobrazenia mena pouÅ¾ÃvateÄ¾a",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie mena pouÅ¾ÃvateÄ¾a ownCloud ",
+"The LDAP attribute to use to generate the user's display name." => "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie zobrazovanÃ©ho mena pouÅ¾ÃvateÄ¾a. ",
 "Base User Tree" => "ZÃ¡kladnÃ½ pouÅ¾ÃvateÄ¾skÃ½ strom",
 "One User Base DN per line" => "Jedna pouÅ¾ÃvateÄ¾skÃ¡ zÃ¡kladnÃ¡ DN na riadok",
 "User Search Attributes" => "AtribÃºty vyhÄ¾adÃ¡vania pouÅ¾ÃvateÄ¾ov",
 "Optional; one attribute per line" => "VoliteÄ¾nÃ©, jeden atribÃºt na jeden riadok",
 "Group Display Name Field" => "Pole pre zobrazenie mena skupiny",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie mena skupiny ownCloud ",
+"The LDAP attribute to use to generate the groups's display name." => "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie zobrazovanÃ©ho mena skupiny.",
 "Base Group Tree" => "ZÃ¡kladnÃ½ skupinovÃ½ strom",
 "One Group Base DN per line" => "Jedna skupinovÃ¡ zÃ¡kladnÃ¡ DN na riadok",
 "Group Search Attributes" => "AtribÃºty vyhÄ¾adÃ¡vania skupÃn",
@@ -75,13 +76,16 @@
 "User Home Folder Naming Rule" => "Pravidlo pre nastavenie mena pouÅ¾ÃvateÄ¾skÃ©ho prieÄinka dÃ¡t",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prÃ¡zdne pre pouÅ¾ÃvateÄ¾skÃ© meno (predvolenÃ©). Inak uveÄte atribÃºt LDAP/AD.",
 "Internal Username" => "InternÃ© pouÅ¾ÃvateÄ¾skÃ© meno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavenÃ bude internÃ© pouÅ¾ÃvateÄ¾skÃ© meno vytvorenÃ© z UUID atribÃºtu. ZabezpeÄÃ sa to, Å¾e pouÅ¾ÃvateÄ¾skÃ© meno bude jedineÄnÃ© a znaky nemusia byÅ¥ prevedenÃ©. InternÃ© meno mÃ¡ obmedzenie, iba tieto znaky sÃº povolenÃ©: [a-zA-Z0-9_ @ -.]. OstatnÃ© znaky sÃº nahradenÃ© ich ASCII alebo jednoducho vynechanÃ©. Pri kolÃziÃ¡ch bude ÄÃslo byÅ¥ pridanÃ© / odobranÃ©. InternÃ© pouÅ¾ÃvateÄ¾skÃ© meno sa pouÅ¾Ãva na identifikÃ¡ciu pouÅ¾ÃvateÄ¾a interne. Je to tieÅ¾ predvolenÃ½ nÃ¡zov pouÅ¾ÃvateÄ¾skÃ©ho domovskÃ©ho prieÄinka v ownCloud. To je tieÅ¾ port vzdialenÃ©ho URL, naprÃklad pre vÅ¡etky sluÅ¾by * DAV. S tÃ½mto nastavenÃm sa dÃ¡ prepÃsaÅ¥ predvolenÃ© sprÃ¡vanie. Pre dosiahnutie podobnÃ©ho sprÃ¡vania sa ako pred ownCloud 5 zadajte atribÃºt zobrazenia pouÅ¾ÃvateÄ¾skÃ©ho mena v tomto poli. Ponechajte prÃ¡zdne pre predvolenÃ© sprÃ¡vanie. Zmeny budÃº maÅ¥ vplyv iba na novo mapovanÃ½ch (pridanÃ½ch) LDAP pouÅ¾ÃvateÄ¾ov.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavenÃ bude internÃ© pouÅ¾ÃvateÄ¾skÃ© meno vytvorenÃ© z UUID atribÃºtu. ZabezpeÄÃ sa to, Å¾e pouÅ¾ÃvateÄ¾skÃ© meno bude jedineÄnÃ© a znaky nemusia byÅ¥ prevedenÃ©. InternÃ© meno mÃ¡ obmedzenie, iba tieto znaky sÃº povolenÃ©: [a-zA-Z0-9_ @ -.]. OstatnÃ© znaky sÃº nahradenÃ© ich ASCII alebo jednoducho vynechanÃ©. Pri kolÃziÃ¡ch pouÅ¾ÃvateÄ¾skÃ½ch mien bude ÄÃslo pridanÃ© / odobranÃ©. InternÃ© pouÅ¾ÃvateÄ¾skÃ© meno sa pouÅ¾Ãva na internÃº identifikÃ¡ciu pouÅ¾ÃvateÄ¾a. Je tieÅ¾ predvolenÃ½m nÃ¡zvom pouÅ¾ÃvateÄ¾skÃ©ho domovskÃ©ho prieÄinka v ownCloud. Je tieÅ¾ sÃºÄasÅ¥ou URL pre vzdialenÃ½ prÃstup, naprÃklad pre vÅ¡etky sluÅ¾by * DAV. S tÃ½mto nastavenÃm sa dÃ¡ prepÃsaÅ¥ predvolenÃ© sprÃ¡vanie. Pre dosiahnutie podobnÃ©ho sprÃ¡vania sa ako pred verziou ownCloud 5 zadajte atribÃºt zobrazenia pouÅ¾ÃvateÄ¾skÃ©ho mena v tomto poli. Ponechajte prÃ¡zdne pre predvolenÃ© sprÃ¡vanie. Zmeny budÃº maÅ¥ vplyv iba na novo namapovanÃ½ch (pridanÃ½ch) LDAP pouÅ¾ÃvateÄ¾ov.",
 "Internal Username Attribute:" => "AtribÃºt internÃ©ho pouÅ¾ÃvateÄ¾skÃ©ho mena:",
 "Override UUID detection" => "PrepÃsaÅ¥ UUID detekciu",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "V predvolenom nastavenÃ je UUID atribÃºt detekovanÃ½ automaticky. UUID atribÃºt je pouÅ¾itÃ½ na jedineÄnÃº identifikÃ¡ciu pouÅ¾ÃvateÄ¾ov a skupÃn z LDAP. Naviac je na zÃ¡klade UUID vytvorenÃ© tieÅ¾ internÃ© pouÅ¾ivateÄ¾skÃ© meno, ak nie je nastavenÃ© inak. MÃ´Å¾ete predvolenÃ© nastavenie prepÃsaÅ¥ a pouÅ¾iÅ¥ atribÃºt ktorÃ½ si sami zvolÃte. MusÃte sa ale ubezpeÄiÅ¥, Å¾e atribÃºt ktorÃ½ vyberiete bude uvedenÃ½ pri pouÅ¾ivateÄ¾och, aj pri skupinÃ¡ch a je jedineÄnÃ½. Ponechajte prÃ¡zdne pre predvolenÃ© sprÃ¡vanie. Zmena bude maÅ¥ vplyv len na novo namapovanÃ½ch (pridanÃ½ch) pouÅ¾ÃvateÄ¾ov a skupiny z LDAP.",
 "UUID Attribute:" => "UUID atribÃºt:",
 "Username-LDAP User Mapping" => "Mapovanie nÃ¡zvov LDAP pouÅ¾ÃvateÄ¾skÃ½ch mien",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "PouÅ¾ivateÄ¾skÃ© menÃ¡ sa pouÅ¾ÃvajÃº pre uchovÃ¡vanie a priraÄovanie (meta)dÃ¡t. Pre sprÃ¡vnu identifikÃ¡ciu a rozpoznanie pouÅ¾ÃvateÄ¾ov bude maÅ¥ kaÅ¾dÃ½ pouÅ¾ÃvateÄ¾ z LDAP internÃ© pouÅ¾ÃvateÄ¾skÃ© meno. To je nevyhnutnÃ© pre namapovanie pouÅ¾ÃvateÄ¾skÃ½ch mien na pouÅ¾ÃvateÄ¾ov v LDAP. VytvorenÃ© pouÅ¾ÃvateÄ¾skÃ© meno je namapovanÃ© na UUID pouÅ¾ÃvateÄ¾a v LDAP. Naviac je cachovanÃ¡ DN pre obmedzenie interakcie s LDAP, ale nie je pouÅ¾ÃvanÃ¡ pre identifikÃ¡ciu. Ak sa DN zmenÃ, bude to sprÃ¡vne rozpoznanÃ©. InternÃ© pouÅ¾ÃvateÄ¾skÃ© meno sa pouÅ¾Ãva vÅ¡ade. VyÄistenie namapovÃ¡nÃ vymaÅ¾e zvyÅ¡ky vÅ¡ade. VyÄistenie naviac nie je Å¡pecifickÃ©, bude maÅ¥ vplyv na vÅ¡etky LDAP konfigurÃ¡cie! Nikdy neÄistite namapovanie v produkÄnom prostredÃ, len v testovacej alebo experimentÃ¡lnej fÃ¡ze.",
 "Clear Username-LDAP User Mapping" => "ZruÅ¡iÅ¥ mapovanie LDAP pouÅ¾ÃvateÄ¾skÃ½ch mien",
 "Clear Groupname-LDAP Group Mapping" => "ZruÅ¡iÅ¥ mapovanie nÃ¡zvov LDAP skupÃn",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index aeca97038e8d455ab5759ae55728d32be4caaf74..80abb79e495cbb754bc502eac7a2926163502830 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Preslikav ni bilo mogoÄe izbrisati",
 "Failed to delete the server configuration" => "Brisanje nastavitev streÅ¾nika je spodletelo.",
 "The configuration is valid and the connection could be established!" => "Nastavitev je veljavna, zato je povezavo mogoÄe vzpostaviti!",
@@ -15,7 +16,6 @@
 "Connection test failed" => "Preizkus povezave je spodletel.",
 "Do you really want to delete the current Server Configuration?" => "Ali res Å¾elite izbrisati trenutne nastavitve streÅ¾nika?",
 "Confirm Deletion" => "Potrdi brisanje",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Opozorilo:</b> moÅ¾nosti user_ldap in user_webdavauth nista zdruÅ¾ljivi. Pri uporabi je mogoÄe nepriÄakovano obnaÅ¡anje sistema. Eno izmed moÅ¾nosti je priporoÄeno onemgoÄiti.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> modul PHP LDAP mora biti nameÅ¡Äen, sicer vmesnik ne bo deloval. Paket je treba namestiti.",
 "Server configuration" => "Nastavitev streÅ¾nika",
 "Add Server Configuration" => "Dodaj nastavitve streÅ¾nika",
@@ -45,24 +45,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natanÄna replika streÅ¾nika LDAP/AD.",
 "Backup (Replica) Port" => "Varnostna kopija (replika) podatka vrat",
 "Disable Main Server" => "OnemogoÄi glavni streÅ¾nik",
-"When switched on, ownCloud will only connect to the replica server." => "Ob priklopu bo streÅ¾nik ownCloud povezan le s kopijo (repliko) streÅ¾nika.",
 "Use TLS" => "Uporabi TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "StreÅ¾nika ni priporoÄljivo uporabljati za povezave LDAPS. Povezava bo spodletela.",
 "Case insensitve LDAP server (Windows)" => "StreÅ¾nik LDAP ne upoÅ¡teva velikosti Ärk (Windows)",
 "Turn off SSL certificate validation." => "OnemogoÄi doloÄanje veljavnosti potrdila SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Kadar deluje povezava le s to moÅ¾nostjo, uvozite potrdilo SSL iz streÅ¾nika LDAP na vaÅ¡ streÅ¾nik ownCloud.",
 "Not recommended, use for testing only." => "Dejanje ni priporoÄeno; uporabljeno naj bo le za preizkuÅ¡anje delovanja.",
 "Cache Time-To-Live" => "Predpomni podatke TTL",
 "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.",
 "Directory Settings" => "Nastavitve mape",
 "User Display Name Field" => "Polje za uporabnikovo prikazano ime",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju uporabniÅ¡kih imen ownCloud.",
 "Base User Tree" => "Osnovno uporabniÅ¡ko drevo",
 "One User Base DN per line" => "Eno osnovno uporabniÅ¡ko ime DN na vrstico",
 "User Search Attributes" => "Uporabi atribute iskanja",
 "Optional; one attribute per line" => "Izbirno; en atribut na vrstico",
 "Group Display Name Field" => "Polje za prikazano ime skupine",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud.",
 "Base Group Tree" => "Osnovno drevo skupine",
 "One Group Base DN per line" => "Eno osnovno ime skupine DN na vrstico",
 "Group Search Attributes" => "Atributi iskanja skupine",
@@ -75,15 +71,13 @@
 "User Home Folder Naming Rule" => "Pravila poimenovanja uporabniÅ¡ke osebne mape",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniÅ¡ko ime (privzeto), sicer navedite atribut LDAP/AD.",
 "Internal Username" => "Interno uporabniÅ¡ko ime",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Po privzetih nastavitvah bo uporabniÅ¡ko ime nastavljeno na podlagi atributa UUID. Ta zagotovi, da je uporabniÅ¡ko ime unikatno in, da znakov ni potrebno pretvarjati. Interno uporabniÅ¡ko ime ima omejitev v uporabi znakov, in sicer so dovoljeni le znaki [ a-zA-Z0-9_.@- ]. Ostali znaki so nadomeÅ¡Äeni z njihovimi ustreznicami v ASCII ali so enostavno prezrti. Pri prekrivanju znakov bo dodana Å¡tevilka. Interno uporabniÅ¡ko ime je v uporabi za interno identifikacijo uporabnika. Je tudi privzeto ime za uporabnikovo domaÄo mapo v ownCloudu.  Predstavlja tudi vrata za oddaljene internetne naslove, na primer za vse storitve *DAV. S to nastavitvijo se privzete nastavitve ne bodo upoÅ¡tevale. ÄŒe boste Å¾eleli doseÄi isto obnaÅ¡anje kot pri razliÄicah ownClouda 5, vnesite atribut za Ime za prikaz v spodnje polje. ÄŒe boste polje pustili prazno, bo uporabljena privzeta vrednost. Spremembe bodo vplivale samo na novo dodane LDAP-uporabnike.",
 "Internal Username Attribute:" => "Atribut Interno uporabniÅ¡ko ime",
 "Override UUID detection" => "Prezri zaznavo UUID",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Po privzetih nastavitvah ownCloud sam zazna atribute UUID. Atribut UUID je uporabljen za identifikacijo LDAP-uporabnikov in skupin. Na podlagi atributa UUID se ustvari tudi interno uporabniÅ¡ko ime, Äe ne navedete drugaÄnih nastavitev sami. Nastavitev lahko povozite in izberete nastavitev po vaÅ¡i izbiri. Potrebno je zagotoviti, da je izbran atribut lahko uporabljen tako za kreiranje uporabnikov kot skupin in je unikaten. Pustite praznega, Äe Å¾elite, da sistem uporabi privzete nastavitve. Spremembe bodo uporabljene Å¡ele pri novo preslikanih ali dodanih LDAP-uporabnikih in skupinah.",
 "UUID Attribute:" => "Atribut UUID",
 "Username-LDAP User Mapping" => "Preslikava uporabniÅ¡ko ime - LDAP-uporabnik",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud uporablja uporabniÅ¡ka imena za shranjevanje in doloÄanje metapodatkov. Za natanÄno identifikacijo in prepoznavo uporabnikov, ima vsak LDAP-uporabnik svoje interno uporabniÅ¡ko ime. To zahteva preslikavo iz uporabniÅ¡kega imena v ownCloudu v LDAP-uporabnika.  Ustvarjeno uporabniÅ¡ko ime je preslikano v UUID LDAP-uporabnika. Hkrati je v predpomnilnik shranjen DN uporabnika, zato da se zmanjÅ¡ajo povezave z LDAP-om, ni pa uporabljen za identifikacijo uporabnikov. ÄŒe se DN spremeni, bo ownCloud sam naÅ¡el te spremembe. Interno ime v ownCloudu je uporabljeno v celotnem sistemu. Brisanje preslikav bo pustilo posledice povsod. Brisanje preslikav je zato problematiÄno za konfiguracijo, vpliva na celotno LDAP-konfiguracijo. Nikoli ne briÅ¡ite preslikav na produkcijskem okolju. Preslikave briÅ¡ite samo v fazi preizkuÅ¡anja storitve.",
 "Clear Username-LDAP User Mapping" => "IzbriÅ¡i preslikavo UporabniÅ¡kega imena in LDAP-uporabnika",
 "Clear Groupname-LDAP Group Mapping" => "IzbriÅ¡i preslikavo Skupine in LDAP-skupine",
 "Test Configuration" => "Preizkusne nastavitve",
 "Help" => "PomoÄ"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 12324b9f966cfe6fa5ea2caab20182dccafc39d4..2de62cc009a096b75f632f6c34e2c44cb2ab776e 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Veprim i gabuar",
 "Password" => "Kodi",
 "Help" => "NdihmÃ«"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index b94bc83e1e477166237a64ae530da8eec4491de7..7dd12fe5cca87b5c9bc651f17b191b7bafb83a56 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Ð‘Ñ€Ð¸ÑÐ°ÑšÐµ Ð½Ð¸Ñ˜Ðµ ÑƒÑÐ¿ÐµÐ»Ð¾",
 "Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Host" => "Ð”Ð¾Ð¼Ð°Ñ›Ð¸Ð½",
@@ -21,16 +22,14 @@
 "Use TLS" => "ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ TLS",
 "Case insensitve LDAP server (Windows)" => "LDAP ÑÐµÑ€Ð²ÐµÑ€ Ð¾ÑÐµÑ‚Ñ™Ð¸Ð² Ð½Ð° Ð²ÐµÐ»Ð¸ÐºÐ° Ð¸ Ð¼Ð°Ð»Ð° ÑÐ»Ð¾Ð²Ð° (Windows)",
 "Turn off SSL certificate validation." => "Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð°.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ð£Ð²ÐµÐ·Ð¸Ñ‚Ðµ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ LDAP ÑÐµÑ€Ð²ÐµÑ€Ð° Ñƒ ÑÐ²Ð¾Ñ˜ ownCloud Ð°ÐºÐ¾ Ð²ÐµÐ·Ð° Ñ€Ð°Ð´Ð¸ ÑÐ°Ð¼Ð¾ ÑÐ° Ð¾Ð²Ð¾Ð¼ Ð¾Ð¿Ñ†Ð¸Ñ˜Ð¾Ð¼.",
 "Not recommended, use for testing only." => "ÐÐµ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜Ðµ ÑÐµ; ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ ÑÐ°Ð¼Ð¾ Ð·Ð° Ñ‚ÐµÑÑ‚Ð¸Ñ€Ð°ÑšÐµ.",
 "in seconds. A change empties the cache." => "Ñƒ ÑÐµÐºÑƒÐ½Ð´Ð°Ð¼Ð°. ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð° Ð¸ÑÐ¿Ñ€Ð°Ð¶ÑšÐ°Ð²Ð° ÐºÐµÑˆ Ð¼ÐµÐ¼Ð¾Ñ€Ð¸Ñ˜Ñƒ.",
 "User Display Name Field" => "Ð˜Ð¼Ðµ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð·Ð° ÑÑ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¸Ð¼ÐµÐ½Ð° ownCloud-Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°.",
 "Base User Tree" => "ÐžÑÐ½Ð¾Ð²Ð½Ð¾ ÑÑ‚Ð°Ð±Ð»Ð¾ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°",
 "Group Display Name Field" => "Ð˜Ð¼Ðµ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð° Ð³Ñ€ÑƒÐ¿Ðµ",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð·Ð° ÑÑ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¸Ð¼ÐµÐ½Ð° ownCloud-Ð° Ð³Ñ€ÑƒÐ¿Ðµ.",
 "Base Group Tree" => "ÐžÑÐ½Ð¾Ð²Ð½Ð° ÑÑ‚Ð°Ð±Ð»Ð¾ Ð³Ñ€ÑƒÐ¿Ð°",
 "Group-Member association" => "ÐŸÑ€Ð¸Ð´Ñ€ÑƒÐ¶Ð¸Ð²Ð°ÑšÐµ Ñ‡Ð»Ð°Ð½Ð¾Ð²Ð° Ñƒ Ð³Ñ€ÑƒÐ¿Ñƒ",
 "in bytes" => "Ñƒ Ð±Ð°Ñ˜Ñ‚Ð¾Ð²Ð¸Ð¼Ð°",
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñ›"
 );
+$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);";
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index 005a76d4bbc0ea523d4c973ffed057827f6d6536..07db505ecf338e8baee5dd1267f696579f433355 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Lozinka",
 "Help" => "PomoÄ‡"
 );
+$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);";
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 6ab8a9e5a6eaedfc5d0a6b37133cd5b76eebdbaa..d5d47074bedb7abf0dadc2df6c50731d05f7262f 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "Fel vid rensning av mappningar",
 "Failed to delete the server configuration" => "Misslyckades med att radera serverinstÃ¤llningen",
 "The configuration is valid and the connection could be established!" => "InstÃ¤llningen Ã¤r giltig och anslutningen kunde upprÃ¤ttas!",
@@ -15,7 +16,7 @@
 "Connection test failed" => "Anslutningstestet misslyckades",
 "Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinstÃ¤llningen?",
 "Confirm Deletion" => "BekrÃ¤fta radering",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Varning:</b> Apps user_ldap och user_webdavauth Ã¤r inkompatibla. OvÃ¤ntade problem kan uppstÃ¥. Be din systemadministratÃ¶r att inaktivera en av dom.",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Varning:</b> Apps user_ldap och user_webdavauth Ã¤r inkompatibla. OvÃ¤ntade problem kan uppstÃ¥. Be din systemadministratÃ¶r att inaktivera en av dom.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP - modulen Ã¤r inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratÃ¶r fÃ¶r installation.",
 "Server configuration" => "ServerinstÃ¤llning",
 "Add Server Configuration" => "LÃ¤gg till serverinstÃ¤llning",
@@ -45,24 +46,24 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Ange en valfri vÃ¤rd fÃ¶r sÃ¤kerhetskopiering. Den mÃ¥ste vara en replika av den huvudsakliga LDAP/AD-servern",
 "Backup (Replica) Port" => "SÃ¤kerhetskopierins-port (Replika)",
 "Disable Main Server" => "Inaktivera huvudserver",
-"When switched on, ownCloud will only connect to the replica server." => "NÃ¤r denna Ã¤r pÃ¥kopplad kommer ownCloud att koppla upp till replika-servern, endast.",
+"Only connect to the replica server." => "Anslut endast till replikaservern.",
 "Use TLS" => "AnvÃ¤nd TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "AnvÃ¤nd inte fÃ¶r LDAPS-anslutningar, det kommer inte att fungera.",
 "Case insensitve LDAP server (Windows)" => "LDAP-servern Ã¤r okÃ¤nslig fÃ¶r gemener och versaler (Windows)",
 "Turn off SSL certificate validation." => "StÃ¤ng av verifiering av SSL-certifikat.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Om anslutningen bara fungerar med det hÃ¤r alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Om anslutningen bara fungerar med detta alternativ, importera LDAP-serverns SSL-certifikat i din% s server.",
 "Not recommended, use for testing only." => "Rekommenderas inte, anvÃ¤nd bara fÃ¶r test. ",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "i sekunder. En fÃ¶rÃ¤ndring tÃ¶mmer cache.",
 "Directory Settings" => "MappinstÃ¤llningar",
 "User Display Name Field" => "Attribut fÃ¶r anvÃ¤ndarnamn",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Attribut som anvÃ¤nds fÃ¶r att generera anvÃ¤ndarnamn i ownCloud.",
+"The LDAP attribute to use to generate the user's display name." => "LDAP-attributet som ska anvÃ¤ndas fÃ¶r att generera anvÃ¤ndarens visningsnamn.",
 "Base User Tree" => "Bas fÃ¶r anvÃ¤ndare i katalogtjÃ¤nst",
 "One User Base DN per line" => "En AnvÃ¤ndare start DN per rad",
 "User Search Attributes" => "AnvÃ¤ndarsÃ¶kningsattribut",
 "Optional; one attribute per line" => "Valfritt; ett attribut per rad",
 "Group Display Name Field" => "Attribut fÃ¶r gruppnamn",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Attribut som anvÃ¤nds fÃ¶r att generera gruppnamn i ownCloud.",
+"The LDAP attribute to use to generate the groups's display name." => "LDAP-attributet som ska anvÃ¤ndas fÃ¶r att generera gruppens visningsnamn.",
 "Base Group Tree" => "Bas fÃ¶r grupper i katalogtjÃ¤nst",
 "One Group Base DN per line" => "En Grupp start DN per rad",
 "Group Search Attributes" => "GruppsÃ¶kningsattribut",
@@ -75,15 +76,16 @@
 "User Home Folder Naming Rule" => "Namnregel fÃ¶r hemkatalog",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "LÃ¤mnas tomt fÃ¶r anvÃ¤ndarnamn (standard). Ange annars ett LDAP/AD-attribut.",
 "Internal Username" => "Internt AnvÃ¤ndarnamn",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Som standard skapas det interna anvÃ¤ndarnamnet frÃ¥n UUID-attributet. Det sÃ¤kerstÃ¤ller att anvÃ¤ndarnamnet Ã¤r unikt och tecken inte behÃ¶ver konverteras. Det interna anvÃ¤ndarnamnet har restriktionerna att endast fÃ¶ljande tecken Ã¤r tillÃ¥tna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelÃ¤mnas helt. En siffra kommer att lÃ¤ggas till eller Ã¶kas pÃ¥ vid en kollision. Det interna anvÃ¤ndarnamnet anvÃ¤nds fÃ¶r att identifiera anvÃ¤ndaren internt. Det Ã¤r Ã¤ven fÃ¶rvalt som anvÃ¤ndarens anvÃ¤ndarnamn i ownCloud. Det Ã¤r Ã¤ven en port fÃ¶r fjÃ¤rrÃ¥tkomst, t.ex. fÃ¶r alla *DAV-tjÃ¤nster. Med denna instÃ¤llning kan det fÃ¶rvalda beteendet Ã¥sidosÃ¤ttas. FÃ¶r att uppnÃ¥ ett liknande beteende som innan ownCloud 5, ange attributet fÃ¶r anvÃ¤ndarens visningsnamn i detta fÃ¤lt. LÃ¤mna det tomt fÃ¶r fÃ¶rvalt beteende. Ã„ndringarna kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-anvÃ¤ndare",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Som standard skapas det interna anvÃ¤ndarnamnet frÃ¥n UUID-attributet. Det sÃ¤kerstÃ¤ller att anvÃ¤ndarnamnet Ã¤r unikt och tecken inte behÃ¶ver konverteras. Det interna anvÃ¤ndarnamnet har restriktionerna att endast fÃ¶ljande tecken Ã¤r tillÃ¥tna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelÃ¤mnas helt. En siffra kommer att lÃ¤ggas till eller Ã¶kas pÃ¥ vid en kollision. Det interna anvÃ¤ndarnamnet anvÃ¤nds fÃ¶r att identifiera anvÃ¤ndaren internt. Det Ã¤r Ã¤ven fÃ¶rvalt som anvÃ¤ndarens anvÃ¤ndarnamn i ownCloud. Det Ã¤r Ã¤ven en port fÃ¶r fjÃ¤rrÃ¥tkomst, t.ex. fÃ¶r alla *DAV-tjÃ¤nster. Med denna instÃ¤llning kan det fÃ¶rvalda beteendet Ã¥sidosÃ¤ttas. FÃ¶r att uppnÃ¥ ett liknande beteende som innan ownCloud 5, ange attributet fÃ¶r anvÃ¤ndarens visningsnamn i detta fÃ¤lt. LÃ¤mna det tomt fÃ¶r fÃ¶rvalt beteende. Ã„ndringarna kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-anvÃ¤ndare",
 "Internal Username Attribute:" => "Internt AnvÃ¤ndarnamn Attribut:",
 "Override UUID detection" => "Ã…sidosÃ¤tt UUID detektion",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Som standard upptÃ¤cker ownCloud automatiskt UUID-attributet. Det UUID-attributet anvÃ¤nds fÃ¶r att utan tvivel identifiera LDAP-anvÃ¤ndare och grupper. Dessutom kommer interna anvÃ¤ndarnamn skapas baserat pÃ¥ detta UUID, om inte annat anges ovan. Du kan Ã¥sidosÃ¤tta instÃ¤llningen och passera ett attribut som du sjÃ¤lv vÃ¤ljer. Du mÃ¥ste se till att attributet som du vÃ¤ljer kan hÃ¤mtas fÃ¶r bÃ¥de anvÃ¤ndare och grupper och att det Ã¤r unikt. LÃ¤mna det tomt fÃ¶r standard beteende. FÃ¶rÃ¤ndringar kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-anvÃ¤ndare och grupper.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Som standard upptÃ¤cker ownCloud automatiskt UUID-attributet. Det UUID-attributet anvÃ¤nds fÃ¶r att utan tvivel identifiera LDAP-anvÃ¤ndare och grupper. Dessutom kommer interna anvÃ¤ndarnamn skapas baserat pÃ¥ detta UUID, om inte annat anges ovan. Du kan Ã¥sidosÃ¤tta instÃ¤llningen och passera ett attribut som du sjÃ¤lv vÃ¤ljer. Du mÃ¥ste se till att attributet som du vÃ¤ljer kan hÃ¤mtas fÃ¶r bÃ¥de anvÃ¤ndare och grupper och att det Ã¤r unikt. LÃ¤mna det tomt fÃ¶r standard beteende. FÃ¶rÃ¤ndringar kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-anvÃ¤ndare och grupper.",
 "UUID Attribute:" => "UUID Attribut:",
 "Username-LDAP User Mapping" => "AnvÃ¤ndarnamn-LDAP User Mapping",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud anvÃ¤nder sig av anvÃ¤ndarnamn fÃ¶r att lagra och tilldela (meta) data. FÃ¶r att exakt kunna identifiera och kÃ¤nna igen anvÃ¤ndare, kommer varje LDAP-anvÃ¤ndare ha ett internt anvÃ¤ndarnamn. Detta krÃ¤ver en mappning frÃ¥n ownCloud-anvÃ¤ndarnamn till LDAP-anvÃ¤ndare. Det skapade anvÃ¤ndarnamnet mappas till UUID fÃ¶r LDAP-anvÃ¤ndaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den anvÃ¤nds inte fÃ¶r identifiering. Om DN fÃ¶rÃ¤ndras, kommer fÃ¶rÃ¤ndringarna hittas av ownCloud. Det interna ownCloud-namnet anvÃ¤nds Ã¶verallt i ownCloud. Om du rensar/raderar mappningarna kommer att lÃ¤mna referenser Ã¶verallt i systemet. Men den Ã¤r inte konfigurationskÃ¤nslig, den pÃ¥verkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljÃ¶. Utan gÃ¶r detta endast pÃ¥ i testmiljÃ¶!",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud anvÃ¤nder sig av anvÃ¤ndarnamn fÃ¶r att lagra och tilldela (meta) data. FÃ¶r att exakt kunna identifiera och kÃ¤nna igen anvÃ¤ndare, kommer varje LDAP-anvÃ¤ndare ha ett internt anvÃ¤ndarnamn. Detta krÃ¤ver en mappning frÃ¥n ownCloud-anvÃ¤ndarnamn till LDAP-anvÃ¤ndare. Det skapade anvÃ¤ndarnamnet mappas till UUID fÃ¶r LDAP-anvÃ¤ndaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den anvÃ¤nds inte fÃ¶r identifiering. Om DN fÃ¶rÃ¤ndras, kommer fÃ¶rÃ¤ndringarna hittas av ownCloud. Det interna ownCloud-namnet anvÃ¤nds Ã¶verallt i ownCloud. Om du rensar/raderar mappningarna kommer att lÃ¤mna referenser Ã¶verallt i systemet. Men den Ã¤r inte konfigurationskÃ¤nslig, den pÃ¥verkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljÃ¶. Utan gÃ¶r detta endast pÃ¥ i testmiljÃ¶!",
 "Clear Username-LDAP User Mapping" => "Rensa AnvÃ¤ndarnamn-LDAP User Mapping",
 "Clear Groupname-LDAP Group Mapping" => "Rensa Gruppnamn-LDAP Group Mapping",
 "Test Configuration" => "Testa konfigurationen",
 "Help" => "HjÃ¤lp"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index 997f09ca8776bb98ad62959ef6df024f749a1dd8..6a541ca2d5252af782b50a2000839f21738f6105 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "à®¨à¯€à®•à¯à®•à®®à¯ à®¤à¯‡à®¾à®²à¯à®µà®¿à®¯à®Ÿà¯ˆà®¨à¯à®¤à®¤à¯",
 "Error" => "à®µà®´à¯",
 "Host" => "à®“à®®à¯à®ªà¯à®©à®°à¯",
@@ -12,17 +13,15 @@
 "Use TLS" => "TLS à® à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯",
 "Case insensitve LDAP server (Windows)" => "à®‰à®£à®°à¯à®šà¯à®šà®¿à®¯à®¾à®© LDAP à®šà¯‡à®µà¯ˆà®¯à®•à®®à¯ (à®šà®¾à®³à®°à®™à¯à®•à®³à¯)",
 "Turn off SSL certificate validation." => "SSL à®šà®¾à®©à¯à®±à®¿à®¤à®´à®¿à®©à¯ à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à¯ˆ à®¨à®¿à®±à¯à®¤à¯à®¤à®¿à®µà®¿à®Ÿà®µà¯à®®à¯",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "à®‡à®¨à¯à®¤ à®¤à¯†à®°à®¿à®µà¯à®•à®³à®¿à®²à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯ à®‡à®£à¯ˆà®ªà¯à®ªà¯ à®µà¯‡à®²à¯ˆà®šà¯†à®¯à¯à®¤à®¾à®²à¯, à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ owncloud à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ LDAP à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®©à¯ SSL à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯ˆ à®‡à®±à®•à¯à®•à¯à®®à®¤à®¿ à®šà¯†à®¯à¯à®¯à®µà¯à®®à¯",
 "Not recommended, use for testing only." => "à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ, à®šà¯‹à®¤à®©à¯ˆà®•à¯à®•à®¾à®• à®®à®Ÿà¯à®Ÿà¯à®®à¯ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯.",
 "in seconds. A change empties the cache." => "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à®¿à®²à¯. à®’à®°à¯ à®®à®¾à®±à¯à®±à®®à¯ à®‡à®Ÿà¯ˆà®®à®¾à®±à¯à®±à¯à®¨à®¿à®©à¯ˆà®µà®•à®¤à¯à®¤à¯ˆ à®µà¯†à®±à¯à®±à®¿à®Ÿà®®à®¾à®•à¯à®•à¯à®®à¯.",
 "User Display Name Field" => "à®ªà®¯à®©à®¾à®³à®°à¯ à®•à®¾à®Ÿà¯à®šà®¿à®ªà¯à®ªà¯†à®¯à®°à¯ à®ªà¯à®²à®®à¯",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "à®ªà®¯à®©à®¾à®³à®°à®¿à®©à¯ ownCloud à®ªà¯†à®¯à®°à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®• LDAP à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯.",
 "Base User Tree" => "à®¤à®³ à®ªà®¯à®©à®¾à®³à®°à¯ à®®à®°à®®à¯",
 "Group Display Name Field" => "à®•à¯à®´à¯à®µà®¿à®©à¯ à®•à®¾à®Ÿà¯à®šà®¿ à®ªà¯†à®¯à®°à¯ à®ªà¯à®²à®®à¯ ",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "ownCloud à®•à¯à®´à¯à®•à¯à®•à®³à®¿à®©à¯ à®ªà¯†à®¯à®°à¯à®•à®³à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®• LDAP à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯.",
 "Base Group Tree" => "à®¤à®³ à®•à¯à®´à¯ à®®à®°à®®à¯",
 "Group-Member association" => "à®•à¯à®´à¯ à®‰à®±à¯à®ªà¯à®ªà®¿à®©à®°à¯ à®šà®™à¯à®•à®®à¯",
 "in bytes" => "bytes à®•à®³à®¿à®²à¯ ",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "à®ªà®¯à®©à®¾à®³à®°à¯ à®ªà¯†à®¯à®°à®¿à®±à¯à®•à¯ à®µà¯†à®±à¯à®±à®¿à®Ÿà®®à®¾à®• à®µà®¿à®Ÿà®µà¯à®®à¯ (à®ªà¯Šà®¤à¯ à®‡à®°à¯à®ªà¯à®ªà¯). à®‡à®²à¯à®²à®¾à®µà®¿à®Ÿà®¿à®©à¯ LDAP/AD à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®µà¯à®®à¯.",
 "Help" => "à®‰à®¤à®µà®¿"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index 3f047631cf70efdb246ea3fbd13df274b80d07b2..23728a9d34b2eac0bb8c5e186f1579df88372521 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à°ªà±Šà°°à°ªà°¾à°Ÿà±",
 "Password" => "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚",
 "Help" => "à°¸à°¹à°¾à°¯à°‚"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index ec279ba01e5e97dc355cf1642678b572d962129e..34739cb51787344fef1ac8a34553bedcc9e50040 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "à¸à¸²à¸£à¸¥à¸šà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§",
 "The configuration is valid and the connection could be established!" => "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¹à¸¥à¸°à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¹„à¸”à¹‰!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¸–à¸¹à¸à¸•à¹‰à¸à¸‡, à¹à¸•à¹ˆà¸à¸²à¸£à¸œà¸¹à¸à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§, à¸à¸£à¸¸à¸“à¸²à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹à¸¥à¸°à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
@@ -12,7 +13,6 @@
 "Connection test failed" => "à¸—à¸”à¸ªà¸à¸šà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§",
 "Do you really want to delete the current Server Configuration?" => "à¸„à¸¸à¸“à¹à¸™à¹ˆà¹ƒà¸ˆà¹à¸¥à¹‰à¸§à¸«à¸£à¸·à¸à¸§à¹ˆà¸²à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¸—à¸´à¹‰à¸‡à¹„à¸›?",
 "Confirm Deletion" => "à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¸²à¸£à¸¥à¸šà¸—à¸´à¹‰à¸‡",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¹à¸à¸›à¸¯ user_ldap à¹à¸¥à¸° user_webdavauth à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸£à¹ˆà¸§à¸¡à¸à¸±à¸™à¹„à¸”à¹‰. à¸„à¸¸à¸“à¸à¸²à¸ˆà¸›à¸£à¸°à¸ªà¸žà¸›à¸±à¸à¸«à¸²à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸„à¸²à¸”à¸„à¸´à¸”à¸ˆà¸²à¸à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§ à¸à¸£à¸¸à¸“à¸²à¸•à¸´à¸”à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸£à¸°à¸‡à¸±à¸šà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸à¸›à¸¯ à¸•à¸±à¸§à¹ƒà¸”à¸•à¸±à¸§à¸«à¸™à¸¶à¹ˆà¸‡à¸‚à¹‰à¸²à¸‡à¸•à¹‰à¸™",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¹‚à¸¡à¸”à¸¹à¸¥ PHP LDAP à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡, à¸£à¸°à¸šà¸šà¸”à¹‰à¸²à¸™à¸«à¸¥à¸±à¸‡à¸ˆà¸°à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸•à¸´à¸”à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸—à¸³à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹‚à¸¡à¸”à¸¹à¸¥à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§",
 "Server configuration" => "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ",
 "Add Server Configuration" => "à¹€à¸žà¸´à¹ˆà¸¡à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ",
@@ -40,18 +40,15 @@
 "Use TLS" => "à¹ƒà¸Šà¹‰ TLS",
 "Case insensitve LDAP server (Windows)" => "à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ LDAP à¸›à¸£à¸°à¹€à¸ à¸— Case insensitive (à¸§à¸´à¸™à¹‚à¸”à¸§à¸ªà¹Œ)",
 "Turn off SSL certificate validation." => "à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢ SSL",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "à¸«à¸²à¸à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰à¹€à¸‰à¸žà¸²à¸°à¸à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™, à¹ƒà¸«à¹‰à¸™à¸³à¹€à¸‚à¹‰à¸²à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸šà¸š SSL à¸‚à¸à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ LDAP à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹€à¸‚à¹‰à¸²à¹„à¸›à¹„à¸§à¹‰à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ ownCloud",
 "Not recommended, use for testing only." => "à¹„à¸¡à¹ˆà¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™, à¹ƒà¸Šà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¸—à¸”à¸ªà¸à¸šà¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
 "in seconds. A change empties the cache." => "à¹ƒà¸™à¸à¸µà¸à¹„à¸¡à¹ˆà¸à¸µà¹ˆà¸§à¸´à¸™à¸²à¸—à¸µ à¸£à¸°à¸šà¸šà¸ˆà¸°à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¹à¸„à¸Šà¹ƒà¸«à¹‰à¸§à¹ˆà¸²à¸‡à¹€à¸›à¸¥à¹ˆà¸²",
 "Directory Settings" => "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆ",
 "User Display Name Field" => "à¸Šà¹ˆà¸à¸‡à¹à¸ªà¸”à¸‡à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸° LDAP à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud",
 "Base User Tree" => "à¸£à¸²à¸¢à¸à¸²à¸£à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree",
 "One User Base DN per line" => "à¸«à¸™à¸¶à¹ˆà¸‡ User Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”",
 "User Search Attributes" => "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸°à¸à¸²à¸£à¸„à¹‰à¸™à¸«à¸²à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰",
 "Optional; one attribute per line" => "à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡; à¸«à¸™à¸¶à¹ˆà¸‡à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸°à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”",
 "Group Display Name Field" => "à¸Šà¹ˆà¸à¸‡à¹à¸ªà¸”à¸‡à¸Šà¸·à¹ˆà¸à¸à¸¥à¸¸à¹ˆà¸¡à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸° LDAP à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸à¸¥à¸¸à¹ˆà¸¡à¸‚à¸à¸‡ ownCloud",
 "Base Group Tree" => "à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸¥à¸¸à¹ˆà¸¡à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree",
 "One Group Base DN per line" => "à¸«à¸™à¸¶à¹ˆà¸‡ Group Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”",
 "Group Search Attributes" => "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸°à¸à¸²à¸£à¸„à¹‰à¸™à¸«à¸²à¹à¸šà¸šà¸à¸¥à¸¸à¹ˆà¸¡",
@@ -61,3 +58,4 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸§à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ (à¸„à¹ˆà¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™) à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆà¸à¸£à¸¸à¸“à¸²à¸£à¸°à¸šà¸¸à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸°à¸‚à¸à¸‡ LDAP/AD",
 "Help" => "à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 3835c72313ab32688bcaed94b6669dcc989c3ada..e334ffcc8f5795bac97aed601517e372222d698d 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Sunucu yapÄ±landÄ±rmasÄ±nÄ± silme baÅŸarÄ±sÄ±z oldu",
 "The configuration is valid and the connection could be established!" => "YapÄ±landÄ±rma geÃ§erli ve baÄŸlantÄ± kuruldu!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "YapÄ±landÄ±rma geÃ§erli fakat baÄŸlanma(bind) baÅŸarÄ±sÄ±z. LÃ¼tfen Sunucu ayarlarÄ± ve kimlik bilgilerini kontrol ediniz.",
@@ -12,7 +13,6 @@
 "Connection test failed" => "BaÄŸlantÄ± testi baÅŸarÄ±sÄ±z oldu",
 "Do you really want to delete the current Server Configuration?" => "Åžu anki sunucu yapÄ±landÄ±rmasÄ±nÄ± silmek istediÄŸinizden emin misiniz?",
 "Confirm Deletion" => "Silmeyi onayla",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. ",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak  yuklemek icin.",
 "Server configuration" => "Sunucu uyunlama ",
 "Add Server Configuration" => "Sunucu Uyunlama birlemek ",
@@ -41,23 +41,19 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Bir kopya cevre vermek, kopya sunucu onemli olmali. ",
 "Backup (Replica) Port" => "Kopya Port ",
 "Disable Main Server" => "Ana sunucuyu devredÄ±ÅŸÄ± birak",
-"When switched on, ownCloud will only connect to the replica server." => "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis.",
 "Use TLS" => "TLS kullan",
 "Do not use it additionally for LDAPS connections, it will fail." => "Bu LDAPS baglama icin kullamaminiz, basamacak. ",
 "Case insensitve LDAP server (Windows)" => "Dusme sunucu LDAP zor degil. (Windows)",
 "Turn off SSL certificate validation." => "SSL sertifika doÄŸrulamasÄ±nÄ± kapat.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. ",
 "Not recommended, use for testing only." => "Ã–nerilmez, sadece test iÃ§in kullanÄ±n.",
 "Cache Time-To-Live" => "Cache Time-To-Live ",
 "in seconds. A change empties the cache." => "saniye cinsinden. Bir deÄŸiÅŸiklik Ã¶nbelleÄŸi temizleyecektir.",
 "Directory Settings" => "Parametrar Listesin Adresinin ",
 "User Display Name Field" => "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. ",
 "Base User Tree" => "Temel KullanÄ±cÄ± AÄŸacÄ±",
 "One User Base DN per line" => "Bir Temel Kullanici DN her dizgi ",
 "User Search Attributes" => "Kategorii Arama Kullanici ",
 "Group Display Name Field" => "Grub Ekrane Alani Adi",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP kullamayin grub adi ownCloud uremek icin. ",
 "Base Group Tree" => "Temel Grup AÄŸacÄ±",
 "One Group Base DN per line" => "Bir Grubu Tabani DN her dizgi. ",
 "Group Search Attributes" => "Kategorii Arama Grubu",
@@ -66,3 +62,4 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "KullanÄ±cÄ± adÄ± bÃ¶lÃ¼mÃ¼nÃ¼ boÅŸ bÄ±rakÄ±n (varsayÄ±lan). ",
 "Help" => "YardÄ±m"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
index 8634cdbe1bec1b8ab32e3e0b0895a87eea006e0c..39382fed1f0a7521eb8c4389ffa8c84f46e5fa86 100644
--- a/apps/user_ldap/l10n/ug.php
+++ b/apps/user_ldap/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "Ø¦Û†Ú†ÛˆØ±ÛˆØ´ Ù…Û•ØºÙ„Û‡Ù¾ Ø¨ÙˆÙ„Ø¯Ù‰",
 "Error" => "Ø®Ø§ØªØ§Ù„Ù‰Ù‚",
 "Host" => "Ø¨Ø§Ø´ Ø¦Ø§Ù¾Ù¾Ø§Ø±Ø§Øª",
@@ -12,3 +13,4 @@
 "Use TLS" => "TLS Ø¦Ù‰Ø´Ù„Û•Øª",
 "Help" => "ÙŠØ§Ø±Ø¯Û•Ù…"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index f92c6d5894ef6ffd87102c880a45c401f1ff9c90..ebf7dbd5d848bcf1d9ff60fd4050fe3ad906aa80 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to delete the server configuration" => "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–ÑŽ ÑÐµÑ€Ð²ÐµÑ€Ð°",
 "The configuration is valid and the connection could be established!" => "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð²Ñ–Ñ€Ð½Ð° Ñ– Ð·Ð²'ÑÐ·Ð¾Ðº Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ â€‹â€‹!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð²Ñ–Ñ€Ð½Ð°, Ð°Ð»Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð·Ð²'ÑÐ·Ð¾Ðº Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑÐµÑ€Ð²ÐµÑ€Ð° Ñ– Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ–.",
@@ -13,7 +14,6 @@
 "Connection test failed" => "ÐŸÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ° Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ Ð½ÐµÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾",
 "Do you really want to delete the current Server Configuration?" => "Ð’Ð¸ Ð´Ñ–Ð¹ÑÐ½Ð¾ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ñƒ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–ÑŽ ÑÐµÑ€Ð²ÐµÑ€Ð° ?",
 "Confirm Deletion" => "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ñ–Ñ‚ÑŒ Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Ð£Ð²Ð°Ð³Ð°:</b> Ð—Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÐ¸ user_ldap Ñ‚Ð° user_webdavauth Ð½Ðµ ÑÑƒÐ¼Ñ–ÑÐ½Ñ–. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ñ–Ñ‚ÐºÐ½ÑƒÑ‚Ð¸ÑÑ Ð· Ð½ÐµÑÐ¿Ð¾Ð´Ñ–Ð²Ð°Ð½Ð¾ÑŽ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¾ÑŽ. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð·Ð²ÐµÑ€Ð½Ñ–Ñ‚ÑŒÑÑ Ð´Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°, Ñ‰Ð¾Ð± Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ Ð¾Ð´Ð½Ñƒ Ð· Ð½Ð¸Ñ….",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ð£Ð²Ð°Ð³Ð°:</ b> ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¸Ð¹ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ PHP LDAP Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, Ð±Ð°Ð·Ð¾Ð²Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ñ‚Ð¸ Ð½Ðµ Ð±ÑƒÐ´Ðµ. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð·Ð²ÐµÑ€Ð½Ñ–Ñ‚ÑŒÑÑ Ð´Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°, Ñ‰Ð¾Ð± Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾.",
 "Server configuration" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐµÑ€Ð²ÐµÑ€Ð°",
 "Add Server Configuration" => "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐµÑ€Ð²ÐµÑ€Ð°",
@@ -43,24 +43,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Ð’ÐºÐ°Ð¶Ñ–Ñ‚ÑŒ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¸Ð¹ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ð¹ ÑÐµÑ€Ð²ÐµÑ€. Ð’Ñ–Ð½ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ Ð±ÑƒÑ‚Ð¸ ÐºÐ¾Ð¿Ñ–Ñ”ÑŽ Ð³Ð¾Ð»Ð¾Ð²Ð½Ð¾Ð³Ð¾ LDAP/AD ÑÐµÑ€Ð²ÐµÑ€Ð°.",
 "Backup (Replica) Port" => "ÐŸÐ¾Ñ€Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð´Ð»Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ñ… ÐºÐ¾Ð¿Ñ–Ð¹",
 "Disable Main Server" => "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð“Ð¾Ð»Ð¾Ð²Ð½Ð¸Ð¹ Ð¡ÐµÑ€Ð²ÐµÑ€",
-"When switched on, ownCloud will only connect to the replica server." => "ÐšÐ¾Ð»Ð¸ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¾, ownCloud  Ð±ÑƒÐ´Ðµ Ð¿Ñ€Ð¸Ñ”Ð´Ð½ÑƒÐ²Ð°Ñ‚Ð¸ÑÑŒ Ð»Ð¸ÑˆÐµ Ð´Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð· Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ð¼Ð¸ ÐºÐ¾Ð¿Ñ–ÑÐ¼Ð¸.",
 "Use TLS" => "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "ÐÐµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ñ†Ðµ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾ Ð´Ð»Ñ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ LDAP, Ð±Ð¾ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¾ Ð½Ðµ Ð±ÑƒÐ´Ðµ.",
 "Case insensitve LDAP server (Windows)" => "ÐÐµÑ‡ÑƒÑ‚Ð»Ð¸Ð²Ð¸Ð¹ Ð´Ð¾ Ñ€ÐµÐ³Ñ–ÑÑ‚Ñ€Ñƒ LDAP ÑÐµÑ€Ð²ÐµÑ€ (Windows)",
 "Turn off SSL certificate validation." => "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÑƒ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð°.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Ð¯ÐºÑ‰Ð¾ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ñ†ÑŽÑ” Ð»Ð¸ÑˆÐµ Ð· Ñ†Ñ–Ñ”ÑŽ Ð¾Ð¿Ñ†Ñ–Ñ”ÑŽ, Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ¹Ñ‚Ðµ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚ LDAP ÑÐµÑ€Ð²ÐµÑ€Ð° Ñƒ Ð²Ð°ÑˆÐ¸Ð¹ ownCloud ÑÐµÑ€Ð²ÐµÑ€.",
 "Not recommended, use for testing only." => "ÐÐµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ñ‚ÑŒÑÑ, Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ñ‚ÐµÑÑ‚Ñ–Ð².",
 "Cache Time-To-Live" => "Ð§Ð°Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾ÑÑ‚Ñ– ÐšÐµÑˆÐ°",
 "in seconds. A change empties the cache." => "Ð² ÑÐµÐºÑƒÐ½Ð´Ð°Ñ…. Ð—Ð¼Ñ–Ð½Ð° Ð¾Ñ‡Ð¸Ñ‰ÑƒÑ” ÐºÐµÑˆ.",
 "Directory Settings" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°",
 "User Display Name Field" => "ÐŸÐ¾Ð»Ðµ, ÑÐºÐµ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ” Ð†Ð¼'Ñ ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ–Ð¼ÐµÐ½ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² ownCloud.",
 "Base User Tree" => "ÐžÑÐ½Ð¾Ð²Ð½Ðµ Ð”ÐµÑ€ÐµÐ²Ð¾ ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð²",
 "One User Base DN per line" => "ÐžÐ´Ð¸Ð½ ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Base DN Ð½Ð° Ð¾Ð´Ð½Ñ–Ð¹ ÑÑ‚Ñ€Ð¾Ñ‡Ñ†Ñ–",
 "User Search Attributes" => "ÐŸÐ¾ÑˆÑƒÐºÐ¾Ð²Ñ– ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸ ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°",
 "Optional; one attribute per line" => "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾; Ð¾Ð´Ð¸Ð½ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð½Ð° ÑÑ‚Ñ€Ð¾Ñ‡ÐºÑƒ",
 "Group Display Name Field" => "ÐŸÐ¾Ð»Ðµ, ÑÐºÐµ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ” Ð†Ð¼'Ñ Ð“Ñ€ÑƒÐ¿Ð¸",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ–Ð¼ÐµÐ½ Ð³Ñ€ÑƒÐ¿ ownCloud.",
 "Base Group Tree" => "ÐžÑÐ½Ð¾Ð²Ð½Ðµ Ð”ÐµÑ€ÐµÐ²Ð¾ Ð“Ñ€ÑƒÐ¿",
 "One Group Base DN per line" => "ÐžÐ´Ð½Ð° Ð“Ñ€ÑƒÐ¿Ð° Base DN Ð½Ð° Ð¾Ð´Ð½Ñ–Ð¹ ÑÑ‚Ñ€Ð¾Ñ‡Ñ†Ñ–",
 "Group Search Attributes" => "ÐŸÐ¾ÑˆÑƒÐºÐ¾Ð²Ñ– ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸ Ð“Ñ€ÑƒÐ¿Ð¸",
@@ -75,3 +71,4 @@
 "Test Configuration" => "Ð¢ÐµÑÑ‚Ð¾Ð²Ðµ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
 "Help" => "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°"
 );
+$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);";
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 83570a596a24b06d91371aed8ebf8206acc1ce02..a84be798f9287f5164485b7fdb3fed5b45695208 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Ø§ÛŒØ±Ø±",
 "Password" => "Ù¾Ø§Ø³ÙˆØ±Úˆ",
 "Help" => "Ù…Ø¯Ø¯"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 7e598225926a4eff92474a16eeb370f87b3adcca..c4fe9b73bcc0084bfae608f464a182593e6a72d1 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "XÃ³a tháº¥t báº¡i",
 "Success" => "ThÃ nh cÃ´ng",
 "Error" => "Lá»—i",
@@ -23,22 +24,18 @@
 "Port" => "Cá»•ng",
 "Backup (Replica) Port" => "Cá»•ng sao lÆ°u (Replica)",
 "Disable Main Server" => "Táº¯t mÃ¡y chá»§ chÃnh",
-"When switched on, ownCloud will only connect to the replica server." => "When switched on, ownCloud will only connect to the replica server.",
 "Use TLS" => "Sá» dá»¥ng TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Do not use it additionally for LDAPS connections, it will fail.",
 "Case insensitve LDAP server (Windows)" => "TrÆ°á»ng há»£p insensitve LDAP mÃ¡y chá»§ (Windows)",
 "Turn off SSL certificate validation." => "Táº¯t xÃ¡c thá»±c chá»©ng nháºn SSL",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Náº¿u káº¿t ná»‘i chá»‰ hoáº¡t Ä‘á»™ng vá»›i tÃ¹y chá»n nÃ y, vui lÃ²ng import LDAP certificate SSL  trong mÃ¡y chá»§ ownCloud cá»§a báº¡n.",
 "Not recommended, use for testing only." => "KhÃ´ng khuyáº¿n khÃch, Chá»‰ sá» dá»¥ng Ä‘á»ƒ thá» nghiá»‡m.",
 "in seconds. A change empties the cache." => "trong vÃ i giÃ¢y. Má»™t sá»± thay Ä‘á»•i bá»™ nhá»› cache.",
 "Directory Settings" => "Directory Settings",
 "User Display Name Field" => "Hiá»ƒn thá»‹ tÃªn ngÆ°á»i sá» dá»¥ng",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "CÃ¡c thuá»™c tÃnh LDAP sá» dá»¥ng Ä‘á»ƒ táº¡o tÃªn ngÆ°á»i dÃ¹ng ownCloud.",
 "Base User Tree" => "CÃ¢y ngÆ°á»i dÃ¹ng cÆ¡ báº£n",
 "User Search Attributes" => "User Search Attributes",
 "Optional; one attribute per line" => "Optional; one attribute per line",
 "Group Display Name Field" => "Hiá»ƒn thá»‹ tÃªn nhÃ³m",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "CÃ¡c thuá»™c tÃnh LDAP sá» dá»¥ng Ä‘á»ƒ táº¡o cÃ¡c nhÃ³m ownCloud.",
 "Base Group Tree" => "CÃ¢y nhÃ³m cÆ¡ báº£n",
 "Group Search Attributes" => "Group Search Attributes",
 "Group-Member association" => "NhÃ³m thÃ nh viÃªn Cá»™ng Ä‘á»“ng",
@@ -47,3 +44,4 @@
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Äá»ƒ trá»‘ng tÃªn ngÆ°á»i dÃ¹ng (máº·c Ä‘á»‹nh). Náº¿u khÃ´ng chá»‰ Ä‘á»‹nh thuá»™c tÃnh LDAP/AD",
 "Help" => "GiÃºp Ä‘á»¡"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index 6c60ec64e270aadb8159b4b72f35364b8cabf380..92eded19b4ca6aafe7ff65282c34a2cf757a4e1d 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Deletion failed" => "åˆ é™¤å¤±è´¥",
 "Success" => "æˆåŠŸ",
 "Error" => "å‡ºé”™",
@@ -23,17 +24,15 @@
 "Use TLS" => "ä½¿ç”¨ TLS",
 "Case insensitve LDAP server (Windows)" => "å¤§å°å†™ä¸æ•æ„Ÿçš„ LDAP æœåŠ¡å™¨ (Windows)",
 "Turn off SSL certificate validation." => "å…³é— SSL è¯ä¹¦æ ¡éªŒã€‚",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "å¦‚æžœåªæœ‰ä½¿ç”¨æ¤é€‰é¡¹æ‰èƒ½è¿žæŽ¥ï¼Œè¯·å¯¼å…¥ LDAP æœåŠ¡å™¨çš„ SSL è¯ä¹¦åˆ°æ‚¨çš„ ownCloud æœåŠ¡å™¨ã€‚",
 "Not recommended, use for testing only." => "ä¸æŽ¨èï¼Œä»…ä¾›æµ‹è¯•",
 "in seconds. A change empties the cache." => "ä»¥ç§’è®¡ã€‚ä¿®æ”¹ä¼šæ¸…ç©ºç¼“å˜ã€‚",
 "User Display Name Field" => "ç”¨æˆ·æ˜¾ç¤ºåç§°å—æ®µ",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "ç”¨äºŽç”Ÿæˆç”¨æˆ·çš„ ownCloud åç§°çš„ LDAP å±žæ€§ã€‚",
 "Base User Tree" => "åŸºæœ¬ç”¨æˆ·æ ‘",
 "Group Display Name Field" => "ç¾¤ç»„æ˜¾ç¤ºåç§°å—æ®µ",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "ç”¨äºŽç”Ÿæˆç¾¤ç»„çš„ ownCloud åç§°çš„ LDAP å±žæ€§ã€‚",
 "Base Group Tree" => "åŸºæœ¬ç¾¤ç»„æ ‘",
 "Group-Member association" => "ç¾¤ç»„-æˆå‘˜ç»„åˆ",
 "in bytes" => "ä»¥å—èŠ‚è®¡",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ç”¨æˆ·åè¯·ç•™ç©º (é»˜è®¤)ã€‚å¦åˆ™ï¼Œè¯·æŒ‡å®šä¸€ä¸ª LDAP/AD å±žæ€§ã€‚",
 "Help" => "å¸®åŠ©"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 675fe4dfc7529df218d7fcfeef4dd821b5eba24b..5107b7b1ab7fb308a7d541cb7e16141eb35c9fee 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "æ¸…é™¤æ˜ å°„å¤±è´¥ã€‚",
 "Failed to delete the server configuration" => "æœªèƒ½åˆ é™¤æœåŠ¡å™¨é…ç½®",
 "The configuration is valid and the connection could be established!" => "é…ç½®æœ‰æ•ˆï¼Œèƒ½å¤Ÿå»ºç«‹è¿žæŽ¥ï¼",
@@ -15,7 +16,6 @@
 "Connection test failed" => "è¿žæŽ¥æµ‹è¯•å¤±è´¥",
 "Do you really want to delete the current Server Configuration?" => "æ‚¨çœŸçš„æƒ³è¦åˆ é™¤å½“å‰æœåŠ¡å™¨é…ç½®å—ï¼Ÿ",
 "Confirm Deletion" => "ç¡®è®¤åˆ é™¤",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>è¦å‘Šï¼š</b>åº”ç”¨ user_ldap å’Œ user_webdavauth ä¸å…¼å®¹ã€‚æ‚¨å¯èƒ½éé‡æœªé¢„æ–™çš„è¡Œä¸ºã€‚è¯·åž‚è¯¢æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜ç¦ç”¨å…¶ä¸ä¸€ä¸ªã€‚",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Šï¼š</b> PHP LDAP æ¨¡å—æœªå®‰è£…ï¼ŒåŽç«¯å°†æ— æ³•å·¥ä½œã€‚è¯·è¯·æ±‚æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜å®‰è£…è¯¥æ¨¡å—ã€‚",
 "Server configuration" => "æœåŠ¡å™¨é…ç½®",
 "Add Server Configuration" => "æ·»åŠ æœåŠ¡å™¨é…ç½®",
@@ -45,24 +45,20 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "ç»™å‡ºä¸€ä¸ªå¯é€‰çš„å¤‡ä»½ä¸»æœºã€‚å®ƒå¿…é¡»ä¸ºä¸» LDAP/AD æœåŠ¡å™¨çš„ä¸€ä¸ªé•œåƒã€‚",
 "Backup (Replica) Port" => "å¤‡ä»½ (é•œåƒ) ç«¯å£",
 "Disable Main Server" => "ç¦ç”¨ä¸»æœåŠ¡å™¨",
-"When switched on, ownCloud will only connect to the replica server." => "å½“å¼€å¯åŽï¼ŒownCloud å°†ä»…è¿žæŽ¥åˆ°é•œåƒæœåŠ¡å™¨ã€‚",
 "Use TLS" => "ä½¿ç”¨TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "å¯¹äºŽ LDAPS è¿žæŽ¥ä¸è¦é¢å¤–å¯ç”¨å®ƒï¼Œè¿žæŽ¥å¿…ç„¶å¤±è´¥ã€‚",
 "Case insensitve LDAP server (Windows)" => "å¤§å°å†™æ•æ„ŸLDAPæœåŠ¡å™¨(Windows)",
 "Turn off SSL certificate validation." => "å…³é—SSLè¯ä¹¦éªŒè¯",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "å¦‚æžœé“¾æŽ¥ä»…åœ¨æ¤é€‰é¡¹æ—¶å¯ç”¨ï¼Œåœ¨æ‚¨çš„ownCloudæœåŠ¡å™¨ä¸å¯¼å…¥LDAPæœåŠ¡å™¨çš„SSLè¯ä¹¦ã€‚",
 "Not recommended, use for testing only." => "æš‚ä¸æŽ¨èï¼Œä»…ä¾›æµ‹è¯•",
 "Cache Time-To-Live" => "ç¼“å˜å˜æ´»æ—¶é—´",
 "in seconds. A change empties the cache." => "ä»¥ç§’è®¡ã€‚ä¿®æ”¹å°†æ¸…ç©ºç¼“å˜ã€‚",
 "Directory Settings" => "ç›®å½•è®¾ç½®",
 "User Display Name Field" => "ç”¨æˆ·æ˜¾ç¤ºåç§°å—æ®µ",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "ç”¨æ¥ç”Ÿæˆç”¨æˆ·çš„ownCloudåç§°çš„ LDAPå±žæ€§",
 "Base User Tree" => "åŸºç¡€ç”¨æˆ·æ ‘",
 "One User Base DN per line" => "æ¯è¡Œä¸€ä¸ªç”¨æˆ·åŸºå‡†åˆ¤åˆ«å",
 "User Search Attributes" => "ç”¨æˆ·æœç´¢å±žæ€§",
 "Optional; one attribute per line" => "å¯é€‰;æ¯è¡Œä¸€ä¸ªå±žæ€§",
 "Group Display Name Field" => "ç»„æ˜¾ç¤ºåç§°å—æ®µ",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "ç”¨æ¥ç”Ÿæˆç»„çš„ownCloudåç§°çš„LDAPå±žæ€§",
 "Base Group Tree" => "åŸºç¡€ç»„æ ‘",
 "One Group Base DN per line" => "æ¯è¡Œä¸€ä¸ªç¾¤ç»„åŸºå‡†åˆ¤åˆ«å",
 "Group Search Attributes" => "ç¾¤ç»„æœç´¢å±žæ€§",
@@ -75,15 +71,13 @@
 "User Home Folder Naming Rule" => "ç”¨æˆ·ä¸»ç›®å½•å‘½åè§„åˆ™",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "å°†ç”¨æˆ·åç§°ç•™ç©º(é»˜è®¤)ã€‚å¦åˆ™æŒ‡å®šä¸€ä¸ªLDAP/ADå±žæ€§",
 "Internal Username" => "å†…éƒ¨ç”¨æˆ·å",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "é»˜è®¤æƒ…å†µä¸‹å†…éƒ¨ç”¨æˆ·åå…·æœ‰å”¯ä¸€è¯†åˆ«å±žæ€§æ¥ç¡®ä¿ç”¨æˆ·åçš„å”¯ä¸€æ€§å’Œå±žæ€§ä¸ç”¨è½¬æ¢ã€‚å†…éƒ¨ç”¨æˆ·åæœ‰ä¸¥æ ¼çš„å—ç¬¦é™åˆ¶ï¼Œåªå…è®¸ä½¿ç”¨ [ a-zA-Z0-9_.@- ]ã€‚å…¶ä»–å—ç¬¦ä¼šè¢«ASCIIç å–ä»£æˆ–è€…è¢«æ´»åŠ›ã€‚å½“å†²çªæ—¶ä¼šå¢žåŠ æˆ–è€…å‡å°‘ä¸€ä¸ªæ•°å—ã€‚å†…éƒ¨ç”¨æˆ·åè¢«ç”¨äºŽå†…éƒ¨è¯†åˆ«ç”¨æˆ·ï¼ŒåŒæ—¶ä¹Ÿä½œä¸ºownCloudä¸ç”¨æˆ·æ ¹æ–‡ä»¶å¤¹çš„é»˜è®¤åã€‚ä¹Ÿä½œä¸ºè¿œç¨‹URLsçš„ä¸€éƒ¨åˆ†ï¼Œæ¯”å¦‚ä¸ºäº†æ‰€æœ‰çš„*DAVæœåŠ¡ã€‚åœ¨è¿™ç§è®¾ç½®ä¸‹ï¼Œé»˜è®¤è¡Œä¸ºå¯ä»¥è¢«è¶…è¶Šã€‚å®žçŽ°ä¸€ä¸ªç±»ä¼¼çš„è¡Œä¸ºï¼Œowncloud 5è¾“å…¥ç”¨æˆ·çš„æ˜¾ç¤ºåç§°å±žæ€§åœ¨ä»¥ä¸‹é¢†åŸŸä¹‹å‰ã€‚è®©å®ƒç©ºç€çš„é»˜è®¤è¡Œä¸ºã€‚æ›´æ”¹åªå¯¹æ–°æ˜ å°„çš„å½±å“ï¼ˆå¢žåŠ ï¼‰çš„LDAPç”¨æˆ·ã€‚",
 "Internal Username Attribute:" => "å†…éƒ¨ç”¨æˆ·åå±žæ€§ï¼š",
 "Override UUID detection" => "è¶…è¶ŠUUIDæ£€æµ‹",
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "é»˜è®¤ownCloudè‡ªåŠ¨æ£€æµ‹UUIDå±žæ€§ã€‚UUIDå±žæ€§ç”¨æ¥æ— è¯¯çš„è¯†åˆ«LDAPç”¨æˆ·å’Œç»„ã€‚åŒæ—¶å†…éƒ¨ç”¨æˆ·åä¹ŸåŸºäºŽUUIDåˆ›å»ºï¼Œå¦‚æžœæ²¡æœ‰ä¸Šè¿°çš„æŒ‡å®šã€‚ä¹Ÿå¯ä»¥è¶…è¶Šè®¾ç½®ç›´æŽ¥æŒ‡å®šä¸€ç§å±žæ€§ã€‚ä½†ä¸€å®šè¦ç¡®ä¿æŒ‡å®šçš„å±žæ€§å–å¾—çš„ç”¨æˆ·å’Œç»„æ˜¯å”¯ä¸€çš„ã€‚é»˜è®¤è¡Œä¸ºç©ºã€‚å˜æ›´åŸºäºŽæ–°æ˜ å°„(å¢žåŠ )LDAPç”¨æˆ·å’Œç»„æ‰ä¼šç”Ÿæ•ˆã€‚",
 "UUID Attribute:" => "UUIDå±žæ€§ï¼š",
 "Username-LDAP User Mapping" => "ç”¨æˆ·å-LDAPç”¨æˆ·æ˜ å°„",
-"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloudä½¿ç”¨ç”¨æˆ·åå˜å‚¨å’Œåˆ†é…æ•°æ®(å…ƒ)ã€‚ä¸ºäº†å‡†ç¡®åœ°è¯†åˆ«å’Œç¡®è®¤ç”¨æˆ·ï¼Œæ¯ä¸ªç”¨æˆ·éƒ½æœ‰ä¸€ä¸ªå†…éƒ¨ç”¨æˆ·åã€‚éœ€è¦ä»ŽownCloudç”¨æˆ·åæ˜ å°„åˆ°LDAPç”¨æˆ·ã€‚åˆ›å»ºçš„ç”¨æˆ·åæ˜ å°„åˆ°LDAPç”¨æˆ·çš„UUIDã€‚æ¤å¤–ï¼ŒDNæ˜¯ç¼“å˜ä»¥åŠå‡å°‘LDAPäº¤äº’ï¼Œä½†å®ƒä¸ç”¨äºŽè¯†åˆ«ã€‚å¦‚æžœDNå˜åŒ–ï¼ŒownCloudä¹Ÿä¼šå˜åŒ–ã€‚å†…éƒ¨ownCloudååœ¨ownCloudçš„å„å¤„ä½¿ç”¨ã€‚æ¸…é™¤æ˜ å°„å°†ä¸€ç‰‡æ··ä¹±ã€‚æ¸…é™¤æ˜ å°„ä¸æ˜¯å¸¸ç”¨çš„é…ç½®ï¼Œå®ƒå½±å“åˆ°æ‰€æœ‰LDAPé…ç½®ï¼åƒä¸‡ä¸è¦åœ¨æ£å¼çŽ¯å¢ƒä¸æ¸…é™¤æ˜ å°„ã€‚åªæœ‰åœ¨æµ‹è¯•æˆ–è¯•éªŒé˜¶æ®µå¯ä»¥æ¸…é™¤æ˜ å°„ã€‚",
 "Clear Username-LDAP User Mapping" => "æ¸…é™¤ç”¨æˆ·-LDAPç”¨æˆ·æ˜ å°„",
 "Clear Groupname-LDAP Group Mapping" => "æ¸…é™¤ç»„ç”¨æˆ·-LDAPçº§æ˜ å°„",
 "Test Configuration" => "æµ‹è¯•é…ç½®",
 "Help" => "å¸®åŠ©"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index ba55c4147905453e86c73a362a57fe7998dbe7a9..b656f0fc4641c892f5183db68eddef61cababe61 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Success" => "æˆåŠŸ",
 "Error" => "éŒ¯èª¤",
 "Password" => "å¯†ç¢¼",
 "Port" => "é€£æŽ¥åŸ ",
 "Help" => "å¹«åŠ©"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index cde743f003378571879c378e972e271e7477b594..84e1f83aefcf178695914cd00e74f7d757685104 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Failed to clear the mappings." => "æ¸…é™¤æ˜ å°„å¤±æ•—",
 "Failed to delete the server configuration" => "åˆªé™¤ä¼ºæœå™¨è¨å®šæ™‚å¤±æ•—",
 "The configuration is valid and the connection could be established!" => "è¨å®šæœ‰æ•ˆä¸”é€£ç·šå¯å»ºç«‹",
@@ -15,7 +16,6 @@
 "Connection test failed" => "é€£ç·šæ¸¬è©¦å¤±æ•—",
 "Do you really want to delete the current Server Configuration?" => "æ‚¨çœŸçš„ç¢ºå®šè¦åˆªé™¤ç¾åœ¨çš„ä¼ºæœå™¨è¨å®šå—Ž?",
 "Confirm Deletion" => "ç¢ºèªå·²åˆªé™¤",
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>è¦å‘Š:</b> æ‡‰ç”¨ç¨‹å¼user_ldapå’Œuser_webdavauthäº’ä¸ç›¸å®¹ã€‚å¯èƒ½æœƒé€ æˆç„¡æ³•é æœŸçš„çµæžœã€‚è«‹è¦æ±‚æ‚¨çš„ç³»çµ±ç®¡ç†å“¡å°‡å…©è€…å…¶ä¸ä¹‹ä¸€åœç”¨ã€‚",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Š:</b>æ²’æœ‰å®‰è£ PHP LDAP æ¨¡çµ„ï¼Œå¾Œç«¯ç³»çµ±å°‡ç„¡æ³•é‹ä½œã€‚è«‹è¦æ±‚æ‚¨çš„ç³»çµ±ç®¡ç†å“¡å®‰è£æ¨¡çµ„ã€‚",
 "Server configuration" => "ä¼ºæœå™¨è¨å®š",
 "Add Server Configuration" => "æ–°å¢žä¼ºæœå™¨è¨å®š",
@@ -43,17 +43,14 @@
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "è«‹çµ¦å®šä¸€å€‹å¯é¸çš„å‚™ç”¨ä¸»æ©Ÿã€‚å¿…é ˆæ˜¯LDAP/ADä¸å¤®ä¼ºæœå™¨çš„è¤‡æœ¬ã€‚",
 "Backup (Replica) Port" => "å‚™ç”¨(è¤‡æœ¬)é€£æŽ¥é˜œ",
 "Disable Main Server" => "åœç”¨ä¸»ä¼ºæœå™¨",
-"When switched on, ownCloud will only connect to the replica server." => "ç•¶é–‹é—œæ‰“é–‹æ™‚ï¼ŒownCloudå°‡åªæœƒé€£æŽ¥è¤‡æœ¬ä¼ºæœå™¨ã€‚",
 "Use TLS" => "ä½¿ç”¨TLS",
 "Case insensitve LDAP server (Windows)" => "ä¸å€åˆ†å¤§å°å¯«çš„LDAPä¼ºæœå™¨(Windows)",
 "Turn off SSL certificate validation." => "é—œé–‰ SSL æ†‘è‰é©—è‰",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "è‹¥é€£ç·šåªæœ‰åœ¨æ¤é¸é …é–‹å•Ÿæ™‚é‹ä½œï¼Œè«‹åŒ¯å…¥LDAPä¼ºæœå™¨çš„SSLèªè‰åˆ°æ‚¨çš„ownCloudä¼ºæœå™¨ã€‚",
 "Not recommended, use for testing only." => "ä¸æŽ¨è–¦ä½¿ç”¨ï¼Œåƒ…ä¾›æ¸¬è©¦ç”¨é€”ã€‚",
 "Cache Time-To-Live" => "å¿«å–çš„å˜æ´»æ™‚é–“",
 "in seconds. A change empties the cache." => "ä»¥ç§’ç‚ºå–®ä½ã€‚æ›´è®Šå¾Œæœƒæ¸…ç©ºå¿«å–ã€‚",
 "Directory Settings" => "ç›®éŒ„é¸é …",
 "User Display Name Field" => "ä½¿ç”¨è€…åç¨±æ¬„ä½",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "ç”¨æ–¼ç”¢ç”ŸownCloudåç¨±",
 "Base User Tree" => "Baseä½¿ç”¨è€…æ•¸",
 "One User Base DN per line" => "ä¸€è¡Œä¸€å€‹ä½¿ç”¨è€…Base DN",
 "User Search Attributes" => "ä½¿ç”¨è€…æœç´¢å±¬æ€§",
@@ -74,3 +71,4 @@
 "Test Configuration" => "æ¸¬è©¦æ¤è¨å®š",
 "Help" => "èªªæ˜Ž"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 31150a5bec57d2c9575e4f3e7af68d82213a6f24..36c8e648b1a71872e91c1d8a2f2851c904dd58f0 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -209,6 +209,22 @@ class Connection {
 									$value);
 	}
 
+	/**
+	 * Special handling for reading Base Configuration
+	 *
+	 * @param $base the internal name of the config key
+	 * @param $value the value stored for the base
+	 */
+	private function readBase($base, $value) {
+		if(empty($value)) {
+			$value = '';
+		} else {
+			$value = preg_split('/\r\n|\r|\n/', $value);
+		}
+
+		$this->config[$base] = $value;
+	}
+
 	/**
 	 * Caches the general LDAP configuration.
 	 */
@@ -224,14 +240,9 @@ class Connection {
 			$this->config['ldapAgentName']  = $this->$v('ldap_dn');
 			$this->config['ldapAgentPassword']
 				= base64_decode($this->$v('ldap_agent_password'));
-			$rawLdapBase                    = $this->$v('ldap_base');
-			$this->config['ldapBase']
-				= preg_split('/\r\n|\r|\n/', $rawLdapBase);
-			$this->config['ldapBaseUsers']
-				= preg_split('/\r\n|\r|\n/', ($this->$v('ldap_base_users')));
-			$this->config['ldapBaseGroups']
-				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_base_groups'));
-			unset($rawLdapBase);
+			$this->readBase('ldapBase',       $this->$v('ldap_base'));
+			$this->readBase('ldapBaseUsers',  $this->$v('ldap_base_users'));
+			$this->readBase('ldapBaseGroups', $this->$v('ldap_base_groups'));
 			$this->config['ldapTLS']        = $this->$v('ldap_tls');
 			$this->config['ldapNoCase']     = $this->$v('ldap_nocase');
 			$this->config['turnOffCertCheck']
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 60ecc0da33df57bf473a71403f14f13ec286ce7c..d626afed6c3b9886e1b04df31002d580bf5a0786 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -134,21 +134,19 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
 			\OCP\Util::DEBUG);
 	}
 
-	static private function getConnector() {
-		if(!is_null(self::$connector)) {
-			return self::$connector;
-		}
-		self::$connector = new \OCA\user_ldap\lib\Connection('user_ldap');
-		return self::$connector;
-	}
-
 	static private function getGroupBE() {
 		if(!is_null(self::$groupBE)) {
 			return self::$groupBE;
 		}
-		self::getConnector();
-		self::$groupBE = new \OCA\user_ldap\GROUP_LDAP();
-		self::$groupBE->setConnector(self::$connector);
+		$configPrefixes = Helper::getServerConfigurationPrefixes(true);
+		if(count($configPrefixes) == 1) {
+			//avoid the proxy when there is only one LDAP server configured
+			$connector = new Connection($configPrefixes[0]);
+			self::$groupBE = new \OCA\user_ldap\GROUP_LDAP();
+			self::$groupBE->setConnector($connector);
+		} else {
+			self::$groupBE = new \OCA\user_ldap\Group_Proxy($configPrefixes);
+		}
 
 		return self::$groupBE;
 	}
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 972970aa3ef11445789bbb51390cffe5c35ec8f6..95aa592594bc4948c3c7dd31205596d916b50562 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -6,7 +6,7 @@
 		<li><a href="#ldapSettings-3">Expert</a></li>
 	</ul>
 		<?php if(OCP\App::isEnabled('user_webdavauth')) {
-			print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>');
+			print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
 		}
 		if(!function_exists('ldap_connect')) {
 			print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
@@ -72,18 +72,18 @@
 				<p><label for="ldap_port"><?php p($l->t('Port'));?></label><input type="number" id="ldap_port" name="ldap_port" data-default="<?php p($_['ldap_port_default']); ?>"  /></p>
 				<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p>
 				<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>"  /></p>
-				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('When switched on, ownCloud will only connect to the replica server.'));?>" /></p>
+				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
 				<p><label for="ldap_tls"><?php p($l->t('Use TLS'));?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php p($_['ldap_tls_default']); ?>" title="<?php p($l->t('Do not use it additionally for LDAPS connections, it will fail.'));?>" /></p>
 				<p><label for="ldap_nocase"><?php p($l->t('Case insensitve LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p>
-				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your ownCloud server.'));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/><small><?php p($l->t('Not recommended, use for testing only.'));?></small></p>
+				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/><small><?php p($l->t('Not recommended, use for testing only.'));?></small></p>
 				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
 			</div>
 			<h3><?php p($l->t('Directory Settings'));?></h3>
 			<div>
-				<p><label for="ldap_display_name"><?php p($l->t('User Display Name Field'));?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php p($_['ldap_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the user`s ownCloud name.'));?>" /></p>
+				<p><label for="ldap_display_name"><?php p($l->t('User Display Name Field'));?></label><input type="text" id="ldap_display_name" name="ldap_display_name" data-default="<?php p($_['ldap_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the user\'s display name.'));?>" /></p>
 				<p><label for="ldap_base_users"><?php p($l->t('Base User Tree'));?></label><textarea id="ldap_base_users" name="ldap_base_users" placeholder="<?php p($l->t('One User Base DN per line'));?>" data-default="<?php p($_['ldap_base_users_default']); ?>" title="<?php p($l->t('Base User Tree'));?>"></textarea></p>
 				<p><label for="ldap_attributes_for_user_search"><?php p($l->t('User Search Attributes'));?></label><textarea id="ldap_attributes_for_user_search" name="ldap_attributes_for_user_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_user_search_default']); ?>" title="<?php p($l->t('User Search Attributes'));?>"></textarea></p>
-				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups`s ownCloud name.'));?>" /></p>
+				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups\'s display name.'));?>" /></p>
 				<p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree'));?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line'));?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree'));?>"></textarea></p>
 				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p>
 				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option></select></p>
@@ -99,16 +99,16 @@
 	</fieldset>
 	<fieldset id="ldapSettings-3">
 		<p><strong><?php p($l->t('Internal Username'));?></strong></p>
-		<p class="ldapIndent"><?php p($l->t('By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.'));?></p>
+		<p class="ldapIndent"><?php p($l->t('By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users.'));?></p>
 		<p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:'));?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p>
 		<p><strong><?php p($l->t('Override UUID detection'));?></strong></p>
-		<p class="ldapIndent"><?php p($l->t('By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p>
+		<p class="ldapIndent"><?php p($l->t('By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups.'));?></p>
 		<p class="ldapIndent"><label for="ldap_expert_uuid_attr"><?php p($l->t('UUID Attribute:'));?></label><input type="text" id="ldap_expert_uuid_attr" name="ldap_expert_uuid_attr" data-default="<?php p($_['ldap_expert_uuid_attr_default']); ?>" /></p>
 		<p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p>
-		<p class="ldapIndent"><?php p($l->t('ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage.'));?></p>
+		<p class="ldapIndent"><?php p($l->t('Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.'));?></p>
 		<p class="ldapIndent"><button id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
 	</fieldset>
-	<input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection"><?php p($l->t('Test Configuration'));?></button> <a href="http://doc.owncloud.org/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?></a>
+	<input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection"><?php p($l->t('Test Configuration'));?></button> <a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?></a>
 	</div>
 
 </form>
diff --git a/apps/user_webdavauth/l10n/ar.php b/apps/user_webdavauth/l10n/ar.php
index 78b347e51faf1f058f4ed6378cf3da48417e801a..bdb335fadb49ff864f69e91ef89ad3f5e7ac1b5c 100644
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "ØªØ£ÙƒØ¯ Ø´Ø®ØµÙŠØ© Ø§Ù„ WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "ØªØ£ÙƒØ¯ Ø´Ø®ØµÙŠØ© Ø§Ù„ WebDAV"
 );
+$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;";
diff --git a/apps/user_webdavauth/l10n/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
index 61503db8392acee4f71a4ace9351d29fab2182fc..14e6b280fd21b20606a1a1c034888a61553eb6ce 100644
--- a/apps/user_webdavauth/l10n/bg_BG.php
+++ b/apps/user_webdavauth/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud Ñ‰Ðµ Ð¸Ð·Ð¿Ñ€Ð°Ñ‚Ð¸ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸Ñ‚Ðµ Ð´Ð°Ð½Ð½Ð¸ Ð´Ð¾ Ñ‚Ð¾Ð·Ð¸ URL. "
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index 339e4dbe68821e3bd8d531266ef89860980dae76..e1f8fd9b2ecd63b56716a548200cacdadfc1d74c 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "AutenticaciÃ³ WebDAV",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enviarÃ  les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarÃ  els codis d'estat 401 i 403 com a credencials no vÃ lides, i qualsevol altra resposta com a credencials vÃ lides."
+"Address: " => "AdreÃ§a:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les credencials d'usuari s'enviaran a aquesta adreÃ§a. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vÃ lides, i qualsevol altra resposta com a credencials vÃ lides."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index e1f8d76e166777e522c0a694c5ca383069a3f7da..dfeac535eb8e0db15582f420646a20a3129a2511 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "OvÄ›Å™enÃ WebDAV",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odeÅ¡le uÅ¾ivatelskÃ© Ãºdaje na zadanou URL. Plugin zkontroluje odpovÄ›Ä a povaÅ¾uje nÃ¡vratovou hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡echny ostatnÃ hodnoty jako platnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje."
+"Address: " => "Adresa:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "UÅ¾ivatelskÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje budou odeslÃ¡ny na tuto adresu. Tento plugin zkontroluje odpovÄ›Ä serveru a interpretuje nÃ¡vratovÃ½ kÃ³d HTTP 401 a 403 jako neplatnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje a jakÃ½koli jinÃ½ jako platnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
index 0d1190ba22287047a6b4b0d819a8619017be6d84..2889a1b42a0b251dfbd761533934602d670d67fc 100644
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@@ -1,4 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-godkendelse",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud vil sende brugerens oplysninger til denne URL. Plugin'et registrerer responsen og fortolker HTTP-statuskoder 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
+"Address: " => "Adresse:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index e2db395b1c6cf341d08f07b6632461a52817ae23..3ddc03313340b3c8a834827d5870b9f9bcb21bec 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,4 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentifikation",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prÃ¼ft die Antwort und wird die Statuscodes 401 und 403 als ungÃ¼ltige Daten und alle anderen Antworten als gÃ¼ltige Daten interpretieren."
+"Address: " => "Addresse: ",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prÃ¼ft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungÃ¼ltige Daten interpretieren und alle anderen Antworten als gÃ¼ltige Daten."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 21a886343f049303a4de5c7eb41cb878f8085b9e..2c31957d2515627eae7aa19daa946e6291568a44 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-Authentifizierung",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prÃ¼ft die Antwort und wird die Statuscodes 401 und 403 als ungÃ¼ltige Daten und alle anderen Antworten als gÃ¼ltige Daten interpretieren."
+"Address: " => "Adresse:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prÃ¼ft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungÃ¼ltige Daten interpretieren und alle anderen Antworten als gÃ¼ltige Daten."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 79bb1d13bf7a20958ad7a3de8dfbefe93913bf03..4a9ab3bafcc40c3ca1c638c70b16ea53b4ced915 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "Î‘Ï…Î¸ÎµÎ½Ï„Î¹ÎºÎ¿Ï€Î¿Î¯Î·ÏƒÎ· Î¼ÎÏƒÏ‰ WebDAV ",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Î¤Î¿ ownCloud Î¸Î± ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹ Ï„Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î±  Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ URL. Î‘Ï…Ï„ÏŒ Ï„Î¿ plugin ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· ÎºÎ±Î¹ Ï„Î·Î½ Î¼ÎµÏ„Î±Ï„ÏÎÏ€ÎµÎ¹ ÏƒÎµ HTTP ÎºÏ‰Î´Î¹ÎºÏŒ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ 401 ÎºÎ±Î¹ 403 Î³Î¹Î± Î¼Î· ÎÎ³ÎºÏ…ÏÎ±, ÏŒÎ»ÎµÏ‚ Î¿Î¹ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€ÎµÏ‚ Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎµÏ‚."
+"Address: " => "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Î¤Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î± Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· Î¸Î± ÏƒÏ„Î±Î»Î¿ÏÎ½ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·. Î‘Ï…Ï„ÏŒ Ï„Î¿ Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î¿ ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ Ï„Î·Î½ Î±Ï€ÏŒÎºÏÎ¹ÏƒÎ· ÎºÎ±Î¹ Î¸Î± ÎµÏÎ¼Î·Î½ÎµÏÏƒÎµÎ¹ Ï„Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ HTTP 401 ÎºÎ±Î¹ 402 Ï‰Ï‚ Î¼Î· ÎÎ³ÎºÏ…ÏÎ± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î± ÎºÎ±Î¹ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ Î¬Î»Î»ÎµÏ‚ Î±Ï€Î¿ÎºÏÎ¯ÏƒÎµÎ¹Ï‚ Ï‰Ï‚ ÎÎ³ÎºÏ…ÏÎ± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î±."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index 0e1fda7c4c272e159143482372258230b9631272..ddcac32ca1b4b3de6abc20063d5ee77c0739fcbf 100644
--- a/apps/user_webdavauth/l10n/eo.php
+++ b/apps/user_webdavauth/l10n/eo.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-aÅtentigo"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index 18c87794d65ffa659eb8d9623ab69d51161e077a..cd8ec6659a4f519e21a8b333282215c3555e0f6b 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "AutenticaciÃ³n de WevDAV",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviarÃ¡ las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
+"Address: " => "DirecciÃ³n:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviarÃ¡ las credenciales de usuario a esta direcciÃ³n. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index cda5d7eab0562e65128a84276865804d5afc676c..608b0ad817938738d8db88727e0427e45e81a36f 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,5 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "AutenticaciÃ³n de WevDAV",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviarÃ¡ las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "AutenticaciÃ³n de WevDAV"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index f95b5214130f6afc457dda1e1249d327d1a45f8d..34b07c654a51a5faac425799391ea192b4e57513 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV autentimine",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kÃµik teised vastused kui korrektsed kasutajatunnused."
+"Address: " => "Aadress:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kÃµik teised vastused kui korrektsed kasutajatunnused."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index 6395d7fc1e0de132b2ecd8e7182bc7477241dab4..29794115fcd72dc6d0e1e191ee7305fc827f5ad4 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,4 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Autentikazioa",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudek erabiltzailearen kredentzialak URL honetara bidaliko ditu. Plugin honek erantzuna aztertzen du eta HTTP 401 eta 403 egoera kodeak baliogabezko kredentzialtzat hartuko ditu, beste erantzunak kredentzial egokitzat hartuko dituelarik."
+"Address: " => "Helbidea:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fi_FI.php b/apps/user_webdavauth/l10n/fi_FI.php
index 61a848bcfe4bdf63f55c19d8951bf12834d5e369..a31e09bc72a73bf8583d83da485e02f3e5d7a07e 100644
--- a/apps/user_webdavauth/l10n/fi_FI.php
+++ b/apps/user_webdavauth/l10n/fi_FI.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-todennus"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV-todennus",
+"Address: " => "Osoite:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "KÃ¤yttÃ¤jÃ¤tiedot lÃ¤hetetÃ¤Ã¤n tÃ¤hÃ¤n osoitteeseen. LiitÃ¤nnÃ¤inen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vÃ¤Ã¤riksi kÃ¤yttÃ¤jÃ¤tiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi kÃ¤yttÃ¤jÃ¤tiedoiksi."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index e7fad26287c334861a12784eb10c7906ee59ef55..0130e35c816a62fca579fffc657d50226d1a421c 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,5 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "Authentification WebDAV",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enverra les informations de connexion Ã  cette adresse. Ce module complÃ©mentaire analyse le code rÃ©ponse HTTP et considÃ¨re tout code diffÃ©rent des codes 401 et 403 comme associÃ© Ã  une authentification correcte."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "Authentification WebDAV"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/gl.php b/apps/user_webdavauth/l10n/gl.php
index 35ed8a1969fe4da0985458c75716f6fbbb951f5a..1d0c38e08f85dde3679e53d14189eef5900e6c9b 100644
--- a/apps/user_webdavauth/l10n/gl.php
+++ b/apps/user_webdavauth/l10n/gl.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "AutenticaciÃ³n WebDAV",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enviarÃ¡ as credenciais do usuario a este URL. Este engadido comproba a resposta e interpretarÃ¡ os cÃ³digos de estado HTTP 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
+"Address: " => "Enderezo:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais do usuario serÃ¡n enviadas a este enderezo. Este engadido comproba a resposta e interpretarÃ¡ os cÃ³digos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/he.php b/apps/user_webdavauth/l10n/he.php
index aee7b00f1851a1955ad982c729de32375a26151f..d11fce81a365b3441c7df3ee368beeef0d58ce18 100644
--- a/apps/user_webdavauth/l10n/he.php
+++ b/apps/user_webdavauth/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "×”×–×“×”×•×ª ×ž×•×œ WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "×ž×¢×¨×›×ª ownCloud ×ª×©×œ×— ××ª ×¤×¨×˜×™ ×”×ž×©×ª×ž×© ×œ×›×ª×•×‘×ª ×–×•. ×”×ª×•×¡×£ ×™×‘×“×•×§ ××ª ×”×ª×’×•×‘×” ×•×™×ª×¨×’× ××ª ×”×§×•×“×™× 401 ×•Ö¾403 ×›×ª×’×•×‘×” ×œ×¦×™×•×Ÿ ×¤×¨×˜×™ ×’×™×©×” ×©×’×•×™×™× ×•××ª ×›×œ ×©××¨ ×”×ª×’×•×‘×•×ª ×›×¤×¨×˜×™ ×’×™×©×” × ×›×•× ×™×."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "×”×–×“×”×•×ª ×ž×•×œ WebDAV"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index d7de5e57f3bd374e24a55450486357dfd7b50b07..63fc084ff4cf7f2a73754d3f960d3db8f8eb9cdc 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV hitelesÃtÃ©s",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Az ownCloud elkÃ¼ldi a felhasznÃ¡lÃ³i fiÃ³k adatai a kÃ¶vetkezÅ‘ URL-re. Ez a bÅ‘vÃtÅ‘modul leellenÅ‘rzi a vÃ¡laszt Ã©s ha a HTTP hibakÃ³d nem 401 vagy 403 azaz Ã©rvÃ©nytelen hitelesÃtÅ‘, akkor minden mÃ¡s vÃ¡lasz Ã©rvÃ©nyes lesz."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV hitelesÃtÃ©s"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/id.php b/apps/user_webdavauth/l10n/id.php
index 8ddf54e47350264df35acc69f5559231eb46daef..278055ce8c2c984f20b6131ea49013d9e5d71ea8 100644
--- a/apps/user_webdavauth/l10n/id.php
+++ b/apps/user_webdavauth/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "Otentikasi WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud akan mengirimkan informasi pengguna ke URL ini. Pengaya akan mengecek respon dan menginterpretasikan kode status HTTP 401 serta 403 sebagai informasi yang keliru, sedangkan respon lainnya dianggap benar."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "Otentikasi WebDAV"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php
index 10dcfa6e3d367eed2a6ef6dd7891403530a01ca0..4fcab07654249eba79049bbe043ed7b5708ab51a 100644
--- a/apps/user_webdavauth/l10n/is.php
+++ b/apps/user_webdavauth/l10n/is.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV AuÃ°kenni"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index 1c1e0899b1da542eafe3a19f079d08204e651bbc..7e2003997e50676630f531b2e69c371c894e9ac8 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticazione WebDAV",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud invierÃ  le credenziali dell'utente a questo URL. Questa estensione controlla la risposta e interpreta i codici di stato 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
+"Address: " => "Indirizzo:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterÃ  i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php
index 703cc71489e8f261ab8e0e58e40e81e3d911e50f..bab7be008efdd7e96574e9a25a361aed469b2de7 100644
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV èªè¨¼",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudã¯ã“ã®URLã«ãƒ¦ãƒ¼ã‚¶è³‡æ ¼æƒ…å ±ã‚’é€ä¿¡ã—ã¾ã™ã€‚ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯å¿œç”ã‚’ãƒã‚§ãƒƒã‚¯ã—ã€HTTPçŠ¶æ…‹ã‚³ãƒ¼ãƒ‰ãŒ 401 ã¨ 403 ã®å ´åˆã¯ç„¡åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã€ä»–ã®å¿œç”ã¯ã™ã¹ã¦æœ‰åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã¦å‡¦ç†ã—ã¾ã™ã€‚"
+"Address: " => "ã‚¢ãƒ‰ãƒ¬ã‚¹:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®æ¨©é™æƒ…å ±ã‚’ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ä¿¡ã—ã¾ã™ã€‚ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯å¿œç”ã‚’ãƒã‚§ãƒƒã‚¯ã—ã€HTTPçŠ¶æ…‹ã‚³ãƒ¼ãƒ‰ãŒ 401 ã¨ 403 ã®å ´åˆã¯ç„¡åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã€ä»–ã®å¿œç”ã¯ã™ã¹ã¦æœ‰åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã¦å‡¦ç†ã—ã¾ã™ã€‚"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ka_GE.php b/apps/user_webdavauth/l10n/ka_GE.php
index 34c502cc5ebe086b0f1c4d1bd8c011b0ccb51058..c2aa956072cecb3a46980fd7d4ec466207fc9910 100644
--- a/apps/user_webdavauth/l10n/ka_GE.php
+++ b/apps/user_webdavauth/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV áƒáƒ£áƒ—áƒ”áƒœáƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudâ€“áƒ˜ áƒ’áƒáƒ›áƒáƒ’áƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒ˜áƒ— áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ¡ áƒáƒ› URLâ€“áƒ–áƒ”. áƒ”áƒ¡ áƒžáƒšáƒáƒ’áƒ˜áƒœáƒ˜ áƒ¨áƒ”áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ¡ áƒžáƒáƒ¡áƒ£áƒ®áƒ¡ áƒ“áƒ áƒ›áƒáƒáƒ®áƒ“áƒ”áƒœáƒ¡ áƒ›áƒ˜áƒ¡ áƒ˜áƒœáƒ¢áƒ”áƒ áƒžáƒ áƒ”áƒ¢áƒáƒªáƒ˜áƒáƒ¡ HTTP áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ™áƒáƒ“áƒ”áƒ‘áƒ¨áƒ˜ 401 áƒ“áƒ 403 áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ®áƒáƒšáƒ áƒ¡áƒ®áƒ•áƒ áƒ“áƒáƒœáƒáƒ áƒ©áƒ”áƒœáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV áƒáƒ£áƒ—áƒ”áƒœáƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
index e0431164a53469ed42e5e20b9d6503c0c4422048..2d2c4d70e73bfc4407e11b1ab30e89289132df66 100644
--- a/apps/user_webdavauth/l10n/ko.php
+++ b/apps/user_webdavauth/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV ì¸ì¦",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudì—ì„œ ì´ URLë¡œ ì‚¬ìš©ìž ì¸ì¦ ì •ë³´ë¥¼ ë³´ëƒ…ë‹ˆë‹¤. ì´ í”ŒëŸ¬ê·¸ì¸ì€ ì‘ë‹µì„ í™•ì¸í•˜ì—¬ HTTP ìƒíƒœ ì½”ë“œ 401ì´ë‚˜ 403ì´ ëŒì•„ì˜¨ ê²½ìš°ì— ìž˜ëª»ëœ ì¸ì¦ ì •ë³´ë¡œ ê°„ì£¼í•©ë‹ˆë‹¤. ë‹¤ë¥¸ ëª¨ë“  ìƒíƒœ ì½”ë“œëŠ” ì˜¬ë°”ë¥¸ ì¸ì¦ ì •ë³´ë¡œ ê°„ì£¼í•©ë‹ˆë‹¤."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV ì¸ì¦"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
index ed81efdf8bfdb0ab9f92f78afd729f04f27ce6fe..90fc2d5ac3ef78e253f0e061694a9a331e719141 100644
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV autorizavimas",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud iÅ¡siÅ³s naudotojo duomenis Ä¯ Å¡Ä¯ WWW adresÄ…. Å is Ä¯skiepis patikrins gautÄ… atsakymÄ… ir interpretuos HTTP bÅ«senos kodÄ… 401 ir 403 kaip negaliojanÄius duomenis, ir visus kitus gautus atsakymus kaip galiojanÄius duomenis. "
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV autorizavimas"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/lv.php b/apps/user_webdavauth/l10n/lv.php
index 7f90f64d215327a0fe74e741b2c7034cee7fcef2..7ce96285881b8ad4c28d2de7740958bfdd89fd3c 100644
--- a/apps/user_webdavauth/l10n/lv.php
+++ b/apps/user_webdavauth/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV autentifikÄcija",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sÅ«tÄ«s lietotÄja akreditÄcijas datus uz Å¡o URL. Å is spraudnis pÄrbauda atbildi un interpretÄ“ HTTP statusa kodus 401 un 403 kÄ nederÄ«gus akreditÄcijas datus un visas citas atbildes kÄ derÄ«gus akreditÄcijas datus."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV autentifikÄcija"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index 086f8ad2ea9a68df1b9a015bf66290bd58d09355..d763789f17adecb1ab2b764404447cd4811b131b 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV authenticatie",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens."
+"Address: " => "Adres:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "De ingloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert de HTTP statuscodes 401 en 403 als invalide inloggegevens, en alle andere terugkoppelingen als valide inloggegevens."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
index 5c4184b33a8b2250dbe5cdcbb11e6025abc187cf..519b942f9f53b750709090673b377bdbba73c61b 100644
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-autentisering",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sender brukarakkreditiv til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV-autentisering"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 8c8116e5234dd21533b1c46e77bfbcbe598af64e..9c39be043854a8ef9397aa449b31bf6f6e68c911 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "Uwierzytelnienie WebDAV",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wyÅ›le dane uwierzytelniajÄ…ce do tego URL. Ten plugin sprawdza odpowiedÅº i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidÅ‚owe dane uwierzytelniajÄ…ce, a kaÅ¼dy inny kod odpowiedzi jako poprawne dane."
+"Address: " => "Adres:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Dane uwierzytelniajÄ…ce uÅ¼ytkownika zostanÄ… wysÅ‚ane na ten adres. Wtyczka sprawdza odpowiedÅº i bÄ™dzie interpretowaÅ‚ status  HTTP 401 i 403 jako nieprawidÅ‚owe dane uwierzytelniajÄ…ce i wszystkie inne odpowiedzi jako prawidÅ‚owe uwierzytelnienie."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/pt_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
index 6727219db427c573286460e1eb6202dc3109b709..6dde16ff4e0db42fa4c1c79d37e089c7255af1f0 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "AutenticaÃ§Ã£o WebDAV",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "O ownCloud enviarÃ¡ as credenciais do usuÃ¡rio para esta URL. Este plugin verifica a resposta e interpreta o os cÃ³digos de status do HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras respostas como credenciais vÃ¡lidas."
+"Address: " => "EndereÃ§o:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais de usuÃ¡rio serÃ£o enviadas para este endereÃ§o. Este plugin verifica a resposta e interpretarÃ¡ os cÃ³digos de status HTTP 401 e 403 como \"credenciais invÃ¡lidas\", e todas as outras respostas como \"credenciais vÃ¡lidas\"."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index eec1a328e1d7dd6bd3ba6643e2a58256d221a0a9..f21d9c0bb9a7d302fcecce05e25fdc34d24a4fda 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,4 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "AutenticaÃ§Ã£o WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "O ownCloud vai enviar as credenciais do utilizador atravÃ©s deste URL. Este plugin verifica a resposta e vai interpretar os cÃ³digos de estado HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras como vÃ¡lidas."
+"Address: " => "EndereÃ§o:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais do utilizador vÃ£o ser enviadas para endereÃ§o URL. Este plugin verifica a resposta e vai interpretar os cÃ³digos de estado HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras respostas como vÃ¡lidas."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index bccd7d50e222651bcf589fd07c7bc5bbb09a357e..5780805a884d086ff57329daa9245751679508be 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "Autentificare WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud va trimite datele de autentificare la acest URL. Acest modul verificÄƒ rÄƒspunsul È™i va interpreta codurile de status HTTP 401 sau 403 ca fiind date de autentificare invalide, È™i orice alt rÄƒspuns ca fiind date valide."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "Autentificare WebDAV"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index 20acc6e59a9bd40af89752ec0a945f6675c6ac7d..76c18a37c207180adc49dcaf3f110f5e2ce091b6 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ WebDAV",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑ. Ð—Ð°Ñ‚ÐµÐ¼ Ð¿Ð»Ð°Ð³Ð¸Ð½ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ Ð¾Ñ‚Ð²ÐµÑ‚, Ð² ÑÐ»ÑƒÑ‡Ð°Ðµ HTTP Ð¾Ñ‚Ð²ÐµÑ‚Ð° 401 Ð¸Ð»Ð¸ 403 Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ ÑÑ‡Ð¸Ñ‚Ð°Ñ‚ÑŒÑÑ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¼Ð¸, Ð¿Ñ€Ð¸ Ð»ÑŽÐ±Ñ‹Ñ… Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¾Ñ‚Ð²ÐµÑ‚Ð°Ñ… - Ð²ÐµÑ€Ð½Ñ‹Ð¼Ð¸."
+"Address: " => "ÐÐ´Ñ€ÐµÑ:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Ð£Ñ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ‹ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑ. ÐŸÐ»Ð°Ð³Ð¸Ð½ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ Ð¾Ñ‚Ð²ÐµÑ‚ Ð¸ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°ÑÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ HTTP ÐºÐ¾Ð´Ñ‹ 401 Ð¸ 403 ÐºÐ°Ðº Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ðµ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ, Ð¿Ñ€Ð¸ Ð»ÑŽÐ±Ð¾Ð¼ Ð´Ñ€ÑƒÐ³Ð¾Ð¼ Ð¾Ñ‚Ð²ÐµÑ‚Ðµ - ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð²ÐµÑ€Ð½Ñ‹."
 );
+$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);";
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index fa63b18569a5457fd101c9f3d7a36677cccb8846..017f923c2b5699fe420c9da2db3e904146f1452e 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV overenie",
-"URL: " => "URL: ",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odoÅ¡le pouÅ¾ÃvateÄ¾skÃ© Ãºdaje na zadanÃº URL. Plugin skontroluje odpoveÄ a povaÅ¾uje nÃ¡vratovÃº hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡etky ostatnÃ© hodnoty ako platnÃ© prihlasovacie Ãºdaje."
+"Address: " => "Adresa: ",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "PouÅ¾ÃvateÄ¾skÃ© prihlasovacie Ãºdaje budÃº odoslanÃ© na tÃºto adresu. Tento plugin skontroluje odpoveÄ servera a interpretuje nÃ¡vratovÃ½ kÃ³d HTTP 401 a 403 ako neplatnÃ© prihlasovacie Ãºdaje a akÃ½koÄ¾vek inÃ½ ako platnÃ© prihlasovacie Ãºdaje."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 105fda48652c2e1f773e2f57e1c82d2fb60be700..f58232b37bd262a1bbc676f2e5f568503b20e768 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,5 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "Overitev WebDAV",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Sistem ownCloud bo poslal uporabniÅ¡ka poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmaÄi kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "Overitev WebDAV"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/user_webdavauth/l10n/sr.php b/apps/user_webdavauth/l10n/sr.php
index 44ff078493c5617759f31deb97cea272f2265bf7..5cb00494033f9a7bc901c3bf30661df9b8562238 100644
--- a/apps/user_webdavauth/l10n/sr.php
+++ b/apps/user_webdavauth/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud Ñ›Ðµ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ð¸ Ð°ÐºÑ€ÐµÐ´Ð¸Ñ‚Ð¸Ð²Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° Ð½Ð° Ð¾Ð²Ñƒ Ð°Ð´Ñ€ÐµÑÑƒ. ÐžÐ²Ð°Ñ˜ Ð¿Ñ€Ð¸ÐºÑ™ÑƒÑ‡Ð°Ðº Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð°Ð²Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€ Ð¸ Ñ‚ÑƒÐ¼Ð°Ñ‡Ð¸ HTTP ÑÑ‚Ð°Ñ‚ÑƒÑÐ½Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ 401 Ð¸ 403 ÐºÐ°Ð¾ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ðµ Ð°ÐºÑ€ÐµÐ´Ð¸Ñ‚Ð¸Ð²Ðµ, Ð° ÑÐ²Ðµ Ð¾ÑÑ‚Ð°Ð»Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ðµ ÐºÐ°Ð¾ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ðµ."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°"
 );
+$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);";
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index 481b7710946ab3bd81ac70a42a66c031e021a15d..7595e61efe587d8965dc01d4e8859090e339cb66 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Autentisering",
-"URL: " => "URL:",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud kommer skicka anvÃ¤ndaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
+"Address: " => "Adress: ",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud kommer skicka anvÃ¤ndaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
index 3c84ef7104d7e52e973875d5170256e2123048f4..102adaca4abaee6924a5725b014b3bb65163b046 100644
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ b/apps/user_webdavauth/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Authentication",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud à¸ˆà¸°à¸ªà¹ˆà¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸›à¸¢à¸±à¸‡à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆ URL à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸™à¸µà¹‰ à¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸µà¹ˆà¹‚à¸•à¹‰à¸•à¸à¸šà¸à¸¥à¸±à¸šà¸¡à¸²à¹à¸¥à¸°à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¹à¸›à¸¥à¸£à¸«à¸±à¸ª HTTP statuscodes 401 à¹à¸¥à¸° 403 à¹ƒà¸«à¹‰à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰ à¸ªà¹ˆà¸§à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸·à¹ˆà¸™à¹†à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Authentication"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index 06bf97c4b03d37c19e4ccacf8369f83d3a750640..907fb88b864ec3510a511d64d0bfb0034f857c8f 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Kimlik doÄŸrulamasÄ±",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud deneyme kullanicin URLe gonderecek. Bu toplan cepaplama muayene edecek ve status kodeci HTTPden 401 ve 403 deneyi  gecerli ve hepsi baska cevaplamari mantekli gibi yorumlacak. "
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Kimlik doÄŸrulamasÄ±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/ug.php b/apps/user_webdavauth/l10n/ug.php
index 7231d0c57085e504e304c26de209bf49b03758b4..8ad7963d49fa4fa9fd3a72e9a60e4acfe28094f2 100644
--- a/apps/user_webdavauth/l10n/ug.php
+++ b/apps/user_webdavauth/l10n/ug.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Ø³Ø§Ù„Ø§Ú¾Ù‰ÙŠÛ•Øª Ø¯Û•Ù„Ù‰Ù„Ù„Û•Ø´"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 2f4d3c95da32376077b9b93c0d4253856bdd0c11..fcde044ec753d256dea8b03b62b13f09ebeca92f 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud Ð½Ð°Ð´Ñ–ÑˆÐ»Ðµ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ– Ð½Ð° Ñ†ÐµÐ¹ URL. Ð¦ÐµÐ¹ Ð¿Ð»Ð°Ð³Ñ–Ð½ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚ÑŒ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´ÑŒ Ñ– Ð±ÑƒÐ´Ðµ Ñ–Ð½Ñ‚ÐµÑ€Ð¿Ñ€ÐµÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ HTTP ÐºÐ¾Ð´Ð¸ 401 Ñ– 403 ÑÐº Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð½ÐµÐ´Ñ–Ð¹ÑÐ½Ñ– Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ, Ð° Ñ€ÐµÑˆÑ‚Ñƒ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´ÐµÐ¹ ÑÐº Ð´Ñ–Ð¹ÑÐ½Ñ– Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ–."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ WebDAV"
 );
+$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);";
diff --git a/apps/user_webdavauth/l10n/vi.php b/apps/user_webdavauth/l10n/vi.php
index 53f1e1c4209914c6778c3682c5a327b5eae81060..1ab4687922feb41f91bb80919754549b38d78ccf 100644
--- a/apps/user_webdavauth/l10n/vi.php
+++ b/apps/user_webdavauth/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "XÃ¡c thá»±c WebDAV",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sáº½ gá»i chá»©ng thÆ° ngÆ°á»i dÃ¹ng tá»›i URL nÃ y. TÃnh nÄƒng nÃ y kiá»ƒm tra tráº£ lá»i vÃ  sáº½ hiá»ƒu mÃ£ 401 vÃ  403 cá»§a giao thá»©c HTTP lÃ  chá»©ng thÆ° khÃ´ng há»£p lá»‡, vÃ  má»i tráº£ lá»i khÃ¡c Ä‘Æ°á»£c coi lÃ  há»£p lá»‡."
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "XÃ¡c thá»±c WebDAV"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index ee4b88c6b49509dd21d03cb34f26966d7c3ad1db..69046042160cdb6cde7fd9e865d648bc613d5c9d 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,5 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV è®¤è¯",
-"URL: " => "åœ°å€ï¼š",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud å°†ä¼šå‘é€ç”¨æˆ·çš„èº«ä»½åˆ°æ¤ URLã€‚è¿™ä¸ªæ’ä»¶æ£€æŸ¥è¿”å›žå€¼å¹¶ä¸”å°† HTTP çŠ¶æ€ç¼–ç  401 å’Œ 403 è§£é‡Šä¸ºéžæ³•èº«ä»½ï¼Œå…¶ä»–æ‰€æœ‰è¿”å›žå€¼ä¸ºåˆæ³•èº«ä»½ã€‚"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV è®¤è¯"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 32166b04751f45b37b86de7213bb8f033cf51966..304ecdaf4f3579c53a764c941fe0a281914b77e6 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV èªè‰",
-"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud æœƒå°‡æŠŠç”¨æˆ¶çš„ç™»å…¥è³‡è¨Šç™¼é€åˆ°é€™å€‹ç¶²å€ä»¥å˜—è©¦ç™»å…¥ï¼Œä¸¦æª¢æŸ¥å›žæ‡‰ï¼Œ HTTP ç‹€æ…‹ç¢¼401å’Œ403è¦–ç‚ºç™»å…¥å¤±æ•—ï¼Œæ‰€æœ‰å…¶ä»–å›žæ‡‰è¦–ç‚ºç™»å…¥æˆåŠŸã€‚"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV èªè‰"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index e199c32675c5c198fee0395e876ce4668136f0bc..70c10057c20caeb81f2d65f59580ece30cbb57c5 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,9 +1,9 @@
 <form id="webdavauth" action="#" method="post">
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('WebDAV Authentication'));?></strong></legend>
-		<p><label for="webdav_url"><?php p($l->t('URL: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
+		<p><label for="webdav_url"><?php p($l->t('Address: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
 		 <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
 		<input type="submit" value="Save" />
-		<br /><?php p($l->t('ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
+		<br /><?php p($l->t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
 	</fieldset>
 </form>
diff --git a/autotest.sh b/autotest.sh
index 141b4333f9725a69c5ca9adfba4d281fec3bc893..a343f6a25ab7bb887b2d1135614e9229316315e3 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -3,12 +3,24 @@
 # ownCloud
 #
 # @author Thomas MÃ¼ller
-# @copyright 2012 Thomas MÃ¼ller thomas.mueller@tmit.eu
+# @copyright 2012, 2013 Thomas MÃ¼ller thomas.mueller@tmit.eu
 #
 
-DATADIR=data-autotest
+#$EXECUTOR_NUMBER is set by Jenkins and allows us to run autotest in parallel
+DATABASENAME=oc_autotest$EXECUTOR_NUMBER
+DATABASEUSER=oc_autotest$EXECUTOR_NUMBER
+ADMINLOGIN=admin$EXECUTOR_NUMBER
 BASEDIR=$PWD
 
+# use tmpfs for datadir - should speedup unit test execution
+if [ -d /dev/shm ]; then
+  DATADIR=/dev/shm/data-autotest$EXECUTOR_NUMBER
+else
+  DATADIR=$BASEDIR/data-autotest
+fi
+
+echo "Using database $DATABASENAME"
+
 # create autoconfig for sqlite, mysql and postgresql
 cat > ./tests/autoconfig-sqlite.php <<DELIM
 <?php
@@ -16,9 +28,9 @@ cat > ./tests/autoconfig-sqlite.php <<DELIM
   'installed' => false,
   'dbtype' => 'sqlite',
   'dbtableprefix' => 'oc_',
-  'adminlogin' => 'admin',
+  'adminlogin' => '$ADMINLOGIN',
   'adminpass' => 'admin',
-  'directory' => '$BASEDIR/$DATADIR',
+  'directory' => '$DATADIR',
 );
 DELIM
 
@@ -28,13 +40,13 @@ cat > ./tests/autoconfig-mysql.php <<DELIM
   'installed' => false,
   'dbtype' => 'mysql',
   'dbtableprefix' => 'oc_',
-  'adminlogin' => 'admin',
+  'adminlogin' => '$ADMINLOGIN',
   'adminpass' => 'admin',
-  'directory' => '$BASEDIR/$DATADIR',
-  'dbuser' => 'oc_autotest',	
-  'dbname' => 'oc_autotest',	
+  'directory' => '$DATADIR',
+  'dbuser' => '$DATABASEUSER',
+  'dbname' => '$DATABASENAME',
   'dbhost' => 'localhost',
-  'dbpass' => 'owncloud',	
+  'dbpass' => 'owncloud',
 );
 DELIM
 
@@ -44,13 +56,13 @@ cat > ./tests/autoconfig-pgsql.php <<DELIM
   'installed' => false,
   'dbtype' => 'pgsql',
   'dbtableprefix' => 'oc_',
-  'adminlogin' => 'admin',
+  'adminlogin' => '$ADMINLOGIN',
   'adminpass' => 'admin',
-  'directory' => '$BASEDIR/$DATADIR',
-  'dbuser' => 'oc_autotest',	
-  'dbname' => 'oc_autotest',	
+  'directory' => '$DATADIR',
+  'dbuser' => '$DATABASEUSER',
+  'dbname' => '$DATABASENAME',
   'dbhost' => 'localhost',
-  'dbpass' => 'owncloud',	
+  'dbpass' => 'owncloud',
 );
 DELIM
 
@@ -60,10 +72,10 @@ cat > ./tests/autoconfig-oci.php <<DELIM
   'installed' => false,
   'dbtype' => 'oci',
   'dbtableprefix' => 'oc_',
-  'adminlogin' => 'admin',
+  'adminlogin' => '$ADMINLOGIN',
   'adminpass' => 'admin',
-  'directory' => '$BASEDIR/$DATADIR',
-  'dbuser' => 'oc_autotest',
+  'directory' => '$DATADIR',
+  'dbuser' => '$DATABASENAME',
   'dbname' => 'XE',
   'dbhost' => 'localhost',
   'dbpass' => 'owncloud',
@@ -88,21 +100,21 @@ function execute_tests {
 
 	# drop database
 	if [ "$1" == "mysql" ] ; then
-		mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
+		mysql -u $DATABASEUSER -powncloud -e "DROP DATABASE $DATABASENAME"
 	fi
 	if [ "$1" == "pgsql" ] ; then
-		dropdb -U oc_autotest oc_autotest
+		dropdb -U $DATABASEUSER $DATABASENAME
 	fi
 	if [ "$1" == "oci" ] ; then
 		echo "drop the database"
 		sqlplus -s -l / as sysdba <<EOF
-			drop user oc_autotest cascade;
+			drop user $DATABASENAME cascade;
 EOF
 
 		echo "create the database"
 		sqlplus -s -l / as sysdba <<EOF
-			create user oc_autotest identified by owncloud;
-			alter user oc_autotest default tablespace users
+			create user $DATABASENAME identified by owncloud;
+			alter user $DATABASENAME default tablespace users
 			temporary tablespace temp
 			quota unlimited on users;
 			grant create session
@@ -113,7 +125,7 @@ EOF
 			, create view
 			, create synonym
 			, alter session
-			to oc_autotest;
+			to $DATABASENAME;
 			exit;
 EOF
 	fi
@@ -153,15 +165,24 @@ fi
 
 #
 # NOTES on mysql:
+#  - CREATE DATABASE oc_autotest;
 #  - CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud';
-#  - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
+#  - grant all on oc_autotest.* to 'oc_autotest'@'localhost';
+#
+#  - for parallel executor support with EXECUTOR_NUMBER=0:
+#  - CREATE DATABASE oc_autotest0;
+#  - CREATE USER 'oc_autotest0'@'localhost' IDENTIFIED BY 'owncloud';
+#  - grant all on oc_autotest0.* to 'oc_autotest0'@'localhost';
 #
 # NOTES on pgsql:
 #  - su - postgres
-#  - createuser -P (enter username and password and enable superuser)
+#  - createuser -P oc_autotest (enter password and enable superuser)
 #  - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
 # local	all	all	trust
 #
+#  - for parallel executor support with EXECUTOR_NUMBER=0:
+#  - createuser -P oc_autotest0 (enter password and enable superuser)
+#
 # NOTES on oci:
 #  - it's a pure nightmare to install Oracle on a Linux-System
 #  - DON'T TRY THIS AT HOME!
diff --git a/build/build.xml b/build/build.xml
index 3df77ad024e1dcaa4beb9dae4abdc2cbf4ca3619..0f9d3605da1fff084a3da8b87de2331c9b58a73d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -69,8 +69,6 @@ jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileA
    <arg value="--log-csv" />
    <arg value="${basedir}/build/logs/phploc.csv" />
    <arg path="${basedir}" />
-   <arg value="--exclude" />
-   <arg value="${basedir}/3rdparty/" />
   </exec>
  </target>
 
@@ -172,8 +170,6 @@ jQuery,$$,OC,$,oc_webroot,oc_appswebroots,oc_current_user,t,Files,FileList,FileA
    <arg path="${basedir}" />
    <arg value="--output" />
    <arg path="${basedir}/build/code-browser" />
-   <arg value="--exclude" />
-   <arg value="${basedir}/3rdparty/" />
   </exec>
  </target>
 </project>
diff --git a/config/config.sample.php b/config/config.sample.php
index dfa29f329c468b31c334e7ae6121d06c1996b6e6..24ba541ac5c8d5f268df6b66db305a0aafc42bb4 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -56,6 +56,9 @@ $CONFIG = array(
 /* Theme to use for ownCloud */
 "theme" => "",
 
+/* Optional ownCloud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the user's language preference configured under "personal -> language" once they have logged in */
+"default_language" => "en",
+
 /* Path to the parent directory of the 3rdparty directory */
 "3rdpartyroot" => "",
 
@@ -114,8 +117,8 @@ $CONFIG = array(
 /* Password to use for sendmail mail, depends on mail_smtpauth if this is used */
 "mail_smtppassword" => "",
 
-/* How long should ownCloud keep deleted files in the trash bin, default value:  180 days */
-'trashbin_retention_obligation' => 180,
+/* How long should ownCloud keep deleted files in the trash bin, default value:  30 days */
+'trashbin_retention_obligation' => 30,
 
 /* allow user to change his display name, if it is supported by the back-end */
 'allow_user_to_change_display_name' => true,
@@ -129,17 +132,17 @@ $CONFIG = array(
 /* Are we connected to the internet or are we running in a closed network? */
 "has_internet_connection" => true,
 
-	/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
 "log_type" => "owncloud",
 
-/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
+/* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */
 "logfile" => "",
 
 /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
 "loglevel" => "",
 
-/* Append All database query and parameters to the log file.
- (whatch out, this option can increase the size of your log file)*/
+/* Append all database queries and parameters to the log file.
+ (watch out, this option can increase the size of your log file)*/
 "log_query" => false,
 
 /* Lifetime of the remember login cookie, default is 15 days */
@@ -154,7 +157,7 @@ $CONFIG = array(
 /* Enable/disable X-Frame-Restriction */
 /* HIGH SECURITY RISK IF DISABLED*/
 "xframe_restriction" => true,
-	
+
 /* The directory where the user data is stored, default to data in the owncloud
  * directory. The sqlite database is also stored here, when sqlite is used.
  */
@@ -167,8 +170,8 @@ $CONFIG = array(
 
 /* Set an array of path for your apps directories
  key 'path' is for the fs path and the key 'url' is for the http path to your
- applications paths. 'writable' indicate if the user can install apps in this folder.
- You must have at least 1 app folder writable or you must set the parameter : appstoreenabled to false
+ applications paths. 'writable' indicates whether the user can install apps in this folder.
+ You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false
 */
 	array(
 		'path'=> '/var/www/owncloud/apps',
@@ -185,5 +188,8 @@ $CONFIG = array(
 //links to custom clients
 'customclient_desktop' => '', //http://owncloud.org/sync-clients/
 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
-'customclient_ios' => '' //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
+'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
+
+// date format to be used while writing to the owncloud logfile
+'logdateformat' => 'F d, Y H:i:s'
 );
diff --git a/console.php b/console.php
new file mode 100644
index 0000000000000000000000000000000000000000..4aec5bdc24ffe1bb32ca0ddb0d9bc8f1b4499457
--- /dev/null
+++ b/console.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$RUNTIME_NOAPPS = true;
+require_once 'lib/base.php';
+
+// Don't do anything if ownCloud has not been installed yet
+if (!OC_Config::getValue('installed', false)) {
+	echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
+	exit(0);
+}
+
+if (!OC::$CLI) {
+	echo "This script can be run from the command line only" . PHP_EOL;
+	exit(0);
+}
+
+if ($argc <= 1) {
+	echo "Usage:" . PHP_EOL;
+	echo " " . basename($argv[0]) . " <command>" . PHP_EOL;
+	exit(0);
+}
+
+$command = $argv[1];
+array_shift($argv);
+
+if ($command === 'files:scan') {
+	require_once 'apps/files/console/scan.php';
+} else {
+	echo "Unknown command '$command'" . PHP_EOL;
+}
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index c9c642077982b0671a39ba156f932e1176248b3c..e829453dbcc59768669c786336f0e32fd828c2b1 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -27,4 +27,4 @@ $app = OC_App::cleanAppId($app);
 
 $l = OC_L10N::get( $app );
 
-OC_JSON::success(array('data' => $l->getTranslations()));
+OC_JSON::success(array('data' => $l->getTranslations(), 'plural_form' => $l->getPluralFormString()));
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index c300b031afdfd430cd6d362894663831c7e40f39..aa72eaf8474ea409b064b2a8d0a6d8bd57e9858b 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -35,7 +35,7 @@
 	position:absolute;
 	top:7px; right:7px;
 	height:20px; width:20px;
-	background:url('../img/actions/delete.svg') no-repeat center;
+	background:url('../img/actions/close.svg') no-repeat center;
 }
 
 .oc-dialog-dim {
diff --git a/core/css/styles.css b/core/css/styles.css
index 89c074aabbfbb7af0351f2a7e53953e6f73f9ed1..2649f16a0109a62258b86831483aa7490b52e8de 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
-html, body { height:100%; overflow:auto; }
+html, body { height:100%; }
 article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
 body { line-height:1.5; }
 table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
@@ -19,17 +19,22 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
 #body-user #header, #body-settings #header {
 	position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em;
 	background:#1d2d44 url('../img/noise.png') repeat;
-	-moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
-#body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em;
- -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5);
-background:#1d2d44; /* Old browsers */
-background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
-background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
-background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
-background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
-background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
-background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
-filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ }
+	-moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222;
+	-webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222;
+	box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222;
+}
+
+#body-login {
+	text-align: center;
+	background: #1d2d44; /* Old browsers */
+	background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
+	background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
+	background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
+	background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
+	background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
+	background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
+}
 
 #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; }
 .header-right { float:right; vertical-align:middle; padding:0.5em; }
@@ -40,7 +45,7 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
 input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"],
 textarea, select,
 button, .button,
-#quota, div.jp-progress, .pager li a {
+#quota, .pager li a {
 	width:10em; margin:.3em; padding:.6em .5em .4em;
 	font-size:1em;
 	background:#fff; color:#333; border:1px solid #ddd; outline:none;
@@ -80,7 +85,7 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#
 /* BUTTONS */
 input[type="submit"], input[type="button"],
 button, .button,
-#quota, div.jp-progress, select, .pager li a {
+#quota, select, .pager li a {
 	width:auto; padding:.4em;
 	background-color:rgba(240,240,240,.9); font-weight:bold; color:#555; text-shadow:rgba(255,255,255,.9) 0 1px 0; border:1px solid rgba(190,190,190,.9); cursor:pointer;
 	-moz-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -webkit-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset;
@@ -109,30 +114,38 @@ a.disabled, a.disabled:hover, a.disabled:focus {
 
 /* Primary action button, use sparingly */
 .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
-	border:1px solid #1d2d44;
-	background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0;
-	-moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset;
+	border: 1px solid #1d2d44;
+	background: #35537a;
+	color: #ddd;
+	text-shadow: #000 0 -1px 0;
+	-moz-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
+	-webkit-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
+	box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
 }
 	.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
 	.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
-		border:1px solid #1d2d44;
-		background:#2d3d54; color:#fff; text-shadow:#000 0 -1px 0;
-		-moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset;
+		border: 1px solid #1d2d44;
+		background: #304d76;
+		color: #fff;
+		text-shadow: #000 0 -1px 0;
+		-moz-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
+		-webkit-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
+		box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
 	}
 	.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
-		border:1px solid #1d2d44;
-		background:#1d2d44; color:#bbb; text-shadow:#000 0 -1px 0;
-		-moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset;
+		border: 1px solid #1d2d44;
+		background: #1d2d44;
+		color: #bbb;
+		text-shadow: #000 0 -1px 0;
+		-moz-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
+		-webkit-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
+		box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
 	}
 
 
-#body-login input { font-size:1.5em; }
-#body-login input[type="text"], #body-login input[type="password"] { width:13em; }
-#body-login input.login { width:auto; float:right; padding:7px 9px 6px; }
-#remember_login { margin:.8em .2em 0 1em; vertical-align:text-bottom; }
 .searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; }
 input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
-#select_all{ margin-top:.4em !important;}
+#select_all{ margin-top:.4em }
 
 /* CONTENT ------------------------------------------------------------------ */
 #controls {
@@ -164,24 +177,67 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto }
 
 
+
+
 /* LOG IN & INSTALLATION ------------------------------------------------------------ */
-#body-login { background:#ddd; }
+
+/* Some whitespace to the top */
+#body-login #header {
+	padding-top: 100px;
+}
+/* Fix background gradient */
+#body-login {
+	background-attachment: fixed;
+}
+
+/* Dark subtle label text */
+#body-login p.info,
+#body-login form fieldset legend,
+#body-login #datadirContent label,
+#body-login form input[type="checkbox"]+label {
+	text-align: center;
+	color: #000;
+	text-shadow: 0 1px 0 rgba(255,255,255,.1);
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	filter: alpha(opacity=80);
+	opacity: .8;
+}
+
 #body-login div.buttons { text-align:center; }
-#body-login p.info { width:22em; text-align:center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
-#body-login p.info a { font-weight:bold; color:#777; }
+#body-login p.info {
+	width: 22em;
+	margin: 0 auto;
+	padding-top: 20px;
+}
+#body-login p.info a {
+	font-weight: bold;
+}
 #body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
 
-#login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
-#login form { width:22em; margin:2em auto 2em; padding:0; }
-#login form fieldset { margin-bottom:20px; }
-#login form #adminaccount { margin-bottom:5px; }
-#login form fieldset legend, #datadirContent label {
-	width:100%; text-align:center;
-	font-weight:bold; color:#999; text-shadow:0 1px 0 white;
+#body-login form { width:22em; margin:2em auto 2em; padding:0; }
+#body-login form fieldset {
+	margin-bottom: 20px;
+	text-align: left;
+}
+#body-login form #adminaccount { margin-bottom:5px; }
+#body-login form fieldset legend, #datadirContent label {
+	width: 100%;
+	font-weight: bold;
+}
+#body-login #datadirContent label {
+	display: block;
+	margin: 0;
+}
+#body-login form #datadirField legend {
+	margin-bottom: 15px;
+}
+#body-login #showAdvanced {
+	padding: 13px; /* increase clickable area of Advanced dropdown */
+}
+#body-login #showAdvanced img {
+	vertical-align: bottom; /* adjust position of Advanced dropdown arrow */
+	margin-left: -4px;
 }
-#login form fieldset legend a { color:#999; }
-#login #datadirContent label { display:block; margin:0; color:#999;  }
-#login form #datadirField legend { margin-bottom:15px; }
 
 /* Icons for username and password fields to better recognize them */
 #adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
@@ -193,84 +249,194 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
 input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
 
-/* Nicely grouping input field sets */
-.grouptop input {
-	margin-bottom:0;
-	border-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0;
+/* General new input field look */
+#body-login input[type="text"],
+#body-login input[type="password"],
+#body-login input[type="email"] {
+	border: 1px solid #323233;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
+	box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
 }
-.groupmiddle input {
-	margin-top:0; margin-bottom:0;
-	border-top:0; border-bottom:0; border-radius:0;
-	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+
+/* Nicely grouping input field sets */
+#body-login .grouptop input {
+	margin-bottom: 0;
+	border-bottom: 0;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+#body-login .groupmiddle input {
+	margin-top: 0;
+	margin-bottom: 0;
+	border-top: 0;
+	border-bottom: 0;
+	border-radius: 0;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
 }
-.groupbottom input {
-	margin-top:0;
-	border-top:0; border-top-right-radius:0; border-top-left-radius:0;
-	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+#body-login .groupbottom input {
+	margin-top: 0;
+	border-top: 0;
+	border-top-right-radius: 0;
+	border-top-left-radius: 0;
+	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
+	box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
 }
 
 /* In field labels. No, HTML placeholder does not work as well. */
-#login form label { color:#666; }
-#login .groupmiddle label, #login .groupbottom label { top:.65em; }
+#body-login .groupmiddle label, #body-login .groupbottom label { top:.65em; }
 p.infield { position:relative; }
 label.infield { cursor:text !important; top:1.05em; left:.85em; }
-#login form label.infield { /* labels are ellipsized when too long, keep them short */
+#body-login form label.infield { /* labels are ellipsized when too long, keep them short */
 	position:absolute; width:90%; padding-left:1.4em;
 	font-size:19px; color:#aaa;
 	white-space:nowrap; overflow:hidden; text-overflow:ellipsis;
 }
-#login #databaseField .infield { padding-left:0; }
-#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
-#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
-#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
+#body-login #databaseField .infield { padding-left:0; }
+#body-login form input[type="checkbox"]+label {
+	position: relative;
+	margin: 0;
+	font-size: 1em;
+	padding: 14px;
+	padding-left: 28px;
+	margin-left: -28px;
+}
+#body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
+#body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
 
 /* Show password toggle */
-#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
-#show, #dbpassword, #personal-show { display:none; }
-#show + label, #dbpassword + label { right:1em; top:1.25em!important; }
-#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
+#show, #dbpassword {
+	position: absolute;
+	right: 1em;
+	top: .8em;
+	float: right;
+}
+#show, #dbpassword, #personal-show {
+	display: none;
+}
+#show + label, #dbpassword + label {
+	right: 21px;
+	top: 15px !important;
+	margin: -14px !important;
+	padding: 14px !important;
+}
+#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	filter: alpha(opacity=80);
+	opacity: .8;
+}
 #show + label, #dbpassword + label, #personal-show + label {
-	position:absolute!important; height:14px; width:24px;
-	background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat;
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3;
+	position: absolute !important;
+	height: 14px;
+	width: 24px;
+	background-image: url("../img/actions/toggle.png");
+	background-repeat: no-repeat;
+	background-position: center;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: .3;
+}
+#pass2, input[name="personal-password-clone"] {
+	padding: .6em 2.5em .4em .4em;
+	width: 8em;
+}
+#personal-show + label {
+	margin-top: 1em;
+	margin-left: -3em;
+}
+#passwordbutton {
+	margin-left: .5em;
 }
-#pass2, input[name="personal-password-clone"] { padding:0.6em 2.5em 0.4em 0.4em; width:8em;}
-#personal-show + label { margin-top:1em; margin-left:-3em; }
-#passwordbutton { margin-left:0.5em; }
 
 /* Database selector */
-#login form #selectDbType { text-align:center; }
-#login form #selectDbType label {
+#body-login form #selectDbType { text-align:center; white-space: nowrap; }
+#body-login form #selectDbType label {
 	position:static; margin:0 -3px 5px; padding:.4em;
 	font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer;
 	border:1px solid #ddd; text-shadow:#eee 0 1px 0;
 	-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
 }
-#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
+#body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
 
-/* Warnings, for information */
-.warning {
+
+/* Warnings and errors are the same */
+.warning, .update, .error {
 	display: block;
-	background-color: #f2dede;
-	color: #b94a48;
-	padding: 8px;
-	margin: 0 7px 5px;
-	border: 1px solid #eed3d7;
+	padding: 10px;
+	color: #dd3b3b;
+	text-shadow: 0 -1px 0 rgba(0,0,0,.3);
+	background-color: rgba(0,0,0,.3);
+	text-align: center;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 	border-radius: 5px;
+	cursor: default;
 }
 .warning legend,
-.warning a {
-	color: #b94a48 !important;
+.warning a,
+.error a {
+	color: #dd3b3b !important;
 	font-weight: bold;
 }
-/* Errors, for grave states */
-li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat;  border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
-.error { color:#FF3B3B; }
+/* Fixes for log in page, TODO should be removed some time */
+#body-login .update,
+#body-login .error {
+	margin: 35px auto;
+}
+#body-login .warning {
+	margin: 0 7px 5px;
+	font-weight: bold;
+}
+#body-login .warning legend {
+	text-shadow: none;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
+#body-login a.warning {
+	cursor: pointer;
+}
+
 
 /* Alternative Logins */
 #alternative-logins legend { margin-bottom:10px; }
 #alternative-logins li { height:40px; display:inline-block; white-space:nowrap; }
 
+/* Log in and install button */
+#body-login input {
+	font-size: 1.5em;
+}
+#body-login input[type="text"],
+#body-login input[type="password"] {
+	width: 13em;
+}
+#body-login input.login {
+	width: auto;
+	float: right;
+}
+#body-login input[type="submit"] {
+	padding: 10px 20px; /* larger log in and installation buttons */
+}
+#remember_login {
+	margin: 18px 5px 0 18px;
+	vertical-align: text-bottom;
+}
+
+/* Sticky footer */
+#body-login .wrapper {
+	min-height: 100%;
+	margin: 0 auto -70px;
+	width: 300px;
+}
+#body-login footer, #body-login .push {
+	height: 70px;
+}
+
+
+
 
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation {
@@ -333,6 +499,10 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
 		padding-top: 20px;
 	}
 
+#apps-management {
+	opacity: .6;
+}
+
 
 /* USER MENU */
 #settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; }
@@ -358,7 +528,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
 		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
 		filter: alpha(opacity=70);
 		opacity: .7;
-		-moz-box-sizing: border-box; box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
 	}
 	#expanddiv a img {
 		margin-bottom: -3px;
@@ -401,7 +572,7 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
 .personalblock > legend, th, dt, label { font-weight:bold; }
 code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
 
-#quota div, div.jp-play-bar, div.jp-seek-bar {
+#quota div {
 	padding: 0;
 	background-color: rgb(220,220,220);
 	font-weight: normal;
@@ -409,13 +580,11 @@ code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono
 	-moz-border-radius-bottomleft: .4em; -webkit-border-bottom-left-radius: .4em; border-bottom-left-radius:.4em;
 	-moz-border-radius-topleft: .4em; -webkit-border-top-left-radius: .4em; border-top-left-radius: .4em; }
 #quotatext {padding:.6em 1em;}
-div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
 .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
 .pager li { display:inline-block; }
 
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; }
-.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777; padding-left:25px; background-position:0 0.3em;}
 .separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; }
 
 a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px }
@@ -469,7 +638,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 .popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; }
 .popup.topright { top:7em; right:1em; }
 .popup.bottomleft { bottom:1em; left:33em; }
-.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/delete.svg') no-repeat center; }
+.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; }
 .popup h2 { font-weight:bold; font-size:1.2em; }
 .arrow { border-bottom:10px solid white; border-left:10px solid transparent; border-right:10px solid transparent; display:block; height:0; position:absolute; width:0; z-index:201; }
 .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); }
@@ -713,7 +882,43 @@ button.loading {
 
 
 
+
+
 /* ---- BROWSER-SPECIFIC FIXES ---- */
+
+/* remove dotted outlines in Firefox */
 ::-moz-focus-inner {
-	border: 0; /* remove dotted outlines in Firefox */
+	border: 0;
+}
+
+/* IE8 needs background to be set to same color to make transparency look good. */
+.lte9 #body-login form input[type="text"] {
+	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
+	background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form input[type="password"] {
+	/* leave out top border for 1px line between input fields*/
+	border-left: 1px solid lightgrey;
+	border-right: 1px solid lightgrey;
+	border-bottom: 1px solid lightgrey;
+	background-color: white; /* don't change background on hover */
+}
+.lte9 #body-login form label.infield {
+	background-color: white; /* don't change background on hover */
+	-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
+}
+/* disable opacity of info text on gradient
+   sice we cannot set a good backround color to use the filter&background hack as with the input labels */
+.lte9 #body-login p.info {
+	filter: initial;
+}
+/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
+.ie #show, .ie #show+label {
+	display: none;
+	visibility: hidden;
+}
+
+/* fix installation screen rendering issue for IE8+9 */
+.lte9 #body-login {
+	height: auto !important;
 }
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
index 8ac5fbbd1988c713a92c47041b21b948496c9bc3..f84e87e0a82ba92d2f0d563c07119e7bac823e1e 100644
Binary files a/core/img/actions/caret-dark.png and b/core/img/actions/caret-dark.png differ
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
index be45ad402bf4276409ee0c0194fad55d9ff55cf5..3a5318e6fa2445f73104e2c538cf1bd96c15fcd2 100644
--- a/core/img/actions/caret-dark.svg
+++ b/core/img/actions/caret-dark.svg
@@ -1,5 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z" fill="#fff"/>
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="#999"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="m4,5,4,7,4-6.989z" fill-opacity="0.19607843" fill="#FFF"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" fill="#000" d="m4,4,4,7,4-6.989z"/>
 </svg>
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index ce8c8387c8efef5eab85542807ca2993a0a998a2..536b180bc8f9d5ca989a864d21cc2304ca72e462 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -110,7 +110,11 @@ OC.EventSource.prototype={
 					this.listeners[type].push(callback);
 				}else{
 					this.source.addEventListener(type,function(e){
-						callback(JSON.parse(e.data));
+						if (typeof e.data != 'undefined') {
+							callback(JSON.parse(e.data));
+						} else {
+							callback('');
+						}
 					},false);
 				}
 			}else{
diff --git a/core/js/js.js b/core/js/js.js
index 5158b66d73a7ab849b31083d4a3a8fbba3d2bfd1..60a29342f2602145cd998e3f276093397efb1792 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1,6 +1,6 @@
 /**
  * Disable console output unless DEBUG mode is enabled.
- * Add 
+ * Add
  *	 define('DEBUG', true);
  * To the end of config/config.php to enable debug mode.
  * The undefined checks fix the broken ie8 console
@@ -24,60 +24,121 @@ if (oc_debug !== true || typeof console === "undefined" || typeof console.log ==
 	}
 }
 
-/**
- * translate a string
- * @param app the id of the app for which to translate the string
- * @param text the string to translate
- * @return string
- */
-function t(app,text, vars){
-	if( !( t.cache[app] )){
-		$.ajax(OC.filePath('core','ajax','translations.php'),{
-			async:false,//todo a proper sollution for this without sync ajax calls
-			data:{'app': app},
-			type:'POST',
-			success:function(jsondata){
+function initL10N(app) {
+	if (!( t.cache[app] )) {
+		$.ajax(OC.filePath('core', 'ajax', 'translations.php'), {
+			async: false,//todo a proper solution for this without sync ajax calls
+			data: {'app': app},
+			type: 'POST',
+			success: function (jsondata) {
 				t.cache[app] = jsondata.data;
+				t.plural_form = jsondata.plural_form;
 			}
 		});
 
 		// Bad answer ...
-		if( !( t.cache[app] )){
+		if (!( t.cache[app] )) {
 			t.cache[app] = [];
 		}
 	}
-	var _build = function (text, vars) {
-		return text.replace(/{([^{}]*)}/g,
+	if (typeof t.plural_function == 'undefined') {
+		t.plural_function = function (n) {
+			var p = (n != 1) ? 1 : 0;
+			return { 'nplural' : 2, 'plural' : p };
+		};
+
+		/**
+		 * code below has been taken from jsgettext - which is LGPL licensed
+		 * https://developer.berlios.de/projects/jsgettext/
+		 * http://cvs.berlios.de/cgi-bin/viewcvs.cgi/jsgettext/jsgettext/lib/Gettext.js
+		 */
+		var pf_re = new RegExp('^(\\s*nplurals\\s*=\\s*[0-9]+\\s*;\\s*plural\\s*=\\s*(?:\\s|[-\\?\\|&=!<>+*/%:;a-zA-Z0-9_\(\)])+)', 'm');
+		if (pf_re.test(t.plural_form)) {
+			//ex english: "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+			//pf = "nplurals=2; plural=(n != 1);";
+			//ex russian: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2)
+			//pf = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)";
+			var pf = t.plural_form;
+			if (! /;\s*$/.test(pf)) pf = pf.concat(';');
+			/* We used to use eval, but it seems IE has issues with it.
+			 * We now use "new Function", though it carries a slightly
+			 * bigger performance hit.
+			 var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };';
+			 Gettext._locale_data[domain].head.plural_func = eval("("+code+")");
+			 */
+			var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };';
+			t.plural_function = new Function("n", code);
+		} else {
+			console.log("Syntax error in language file. Plural-Forms header is invalid ["+plural_forms+"]");
+		}
+	}
+}
+/**
+ * translate a string
+ * @param app the id of the app for which to translate the string
+ * @param text the string to translate
+ * @param vars (optional) FIXME
+ * @param count (optional) number to replace %n with
+ * @return string
+ */
+function t(app, text, vars, count){
+	initL10N(app);
+	var _build = function (text, vars, count) {
+		return text.replace(/%n/g, count).replace(/{([^{}]*)}/g,
 			function (a, b) {
 				var r = vars[b];
 				return typeof r === 'string' || typeof r === 'number' ? r : a;
 			}
 		);
 	};
+	var translation = text;
 	if( typeof( t.cache[app][text] ) !== 'undefined' ){
-		if(typeof vars === 'object') {
-			return _build(t.cache[app][text], vars);
-		} else {
-			return t.cache[app][text];
+		translation = t.cache[app][text];
+	}
+
+	if(typeof vars === 'object' || count !== undefined ) {
+		return _build(translation, vars, count);
+	} else {
+		return translation;
+	}
+}
+t.cache = {};
+
+/**
+ * translate a string
+ * @param app the id of the app for which to translate the string
+ * @param text_singular the string to translate for exactly one object
+ * @param text_plural the string to translate for n objects
+ * @param count number to determine whether to use singular or plural
+ * @param vars (optional) FIXME
+ * @return string
+ */
+function n(app, text_singular, text_plural, count, vars) {
+	initL10N(app);
+	var identifier = '_' + text_singular + '__' + text_plural + '_';
+	if( typeof( t.cache[app][identifier] ) !== 'undefined' ){
+		var translation = t.cache[app][identifier];
+		if ($.isArray(translation)) {
+			var plural = t.plural_function(count);
+			return t(app, translation[plural.plural], vars, count);
 		}
 	}
+
+	if(count === 1) {
+		return t(app, text_singular, vars, count);
+	}
 	else{
-		if(typeof vars === 'object') {
-			return _build(text, vars);
-		} else {
-			return text;
-		}
+		return t(app, text_plural, vars, count);
 	}
 }
-t.cache={};
 
-/*
+/**
 * Sanitizes a HTML string
-* @param string
+* @param s string
 * @return Sanitized string
 */
 function escapeHTML(s) {
-		return s.toString().split('&').join('&amp;').split('<').join('&lt;').split('"').join('&quot;');
+	return s.toString().split('&').join('&amp;').split('<').join('&lt;').split('"').join('&quot;');
 }
 
 /**
@@ -96,6 +157,7 @@ var OC={
 	PERMISSION_UPDATE:2,
 	PERMISSION_DELETE:8,
 	PERMISSION_SHARE:16,
+	PERMISSION_ALL:31,
 	webroot:oc_webroot,
 	appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
 	currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
@@ -370,6 +432,44 @@ OC.Notification={
 OC.Breadcrumb={
 	container:null,
 	crumbs:[],
+	show:function(dir, leafname, leaflink){
+		OC.Breadcrumb.clear();
+		
+		// show home + path in subdirectories
+		if (dir && dir !== '/') {
+			//add home
+			var link = OC.linkTo('files','index.php');
+
+			var crumb=$('<div/>');
+			crumb.addClass('crumb');
+
+			var crumbLink=$('<a/>');
+			crumbLink.attr('href',link);
+
+			var crumbImg=$('<img/>');
+			crumbImg.attr('src',OC.imagePath('core','places/home'));
+			crumbLink.append(crumbImg);
+			crumb.append(crumbLink);
+			OC.Breadcrumb.container.prepend(crumb);
+			OC.Breadcrumb.crumbs.push(crumb);
+
+			//add path parts
+			var segments = dir.split('/');
+			var pathurl = '';
+			jQuery.each(segments, function(i,name) {
+				if (name !== '') {
+					pathurl = pathurl+'/'+name;
+					var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl);
+					OC.Breadcrumb.push(name, link);
+				}
+			});
+		}
+		
+		//add leafname
+		if (leafname && leaflink) {
+				OC.Breadcrumb.push(leafname, leaflink);
+		}
+	},
 	push:function(name, link){
 		if(!OC.Breadcrumb.container){//default
 			OC.Breadcrumb.container=$('#controls');
@@ -387,7 +487,7 @@ OC.Breadcrumb={
 			existing.removeClass('last');
 			existing.last().after(crumb);
 		}else{
-			OC.Breadcrumb.container.append(crumb);
+			OC.Breadcrumb.container.prepend(crumb);
 		}
 		OC.Breadcrumb.crumbs.push(crumb);
 		return crumb;
@@ -658,16 +758,12 @@ $(document).ready(function(){
 	});
 
 	// all the tipsy stuff needs to be here (in reverse order) to work
-	$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
-	$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
 	$('.displayName .action').tipsy({gravity:'se', fade:true, live:true});
 	$('.password .action').tipsy({gravity:'se', fade:true, live:true});
 	$('#upload').tipsy({gravity:'w', fade:true});
 	$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
 	$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
 	$('a.action').tipsy({gravity:'s', fade:true, live:true});
-	$('#headerSize').tipsy({gravity:'s', fade:true, live:true});
-	$('td.filesize').tipsy({gravity:'s', fade:true, live:true});
 	$('td .modified').tipsy({gravity:'s', fade:true, live:true});
 
 	$('input').tipsy({gravity:'w', fade:true});
@@ -697,14 +793,6 @@ function humanFileSize(size) {
 	return relativeSize + ' ' + readableFormat;
 }
 
-function simpleFileSize(bytes) {
-	var mbytes = Math.round(bytes/(1024*1024/10))/10;
-	if(bytes == 0) { return '0'; }
-	else if(mbytes < 0.1) { return '< 0.1'; }
-	else if(mbytes > 1000) { return '> 1000'; }
-	else { return mbytes.toFixed(1); }
-}
-
 function formatDate(date){
 	if(typeof date=='number'){
 		date=new Date(date);
@@ -723,15 +811,13 @@ function relative_modified_date(timestamp) {
 	var diffdays = Math.round(diffhours/24);
 	var diffmonths = Math.round(diffdays/31);
 	if(timediff < 60) { return t('core','seconds ago'); }
-	else if(timediff < 120) { return t('core','1 minute ago'); }
-	else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); }
-	else if(timediff < 7200) { return t('core','1 hour ago'); }
-	else if(timediff < 86400) { return t('core','{hours} hours ago',{hours: diffhours}); }
+	else if(timediff < 3600) { return n('core','%n minute ago', '%n minutes ago', diffminutes); }
+	else if(timediff < 86400) { return n('core', '%n hour ago', '%n hours ago', diffhours); }
 	else if(timediff < 86400) { return t('core','today'); }
 	else if(timediff < 172800) { return t('core','yesterday'); }
-	else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); }
+	else if(timediff < 2678400) { return n('core', '%n day ago', '%n days ago', diffdays); }
 	else if(timediff < 5184000) { return t('core','last month'); }
-	else if(timediff < 31556926) { return t('core','{months} months ago',{months: diffmonths}); }
+	else if(timediff < 31556926) { return n('core', '%n month ago', '%n months ago', diffmonths); }
 	//else if(timediff < 31556926) { return t('core','months ago'); }
 	else if(timediff < 63113852) { return t('core','last year'); }
 	else { return t('core','years ago'); }
@@ -745,7 +831,7 @@ OC.get=function(name) {
 	var namespaces = name.split(".");
 	var tail = namespaces.pop();
 	var context=window;
-	
+
 	for(var i = 0; i < namespaces.length; i++) {
 		context = context[namespaces[i]];
 		if(!context){
@@ -764,7 +850,7 @@ OC.set=function(name, value) {
 	var namespaces = name.split(".");
 	var tail = namespaces.pop();
 	var context=window;
-	
+
 	for(var i = 0; i < namespaces.length; i++) {
 		if(!context[namespaces[i]]){
 			context[namespaces[i]]={};
diff --git a/core/js/setup.js b/core/js/setup.js
index 76812b2997969e28dc8bc3725b56ab2aaf7a9138..c0df1ed96b09b2d0b45b4188e13c8feb76aaa81b 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -11,42 +11,36 @@ $(document).ready(function() {
 	$('#selectDbType').buttonset();
 	$('#datadirContent').hide(250);
 	$('#databaseField').hide(250);
-	if($('#hasSQLite').val()=='true'){
+	if($('#hasSQLite').val()){
 		$('#use_other_db').hide();
-		$('#dbhost').hide();
-		$('#dbhostlabel').hide();
+		$('#use_oracle_db').hide();
 	}
 	$('#adminlogin').change(function(){
 		$('#adminlogin').val($.trim($('#adminlogin').val()));
 	});
 	$('#sqlite').click(function() {
 		$('#use_other_db').slideUp(250);
-		$('#dbhost').hide(250);
-		$('#dbhostlabel').hide(250);
+		$('#use_oracle_db').slideUp(250);
 	});
 
 	$('#mysql').click(function() {
 		$('#use_other_db').slideDown(250);
-		$('#dbhost').show(250);
-		$('#dbhostlabel').show(250);
+		$('#use_oracle_db').slideUp(250);
 	});
-	
+
 	$('#pgsql').click(function() {
 		$('#use_other_db').slideDown(250);
-		$('#dbhost').show(250);
-		$('#dbhostlabel').show(250);
+		$('#use_oracle_db').slideUp(250);
 	});
-	
+
 	$('#oci').click(function() {
 		$('#use_other_db').slideDown(250);
-		$('#dbhost').show(250);
-		$('#dbhostlabel').show(250);
+		$('#use_oracle_db').show(250);
 	});
-    
+
 	$('#mssql').click(function() {
 		$('#use_other_db').slideDown(250);
-		$('#dbhost').show(250);
-		$('#dbhostlabel').show(250);
+		$('#use_oracle_db').slideUp(250);
 	});
 
 	$('input[checked]').trigger('click');
diff --git a/core/js/share.js b/core/js/share.js
index 21e352ee1c656bc94eb165eab4f221a38fc3ea31..e7fb26d0ed8f136f9fb2064092735e7fa1878d66 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -22,9 +22,9 @@ OC.Share={
 					if (itemType != 'file' && itemType != 'folder') {
 						$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
 					} else {
-						var file = $('tr').filterAttr('data-id', item);
+						var file = $('tr[data-id="'+item+'"]');
 						if (file.length > 0) {
-							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+							var action = $(file).find('.fileactions .action[data-action="Share"]');
 							var img = action.find('img').attr('src', image);
 							action.addClass('permanent');
 							action.html(' '+t('core', 'Shared')).prepend(img);
@@ -36,7 +36,7 @@ OC.Share={
 								// Search for possible parent folders that are shared
 								while (path != last) {
 									if (path == data['path']) {
-										var actions = $('.fileactions .action').filterAttr('data-action', 'Share');
+										var actions = $('.fileactions .action[data-action="Share"]');
 										$.each(actions, function(index, action) {
 											var img = $(action).find('img');
 											if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
@@ -92,6 +92,7 @@ OC.Share={
 			}
 		}
 		if (shares) {
+			OC.Share.statuses[itemSource] = OC.Share.statuses[itemSource] || {};
 			OC.Share.statuses[itemSource]['link'] = link;
 		} else {
 			delete OC.Share.statuses[itemSource];
@@ -122,7 +123,12 @@ OC.Share={
 					callback(result.data);
 				}
 			} else {
-				OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
+				if (result.data && result.data.message) {
+					var msg = result.data.message;
+				} else {
+					var msg = t('core', 'Error');
+				}
+				OC.dialogs.alert(msg, t('core', 'Error while sharing'));
 			}
 		});
 	},
@@ -161,7 +167,12 @@ OC.Share={
 			// respective checkbox should be checked or
 			// not.
 
+			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
+			if (typeof publicUploadEnabled == 'undefined') {
+				publicUploadEnabled = 'no';
+			}
 			var allowPublicUploadStatus = false;
+
 			$.each(data.shares, function(key, value) {
 				if (allowPublicUploadStatus) {
 					return true;
@@ -181,7 +192,7 @@ OC.Share={
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
-				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) {
+				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
 					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
 					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
 					html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
@@ -245,8 +256,8 @@ OC.Share={
 				var shareType = selected.item.value.shareType;
 				var shareWith = selected.item.value.shareWith;
 				$(this).val(shareWith);
-				// Default permissions are Read and Share
-				var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE;
+				// Default permissions are Edit (CRUD) and Share
+				var permissions = OC.PERMISSION_ALL;
 				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
 					OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
 					$('#shareWith').val('');
@@ -581,8 +592,7 @@ $(document).ready(function() {
 		}
 
 		// Update the share information
-		OC.Share.share(itemType, itemSource,	OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
-			return;
+		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, function(data) {
 		});
 	});
 
@@ -598,13 +608,26 @@ $(document).ready(function() {
 	});
 
 	$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
-		if ( $('#linkPassText').val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), OC.PERMISSION_READ, function() {
-				console.log("password set to: '" + $('#linkPassText').val() +"' by event: " + event.type);
-				$('#linkPassText').val('');
-				$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+		var linkPassText = $('#linkPassText');
+		if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
+
+			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
+			var dropDown = $('#dropdown');
+			var itemType = dropDown.data('item-type');
+			var itemSource = dropDown.data('item-source');
+			var permissions = 0;
+
+			// Calculate permissions
+			if (allowPublicUpload) {
+				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+			} else {
+				permissions = OC.PERMISSION_READ;
+			}
+
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, function() {
+				console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type);
+				linkPassText.val('');
+				linkPassText.attr('placeholder', t('core', 'Password protected'));
 			});
 		}
 	});
diff --git a/core/js/update.js b/core/js/update.js
index 8ab02bbf9350c3bdeb594a49561c6ae6499b34c2..2c28e72f7cd8404e224d1567515d8cbef00533eb 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -5,6 +5,9 @@ $(document).ready(function () {
 	});
 	updateEventSource.listen('error', function(message) {
 		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		message = 'Please reload the page.';
+		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		updateEventSource.close();
 	});
 	updateEventSource.listen('failure', function(message) {
 		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
@@ -20,4 +23,4 @@ $(document).ready(function () {
 			window.location.href = OC.webroot;
 		}, 3000);
 	});
-});
\ No newline at end of file
+});
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index dc78e44c8d7140fcc643ff182b306ceacb774c8c..ed5989e43bd6faf69c0550d1198b971822e88197 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "Instellings",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
 "Password" => "Wagwoord",
 "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
 "You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
@@ -30,3 +35,4 @@
 "prev" => "vorige",
 "next" => "volgende"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index b18ee712cfa206148bfac61f29e173e01adb6d8a..b61b5cd060aa156b33f6f6bdf9230290b49e21b8 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Ù†ÙˆØ¹ Ø§Ù„ØªØµÙ†ÙŠÙ Ù„Ù… ÙŠØ¯Ø®Ù„",
 "No category to add?" => "Ø£Ù„Ø§ ØªÙˆØ¬Ø¯ ÙØ¦Ø© Ù„Ù„Ø¥Ø¶Ø§ÙØ©ØŸ",
 "This category already exists: %s" => "Ù‡Ø°Ø§ Ø§Ù„ØªØµÙ†ÙŠÙ Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§ :  %s",
@@ -28,15 +29,13 @@
 "December" => "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„",
 "Settings" => "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª",
 "seconds ago" => "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ",
-"1 minute ago" => "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©",
-"{minutes} minutes ago" => "{minutes} Ù…Ù†Ø° Ø¯Ù‚Ø§Ø¦Ù‚",
-"1 hour ago" => "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
-"{hours} hours ago" => "{hours} Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
+"_%n minute ago_::_%n minutes ago_" => array("","","","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","","","",""),
 "today" => "Ø§Ù„ÙŠÙˆÙ…",
 "yesterday" => "ÙŠÙˆÙ… Ø£Ù…Ø³",
-"{days} days ago" => "{days} ÙŠÙˆÙ… Ø³Ø§Ø¨Ù‚",
+"_%n day ago_::_%n days ago_" => array("","","","","",""),
 "last month" => "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ",
-"{months} months ago" => "{months} Ø´Ù‡Ø± Ù…Ø¶Øª",
+"_%n month ago_::_%n months ago_" => array("","","","","",""),
 "months ago" => "Ø´Ù‡Ø± Ù…Ø¶Ù‰",
 "last year" => "Ø§Ù„Ø³Ù†Ø©Ø§Ù„Ù…Ø§Ø¶ÙŠØ©",
 "years ago" => "Ø³Ù†Ø© Ù…Ø¶Øª",
@@ -82,7 +81,6 @@
 "Email sent" => "ØªÙ… Ø§Ø±Ø³Ø§Ù„ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø§Ù„ÙƒØªØ±ÙˆÙ†ÙŠ",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "ØØµÙ„ Ø®Ø·Ø£ ÙÙŠ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ØªØØ¯ÙŠØ«, ÙŠØ±Ø¬Ù‰ Ø§Ø±Ø³Ø§Ù„ ØªÙ‚Ø±ÙŠØ± Ø¨Ù‡Ø°Ù‡ Ø§Ù„Ù…Ø´ÙƒÙ„Ø© Ø§Ù„Ù‰ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "ØªÙ… Ø§Ù„ØªØØ¯ÙŠØ« Ø¨Ù†Ø¬Ø§Ø , ÙŠØªÙ… Ø§Ø¹Ø§Ø¯Ø© ØªÙˆØ¬ÙŠÙ‡Ùƒ Ø§Ù„Ø§Ù† Ø§Ù„Ù‰ Owncloud",
-"ownCloud password reset" => "Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† ÙƒÙ„Ù…Ø© Ø³Ø± ownCloud",
 "Use the following link to reset your password: {link}" => "Ø§Ø³ØªØ®Ø¯Ù… Ù‡Ø°Ù‡ Ø§Ù„ÙˆØµÙ„Ø© Ù„Ø§Ø³ØªØ±Ø¬Ø§Ø¹ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±: {link}",
 "You will receive a link to reset your password via Email." => "Ø³ÙˆÙ Ù†Ø±Ø³Ù„ Ù„Ùƒ Ø¨Ø±ÙŠØ¯ ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØµÙ„Ø© Ù„ØªØ¬Ø¯ÙŠØ¯ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±.",
 "Username" => "Ø¥Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…",
@@ -102,11 +100,9 @@
 "Add" => "Ø§Ø¶Ù",
 "Security Warning" => "ØªØØ°ÙŠØ± Ø£Ù…Ø§Ù†",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Please update your PHP installation to use ownCloud securely.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ù…ÙˆÙ„Ù‘Ø¯ Ø£Ø±Ù‚Ø§Ù… Ø¹Ø´ÙˆØ§Ø¦ÙŠØ© ØŒ Ø§Ù„Ø±Ø¬Ø§Ø¡ ØªÙØ¹ÙŠÙ„ Ø§Ù„Ù€ PHP OpenSSL extension.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ø¨Ø¯ÙˆÙ† ÙˆØ¬ÙˆØ¯ Ù…ÙˆÙ„Ø¯ Ø£Ø±Ù‚Ø§Ù… Ø¹Ø´ÙˆØ§Ø¦ÙŠØ© Ø¢Ù…Ù† Ù‚Ø¯ ÙŠØªÙ…ÙƒÙ† Ø§Ù„Ù…Ù‡Ø§Ø¬Ù… Ù…Ù† Ø§Ù„ØªÙ†Ø¨Ø¤ Ø¨ÙƒÙ„Ù…Ø§Øª Ø§Ø¹Ø§Ø¯Ø© Ø¶Ø¨Ø· ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± ÙˆØ§Ù„ØªÙ…ÙƒÙ† Ù…Ù† Ø§Ù„Ø³ÙŠØ·Ø±Ø© Ø¹Ù„Ù‰ ØØ³Ø§Ø¨Ùƒ",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ù…Ø¬Ù„Ø¯Ø§Øª Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª ÙˆØ§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø®Ø§ØµØ© Ù‚Ø¯ ØªÙƒÙˆÙ† Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª ÙˆØ°Ù„Ùƒ Ø¨Ø³Ø¨Ø¨ Ø§Ù† Ù…Ù„Ù .htaccess  Ù„Ø§ ÙŠØ¹Ù…Ù„ Ø¨Ø´ÙƒÙ„ ØµØÙŠØ.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø¹Ù† ÙƒÙŠÙÙŠØ© Ø§Ø¹Ø¯Ø§Ø¯ Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ , ÙŠØ±Ø¬Ù‰ Ø²ÙŠØ§Ø±Ø© Ø§Ù„Ø±Ø§Ø¨Ø·  Ø§Ù„ØªØ§Ù„ÙŠ  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Ø£Ø¶Ù </strong>Ù…Ø³ØªØ®Ø¯Ù… Ø±Ø¦ÙŠØ³ÙŠ <strong>",
 "Advanced" => "ØªØ¹Ø¯ÙŠÙ„Ø§Øª Ù…ØªÙ‚Ø¯Ù…Ù‡",
 "Data folder" => "Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª",
@@ -130,3 +126,4 @@
 "next" => "Ø§Ù„ØªØ§Ù„ÙŠ",
 "Updating ownCloud to version %s, this may take a while." => "Ø¬Ø§Ø±ÙŠ ØªØØ¯ÙŠØ« Owncloud Ø§Ù„Ù‰ Ø§ØµØ¯Ø§Ø± %s , Ù‚Ø¯ ÙŠØ³ØªØºØ±Ù‚ Ù‡Ø°Ø§ Ø¨Ø¹Ø¶ Ø§Ù„ÙˆÙ‚Øª."
 );
+$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;";
diff --git a/core/l10n/be.php b/core/l10n/be.php
index ecf16e5d6a7efc9404a6c8cf94ed9e85f4ce5dda..de1b24e4a7a1fea71927f41fbbb76cdfc3ec494c 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -1,6 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
+"_%n day ago_::_%n days ago_" => array("","","",""),
+"_%n month ago_::_%n months ago_" => array("","","",""),
 "Advanced" => "Ð”Ð°ÑÐ²ÐµÐ´Ñ‡Ð°Ð½Ñ‹",
 "Finish setup" => "Ð—Ð°Ð²ÑÑ€ÑˆÑ‹Ñ†ÑŒ ÑžÑÑ‚Ð°Ð½Ð¾ÑžÐºÑƒ.",
 "prev" => "ÐŸÐ°Ð¿ÑÑ€ÑÐ´Ð½ÑÑ",
 "next" => "Ð”Ð°Ð»ÐµÐ¹"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 608f26bc861d6f0442b9443b63d81681356c51e6..d79fe87c8f0e1b56681642c88e6b3a265262bb87 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No categories selected for deletion." => "ÐÑÐ¼Ð° Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸ Ð·Ð° Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ",
 "Sunday" => "ÐÐµÐ´ÐµÐ»Ñ",
 "Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº",
@@ -21,11 +22,13 @@
 "December" => "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸",
 "Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
 "seconds ago" => "Ð¿Ñ€ÐµÐ´Ð¸ ÑÐµÐºÑƒÐ½Ð´Ð¸",
-"1 minute ago" => "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
-"1 hour ago" => "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ñ‡Ð°Ñ",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Ð´Ð½ÐµÑ",
 "yesterday" => "Ð²Ñ‡ÐµÑ€Ð°",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°",
 "years ago" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸",
 "Cancel" => "ÐžÑ‚ÐºÐ°Ð·",
@@ -69,3 +72,4 @@
 "prev" => "Ð¿Ñ€ÐµÐ´.",
 "next" => "ÑÐ»ÐµÐ´Ð²Ð°Ñ‰Ð¾"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 5c171af567c10363f2c650678fe8fef5ab181f8c..b9227e1e61e8c2134f93da5b5e290b8c2a44115f 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "à¦•à§à¦¯à¦¾à¦Ÿà§‡à¦—à¦°à¦¿à¦° à¦§à¦°à¦£à¦Ÿà¦¿ à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿ à¦¨à¦¿à¥¤",
 "No category to add?" => "à¦¯à§‹à¦— à¦•à¦°à¦¾à¦° à¦®à¦¤ à¦•à§‹à¦¨ à¦•à§à¦¯à¦¾à¦Ÿà§‡à¦—à¦°à¦¿ à¦¨à§‡à¦‡ ?",
 "Object type not provided." => "à¦…à¦¬à¦œà§‡à¦•à§à¦Ÿà§‡à¦° à¦§à¦°à¦£à¦Ÿà¦¿ à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿ à¦¨à¦¿à¥¤",
@@ -27,15 +28,13 @@
 "December" => "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°",
 "Settings" => "à¦¨à¦¿à§Ÿà¦¾à¦®à¦•à¦¸à¦®à§‚à¦¹",
 "seconds ago" => "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡",
-"1 minute ago" => "à§§ à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡",
-"{minutes} minutes ago" => "{minutes} à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡",
-"1 hour ago" => "1 à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡",
-"{hours} hours ago" => "{hours} à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à¦†à¦œ",
 "yesterday" => "à¦—à¦¤à¦•à¦¾à¦²",
-"{days} days ago" => "{days} à¦¦à¦¿à¦¨ à¦ªà§‚à¦°à§à¦¬à§‡",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "à¦—à¦¤ à¦®à¦¾à¦¸",
-"{months} months ago" => "{months} à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡",
 "last year" => "à¦—à¦¤ à¦¬à¦›à¦°",
 "years ago" => "à¦¬à¦›à¦° à¦ªà§‚à¦°à§à¦¬à§‡",
@@ -79,7 +78,6 @@
 "Error setting expiration date" => "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡",
 "Sending ..." => "à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à¦šà§à¦›à§‡......",
 "Email sent" => "à¦‡-à¦®à§‡à¦‡à¦² à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à§Ÿà§‡à¦›à§‡",
-"ownCloud password reset" => "ownCloud à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£",
 "Use the following link to reset your password: {link}" => "à¦†à¦ªà¦¨à¦¾à¦° à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦à¦Ÿà¦¿ à¦ªà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£  à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¨à¦¿à¦®à§à¦¨à§‹à¦•à§à¦¤ à¦²à¦¿à¦‚à¦•à¦Ÿà¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à§à¦¨à¦ƒ {link}",
 "You will receive a link to reset your password via Email." => "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£à§‡à¦° à¦œà¦¨à§à¦¯ à¦à¦•à¦Ÿà¦¿ à¦Ÿà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦²à¦¿à¦‚à¦•à¦Ÿà¦¿ à¦†à¦ªà¦¨à¦¾à¦•à§‡ à¦‡-à¦®à§‡à¦‡à¦²à§‡ à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à§Ÿà§‡à¦›à§‡ à¥¤",
 "Username" => "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
@@ -117,3 +115,4 @@
 "next" => "à¦ªà¦°à¦¬à¦°à§à¦¤à§€",
 "Updating ownCloud to version %s, this may take a while." => "%s à¦à¦¾à¦°à§à¦¸à¦¨à§‡ ownCloud à¦ªà¦°à¦¿à¦¬à¦°à§à¦§à¦¨ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ à¦•à¦¿à¦›à§ à¦¸à¦®à§Ÿ à¦ªà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bs.php b/core/l10n/bs.php
index 6b65cf81f2893e87a33a7b247a92230914ca1390..885518f913689366a4274b61380a69195a6218bc 100644
--- a/core/l10n/bs.php
+++ b/core/l10n/bs.php
@@ -1,4 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","",""),
 "Share" => "Podijeli",
 "Add" => "Dodaj"
 );
+$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);";
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 80f0e558a67a3f702c5f6390b5ebc96250b9e0d9..41b85875e77e108bec54c7929ce16fc5736c3d19 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s ha compartit Â»%sÂ« amb tu",
 "Category type not provided." => "No s'ha especificat el tipus de categoria.",
 "No category to add?" => "No voleu afegir cap categoria?",
@@ -29,15 +30,13 @@
 "December" => "Desembre",
 "Settings" => "ConfiguraciÃ³",
 "seconds ago" => "segons enrere",
-"1 minute ago" => "fa 1 minut",
-"{minutes} minutes ago" => "fa {minutes} minuts",
-"1 hour ago" => "fa 1 hora",
-"{hours} hours ago" => "fa {hours} hores",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "avui",
 "yesterday" => "ahir",
-"{days} days ago" => "fa {days} dies",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "el mes passat",
-"{months} months ago" => "fa {months} mesos",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "mesos enrere",
 "last year" => "l'any passat",
 "years ago" => "anys enrere",
@@ -85,7 +84,6 @@
 "Email sent" => "El correu electrÃ³nic s'ha enviat",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualitzaciÃ³ ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'actualitzaciÃ³ ha estat correcte. Ara us redirigim a ownCloud.",
-"ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
 "Use the following link to reset your password: {link}" => "Useu l'enllaÃ§ segÃ¼ent per restablir la contrasenya: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "L'enllaÃ§ per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no Ã©s allÃ , pregunteu a l'administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "La peticiÃ³ ha fallat!<br>Esteu segur que el correu/nom d'usuari Ã©s correcte?",
@@ -110,11 +108,11 @@
 "Add" => "Afegeix",
 "Security Warning" => "AvÃs de seguretat",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versiÃ³ de PHP que useu Ã©s vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Actualitzeu la instalÂ·laciÃ³ de PHP per usar ownCloud de forma segura.",
+"Please update your PHP installation to use %s securely." => "Actualitzeu la instalÂ·laciÃ³ de PHP per usar %s de forma segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No estÃ  disponible el generador de nombres aleatoris segurs, habiliteu l'extensiÃ³ de PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement sÃ³n accessibles des d'internet perquÃ¨ el fitxer .htaccess no funciona.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Per mÃ©s informaciÃ³ sobre com configurar correctament el servidor, mireu la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informaciÃ³ de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentaciÃ³</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
 "Advanced" => "AvanÃ§at",
 "Data folder" => "Carpeta de dades",
@@ -140,3 +138,4 @@
 "next" => "segÃ¼ent",
 "Updating ownCloud to version %s, this may take a while." => "S'estÃ  actualitzant ownCloud a la versiÃ³ %s, pot trigar una estona."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index b0e70938d4a5875740f314e7e4c419194c3171d5..f984d1e526baf0c51511aa9ec5eaf89029c789b0 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s s vÃ¡mi sdÃlÃ Â»%sÂ«",
 "Category type not provided." => "NezadÃ¡n typ kategorie.",
 "No category to add?" => "Å½Ã¡dnÃ¡ kategorie k pÅ™idÃ¡nÃ?",
@@ -29,15 +30,13 @@
 "December" => "Prosinec",
 "Settings" => "NastavenÃ",
 "seconds ago" => "pÅ™ed pÃ¡r vteÅ™inami",
-"1 minute ago" => "pÅ™ed minutou",
-"{minutes} minutes ago" => "pÅ™ed {minutes} minutami",
-"1 hour ago" => "pÅ™ed hodinou",
-"{hours} hours ago" => "pÅ™ed {hours} hodinami",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "dnes",
 "yesterday" => "vÄera",
-"{days} days ago" => "pÅ™ed {days} dny",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "minulÃ½ mÄ›sÃc",
-"{months} months ago" => "pÅ™ed {months} mÄ›sÃci",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "pÅ™ed mÄ›sÃci",
 "last year" => "minulÃ½ rok",
 "years ago" => "pÅ™ed lety",
@@ -50,7 +49,7 @@
 "The object type is not specified." => "NenÃ urÄen typ objektu.",
 "Error" => "Chyba",
 "The app name is not specified." => "NenÃ urÄen nÃ¡zev aplikace.",
-"The required file {file} is not installed!" => "PoÅ¾adovanÃ½ soubor {file} nenÃ nainstalovÃ¡n.",
+"The required file {file} is not installed!" => "PoÅ¾adovanÃ½ soubor {file} nenÃ nainstalovÃ¡n!",
 "Shared" => "SdÃlenÃ©",
 "Share" => "SdÃlet",
 "Error while sharing" => "Chyba pÅ™i sdÃlenÃ",
@@ -85,14 +84,13 @@
 "Email sent" => "E-mail odeslÃ¡n",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neprobÄ›hla ÃºspÄ›Å¡nÄ›. Nahlaste prosÃm problÃ©m do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla ÃºspÄ›Å¡nÃ¡. PÅ™esmÄ›rovÃ¡vÃ¡m na ownCloud.",
-"ownCloud password reset" => "ObnovenÃ hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo obnovÃte pouÅ¾itÃm nÃ¡sledujÃcÃho odkazu: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenÃ hesla byl odeslÃ¡n na vaÅ¡i e-mailovou adresu.<br>Pokud jej v krÃ¡tkÃ© dobÄ› neobdrÅ¾Ãte, zkontrolujte vÃ¡Å¡ koÅ¡ a sloÅ¾ku spam.<br>Pokud jej nenaleznete, kontaktujte svÃ©ho sprÃ¡vce.",
-"Request failed!<br>Did you make sure your email/username was right?" => "PoÅ¾adavek selhal.<br>Ujistili jste se, Å¾e vaÅ¡e uÅ¾ivatelskÃ© jmÃ©no a e-mail jsou sprÃ¡vnÄ›?",
-"You will receive a link to reset your password via Email." => "Bude VÃ¡m e-mailem zaslÃ¡n odkaz pro obnovu hesla.",
+"Request failed!<br>Did you make sure your email/username was right?" => "PoÅ¾adavek selhal!<br>Ujistili jste se, Å¾e vaÅ¡e uÅ¾ivatelskÃ© jmÃ©no a e-mail jsou sprÃ¡vnÄ›?",
+"You will receive a link to reset your password via Email." => "E-mailem VÃ¡m bude zaslÃ¡n odkaz pro obnovu hesla.",
 "Username" => "UÅ¾ivatelskÃ© jmÃ©no",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "VaÅ¡e soubory jsou Å¡ifrovÃ¡ny. Pokud nemÃ¡te povolen klÃÄ obnovy, neexistuje zpÅ¯sob jak zÃskat po obnovÄ› hesla vaÅ¡e data. Pokud si nejste jisti co dÄ›lat, kontaktujte nejprve svÃ©ho sprÃ¡vce. Opravdu si pÅ™ejete pokraÄovat?",
-"Yes, I really want to reset my password now" => "Ano, opravdu si nynÃ pÅ™eji obnovit svÃ© heslo",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "VaÅ¡e soubory jsou Å¡ifrovÃ¡ny. Pokud nemÃ¡te povolen klÃÄ pro obnovu, neexistuje zpÅ¯sob jak zÃskat, po zmÄ›nÄ› hesla, vaÅ¡e data. Pokud si nejste jisti co dÄ›lat, kontaktujte nejprve svÃ©ho sprÃ¡vce. Opravdu si pÅ™ejete pokraÄovat?",
+"Yes, I really want to reset my password now" => "Ano, opravdu si nynÃ pÅ™eji obnovit mÃ© heslo",
 "Request reset" => "VyÅ¾Ã¡dat obnovu",
 "Your password was reset" => "VaÅ¡e heslo bylo obnoveno",
 "To login page" => "Na strÃ¡nku pÅ™ihlÃ¡Å¡enÃ",
@@ -105,16 +103,16 @@
 "Help" => "NÃ¡povÄ›da",
 "Access forbidden" => "PÅ™Ãstup zakÃ¡zÃ¡n",
 "Cloud not found" => "Cloud nebyl nalezen",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vÃ¡m chci oznÃ¡mit Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete zde: %s\n\nDÃky",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vÃ¡m chci oznÃ¡mit, Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete zde: %s\n\nDÃky",
 "Edit categories" => "Upravit kategorie",
 "Add" => "PÅ™idat",
 "Security Warning" => "BezpeÄnostnÃ upozornÄ›nÃ",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verze vaÅ¡eho PHP je napadnutelnÃ¡ pomocÃ techniky \"NULL Byte\" (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Aktualizujte prosÃm vaÅ¡i instanci PHP pro bezpeÄnÃ© pouÅ¾ÃvÃ¡nÃ ownCloud.",
+"Please update your PHP installation to use %s securely." => "Aktualizujte prosÃm vaÅ¡i instanci PHP pro bezpeÄnÃ© pouÅ¾ÃvÃ¡nÃ %s.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "NenÃ dostupnÃ½ Å¾Ã¡dnÃ½ bezpeÄnÃ½ generÃ¡tor nÃ¡hodnÃ½ch ÄÃsel. Povolte, prosÃm, rozÅ¡ÃÅ™enÃ OpenSSL v PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpeÄnÃ©ho generÃ¡toru nÃ¡hodnÃ½ch ÄÃsel mÅ¯Å¾e ÃºtoÄnÃk pÅ™edpovÄ›dÄ›t token pro obnovu hesla a pÅ™evzÃt kontrolu nad VaÅ¡Ãm ÃºÄtem.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "VÃ¡Å¡ adresÃ¡Å™ s daty a soubory jsou dostupnÃ© z internetu, protoÅ¾e soubor .htaccess nefunguje.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pro informace jak sprÃ¡vnÄ› nastavit vÃ¡Å¡ server se podÃvejte do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentace</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak sprÃ¡vnÄ› nastavit vÃ¡Å¡ server, se podÃvejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
 "Create an <strong>admin account</strong>" => "VytvoÅ™it <strong>ÃºÄet sprÃ¡vce</strong>",
 "Advanced" => "PokroÄilÃ©",
 "Data folder" => "SloÅ¾ka s daty",
@@ -128,15 +126,17 @@
 "Finish setup" => "DokonÄit nastavenÃ",
 "%s is available. Get more information on how to update." => "%s je dostupnÃ¡. ZÃskejte vÃce informacÃ k postupu aktualizace.",
 "Log out" => "OdhlÃ¡sit se",
-"Automatic logon rejected!" => "AutomatickÃ© pÅ™ihlÃ¡Å¡enÃ odmÃtnuto.",
-"If you did not change your password recently, your account may be compromised!" => "V nedÃ¡vnÃ© dobÄ› jste nezmÄ›nili svÃ© heslo, VÃ¡Å¡ ÃºÄet mÅ¯Å¾e bÃ½t kompromitovÃ¡n.",
+"More apps" => "VÃce aplikacÃ",
+"Automatic logon rejected!" => "AutomatickÃ© pÅ™ihlÃ¡Å¡enÃ odmÃtnuto!",
+"If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedÃ¡vnÃ© dobÄ› nemÄ›nili svÃ© heslo, VÃ¡Å¡ ÃºÄet mÅ¯Å¾e bÃ½t kompromitovÃ¡n!",
 "Please change your password to secure your account again." => "ZmÄ›Åˆte, prosÃm, svÃ© heslo pro opÄ›tovnÃ© zabezpeÄenÃ VaÅ¡eho ÃºÄtu.",
 "Lost your password?" => "Ztratili jste svÃ© heslo?",
 "remember" => "zapamatovat",
 "Log in" => "PÅ™ihlÃ¡sit",
 "Alternative Logins" => "AlternativnÃ pÅ™ihlÃ¡Å¡enÃ",
-"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>jenom vÃ¡m chci oznÃ¡mit Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete <br><a href=\"%s\">zde</a>.<br><br>DÃky",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>jenom vÃ¡m chci oznÃ¡mit, Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete <br><a href=\"%s\">zde</a>.<br><br>DÃky",
 "prev" => "pÅ™edchozÃ",
 "next" => "nÃ¡sledujÃcÃ",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvÃli trvat."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index aeb2995e6bdeb8cb608f9469b7db0c913d318b76..0123b098485db31e2bbd083e2edb20d15ac528e9 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Math o gategori heb ei ddarparu.",
 "No category to add?" => "Dim categori i'w ychwanegu?",
 "This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s",
@@ -28,15 +29,13 @@
 "December" => "Rhagfyr",
 "Settings" => "Gosodiadau",
 "seconds ago" => "eiliad yn Ã´l",
-"1 minute ago" => "1 munud yn Ã´l",
-"{minutes} minutes ago" => "{minutes} munud yn Ã´l",
-"1 hour ago" => "1 awr yn Ã´l",
-"{hours} hours ago" => "{hours} awr yn Ã´l",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
 "today" => "heddiw",
 "yesterday" => "ddoe",
-"{days} days ago" => "{days} diwrnod yn Ã´l",
+"_%n day ago_::_%n days ago_" => array("","","",""),
 "last month" => "mis diwethaf",
-"{months} months ago" => "{months} mis yn Ã´l",
+"_%n month ago_::_%n months ago_" => array("","","",""),
 "months ago" => "misoedd yn Ã´l",
 "last year" => "y llynedd",
 "years ago" => "blwyddyn yn Ã´l",
@@ -82,7 +81,6 @@
 "Email sent" => "Anfonwyd yr e-bost",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
-"ownCloud password reset" => "ailosod cyfrinair ownCloud",
 "Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch Ã¢'ch gweinyddwr lleol.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost.",
@@ -104,11 +102,9 @@
 "Add" => "Ychwanegu",
 "Security Warning" => "Rhybudd Diogelwch",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Diweddarwch eich PHP i ddefnyddio ownCloud yn ddiogel.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Am wybodaeth ar sut i gyflunio'r gweinydd yn gywir, cyfeiriwch at y <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ddogfennaeth</a>.",
 "Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
 "Advanced" => "Uwch",
 "Data folder" => "Plygell data",
@@ -133,3 +129,4 @@
 "next" => "nesaf",
 "Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 2e84c3ff511d78b76997da02b6c0de76598b24cf..f6498e5d334c10af080ae940c2ab42a292231656 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s delte Â»%sÂ« med sig",
 "Category type not provided." => "Kategori typen ikke er fastsat.",
 "No category to add?" => "Ingen kategori at tilfÃ¸je?",
 "This category already exists: %s" => "Kategorien eksisterer allerede: %s",
@@ -28,15 +30,13 @@
 "December" => "December",
 "Settings" => "Indstillinger",
 "seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minut siden",
-"{minutes} minutes ago" => "{minutes} minutter siden",
-"1 hour ago" => "1 time siden",
-"{hours} hours ago" => "{hours} timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
-"{days} days ago" => "{days} dage siden",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "sidste mÃ¥ned",
-"{months} months ago" => "{months} mÃ¥neder siden",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "mÃ¥neder siden",
 "last year" => "sidste Ã¥r",
 "years ago" => "Ã¥r siden",
@@ -61,6 +61,7 @@
 "Share with link" => "Del med link",
 "Password protect" => "Beskyt med adgangskode",
 "Password" => "Kodeord",
+"Allow Public Upload" => "Tillad Offentlig Upload",
 "Email link to person" => "E-mail link til person",
 "Send" => "Send",
 "Set expiration date" => "VÃ¦lg udlÃ¸bsdato",
@@ -83,12 +84,13 @@
 "Email sent" => "E-mail afsendt",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udfÃ¸rt korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udfÃ¸rt korrekt. Du bliver nu viderestillet til ownCloud.",
-"ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend fÃ¸lgende link til at nulstille din adgangskode: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, sÃ¥ tjek dine spam / junk mapper.<br> Hvis det ikke er der, sÃ¥ spÃ¸rg din lokale administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anmodning mislykkedes!<br>Er du sikker pÃ¥ at din e-post / brugernavn var korrekt?",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
 "Username" => "Brugernavn",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnÃ¸glen kan du ikke fÃ¥ dine data tilbage efter at du har Ã¦ndret adgangskode. HVis du ikke er sikker pÃ¥, hvad du skal gÃ¸re sÃ¥ kontakt din administrator fÃ¸r du fortsÃ¦tter. Vil du fortsÃ¦tte?",
+"Yes, I really want to reset my password now" => "Ja, Jeg Ã¸nsker virkelig at nulstille mit kodeord",
 "Request reset" => "Anmod om nulstilling",
 "Your password was reset" => "Dit kodeord blev nulstillet",
 "To login page" => "Til login-side",
@@ -101,15 +103,16 @@
 "Help" => "HjÃ¦lp",
 "Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo\n\ndette blot for at lade dig vide, at %s har delt %s med dig.\nSe det: %s\n\nHej",
 "Edit categories" => "Rediger kategorier",
 "Add" => "TilfÃ¸j",
 "Security Warning" => "Sikkerhedsadvarsel",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din PHP-version er sÃ¥rbar overfor et NULL Byte angreb (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Opdater venligs din PHP-installation for at kunne bruge ownCloud sikkert.",
+"Please update your PHP installation to use %s securely." => "Opdater venligst din PHP installation for at anvende %s sikkert.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sikker tilfÃ¦ldighedsgenerator til tal er tilgÃ¦ngelig. Aktiver venligst OpenSSL udvidelsen.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Uden en sikker tilfÃ¦ldighedsgenerator til tal kan en angriber mÃ¥ske gÃ¦tte dit gendan kodeord og overtage din konto",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgÃ¦ngelige fra internettet fordi .htaccess filen ikke virker.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "For at vide mere om hvordan du konfigurerer din server ordentligt, se venligst <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentationen</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Advanced" => "Avanceret",
 "Data folder" => "Datamappe",
@@ -123,6 +126,7 @@
 "Finish setup" => "Afslut opsÃ¦tning",
 "%s is available. Get more information on how to update." => "%s er tilgÃ¦ngelig. FÃ¥ mere information om, hvordan du opdaterer.",
 "Log out" => "Log ud",
+"More apps" => "Flere programmer",
 "Automatic logon rejected!" => "Automatisk login afvist!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har Ã¦ndret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
 "Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
@@ -130,7 +134,9 @@
 "remember" => "husk",
 "Log in" => "Log ind",
 "Alternative Logins" => "Alternative logins",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej",
 "prev" => "forrige",
 "next" => "nÃ¦ste",
 "Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c33045eb7b6746e3baad2652f9e480de62356692..d8c7ae95582e5568ddb091a9303f1d2a50d7429f 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s teilte Â»%sÂ« mit Ihnen",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufÃ¼gen?",
@@ -29,15 +30,13 @@
 "December" => "Dezember",
 "Settings" => "Einstellungen",
 "seconds ago" => "Gerade eben",
-"1 minute ago" => "vor einer Minute",
-"{minutes} minutes ago" => "Vor {minutes} Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"{hours} hours ago" => "Vor {hours} Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Heute",
 "yesterday" => "Gestern",
-"{days} days ago" => "Vor {days} Tag(en)",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "Letzten Monat",
-"{months} months ago" => "Vor {months} Monaten",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
@@ -62,6 +61,7 @@
 "Share with link" => "Ãœber einen Link freigegeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
+"Allow Public Upload" => "Ã–ffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
@@ -84,7 +84,6 @@
 "Email sent" => "E-Mail wurde verschickt",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
-"ownCloud password reset" => "ownCloud-Passwort zurÃ¼cksetzen",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurÃ¼ckzusetzen: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum RÃ¼cksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernÃ¼nftigen Zeit empfÃ¤ngst, prÃ¼fe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
@@ -109,11 +108,11 @@
 "Add" => "HinzufÃ¼gen",
 "Security Warning" => "Sicherheitswarnung",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use ownCloud securely." => "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu kÃ¶nnen.",
+"Please update your PHP installation to use %s securely." => "Bitte aktualisiere deine PHP-Installation um %s sicher nutzen zu kÃ¶nnen.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfÃ¼gbar, bitte aktiviere die PHP-Erweiterung fÃ¼r OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens fÃ¼r das ZurÃ¼cksetzen der PasswÃ¶rter vorherzusehen und Konten  zu Ã¼bernehmen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lieÃŸ die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> fÃ¼r Informationen, wie Du Deinen Server konfigurierst.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "FÃ¼r Informationen, wie du deinen Server richtig konfigurierst lese bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
@@ -127,6 +126,7 @@
 "Finish setup" => "Installation abschlieÃŸen",
 "%s is available. Get more information on how to update." => "%s ist verfÃ¼gbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
+"More apps" => "Mehr Apps",
 "Automatic logon rejected!" => "Automatischer Login zurÃ¼ckgewiesen!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geÃ¤ndert hast, kÃ¶nnte Dein\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte Ã¤ndere Dein Passwort, um Deinen Account wieder zu schÃ¼tzen.",
@@ -139,3 +139,4 @@
 "next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
new file mode 100644
index 0000000000000000000000000000000000000000..c0e3e80f0a37ef6db75c77020cf3093f392768b9
--- /dev/null
+++ b/core/l10n/de_AT.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"More apps" => "Mehr Apps"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..81c74d841ee8b6e625527449d8054a0a43036e3f
--- /dev/null
+++ b/core/l10n/de_CH.php
@@ -0,0 +1,142 @@
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s teilt Â»%sÂ« mit Ihnen",
+"Category type not provided." => "Kategorie nicht angegeben.",
+"No category to add?" => "Keine Kategorie hinzuzufÃ¼gen?",
+"This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
+"Object type not provided." => "Objekttyp nicht angegeben.",
+"%s ID not provided." => "%s ID nicht angegeben.",
+"Error adding %s to favorites." => "Fehler beim HinzufÃ¼gen von %s zu den Favoriten.",
+"No categories selected for deletion." => "Es wurden keine Kategorien zum LÃ¶schen ausgewÃ¤hlt.",
+"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
+"Sunday" => "Sonntag",
+"Monday" => "Montag",
+"Tuesday" => "Dienstag",
+"Wednesday" => "Mittwoch",
+"Thursday" => "Donnerstag",
+"Friday" => "Freitag",
+"Saturday" => "Samstag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "MÃ¤rz",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Settings" => "Einstellungen",
+"seconds ago" => "Gerade eben",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "Heute",
+"yesterday" => "Gestern",
+"_%n day ago_::_%n days ago_" => array("",""),
+"last month" => "Letzten Monat",
+"_%n month ago_::_%n months ago_" => array("",""),
+"months ago" => "Vor Monaten",
+"last year" => "Letztes Jahr",
+"years ago" => "Vor Jahren",
+"Choose" => "AuswÃ¤hlen",
+"Cancel" => "Abbrechen",
+"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-AuswÃ¤hlers aufgetreten.",
+"Yes" => "Ja",
+"No" => "Nein",
+"Ok" => "OK",
+"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
+"Error" => "Fehler",
+"The app name is not specified." => "Der App-Name ist nicht angegeben.",
+"The required file {file} is not installed!" => "Die benÃ¶tigte Datei {file} ist nicht installiert!",
+"Shared" => "Geteilt",
+"Share" => "Teilen",
+"Error while sharing" => "Fehler beim Teilen",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
+"Error while changing permissions" => "Fehler bei der Ã„nderung der Rechte",
+"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
+"Share with" => "Teilen mit",
+"Share with link" => "Ãœber einen Link teilen",
+"Password protect" => "Passwortschutz",
+"Password" => "Passwort",
+"Allow Public Upload" => "Ã–ffentliches Hochladen erlauben",
+"Email link to person" => "Link per E-Mail verschicken",
+"Send" => "Senden",
+"Set expiration date" => "Ein Ablaufdatum setzen",
+"Expiration date" => "Ablaufdatum",
+"Share via email:" => "Mittels einer E-Mail teilen:",
+"No people found" => "Niemand gefunden",
+"Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
+"Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
+"Unshare" => "Freigabe aufheben",
+"can edit" => "kann bearbeiten",
+"access control" => "Zugriffskontrolle",
+"create" => "erstellen",
+"update" => "aktualisieren",
+"delete" => "lÃ¶schen",
+"share" => "teilen",
+"Password protected" => "PasswortgeschÃ¼tzt",
+"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
+"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
+"Sending ..." => "Sende ...",
+"Email sent" => "Email gesendet",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurÃ¼ckzusetzen: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum RÃ¼cksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernÃ¼nftigen Zeitspanne erhalten, prÃ¼fen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
+"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurÃ¼ckzusetzen.",
+"Username" => "Benutzername",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlÃ¼sselt. Wenn Sie den WiederherstellungsschlÃ¼ssel nicht aktiviert haben, wird es keine MÃ¶glichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurÃ¼ckgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"Yes, I really want to reset my password now" => "Ja, ich mÃ¶chte jetzt mein Passwort wirklich zurÃ¼cksetzen.",
+"Request reset" => "ZurÃ¼cksetzung anfordern",
+"Your password was reset" => "Ihr Passwort wurde zurÃ¼ckgesetzt.",
+"To login page" => "Zur Login-Seite",
+"New password" => "Neues Passwort",
+"Reset password" => "Passwort zurÃ¼cksetzen",
+"Personal" => "PersÃ¶nlich",
+"Users" => "Benutzer",
+"Apps" => "Apps",
+"Admin" => "Administrator",
+"Help" => "Hilfe",
+"Access forbidden" => "Zugriff verboten",
+"Cloud not found" => "Cloud wurde nicht gefunden",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele GrÃ¼sse!",
+"Edit categories" => "Kategorien Ã¤ndern",
+"Add" => "HinzufÃ¼gen",
+"Security Warning" => "Sicherheitshinweis",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+"Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu kÃ¶nnen.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfÃ¼gbar, bitte aktivieren Sie die PHP-Erweiterung fÃ¼r OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens fÃ¼r das ZurÃ¼cksetzen der PasswÃ¶rter vorherzusehen und Ihr Konto zu Ã¼bernehmen.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "FÃ¼r Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Advanced" => "Fortgeschritten",
+"Data folder" => "Datenverzeichnis",
+"Configure the database" => "Datenbank einrichten",
+"will be used" => "wird verwendet",
+"Database user" => "Datenbank-Benutzer",
+"Database password" => "Datenbank-Passwort",
+"Database name" => "Datenbank-Name",
+"Database tablespace" => "Datenbank-Tablespace",
+"Database host" => "Datenbank-Host",
+"Finish setup" => "Installation abschliessen",
+"%s is available. Get more information on how to update." => "%s ist verfÃ¼gbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+"Log out" => "Abmelden",
+"More apps" => "Mehr Apps",
+"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
+"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geÃ¤ndert haben, kÃ¶nnte Ihr\nAccount kompromittiert sein!",
+"Please change your password to secure your account again." => "Bitte Ã¤ndern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
+"Lost your password?" => "Passwort vergessen?",
+"remember" => "merken",
+"Log in" => "Einloggen",
+"Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele GrÃ¼sse!",
+"prev" => "ZurÃ¼ck",
+"next" => "Weiter",
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 9d5a7298e19d775982205df8226861ef60bd9ef5..e505610a6d2123c80a1744fcb9c393f5728fdea0 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s geteilt Â»%sÂ« mit Ihnen",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufÃ¼gen?",
@@ -29,15 +30,13 @@
 "December" => "Dezember",
 "Settings" => "Einstellungen",
 "seconds ago" => "Gerade eben",
-"1 minute ago" => "Vor 1 Minute",
-"{minutes} minutes ago" => "Vor {minutes} Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"{hours} hours ago" => "Vor {hours} Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Heute",
 "yesterday" => "Gestern",
-"{days} days ago" => "Vor {days} Tag(en)",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "Letzten Monat",
-"{months} months ago" => "Vor {months} Monaten",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
@@ -62,7 +61,7 @@
 "Share with link" => "Ãœber einen Link teilen",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
-"Allow Public Upload" => "Erlaube Ã¶ffentliches hochladen",
+"Allow Public Upload" => "Ã–ffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
 "Set expiration date" => "Ein Ablaufdatum setzen",
@@ -85,13 +84,12 @@
 "Email sent" => "Email gesendet",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-"ownCloud password reset" => "ownCloud-Passwort zurÃ¼cksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurÃ¼ckzusetzen: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum RÃ¼cksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernÃ¼nftigen Zeitspanne erhalten, prÃ¼fen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurÃ¼ckzusetzen.",
 "Username" => "Benutzername",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlÃ¼sselt. Wenn Sie den WiederherstellungsschlÃ¼ssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurÃ¼ckgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlÃ¼sselt. Wenn Sie den WiederherstellungsschlÃ¼ssel nicht aktiviert haben, wird es keine MÃ¶glichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurÃ¼ckgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
 "Yes, I really want to reset my password now" => "Ja, ich mÃ¶chte jetzt mein Passwort wirklich zurÃ¼cksetzen.",
 "Request reset" => "ZurÃ¼cksetzung anfordern",
 "Your password was reset" => "Ihr Passwort wurde zurÃ¼ckgesetzt.",
@@ -110,11 +108,11 @@
 "Add" => "HinzufÃ¼gen",
 "Security Warning" => "Sicherheitshinweis",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use ownCloud securely." => "Bitte bringen Sie Ihre PHP Version auf den neuesten Stand um ownCloud sicher nutzen zu kÃ¶nnen.",
+"Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu kÃ¶nnen.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfÃ¼gbar, bitte aktivieren Sie die PHP-Erweiterung fÃ¼r OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens fÃ¼r das ZurÃ¼cksetzen der PasswÃ¶rter vorherzusehen und Ihr Konto zu Ã¼bernehmen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> fÃ¼r Informationen, wie Sie Ihren Server konfigurieren.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "FÃ¼r Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
@@ -128,6 +126,7 @@
 "Finish setup" => "Installation abschlieÃŸen",
 "%s is available. Get more information on how to update." => "%s ist verfÃ¼gbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
+"More apps" => "Mehr Apps",
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geÃ¤ndert haben, kÃ¶nnte Ihr\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte Ã¤ndern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
@@ -140,3 +139,4 @@
 "next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 2dcfa1bb69860073dccea0bc7c2b09f6f52700c8..330a29e2743d8c8f0d8a5cc9edd2b25f40c68d5e 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "ÎŸ %s Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Î¼Î±Î¶Î¯ ÏƒÎ±Ï‚ Ï„Î¿ Â»%sÂ«",
 "Category type not provided." => "Î”ÎµÎ½ Î´ÏŽÎ¸Î·ÎºÎµ Ï„ÏÏ€Î¿Ï‚ ÎºÎ±Ï„Î·Î³Î¿ÏÎ¯Î±Ï‚.",
 "No category to add?" => "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ ÎºÎ±Ï„Î·Î³Î¿ÏÎ¯Î± Î½Î± Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÎµÏ„Îµ;",
@@ -29,20 +30,19 @@
 "December" => "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚",
 "Settings" => "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚",
 "seconds ago" => "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½",
-"1 minute ago" => "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½",
-"{minutes} minutes ago" => "{minutes} Î»ÎµÏ€Ï„Î¬ Ï€ÏÎ¹Î½",
-"1 hour ago" => "1 ÏŽÏÎ± Ï€ÏÎ¹Î½",
-"{hours} hours ago" => "{hours} ÏŽÏÎµÏ‚ Ï€ÏÎ¹Î½",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "ÏƒÎ®Î¼ÎµÏÎ±",
 "yesterday" => "Ï‡Ï„ÎµÏ‚",
-"{days} days ago" => "{days} Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±",
-"{months} months ago" => "{months} Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½",
 "last year" => "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿",
 "years ago" => "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½",
 "Choose" => "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ",
 "Cancel" => "Î†ÎºÏ…ÏÎ¿",
+"Error loading file picker template" => "Î£Ï†Î¬Î»Î¼Î± Ï†ÏŒÏÏ„Ï‰ÏƒÎ·Ï‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÎµÏ€Î¹Î»Î¿Î³ÎÎ± Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…",
 "Yes" => "ÎÎ±Î¹",
 "No" => "ÎŒÏ‡Î¹",
 "Ok" => "ÎŸÎº",
@@ -61,6 +61,7 @@
 "Share with link" => "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿",
 "Password protect" => "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï",
 "Password" => "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ",
+"Allow Public Upload" => "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î· Î”Î·Î¼ÏŒÏƒÎ¹Î± Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®",
 "Email link to person" => "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® ÏƒÏ…Î½Î´ÎÏƒÎ¼Î¿Ï… Î¼Îµ email ",
 "Send" => "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®",
 "Set expiration date" => "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î·Î¼. Î»Î®Î¾Î·Ï‚",
@@ -83,7 +84,6 @@
 "Email sent" => "Î¤Î¿ Email Î±Ï€ÎµÏƒÏ„Î¬Î»Î· ",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Î— ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Î®Ï„Î±Î½ Î±Î½ÎµÏ€Î¹Ï„Ï…Ï‡Î®Ï‚. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏƒÏ„ÎµÎ¯Î»Ï„Îµ Î±Î½Î±Ï†Î¿ÏÎ¬ ÏƒÏ„Î·Î½ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ÎºÎ¿Î¹Î½ÏŒÏ„Î·Ï„Î± ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Î— ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Î®Ï„Î±Î½ ÎµÏ€Î¹Ï„Ï…Ï‡Î®Ï‚. ÎœÎµÏ„Î¬Î²Î±ÏƒÎ· ÏƒÏ„Î¿ ownCloud.",
-"ownCloud password reset" => "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ownCloud",
 "Use the following link to reset your password: {link}" => "Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¿Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿ Î³Î¹Î± Î½Î± ÎµÏ€Î±Î½ÎµÎºÎ´ÏŒÏƒÎµÏ„Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "ÎŸ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ Î³Î¹Î± Î½Î± ÎµÏ€Î±Î½Î±ÎºÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ ÏƒÎ±Ï‚ ÎÏ‡ÎµÎ¹ ÏƒÏ„Î±Î»ÎµÎ¯ ÏƒÏ„Î¿ email <br>Î±Î½ Î´ÎµÎ½ Ï„Î¿ Î»Î¬Î²ÎµÏ„Îµ Î¼ÎÏƒÎ± ÏƒÎµ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿ Î´Î¹Î¬ÏƒÏ„Î·Î¼Î±, ÎµÎ»ÎÎ³Î¾ÎµÏ„Îµ Ï„Î¿Ï…Ï‚ Ï†Î±ÎºÎµÎ»Î»Î¿Ï…Ï‚ ÏƒÎ±Ï‚ spam/junk <br> Î±Î½ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎºÎµÎ¯ ÏÏ‰Ï„Î®ÏƒÏ„Îµ Ï„Î¿Î½ Ï„Î¿Ï€Î¹ÎºÏŒ ÏƒÎ±Ï‚ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ",
 "Request failed!<br>Did you make sure your email/username was right?" => "Î— Î±Î¯Ï„Î·ÏƒÎ· Î±Ï€ÎÏ„Ï…Ï‡Îµ! Î’ÎµÎ²Î±Î¹Ï‰Î¸Î·ÎºÎ±Ï„Îµ ÏŒÏ„Î¹ Ï„Î¿ email ÏƒÎ±Ï‚ / username ÎµÎ¹Î½Î±Î¹ ÏƒÏ‰ÏƒÏ„Î¿? ",
@@ -108,11 +108,11 @@
 "Add" => "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ·",
 "Security Warning" => "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î‘ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Î— PHP ÎµÎ¹Î½Î±Î¹ ÎµÏ…Î±Î»Ï‰Ï„Î· ÏƒÏ„Î·Î½ NULL Byte ÎµÏ€Î¹Î¸ÎµÏƒÎ· (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· PHP ÏƒÎ±Ï‚ ÏŽÏƒÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î±ÏƒÏ†Î±Î»ÎÏƒÏ„ÎµÏÎ± Ï„Î¿ ownCloud.",
+"Please update your PHP installation to use %s securely." => "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î·Ï‚ PHP ÏŽÏƒÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î¿ %s Î¼Îµ Î±ÏƒÏ†Î¬Î»ÎµÎ¹Î±.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿ Ï„Î¿ Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î¿ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï„Ï…Ï‡Î±Î¯Ï‰Î½ Î±ÏÎ¹Î¸Î¼ÏŽÎ½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÏ„Îµ Ï„Î¿ Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î¿ Ï„Î·Ï‚ PHP, OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Î§Ï‰ÏÎ¯Ï‚ Ï„Î¿ Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î¿ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï„Ï…Ï‡Î±Î¯Ï‰Î½ Î±ÏÎ¹Î¸Î¼ÏŽÎ½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚, Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±ÏÏÎµÏÏƒÎµÎ¹ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ±Ï‚ Î±Ï€ÏŒ ÎµÏ€Î¹Î¸ÎÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ ÎºÎ±Î¹ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±Ï‚ ÎµÎ¯Î½Î±Î¹ Ï€Î¹Î¸Î±Î½ÏŒ Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î± Î±Ï€ÏŒ Ï„Î¿ internet Î³Î¹Î±Ï„Î¯ Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ .htaccess.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Î“Î¹Î± Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Ï„Î·Î½ ÏƒÏ‰ÏƒÏ„Î® ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚, Î´ÎµÎ¯Ï„Îµ ÏƒÏ„Î·Î½ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ï„ÎµÎºÎ¼Î·ÏÎ¯Ï‰ÏƒÎ·</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Î“Î¹Î± Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï€Ï‰Ï‚ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Î¿ÏÎ¸Î¬ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Î´ÎµÎ¯Ï„Îµ Ï„Î·Î½ <a href=\"%s\" target=\"_blank\">Ï„ÎµÎºÎ¼Î·ÏÎ¯Ï‰ÏƒÎ·</a>.",
 "Create an <strong>admin account</strong>" => "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÏ„Îµ ÎÎ½Î±Î½ <strong>Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®</strong>",
 "Advanced" => "Î“Î¹Î± Ï€ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿Ï…Ï‚",
 "Data folder" => "Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½",
@@ -138,3 +138,4 @@
 "next" => "ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿",
 "Updating ownCloud to version %s, this may take a while." => "Î•Î½Î·Î¼ÎµÏÏŽÎ½Î¿Î½Ï„Î±Ï‚ Ï„Î¿ ownCloud ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s,Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€Î¬ÏÎµÎ¹ Î»Î¯Î³Î¿ Ï‡ÏÏŒÎ½Î¿."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c..997d1f88c46a11c0627e470a875340fbc076da5e 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -1,3 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
 "Password" => "Passcode"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 00f925e5274419d0b47ed089afab6b8ce2c03c09..66fc435fec7e30c288f1c64e2dcee9a80ffa1617 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s kunhavigis â€œ%sâ€ kun vi",
 "Category type not provided." => "Ne proviziÄis tipon de kategorio.",
 "No category to add?" => "Äˆu neniu kategorio estas aldonota?",
@@ -29,15 +30,13 @@
 "December" => "Decembro",
 "Settings" => "Agordo",
 "seconds ago" => "sekundoj antaÅe",
-"1 minute ago" => "antaÅ 1 minuto",
-"{minutes} minutes ago" => "antaÅ {minutes} minutoj",
-"1 hour ago" => "antaÅ 1 horo",
-"{hours} hours ago" => "antaÅ {hours} horoj",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hodiaÅ",
 "yesterday" => "hieraÅ",
-"{days} days ago" => "antaÅ {days} tagoj",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "lastamonate",
-"{months} months ago" => "antaÅ {months} monatoj",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "monatoj antaÅe",
 "last year" => "lastajare",
 "years ago" => "jaroj antaÅe",
@@ -83,7 +82,6 @@
 "Email sent" => "La retpoÅtaÄµo sendiÄis",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La Äisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La Äisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
-"ownCloud password reset" => "La pasvorto de ownCloud restariÄis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
 "Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Äˆu vi certiÄis, ke via retpoÅto/uzantonomo Äustas?",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoÅte por rekomencigi vian pasvorton.",
@@ -106,7 +104,6 @@
 "Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Bonvolu Äisdatigi vian instalon de PHP por uzi ownCloud-on sekure.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaÄµon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
 "Advanced" => "Progresinta",
@@ -133,3 +130,4 @@
 "next" => "jena",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud ÄisdatiÄas al eldono %s, tio Ä‰i povas daÅri je iom da tempo."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.php b/core/l10n/es.php
index ae98a019db1994cb33b9b081a1b02ddc472af299..677f881da424831bb36d7939ce320f56592762f6 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s compatido  Â»%sÂ« contigo",
 "Category type not provided." => "Tipo de categorÃa no proporcionado.",
 "No category to add?" => "Â¿Ninguna categorÃa para aÃ±adir?",
@@ -29,15 +30,13 @@
 "December" => "Diciembre",
 "Settings" => "Ajustes",
 "seconds ago" => "hace segundos",
-"1 minute ago" => "hace 1 minuto",
-"{minutes} minutes ago" => "hace {minutes} minutos",
-"1 hour ago" => "Hace 1 hora",
-"{hours} hours ago" => "Hace {hours} horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoy",
 "yesterday" => "ayer",
-"{days} days ago" => "hace {days} dÃas",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "el mes pasado",
-"{months} months ago" => "Hace {months} meses",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "hace meses",
 "last year" => "el aÃ±o pasado",
 "years ago" => "hace aÃ±os",
@@ -85,7 +84,6 @@
 "Email sent" => "Correo electrÃ³nico enviado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualizaciÃ³n ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualizaciÃ³n se ha realizado con Ã©xito. Redireccionando a ownCloud ahora.",
-"ownCloud password reset" => "Reseteo contraseÃ±a de ownCloud",
 "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseÃ±a: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseÃ±a ha sido enviada a su correo electrÃ³nico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no estÃ¡ allÃ, pregunte a su administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "La peticiÃ³n ha fallado! <br> Â¿EstÃ¡ seguro de que su direcciÃ³n de correo electrÃ³nico o nombre de usuario era correcto?",
@@ -110,11 +108,11 @@
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versiÃ³n de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalaciÃ³n de PHP para utilizar ownCloud de manera segura.",
+"Please update your PHP installation to use %s securely." => "Por favor, actualice su instalaciÃ³n PHP para usar %s con seguridad.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No estÃ¡ disponible un generador de nÃºmeros aleatorios seguro, por favor habilite la extensiÃ³n OpenSSL de PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de nÃºmeros aleatorios seguro, un atacante podrÃa predecir los tokens de restablecimiento de contraseÃ±as y tomar el control de su cuenta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a travÃ©s de internet ya que el archivo .htaccess no funciona.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para informaciÃ³n sobre cÃ³mo configurar adecuadamente su servidor, por favor vea la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para informaciÃ³n de cÃ³mo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentaciÃ³n</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de datos",
@@ -140,3 +138,4 @@
 "next" => "siguiente",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versiÃ³n %s, esto puede demorar un tiempo."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1fac1c88dad7a92c424560f6a09a0549567deffd..68c501e05a3fb079e9cc3ca6cadbb9d747576e3f 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s compartiÃ³ \"%s\" con vos",
 "Category type not provided." => "Tipo de categorÃa no provisto. ",
 "No category to add?" => "Â¿Ninguna categorÃa para aÃ±adir?",
@@ -29,15 +30,13 @@
 "December" => "diciembre",
 "Settings" => "ConfiguraciÃ³n",
 "seconds ago" => "segundos atrÃ¡s",
-"1 minute ago" => "hace 1 minuto",
-"{minutes} minutes ago" => "hace {minutes} minutos",
-"1 hour ago" => "1 hora atrÃ¡s",
-"{hours} hours ago" => "hace {hours} horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoy",
 "yesterday" => "ayer",
-"{days} days ago" => "hace {days} dÃas",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "el mes pasado",
-"{months} months ago" => "{months} meses atrÃ¡s",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "meses atrÃ¡s",
 "last year" => "el aÃ±o pasado",
 "years ago" => "aÃ±os atrÃ¡s",
@@ -62,6 +61,7 @@
 "Share with link" => "Compartir con enlace",
 "Password protect" => "Proteger con contraseÃ±a ",
 "Password" => "ContraseÃ±a",
+"Allow Public Upload" => "Permitir Subida PÃºblica",
 "Email link to person" => "Enviar el enlace por e-mail.",
 "Send" => "Mandar",
 "Set expiration date" => "Asignar fecha de vencimiento",
@@ -84,7 +84,6 @@
 "Email sent" => "e-mail mandado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualizaciÃ³n no pudo ser completada. Por favor, reportÃ¡ el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualizaciÃ³n fue exitosa. EstÃ¡s siendo redirigido a ownCloud.",
-"ownCloud password reset" => "Restablecer contraseÃ±a de ownCloud",
 "Use the following link to reset your password: {link}" => "UsÃ¡ este enlace para restablecer tu contraseÃ±a: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseÃ±a fue enviada a tu e-mail. <br> Si no lo recibÃs en un plazo de tiempo razonable,  revisÃ¡ tu carpeta de spam / correo no deseado. <br> Si no estÃ¡ ahÃ, preguntale a tu administrador.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Â¡Error en el pedido! <br> Â¿EstÃ¡s seguro de que tu direcciÃ³n de correo electrÃ³nico o nombre de usuario son correcto?",
@@ -109,11 +108,9 @@
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versiÃ³n de PHP que tenÃ©s, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "ActualizÃ¡ tu instalaciÃ³n de PHP para usar ownCloud de manera segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningÃºn generador de nÃºmeros aleatorios seguro. Por favor, habilitÃ¡ la extensiÃ³n OpenSSL de PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de nÃºmeros aleatorios seguro un atacante podrÃa predecir las pruebas de reinicio de tu contraseÃ±a y tomar control de tu cuenta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a travÃ©s de internet, ya que el archivo .htaccess no estÃ¡ funcionando.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para informaciÃ³n sobre cÃ³mo configurar adecuadamente tu servidor, por favor mirÃ¡ la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
@@ -139,3 +136,4 @@
 "next" => "siguiente",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versiÃ³n %s, puede demorar un rato."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index ec850491b79066003934106c6706e5d8d366462d..5524411e77db9816a8a8fe2807918e1683df6dca 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s jagas sinuga Â»%sÂ«",
 "Category type not provided." => "Kategooria tÃ¼Ã¼p puudub.",
 "No category to add?" => "Pole kategooriat, mida lisada?",
@@ -29,15 +30,13 @@
 "December" => "Detsember",
 "Settings" => "Seaded",
 "seconds ago" => "sekundit tagasi",
-"1 minute ago" => "1 minut tagasi",
-"{minutes} minutes ago" => "{minutes} minutit tagasi",
-"1 hour ago" => "1 tund tagasi",
-"{hours} hours ago" => "{hours} tundi tagasi",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "tÃ¤na",
 "yesterday" => "eile",
-"{days} days ago" => "{days} pÃ¤eva tagasi",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "viimasel kuul",
-"{months} months ago" => "{months} kuud tagasi",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "kuu tagasi",
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
@@ -85,7 +84,6 @@
 "Email sent" => "E-kiri on saadetud",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaÃµnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
-"ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta jÃ¤rgnevat linki oma parooli taastamiseks: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mÃµistliku aja jooksul, siis kontrolli oma spam-/rÃ¤mpskirjade katalooge.<br>Kui kirja pole ka seal, siis kÃ¼si abi sÃ¼steemihaldurilt.",
 "Request failed!<br>Did you make sure your email/username was right?" => "PÃ¤ring ebaÃµnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on Ãµiged?",
@@ -110,11 +108,11 @@
 "Add" => "Lisa",
 "Security Warning" => "Turvahoiatus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rÃ¼nnakuga.",
-"Please update your PHP installation to use ownCloud securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks ownCloudi turvalisus.",
+"Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvalist juhuslike numbrite generaatorit pole saadaval. Palun luba PHP-s OpenSSL laiendus.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ilma turvalise juhuslike numbrite generaatorita vÃµib rÃ¼ndaja ennustada paroolivahetuse vÃµtme ning hÃµivata su konto.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tÃµenÃ¤oliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks tutvu palun <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
 "Advanced" => "TÃ¤psem",
 "Data folder" => "Andmete kaust",
@@ -128,6 +126,7 @@
 "Finish setup" => "LÃµpeta seadistamine",
 "%s is available. Get more information on how to update." => "%s on saadaval. Vaata lÃ¤hemalt kuidas uuendada.",
 "Log out" => "Logi vÃ¤lja",
+"More apps" => "Rohkem rakendusi",
 "Automatic logon rejected!" => "Automaatne sisselogimine lÃ¼kati tagasi!",
 "If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis vÃµib su kasutajakonto olla ohustatud!",
 "Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
@@ -140,3 +139,4 @@
 "next" => "jÃ¤rgm",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See vÃµib veidi aega vÃµtta."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 4242d975f3b6b0236a1a8dd02227554f6bf1d004..5ab0e032e4be7b0df30f61878ce3969eb069f842 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s-ek Â»%sÂ« zurekin partekatu du",
 "Category type not provided." => "Kategoria mota ez da zehaztu.",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
 "This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
@@ -28,20 +30,19 @@
 "December" => "Abendua",
 "Settings" => "Ezarpenak",
 "seconds ago" => "segundu",
-"1 minute ago" => "orain dela minutu 1",
-"{minutes} minutes ago" => "orain dela {minutes} minutu",
-"1 hour ago" => "orain dela ordu bat",
-"{hours} hours ago" => "orain dela {hours} ordu",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "gaur",
 "yesterday" => "atzo",
-"{days} days ago" => "orain dela {days} egun",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "joan den hilabetean",
-"{months} months ago" => "orain dela {months} hilabete",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "hilabete",
 "last year" => "joan den urtean",
 "years ago" => "urte",
 "Choose" => "Aukeratu",
 "Cancel" => "Ezeztatu",
+"Error loading file picker template" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan",
 "Yes" => "Bai",
 "No" => "Ez",
 "Ok" => "Ados",
@@ -60,6 +61,7 @@
 "Share with link" => "Elkarbanatu lotura batekin",
 "Password protect" => "Babestu pasahitzarekin",
 "Password" => "Pasahitza",
+"Allow Public Upload" => "Gaitu igotze publikoa",
 "Email link to person" => "Postaz bidali lotura ",
 "Send" => "Bidali",
 "Set expiration date" => "Ezarri muga data",
@@ -82,10 +84,13 @@
 "Email sent" => "Eposta bidalia",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
-"ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
 "Username" => "Erabiltzaile izena",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
+"Yes, I really want to reset my password now" => "Bai, nire pasahitza orain berrabiarazi nahi dut",
 "Request reset" => "Eskaera berrezarri da",
 "Your password was reset" => "Zure pasahitza berrezarri da",
 "To login page" => "Sarrera orrira",
@@ -98,15 +103,16 @@
 "Help" => "Laguntza",
 "Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\nOngi jarraitu!",
 "Edit categories" => "Editatu kategoriak",
 "Add" => "Gehitu",
 "Security Warning" => "Segurtasun abisua",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
-"Please update your PHP installation to use ownCloud securely." => "Mesedez eguneratu zure PHP instalazioa ownCloud modu seguru batean erabiltzeko.",
+"Please update your PHP installation to use %s securely." => "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ez dago hausazko zenbaki sortzaile segururik eskuragarri, mesedez gatiu PHP OpenSSL extensioa.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Hausazko zenbaki sortzaile segururik gabe erasotzaile batek pasahitza berrezartzeko kodeak iragarri ditzake eta zure kontuaz jabetu.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Zure zerbitzaria ongi konfiguratzeko informazioa eskuratzeko, begiratu  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentazioa</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
 "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
 "Advanced" => "Aurreratua",
 "Data folder" => "Datuen karpeta",
@@ -118,6 +124,7 @@
 "Database tablespace" => "Datu basearen taula-lekua",
 "Database host" => "Datubasearen hostalaria",
 "Finish setup" => "Bukatu konfigurazioa",
+"%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
 "Log out" => "Saioa bukatu",
 "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!",
 "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!",
@@ -126,7 +133,9 @@
 "remember" => "gogoratu",
 "Log in" => "Hasi saioa",
 "Alternative Logins" => "Beste erabiltzaile izenak",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!",
 "prev" => "aurrekoa",
 "next" => "hurrengoa",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 02fe2ce1148900df4e10b338408b3262d37049a0..f9af8787e0aea47c132a3182fa8ead61a96137e1 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª Â»%sÂ« ØªÙˆØ³Ø· Ø´Ù…Ø§",
 "Category type not provided." => "Ù†ÙˆØ¹ Ø¯Ø³ØªÙ‡ Ø¨Ù†Ø¯ÛŒ Ø§Ø±Ø§Ø¦Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
 "No category to add?" => "Ø¢ÛŒØ§ Ú¯Ø±ÙˆÙ‡ Ø¯ÛŒÚ¯Ø±ÛŒ Ø¨Ø±Ø§ÛŒ Ø§ÙØ²ÙˆØ¯Ù† Ù†Ø¯Ø§Ø±ÛŒØ¯",
@@ -29,15 +30,13 @@
 "December" => "Ø¯Ø³Ø§Ù…Ø¨Ø±",
 "Settings" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
 "seconds ago" => "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´",
-"1 minute ago" => "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
-"{minutes} minutes ago" => "{Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§} Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§ÛŒ Ù¾ÛŒØ´",
-"1 hour ago" => "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´",
-"{hours} hours ago" => "{Ø³Ø§Ø¹Øª Ù‡Ø§} Ø³Ø§Ø¹Øª Ù‡Ø§ Ù¾ÛŒØ´",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "Ø§Ù…Ø±ÙˆØ²",
 "yesterday" => "Ø¯ÛŒØ±ÙˆØ²",
-"{days} days ago" => "{Ø±ÙˆØ²Ù‡Ø§} Ø±ÙˆØ²Ù‡Ø§ÛŒ Ù¾ÛŒØ´",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "Ù…Ø§Ù‡ Ù‚Ø¨Ù„",
-"{months} months ago" => "{Ù…Ø§Ù‡ Ù‡Ø§} Ù…Ø§Ù‡ Ù‡Ø§ Ù¾ÛŒØ´",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„",
 "last year" => "Ø³Ø§Ù„ Ù‚Ø¨Ù„",
 "years ago" => "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„",
@@ -85,7 +84,6 @@
 "Email sent" => "Ø§ÛŒÙ…ÛŒÙ„ Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯. Ù„Ø·ÙØ§ Ø§ÛŒÙ† Ø®Ø·Ø§ Ø±Ø§ Ø¨Ù‡  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Ø¬Ø§Ù…Ø¹Ù‡ ÛŒ OwnCloud</a> Ú¯Ø²Ø§Ø±Ø´ Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "The update was successful. Redirecting you to ownCloud now." => "Ø¨Ù‡ Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù…ÙˆÙÙ‚ÛŒØª Ø¢Ù…ÛŒØ² Ø¨ÙˆØ¯. Ø¯Ø± ØØ§Ù„ Ø§Ù†ØªÙ‚Ø§Ù„ Ø´Ù…Ø§ Ø¨Ù‡ OwnCloud.",
-"ownCloud password reset" => "Ù¾Ø³ÙˆØ±Ø¯ Ø§Ø¨Ø±Ù‡Ø§ÛŒ Ø´Ù…Ø§ ØªØºÛŒÛŒØ±Ú©Ø±Ø¯",
 "Use the following link to reset your password: {link}" => "Ø§Ø² Ù„ÛŒÙ†Ú© Ø²ÛŒØ± Ø¬Ù‡Øª Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø³Ø§Ø²ÛŒ Ù¾Ø³ÙˆØ±Ø¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯ :\n{link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ù„ÛŒÙ†Ú© ØªÙ†Ø¸ÛŒÙ… Ù…Ø¬Ø¯Ø¯ Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± Ø¨Ù‡ Ø§ÛŒÙ…ÛŒÙ„ Ø´Ù…Ø§ Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª.<br>Ø§Ú¯Ø± Ø¢Ù† Ø±Ø§Ø¯Ø± ÛŒÚ© Ø²Ù…Ø§Ù† Ù…Ø´Ø®ØµÛŒ Ø¯Ø±ÛŒØ§ÙØª Ù†Ú©Ø±Ø¯Ù‡ Ø§ÛŒØ¯ØŒ Ù„Ø·ÙØ§ Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡/ Ù¾ÙˆØ´Ù‡ Ù‡Ø§ÛŒ Ù†Ø§Ø®ÙˆØ§Ø³ØªÙ‡ Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯.<br>Ø¯Ø± ØµÙˆØ±Øª Ù†Ø¨ÙˆØ¯Ù† Ø§Ø² Ù…Ø¯ÛŒØ± Ø®ÙˆØ¯ Ø¨Ù¾Ø±Ø³ÛŒØ¯.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø±Ø¯ Ø´Ø¯Ù‡ Ø§Ø³Øª !<br> Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ Ú©Ù‡ Ø§ÛŒÙ…ÛŒÙ„/ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø´Ù…Ø§ ØµØÛŒØ Ù…ÛŒØ¨Ø§Ø´Ø¯ ØŸ",
@@ -110,11 +108,9 @@
 "Add" => "Ø§ÙØ²ÙˆØ¯Ù†",
 "Security Warning" => "Ø§Ø®Ø·Ø§Ø± Ø§Ù…Ù†ÛŒØªÛŒ",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ù†Ø³Ø®Ù‡ ÛŒ PHP Ø´Ù…Ø§ Ø¯Ø± Ø¨Ø±Ø§Ø¨Ø± ØÙ…Ù„Ø§Øª NULL Byte Ø¢Ø³ÛŒØ¨ Ù¾Ø°ÛŒØ± Ø§Ø³Øª.(CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Ù„Ø·ÙØ§ Ø¨Ø±Ù†Ø§Ù…Ù‡ ÛŒ PHP Ø®ÙˆØ¯ØªØ§Ù† Ø±Ø§ Ø¨Ø±ÙˆØ² Ú©Ù†ÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØ¯ Ø§ÛŒÙ…Ù† ØªØ± Ø§Ø² ownCloud Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ù‡ÛŒÚ† Ù…ÙˆÙ„Ø¯ ØªØµØ§Ø¯ÙÛŒ Ø§Ù…Ù† Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³ØªØŒ Ù„Ø·ÙØ§ ÙØ±Ù…Øª PHP OpenSSL Ø±Ø§ ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ø¨Ø¯ÙˆÙ† ÙˆØ¬ÙˆØ¯ ÛŒÚ© ØªÙˆÙ„ÛŒØ¯ Ú©Ù†Ù†Ø¯Ù‡ Ø§Ø¹Ø¯Ø§Ø¯ ØªØµØ§Ø¯ÙÛŒ Ø§Ù…Ù† ØŒ ÛŒÚ© Ù…Ù‡Ø§Ø¬Ù… Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø§ÛŒÙ† Ù‚Ø§Ø¨Ù„ÛŒØª Ø±Ø§ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯ Ú©Ù‡ Ù¾ÛŒØ´Ú¯ÙˆÛŒÛŒ Ú©Ù†Ø¯ Ù¾Ø³ÙˆÙˆØ±Ø¯ Ù‡Ø§ÛŒ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø² Ú¯Ø±ÙØªÙ‡ Ø´Ø¯Ù‡ Ùˆ Ú©Ù†ØªØ±Ù„ÛŒ Ø±ÙˆÛŒ ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø´Ù…Ø§ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯ .",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "ÙØ§ÛŒÙ„Ù‡Ø§ Ùˆ ÙÙ‡Ø±Ø³Øª Ù‡Ø§ÛŒ Ø¯Ø§Ø¯Ù‡ Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ù‚Ø§Ø¨Ù„ Ø§Ø² Ø§ÛŒÙ†ØªØ±Ù†Øª Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯ØŒ Ú†ÙˆÙ†Ú©Ù‡ ÙØ§ÛŒÙ„ htacces. Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ø¨Ø±Ø§ÛŒ Ù…Ø·Ù„Ø¹ Ø´Ø¯Ù† Ø§Ø² Ú†Ú¯ÙˆÙ†Ú¯ÛŒ ØªÙ†Ø¸ÛŒÙ… Ø³Ø±ÙˆØ±ØªØ§Ù†ØŒÙ„Ø·ÙØ§ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ø§ÛŒÙ†</a> Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯.",
 "Create an <strong>admin account</strong>" => "Ù„Ø·ÙØ§ ÛŒÚ© <strong> Ø´Ù†Ø§Ø³Ù‡ Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ±</strong> Ø¨Ø³Ø§Ø²ÛŒØ¯",
 "Advanced" => "Ù¾ÛŒØ´Ø±ÙØªÙ‡",
 "Data folder" => "Ù¾ÙˆØ´Ù‡ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ",
@@ -140,3 +136,4 @@
 "next" => "Ø¨Ø¹Ø¯ÛŒ",
 "Updating ownCloud to version %s, this may take a while." => "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ OwnCloud Ø¨Ù‡ Ù†Ø³Ø®Ù‡ ÛŒ %sØŒ Ø§ÛŒÙ† Ø¹Ù…Ù„ÛŒØ§Øª Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø²Ù…Ø§Ù† Ø¨Ø± Ø¨Ø§Ø´Ø¯."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fi.php b/core/l10n/fi.php
index 655d544d393f04ca042d997719c3a775bdc49cb2..956ab31233748650b1a15635f1f31bea753649f5 100644
--- a/core/l10n/fi.php
+++ b/core/l10n/fi.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "asetukset",
 "Username" => "KÃ¤yttÃ¤jÃ¤tunnus"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 23b697a25c3bb1dc28de05ec8efffba38e76270f..5741f2ce6fb317cd4ba49490be375ad1edb2540b 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s jakoi kohteen Â»%sÂ« kanssasi",
 "Category type not provided." => "Luokan tyyppiÃ¤ ei mÃ¤Ã¤ritelty.",
 "No category to add?" => "Ei lisÃ¤ttÃ¤vÃ¤Ã¤ luokkaa?",
@@ -27,15 +28,13 @@
 "December" => "joulukuu",
 "Settings" => "Asetukset",
 "seconds ago" => "sekuntia sitten",
-"1 minute ago" => "1 minuutti sitten",
-"{minutes} minutes ago" => "{minutes} minuuttia sitten",
-"1 hour ago" => "1 tunti sitten",
-"{hours} hours ago" => "{hours} tuntia sitten",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "tÃ¤nÃ¤Ã¤n",
 "yesterday" => "eilen",
-"{days} days ago" => "{days} pÃ¤ivÃ¤Ã¤ sitten",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "viime kuussa",
-"{months} months ago" => "{months} kuukautta sitten",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "kuukautta sitten",
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
@@ -58,6 +57,7 @@
 "Share with link" => "Jaa linkillÃ¤",
 "Password protect" => "Suojaa salasanalla",
 "Password" => "Salasana",
+"Allow Public Upload" => "Salli julkinen lÃ¤hetys",
 "Email link to person" => "LÃ¤hetÃ¤ linkki sÃ¤hkÃ¶postitse",
 "Send" => "LÃ¤hetÃ¤",
 "Set expiration date" => "Aseta pÃ¤Ã¤ttymispÃ¤ivÃ¤",
@@ -79,8 +79,8 @@
 "Email sent" => "SÃ¤hkÃ¶posti lÃ¤hetetty",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "PÃ¤ivitys epÃ¤onnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisÃ¶lle</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "PÃ¤ivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
-"ownCloud password reset" => "ownCloud-salasanan nollaus",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkki salasanan nollaamiseen on lÃ¤hetetty sÃ¤hkÃ¶postiisi.<br>Jos et saa viestiÃ¤ pian, tarkista roskapostikansiosi.<br>Jos et lÃ¶ydÃ¤ viestiÃ¤ roskapostinkaan seasta, ota yhteys yllÃ¤pitÃ¤jÃ¤Ã¤n.",
 "Request failed!<br>Did you make sure your email/username was right?" => "PyyntÃ¶ epÃ¤onnistui!<br>Olihan sÃ¤hkÃ¶postiosoitteesi/kÃ¤yttÃ¤jÃ¤tunnuksesi oikein?",
 "You will receive a link to reset your password via Email." => "Saat sÃ¤hkÃ¶postitse linkin nollataksesi salasanan.",
 "Username" => "KÃ¤yttÃ¤jÃ¤tunnus",
@@ -102,10 +102,10 @@
 "Add" => "LisÃ¤Ã¤",
 "Security Warning" => "Turvallisuusvaroitus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyÃ¶kkÃ¤ykselle (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "PÃ¤ivitÃ¤ PHP-asennuksesi kÃ¤yttÃ¤Ã¤ksesi ownCloudia turvallisesti.",
+"Please update your PHP installation to use %s securely." => "PÃ¤ivitÃ¤ PHP-asennus varmistaaksesi, ettÃ¤ %s on turvallinen kÃ¤yttÃ¤Ã¤.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvallista satunnaislukugeneraattoria ei ole kÃ¤ytettÃ¤vissÃ¤, ota kÃ¤yttÃ¶Ã¶n PHP:n OpenSSL-laajennus",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitÃ¤ luultavimmin muiden saavutettavissa internetistÃ¤, koska .htaccess-tiedosto ei toimi.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Katso palvelimen asetuksien mÃ¤Ã¤rittÃ¤miseen liittyvÃ¤t ohjeet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaatiosta</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "LisÃ¤tietoja palvelimen asetuksien mÃ¤Ã¤rittÃ¤misestÃ¤ on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
 "Create an <strong>admin account</strong>" => "Luo <strong>yllÃ¤pitÃ¤jÃ¤n tunnus</strong>",
 "Advanced" => "LisÃ¤asetukset",
 "Data folder" => "Datakansio",
@@ -119,6 +119,7 @@
 "Finish setup" => "Viimeistele asennus",
 "%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisÃ¤tietoja, miten pÃ¤ivitys asennetaan.",
 "Log out" => "Kirjaudu ulos",
+"More apps" => "LisÃ¤Ã¤ sovelluksia",
 "Automatic logon rejected!" => "Automaattinen sisÃ¤Ã¤nkirjautuminen hylÃ¤ttiin!",
 "If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi Ã¤skettÃ¤in, tilisi saattaa olla murrettu.",
 "Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.",
@@ -131,3 +132,4 @@
 "next" => "seuraava",
 "Updating ownCloud to version %s, this may take a while." => "PÃ¤ivitetÃ¤Ã¤n ownCloud versioon %s, tÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index bc8a0d281534f60480dd4b050ee76df03ea0ffd9..641378ac42b8b557734e40047f49fc356fa8b301 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s partagÃ© Â»%sÂ« avec vous",
 "Category type not provided." => "Type de catÃ©gorie non spÃ©cifiÃ©.",
 "No category to add?" => "Pas de catÃ©gorie Ã  ajouter ?",
@@ -29,15 +30,13 @@
 "December" => "dÃ©cembre",
 "Settings" => "ParamÃ¨tres",
 "seconds ago" => "il y a quelques secondes",
-"1 minute ago" => "il y a une minute",
-"{minutes} minutes ago" => "il y a {minutes} minutes",
-"1 hour ago" => "Il y a une heure",
-"{hours} hours ago" => "Il y a {hours} heures",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "aujourd'hui",
 "yesterday" => "hier",
-"{days} days ago" => "il y a {days} jours",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "le mois dernier",
-"{months} months ago" => "Il y a {months} mois",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "il y a plusieurs mois",
 "last year" => "l'annÃ©e derniÃ¨re",
 "years ago" => "il y a plusieurs annÃ©es",
@@ -85,7 +84,6 @@
 "Email sent" => "Email envoyÃ©",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise Ã  jour a Ã©chouÃ©. Veuillez signaler ce problÃ¨me Ã  la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communautÃ© ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La mise Ã  jour a rÃ©ussi. Vous Ãªtes redirigÃ© maintenant vers ownCloud.",
-"ownCloud password reset" => "RÃ©initialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour rÃ©initialiser votre mot de passe : {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Le lien permettant de rÃ©initialiser votre mot de passe vous a Ã©tÃ© transmis.<br>Si vous ne le recevez pas dans un dÃ©lai raisonnable, vÃ©rifier votre boÃ®te de pourriels.<br>Au besoin, contactez votre administrateur local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "RequÃªte en Ã©chec!<br>Avez-vous vÃ©rifiÃ© vos courriel/nom d'utilisateur?",
@@ -110,11 +108,9 @@
 "Add" => "Ajouter",
 "Security Warning" => "Avertissement de sÃ©curitÃ©",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnÃ©rable Ã  l'attaque par caractÃ¨re NULL (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Veuillez mettre Ã  jour votre installation PHP pour utiliser ownCloud de faÃ§on sÃ©curisÃ©e.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun gÃ©nÃ©rateur de nombre alÃ©atoire sÃ©curisÃ© n'est disponible, veuillez activer l'extension PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans gÃ©nÃ©rateur de nombre alÃ©atoire sÃ©curisÃ©, un attaquant peut Ãªtre en mesure de prÃ©dire les jetons de rÃ©initialisation du mot de passe, et ainsi prendre le contrÃ´le de votre compte utilisateur.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre rÃ©pertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "CrÃ©er un <strong>compte administrateur</strong>",
 "Advanced" => "AvancÃ©",
 "Data folder" => "RÃ©pertoire des donnÃ©es",
@@ -140,3 +136,4 @@
 "next" => "suivant",
 "Updating ownCloud to version %s, this may take a while." => "Mise Ã  jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index b55daf27c2197bce57bb1c919390bea9f017032b..d5492456ca027c35b10945150579519541f3d2b4 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s compartiu Â«%sÂ» con vostede",
 "Category type not provided." => "Non se indicou o tipo de categorÃa",
 "No category to add?" => "Sen categorÃa que engadir?",
@@ -29,15 +30,13 @@
 "December" => "decembro",
 "Settings" => "Axustes",
 "seconds ago" => "segundos atrÃ¡s",
-"1 minute ago" => "hai 1 minuto",
-"{minutes} minutes ago" => "hai {minutes} minutos",
-"1 hour ago" => "Vai 1 hora",
-"{hours} hours ago" => "hai {hours} horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoxe",
 "yesterday" => "onte",
-"{days} days ago" => "hai {days} dÃas",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "Ãºltimo mes",
-"{months} months ago" => "hai {months} meses",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "meses atrÃ¡s",
 "last year" => "Ãºltimo ano",
 "years ago" => "anos atrÃ¡s",
@@ -85,7 +84,6 @@
 "Email sent" => "Correo enviado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualizaciÃ³n non foi satisfactoria, informe deste problema Ã¡  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualizaciÃ³n realizouse correctamente. RedirixÃndoo agora Ã¡ ownCloud.",
-"ownCloud password reset" => "Restabelecer o contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Usa a seguinte ligazÃ³n para restabelecer o contrasinal: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "EnviÃ³uselle ao seu correo unha ligazÃ³n para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoÃ¡bel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aÃ pregÃºntelle ao seu administrador local..",
 "Request failed!<br>Did you make sure your email/username was right?" => "Non foi posÃbel facer a peticiÃ³n!<br>AsegÃºrese de que o seu enderezo de correo ou nome de usuario Ã© correcto.",
@@ -110,11 +108,11 @@
 "Add" => "Engadir",
 "Security Warning" => "Aviso de seguranza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sÃºa versiÃ³n de PHP Ã© vulnerÃ¡bel a un ataque de byte nulo (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Actualice a instalaciÃ³n de PHP para empregar ownCloud de xeito seguro.",
+"Please update your PHP installation to use %s securely." => "Actualice a instalaciÃ³n de PHP para empregar %s de xeito seguro.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non hai un xerador de nÃºmeros ao chou dispoÃ±Ãbel. Active o engadido de OpenSSL para PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sen un xerador seguro de nÃºmeros ao chou poderÃa acontecer que predicindo as cadeas de texto de reinicio de contrasinais se afagan coa sÃºa conta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesÃbeis desde a Internet xa que o ficheiro .htaccess non estÃ¡ a traballar.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para obter informaciÃ³n sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informaciÃ³n sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentaciÃ³n</a>.",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Cartafol de datos",
@@ -128,6 +126,7 @@
 "Finish setup" => "Rematar a configuraciÃ³n",
 "%s is available. Get more information on how to update." => "%s estÃ¡ dispoÃ±Ãbel. ObteÃ±a mÃ¡is informaciÃ³n sobre como actualizar.",
 "Log out" => "Desconectar",
+"More apps" => "MÃ¡is aplicativos",
 "Automatic logon rejected!" => "Rexeitouse a entrada automÃ¡tica",
 "If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal Ã© posÃbel que a sÃºa conta estea comprometida!",
 "Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a sÃºa conta.",
@@ -140,3 +139,4 @@
 "next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versiÃ³n %s,  esto pode levar un anaco."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/he.php b/core/l10n/he.php
index ab002ab64e8ab940a9078426fddb22a25cda14f5..6a2e5c88eeb0e86911f629bedcffb24355b799ff 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "×¡×•×’ ×”×§×˜×’×•×¨×™×” ×œ× ×¡×•×¤×§.",
 "No category to add?" => "××™×Ÿ ×§×˜×’×•×¨×™×” ×œ×”×•×¡×¤×”?",
 "This category already exists: %s" => "×”×§×˜×’×•×¨×™×” ×”×‘××” ×›×‘×¨ ×§×™×™×ž×ª: %s",
@@ -28,15 +29,13 @@
 "December" => "×“×¦×ž×‘×¨",
 "Settings" => "×”×’×“×¨×•×ª",
 "seconds ago" => "×©× ×™×•×ª",
-"1 minute ago" => "×œ×¤× ×™ ×“×§×” ××—×ª",
-"{minutes} minutes ago" => "×œ×¤× ×™ {minutes} ×“×§×•×ª",
-"1 hour ago" => "×œ×¤× ×™ ×©×¢×”",
-"{hours} hours ago" => "×œ×¤× ×™ {hours} ×©×¢×•×ª",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "×”×™×•×",
 "yesterday" => "××ª×ž×•×œ",
-"{days} days ago" => "×œ×¤× ×™ {days} ×™×ž×™×",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "×—×•×“×© ×©×¢×‘×¨",
-"{months} months ago" => "×œ×¤× ×™ {months} ×—×•×“×©×™×",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "×—×•×“×©×™×",
 "last year" => "×©× ×” ×©×¢×‘×¨×”",
 "years ago" => "×©× ×™×",
@@ -83,7 +82,6 @@
 "Email sent" => "×”×•×“×¢×ª ×”×“×•××´×œ × ×©×œ×—×”",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "×ª×”×œ×™×š ×”×¢×“×›×•×Ÿ ×œ× ×”×•×©×œ× ×‘×”×¦×œ×—×”. × × ×“×•×•×— ××ª ×”×‘×¢×™×” ×‘<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">×§×”×™×œ×ª ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "×ª×”×œ×™×š ×”×¢×“×›×•×Ÿ ×”×¡×ª×™×™× ×‘×”×¦×œ×—×”. ×¢×›×©×™×• ×ž× ×ª×‘ ××•×ª×š ××œ ownCloud.",
-"ownCloud password reset" => "××™×¤×•×¡ ×”×¡×¡×ž×” ×©×œ ownCloud",
 "Use the following link to reset your password: {link}" => "×™×© ×œ×”×©×ª×ž×© ×‘×§×™×©×•×¨ ×”×‘× ×›×“×™ ×œ××¤×¡ ××ª ×”×¡×¡×ž×” ×©×œ×š: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "×”×§×™×©×•×¨ ×œ××™×¤×•×¡ ×”×¡×¡×ž×” ×©×œ×š × ×©×œ×— ××œ×™×š ×‘×“×•××´×œ.<br>×× ×œ× ×§×™×‘×œ×ª ××ª ×”×§×™×©×•×¨ ×ª×•×š ×–×ž×Ÿ ×¡×‘×™×¨, ×ž×•×˜×‘ ×œ×‘×“×•×§ ××ª ×ª×™×‘×ª ×”×–×‘×œ ×©×œ×š.<br>×× ×”×”×•×“×¢×” ×œ× ×©×, ×›×“××™ ×œ×©××•×œ ××ª ×ž× ×”×œ ×”×¨×©×ª ×©×œ×š .",
 "Request failed!<br>Did you make sure your email/username was right?" => "×”×‘×§×©×” × ×›×©×œ×”!<br>×”×× ×›×ª×•×‘×ª ×”×“×•××´×œ/×©× ×”×ž×©×ª×ž×© ×©×œ×š × ×›×•× ×™×?",
@@ -105,11 +103,9 @@
 "Add" => "×”×•×¡×¤×”",
 "Security Warning" => "××–×”×¨×ª ××‘×˜×—×”",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "×’×¨×¡×ª ×”Ö¾PHP ×¤×’×™×¢×” ×‘×¤× ×™ ×”×ª×§×¤×ª ×‘×™×ª NULL/×¨×™×§ (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "× × ×œ×¢×“×›×Ÿ ××ª ×”×ª×§× ×ª ×”Ö¾PHP ×©×œ×š ×›×“×™ ×œ×”×©×ª×ž×© ×‘Ö¾PHP ×‘×‘×˜×—×”.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "××™×Ÿ ×ž×—×•×œ×œ ×ž×¡×¤×¨×™× ××§×¨××™×™× ×ž××•×‘×˜×—, × × ×œ×”×¤×¢×™×œ ××ª ×”×”×¨×—×‘×” OpenSSL ×‘Ö¾PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "×œ×œ× ×ž×—×•×œ×œ ×ž×¡×¤×¨×™× ××§×¨××™×™× ×ž××•×‘×˜×— ×ª×•×§×£ ×™×›×•×œ ×œ× ×‘× ××ª ×ž×—×¨×•×–×•×ª ××™×¤×•×¡ ×”×¡×¡×ž×” ×•×œ×”×©×ª×œ×˜ ×¢×œ ×”×—×©×‘×•×Ÿ ×©×œ×š.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "×ª×™×§×™×™×ª ×•×§×‘×¦×™ ×”×ž×™×“×¢ ×©×œ×š ×›× ×¨××” × ×’×™×©×™× ×ž×”××™× ×˜×¨× ×˜ ×ž×›×™×•×•×Ÿ ×©×§×•×‘×¥ ×”.htaccess ×œ× ×¢×•×‘×“.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "×œ×§×‘×œ×ª ×ž×™×“×¢ ×œ×”×’×“×¨×” × ×›×•× ×” ×©×œ ×”×©×¨×ª ×©×œ×š, ×¨××” ××ª ×”<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">×ª×™×¢×•×“</a>.",
 "Create an <strong>admin account</strong>" => "×™×¦×™×¨×ª <strong>×—×©×‘×•×Ÿ ×ž× ×”×œ</strong>",
 "Advanced" => "×ž×ª×§×“×",
 "Data folder" => "×ª×™×§×™×™×ª × ×ª×•× ×™×",
@@ -134,3 +130,4 @@
 "next" => "×”×‘×",
 "Updating ownCloud to version %s, this may take a while." => "×ž×¢×“×›×Ÿ ××ª ownCloud ××œ ×’×¨×¡× %s, ×–×” ×¢×œ×•×œ ×œ×§×—×ª ×–×ž×Ÿ ×ž×”."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 4285f8ce57746180c10ade8007a3fa77014b386b..7ad75a41a1bfc83dc15a1c95cd4fdf596e5656a1 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "January" => "à¤œà¤¨à¤µà¤°à¥€",
 "February" => "à¤«à¤°à¤µà¤°à¥€",
 "March" => "à¤®à¤¾à¤°à¥à¤š",
@@ -12,6 +13,10 @@
 "November" => "à¤¨à¤µà¤‚à¤¬à¤°",
 "December" => "à¤¦à¤¿à¤¸à¤®à¥à¤¬à¤°",
 "Settings" => "à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤¸",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
 "Error" => "à¤¤à¥à¤°à¥à¤Ÿà¤¿",
 "Share" => "à¤¸à¤¾à¤à¤¾ à¤•à¤°à¥‡à¤‚",
 "Share with" => "à¤•à¥‡ à¤¸à¤¾à¤¥ à¤¸à¤¾à¤à¤¾",
@@ -40,3 +45,4 @@
 "prev" => "à¤ªà¤¿à¤›à¤²à¤¾",
 "next" => "à¤…à¤—à¤²à¤¾"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 3eb556e9f63eeefc97588442b1ed9b88ef74c61b..403df77f8192bb2d79faf9b89e1497666be27a55 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No category to add?" => "Nemate kategorija koje moÅ¾ete dodati?",
 "No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
 "Sunday" => "nedelja",
@@ -22,9 +23,13 @@
 "December" => "Prosinac",
 "Settings" => "Postavke",
 "seconds ago" => "sekundi prije",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "danas",
 "yesterday" => "juÄer",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "proÅ¡li mjesec",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "mjeseci",
 "last year" => "proÅ¡lu godinu",
 "years ago" => "godina",
@@ -57,7 +62,6 @@
 "Password protected" => "ZaÅ¡tita lozinkom",
 "Error unsetting expiration date" => "GreÅ¡ka prilikom brisanja datuma isteka",
 "Error setting expiration date" => "GreÅ¡ka prilikom postavljanja datuma isteka",
-"ownCloud password reset" => "ownCloud resetiranje lozinke",
 "Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poniÅ¡tili lozinku: {link}",
 "You will receive a link to reset your password via Email." => "Primit Ä‡ete link kako biste poniÅ¡tili zaporku putem e-maila.",
 "Username" => "KorisniÄko ime",
@@ -93,3 +97,4 @@
 "prev" => "prethodan",
 "next" => "sljedeÄ‡i"
 );
+$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;";
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 25abd07890138dd458846208101cad400a4366fb..ddec9c1e4ca3838b44307ac025f4bfa83bcdbbc7 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s megosztotta Ã–nnel ezt:  Â»%sÂ«",
 "Category type not provided." => "Nincs megadva a kategÃ³ria tÃpusa.",
 "No category to add?" => "Nincs hozzÃ¡adandÃ³ kategÃ³ria?",
@@ -29,15 +30,13 @@
 "December" => "december",
 "Settings" => "BeÃ¡llÃtÃ¡sok",
 "seconds ago" => "pÃ¡r mÃ¡sodperce",
-"1 minute ago" => "1 perce",
-"{minutes} minutes ago" => "{minutes} perce",
-"1 hour ago" => "1 Ã³rÃ¡ja",
-"{hours} hours ago" => "{hours} Ã³rÃ¡ja",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "ma",
 "yesterday" => "tegnap",
-"{days} days ago" => "{days} napja",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "mÃºlt hÃ³napban",
-"{months} months ago" => "{months} hÃ³napja",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "tÃ¶bb hÃ³napja",
 "last year" => "tavaly",
 "years ago" => "tÃ¶bb Ã©ve",
@@ -62,6 +61,7 @@
 "Share with link" => "Link megadÃ¡sÃ¡val osztom meg",
 "Password protect" => "JelszÃ³val is vÃ©dem",
 "Password" => "JelszÃ³",
+"Allow Public Upload" => "FeltÃ¶ltÃ©st is engedÃ©lyezek",
 "Email link to person" => "Email cÃmre kÃ¼ldjÃ¼k el",
 "Send" => "KÃ¼ldjÃ¼k el",
 "Set expiration date" => "Legyen lejÃ¡rati idÅ‘",
@@ -84,12 +84,12 @@
 "Email sent" => "Az emailt elkÃ¼ldtÃ¼k",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissÃtÃ©s nem sikerÃ¼lt. KÃ©rem Ã©rtesÃtse errÅ‘l a problÃ©mÃ¡rÃ³l az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kÃ¶zÃ¶ssÃ©get</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A frissÃtÃ©s sikeres volt. VisszairÃ¡nyÃtjuk az ownCloud szolgÃ¡ltatÃ¡shoz.",
-"ownCloud password reset" => "ownCloud jelszÃ³-visszaÃ¡llÃtÃ¡s",
 "Use the following link to reset your password: {link}" => "HasznÃ¡lja ezt a linket a jelszÃ³ ismÃ©telt beÃ¡llÃtÃ¡sÃ¡hoz: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Emailben fog kapni egy linket, amivel Ãºj jelszÃ³t tud majd beÃ¡llÃtani magÃ¡nak. <br>Ha a levÃ©l nem jÃ¶tt meg, holott Ãºgy Ã©rzi, hogy mÃ¡r meg kellett volna Ã©rkeznie, akkor ellenÅ‘rizze a spam/levÃ©lszemÃ©t mappÃ¡jÃ¡t. <br>Ha ott sincsen, akkor Ã©rdeklÅ‘djÃ¶n a rendszergazdÃ¡nÃ¡l.",
 "Request failed!<br>Did you make sure your email/username was right?" => "A kÃ©rÃ©st nem sikerÃ¼lt teljesÃteni! <br>Biztos, hogy jÃ³ emailcÃmet/felhasznÃ¡lÃ³nevet adott meg?",
 "You will receive a link to reset your password via Email." => "Egy emailben fog Ã©rtesÃtÃ©st kapni a jelszÃ³beÃ¡llÃtÃ¡s mÃ³djÃ¡rÃ³l.",
 "Username" => "FelhasznÃ¡lÃ³nÃ©v",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Az Ã–n Ã¡llomÃ¡nyai titkosÃtva vannak. Ha nem engedÃ©lyezte korÃ¡bban az adatok visszanyerÃ©sÃ©hez szÃ¼ksÃ©ges kulcs hasznÃ¡latÃ¡t, akkor a jelszÃ³ megvÃ¡ltoztatÃ¡sÃ¡t kÃ¶vetÅ‘en nem fog hozzÃ¡fÃ©rni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kÃ©rdezze meg a rendszergazdÃ¡t, mielÅ‘tt tovÃ¡bbmenne. Biztos, hogy folytatni kÃvÃ¡nja?",
 "Yes, I really want to reset my password now" => "Igen, tÃ©nyleg meg akarom vÃ¡ltoztatni a jelszavam",
 "Request reset" => "VisszaÃ¡llÃtÃ¡s igÃ©nylÃ©se",
 "Your password was reset" => "JelszÃ³ megvÃ¡ltoztatva",
@@ -108,11 +108,11 @@
 "Add" => "HozzÃ¡adÃ¡s",
 "Security Warning" => "BiztonsÃ¡gi figyelmeztetÃ©s",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ã–n PHP verziÃ³ja sebezhetÅ‘ a NULL bÃ¡jtos tÃ¡madÃ¡ssal szemben (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "KÃ©rjÃ¼k frissÃtse a telepÃtett PHP csomagjait, hogy biztonsÃ¡gos legyen az ownCloud szolgÃ¡ltatÃ¡sa.",
+"Please update your PHP installation to use %s securely." => "KÃ©rjÃ¼k frissÃtse a telepÃtett PHP csomagjait, hogy biztonsÃ¡gos legyen az %s szolgÃ¡ltatÃ¡sa.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nem Ã©rhetÅ‘ el megfelelÅ‘ vÃ©letlenszÃ¡m-generÃ¡tor, telepÃteni kellene a PHP OpenSSL kiegÃ©szÃtÃ©sÃ©t.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "MegfelelÅ‘ vÃ©letlenszÃ¡m-generÃ¡tor hiÃ¡nyÃ¡ban egy tÃ¡madÃ³ szÃ¡ndÃ©kÃº idegen kÃ©pes lehet megjÃ³solni a jelszÃ³visszaÃ¡llÃtÃ³ tokent, Ã©s Ã–n helyett belÃ©pni.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkÃ¶nyvtÃ¡r Ã©s a benne levÅ‘ Ã¡llomÃ¡nyok valÃ³szÃnÅ±leg kÃ¶zvetlenÃ¼l is elÃ©rhetÅ‘k az internetrÅ‘l, mert a .htaccess Ã¡llomÃ¡ny nem Ã©rvÃ©nyesÃ¼l.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "A kiszolgÃ¡lÃ³ megfelelÅ‘ beÃ¡llÃtÃ¡sÃ¡hoz kÃ©rjÃ¼k olvassa el a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÃ¡ciÃ³t</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgÃ¡lÃ³ megfelelÅ‘ beÃ¡llÃtÃ¡sÃ¡hoz kÃ©rjÃ¼k olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentÃ¡ciÃ³t</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belÃ©pÃ©s</strong> lÃ©trehozÃ¡sa",
 "Advanced" => "HaladÃ³",
 "Data folder" => "AdatkÃ¶nyvtÃ¡r",
@@ -138,3 +138,4 @@
 "next" => "kÃ¶vetkezÅ‘",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud frissÃtÃ©s a %s verziÃ³ra folyamatban. Kis tÃ¼relmet."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
index de0c725c73b62b4590d04682d08660eeef60c2de..9965d4731b08fc18f238c9a2fb1685e87693198f 100644
--- a/core/l10n/hy.php
+++ b/core/l10n/hy.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Sunday" => "Ô¿Õ«Ö€Õ¡Õ¯Õ«",
 "Monday" => "ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«",
 "Tuesday" => "ÔµÖ€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«",
@@ -17,5 +18,10 @@
 "September" => "ÕÕ¥ÕºÕ¿Õ¥Õ´Õ¢Õ¥Ö€",
 "October" => "Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
 "November" => "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€",
-"December" => "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
+"December" => "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 8c9b6b88ef3a252c92f5fc42eacf758c5ef651e7..e0d1e96f6acf6717c4009a65acb266d0f7d87463 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Sunday" => "Dominica",
 "Monday" => "Lunedi",
 "Tuesday" => "Martedi",
@@ -19,12 +20,15 @@
 "November" => "Novembre",
 "December" => "Decembre",
 "Settings" => "Configurationes",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
 "Cancel" => "Cancellar",
 "Error" => "Error",
 "Share" => "Compartir",
 "Password" => "Contrasigno",
 "Send" => "Invia",
-"ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
 "Username" => "Nomine de usator",
 "Request reset" => "Requestar reinitialisation",
 "Your password was reset" => "Tu contrasigno esseva reinitialisate",
@@ -56,3 +60,4 @@
 "prev" => "prev",
 "next" => "prox"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 2ee9c37ec2d555320145202acc6362d6fb616e03..644efde9fc02c89423ed5999483035c5a134aca9 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Tipe kategori tidak diberikan.",
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: %s" => "Kategori ini sudah ada: %s",
@@ -28,15 +29,13 @@
 "December" => "Desember",
 "Settings" => "Setelan",
 "seconds ago" => "beberapa detik yang lalu",
-"1 minute ago" => "1 menit yang lalu",
-"{minutes} minutes ago" => "{minutes} menit yang lalu",
-"1 hour ago" => "1 jam yang lalu",
-"{hours} hours ago" => "{hours} jam yang lalu",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "hari ini",
 "yesterday" => "kemarin",
-"{days} days ago" => "{days} hari yang lalu",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "bulan kemarin",
-"{months} months ago" => "{months} bulan yang lalu",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "beberapa bulan lalu",
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
@@ -82,7 +81,6 @@
 "Email sent" => "Email terkirim",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
-"ownCloud password reset" => "Setel ulang sandi ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
 "Username" => "Nama pengguna",
@@ -102,11 +100,9 @@
 "Add" => "Tambah",
 "Security Warning" => "Peringatan Keamanan",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Silakan perbarui instalasi PHP untuk dapat menggunakan ownCloud secara aman.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generator acak yang aman tidak tersedia, silakan aktifkan ekstensi OpenSSL pada PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Tanpa generator acak, penyerang mungkin dapat menebak token penyetelan sandi dan mengambil alih akun Anda.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Untuk informasi lebih lanjut tentang pengaturan server yang benar, silakan lihat <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasi</a>.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Advanced" => "Lanjutan",
 "Data folder" => "Folder data",
@@ -130,3 +126,4 @@
 "next" => "selanjutnya",
 "Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 3d3ce41b27ad5b608735eb7610c9591f53b6ee4d..5115d70ee7a4685d53ec8a0c588249e0fb86ad95 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Flokkur ekki gefin",
 "No category to add?" => "Enginn flokkur til aÃ° bÃ¦ta viÃ°?",
 "Object type not provided." => "Tegund ekki Ã boÃ°i.",
@@ -27,15 +28,13 @@
 "December" => "Desember",
 "Settings" => "Stillingar",
 "seconds ago" => "sek.",
-"1 minute ago" => "Fyrir 1 mÃnÃºtu",
-"{minutes} minutes ago" => "{minutes} min sÃÃ°an",
-"1 hour ago" => "Fyrir 1 klst.",
-"{hours} hours ago" => "fyrir {hours} klst.",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Ã dag",
 "yesterday" => "Ã gÃ¦r",
-"{days} days ago" => "{days} dagar sÃÃ°an",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "sÃÃ°asta mÃ¡nuÃ°i",
-"{months} months ago" => "fyrir {months} mÃ¡nuÃ°um",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "mÃ¡nuÃ°ir sÃÃ°an",
 "last year" => "sÃÃ°asta Ã¡ri",
 "years ago" => "einhverjum Ã¡rum",
@@ -80,7 +79,6 @@
 "Sending ..." => "Sendi ...",
 "Email sent" => "TÃ¶lvupÃ³stur sendur",
 "The update was successful. Redirecting you to ownCloud now." => "UppfÃ¦rslan heppnaÃ°ist. Beini Ã¾Ã©r til ownCloud nÃº.",
-"ownCloud password reset" => "endursetja ownCloud lykilorÃ°",
 "Use the following link to reset your password: {link}" => "NotaÃ° eftirfarandi veftengil til aÃ° endursetja lykilorÃ°iÃ° Ã¾itt: {link}",
 "You will receive a link to reset your password via Email." => "ÃžÃº munt fÃ¡ veftengil Ã tÃ¶lvupÃ³sti til aÃ° endursetja lykilorÃ°iÃ°.",
 "Username" => "Notendanafn",
@@ -124,3 +122,4 @@
 "next" => "nÃ¦sta",
 "Updating ownCloud to version %s, this may take a while." => "UppfÃ¦ri ownCloud Ã ÃºtgÃ¡fu %s, Ã¾aÃ° gÃ¦ti tekiÃ° smÃ¡ stund."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.php b/core/l10n/it.php
index c1c27cdf54ceb362e11e9da024be3b9dae562c79..9c55f7125a761838ee8d9bdd253b5a39fe254085 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,5 +1,6 @@
-<?php $TRANSLATIONS = array(
-"%s shared Â»%sÂ« with you" => "%s ha condiviso Â»%sÂ« con te",
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s ha condiviso Â«%sÂ» con te",
 "Category type not provided." => "Tipo di categoria non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: %s" => "Questa categoria esiste giÃ : %s",
@@ -29,15 +30,13 @@
 "December" => "Dicembre",
 "Settings" => "Impostazioni",
 "seconds ago" => "secondi fa",
-"1 minute ago" => "Un minuto fa",
-"{minutes} minutes ago" => "{minutes} minuti fa",
-"1 hour ago" => "1 ora fa",
-"{hours} hours ago" => "{hours} ore fa",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "oggi",
 "yesterday" => "ieri",
-"{days} days ago" => "{days} giorni fa",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "mese scorso",
-"{months} months ago" => "{months} mesi fa",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "mesi fa",
 "last year" => "anno scorso",
 "years ago" => "anni fa",
@@ -85,7 +84,6 @@
 "Email sent" => "Messaggio inviato",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non Ã¨ riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitÃ  di ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento Ã¨ stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
-"ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Il collegamento per ripristinare la password Ã¨ stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lÃ¬, contatta il tuo amministratore locale.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
@@ -110,11 +108,11 @@
 "Add" => "Aggiungi",
 "Security Warning" => "Avviso di sicurezza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP Ã¨ vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Aggiorna la tua installazione di PHP per utilizzare ownCloud in modo sicuro.",
+"Please update your PHP installation to use %s securely." => "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non Ã¨ disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo account.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poichÃ© il file .htaccess non funziona.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il server, vedi la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentazione</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
 "Advanced" => "Avanzat",
 "Data folder" => "Cartella dati",
@@ -135,8 +133,9 @@
 "remember" => "ricorda",
 "Log in" => "Accedi",
 "Alternative Logins" => "Accessi alternativi",
-"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "EhilÃ ,<br><br>volevo solamente farti sapere che %s ha condiviso Â»%sÂ« con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "EhilÃ ,<br><br>volevo solamente farti sapere che %s ha condiviso Â«%sÂ» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
 "prev" => "precedente",
 "next" => "successivo",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciÃ² potrebbe richiedere del tempo."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5f9ca65b62762737542aebd64beee42b8d622599..fc18408829392800089bcb598800231cefc7eff6 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%sãŒ ã‚ãªãŸã¨ Â»%sÂ«ã‚’å…±æœ‰ã—ã¾ã—ãŸ",
 "Category type not provided." => "ã‚«ãƒ†ã‚´ãƒªã‚¿ã‚¤ãƒ—ã¯æä¾›ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
 "No category to add?" => "è¿½åŠ ã™ã‚‹ã‚«ãƒ†ã‚´ãƒªã¯ã‚ã‚Šã¾ã›ã‚“ã‹ï¼Ÿ",
@@ -29,15 +30,13 @@
 "December" => "12æœˆ",
 "Settings" => "è¨å®š",
 "seconds ago" => "æ•°ç§’å‰",
-"1 minute ago" => "1 åˆ†å‰",
-"{minutes} minutes ago" => "{minutes} åˆ†å‰",
-"1 hour ago" => "1 æ™‚é–“å‰",
-"{hours} hours ago" => "{hours} æ™‚é–“å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šæ—¥",
 "yesterday" => "æ˜¨æ—¥",
-"{days} days ago" => "{days} æ—¥å‰",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "ä¸€æœˆå‰",
-"{months} months ago" => "{months} æœˆå‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "æœˆå‰",
 "last year" => "ä¸€å¹´å‰",
 "years ago" => "å¹´å‰",
@@ -62,7 +61,7 @@
 "Share with link" => "URLãƒªãƒ³ã‚¯ã§å…±æœ‰",
 "Password protect" => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ä¿è·",
 "Password" => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰",
-"Allow Public Upload" => "ãƒ‘ãƒ–ãƒªãƒƒã‚¯ãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’è¨±å¯",
+"Allow Public Upload" => "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’è¨±å¯",
 "Email link to person" => "ãƒ¡ãƒ¼ãƒ«ãƒªãƒ³ã‚¯",
 "Send" => "é€ä¿¡",
 "Set expiration date" => "æœ‰åŠ¹æœŸé™ã‚’è¨å®š",
@@ -85,7 +84,6 @@
 "Email sent" => "ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã—ãŸ",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸã€‚ã“ã®å•é¡Œã‚’ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> ã«ãƒ¬ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚",
 "The update was successful. Redirecting you to ownCloud now." => "æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸã€‚ä»Šã™ãownCloudã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚",
-"ownCloud password reset" => "ownCloudã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã—ã¾ã™",
 "Use the following link to reset your password: {link}" => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã™ã‚‹ã«ã¯æ¬¡ã®ãƒªãƒ³ã‚¯ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¦ä¸‹ã•ã„: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãƒªã‚»ãƒƒãƒˆã®ãƒªãƒ³ã‚¯ã‚’ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ä¿¡ã—ã¾ã—ãŸã€‚<br>ã—ã°ã‚‰ããŸã£ã¦ã‚‚å—ä¿¡å‡ºæ¥ãªã„å ´åˆã¯ã€ã‚¹ãƒ‘ãƒ ï¼è¿·æƒ‘ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚©ãƒ«ãƒ€ã‚’ç¢ºèªã—ã¦ä¸‹ã•ã„ã€‚<br>ã‚‚ã—ãã“ã«ã‚‚ãªã„å ´åˆã¯ã€ç®¡ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚",
 "Request failed!<br>Did you make sure your email/username was right?" => "ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸï¼<br>ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ï¼ãƒ¦ãƒ¼ã‚¶åãŒæ£ã—ã„ã“ã¨ã‚’ç¢ºèªã—ã¾ã—ãŸã‹ï¼Ÿ",
@@ -110,11 +108,11 @@
 "Add" => "è¿½åŠ ",
 "Security Warning" => "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£è¦å‘Š",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "ã‚ãªãŸã®PHPã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ã€Null Byteæ”»æ’ƒ(CVE-2006-7243)ã¨ã„ã†è„†å¼±æ€§ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚",
-"Please update your PHP installation to use ownCloud securely." => "ownCloud ã‚’å®‰å…¨ã«åˆ©ç”¨ã™ã‚‹ã«ã€PHPã®æ›´æ–°ã‚’è¡Œãªã£ã¦ãã ã•ã„ã€‚",
+"Please update your PHP installation to use %s securely." => "%s ã‚’å®‰å…¨ã«åˆ©ç”¨ã™ã‚‹ç‚ºã« ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹PHPã‚’ã‚¢ãƒƒãƒ—ãƒ‡ãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "ã‚»ã‚ãƒ¥ã‚¢ãªä¹±æ•°ç”Ÿæˆå™¨ãŒåˆ©ç”¨å¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚PHPã®OpenSSLæ‹¡å¼µã‚’æœ‰åŠ¹ã«ã—ã¦ä¸‹ã•ã„ã€‚",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ã‚»ã‚ãƒ¥ã‚¢ãªä¹±æ•°ç”Ÿæˆå™¨ãŒç„¡ã„å ´åˆã€æ”»æ’ƒè€…ãŒãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ãƒªã‚»ãƒƒãƒˆã®ãƒˆãƒ¼ã‚¯ãƒ³ã‚’äºˆæ¸¬ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ä¹—ã£å–ã‚‰ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ãƒ•ã‚¡ã‚¤ãƒ«ãŒå‹•ä½œã—ã¦ã„ãªã„ãŸã‚ã€ãŠãã‚‰ãã‚ãªãŸã®ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚ã—ãã¯ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ã§ã™ã€‚",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "ã‚ãªãŸã®ã‚µãƒ¼ãƒã®é©åˆ‡ãªè¨å®šã«é–¢ã™ã‚‹æƒ…å ±ã¨ã—ã¦ã€<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆ</a>ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„ã€‚",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "ã‚µãƒ¼ãƒãƒ¼ã‚’é©æ£ã«è¨å®šã™ã‚‹æƒ…å ±ã¯ã€ã“ã¡ã‚‰ã®<a href=\"%s\" target=\"_blank\">ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆ</a>ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚",
 "Create an <strong>admin account</strong>" => "<strong>ç®¡ç†è€…ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ</strong>ã‚’ä½œæˆã—ã¦ãã ã•ã„",
 "Advanced" => "è©³ç´°è¨å®š",
 "Data folder" => "ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚©ãƒ«ãƒ€",
@@ -128,6 +126,7 @@
 "Finish setup" => "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’å®Œäº†ã—ã¾ã™",
 "%s is available. Get more information on how to update." => "%s ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚æ›´æ–°æ–¹æ³•ã«é–¢ã—ã¦ã•ã‚‰ã«æƒ…å ±ã‚’å–å¾—ã—ã¦ä¸‹ã•ã„ã€‚",
 "Log out" => "ãƒã‚°ã‚¢ã‚¦ãƒˆ",
+"More apps" => "ä»–ã®ã‚¢ãƒ—ãƒª",
 "Automatic logon rejected!" => "è‡ªå‹•ãƒã‚°ã‚¤ãƒ³ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼",
 "If you did not change your password recently, your account may be compromised!" => "æœ€è¿‘ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å¤‰æ›´ã—ã¦ã„ãªã„å ´åˆã€ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯å±é™ºã«ã•ã‚‰ã•ã‚Œã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚",
 "Please change your password to secure your account again." => "ã‚¢ã‚«ã‚¦ãƒ³ãƒˆä¿è·ã®ç‚ºã€ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å†åº¦ã®å¤‰æ›´ã‚’ãŠé¡˜ã„ã„ãŸã—ã¾ã™ã€‚",
@@ -140,3 +139,4 @@
 "next" => "æ¬¡",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æ›´æ–°ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ä¸‹ã•ã„ã€‚"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ka.php b/core/l10n/ka.php
index b8deeb1e550a99e8582fe83fe1a0d4b70b0b5e70..b6700f00f94c26b8960dd03024e53769013e6722 100644
--- a/core/l10n/ka.php
+++ b/core/l10n/ka.php
@@ -1,12 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "seconds ago" => "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 minute ago" => "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 hour ago" => "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "áƒ“áƒ¦áƒ”áƒ¡",
 "yesterday" => "áƒ’áƒ£áƒ¨áƒ˜áƒœ",
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
 "Password" => "áƒžáƒáƒ áƒáƒšáƒ˜",
 "Personal" => "áƒžáƒ”áƒ áƒ¡áƒáƒœáƒ",
 "Users" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜",
 "Admin" => "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜",
 "Help" => "áƒ¨áƒ•áƒ”áƒšáƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 877d66a0db315fa4b4ecec8ab3c74b3116ef1485..bf9ce1b8a4613c7a1a7dcb40c857048e72057d0e 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ¢áƒ˜áƒžáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ’áƒáƒœáƒ®áƒ˜áƒšáƒ£áƒšáƒ˜.",
 "No category to add?" => "áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ áƒ“áƒáƒ¡áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒšáƒáƒ“?",
 "This category already exists: %s" => "áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡: %s",
@@ -28,15 +29,13 @@
 "December" => "áƒ“áƒ”áƒ™áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜",
 "Settings" => "áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜",
 "seconds ago" => "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 minute ago" => "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"{minutes} minutes ago" => "{minutes} áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 hour ago" => "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"{hours} hours ago" => "{hours} áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "áƒ“áƒ¦áƒ”áƒ¡",
 "yesterday" => "áƒ’áƒ£áƒ¨áƒ˜áƒœ",
-"{days} days ago" => "{days} áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜",
-"{months} months ago" => "{months} áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "last year" => "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡",
 "years ago" => "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
@@ -82,7 +81,6 @@
 "Email sent" => "áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ˜ áƒ’áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒ",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒ’áƒ•áƒáƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒáƒ— áƒáƒ› áƒžáƒ áƒáƒ‘áƒšáƒ”áƒ›áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘ áƒáƒ¥: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ. áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ ownCloudâ€“áƒ–áƒ”.",
-"ownCloud password reset" => "ownCloud áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ",
 "Use the following link to reset your password: {link}" => "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒšáƒ˜áƒœáƒ™áƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒªáƒ•áƒšáƒ”áƒšáƒáƒ“: {link}",
 "You will receive a link to reset your password via Email." => "áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒáƒ’áƒ˜áƒ•áƒáƒ— áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒªáƒ•áƒšáƒ”áƒšáƒ˜ áƒšáƒ˜áƒœáƒ™áƒ˜ áƒ›áƒ”áƒ˜áƒšáƒ–áƒ”",
 "Username" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜",
@@ -102,11 +100,9 @@
 "Add" => "áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
 "Security Warning" => "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ PHP áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ áƒ¨áƒ”áƒ˜áƒªáƒáƒ•áƒ¡ áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒ”áƒ¡  NULL Byte áƒ¨áƒ”áƒ¢áƒ”áƒ•áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ— ownCloud áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ“, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜  PHP áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒ˜áƒ—áƒ˜ áƒ¡áƒ˜áƒ›áƒ‘áƒáƒšáƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒ¢áƒáƒ áƒ˜ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ©áƒáƒ áƒ—áƒáƒ— PHP OpenSSL áƒ’áƒáƒ¤áƒáƒ áƒ—áƒáƒ”áƒ‘áƒ.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒ˜áƒ—áƒ˜ áƒ¡áƒ˜áƒ›áƒ‘áƒáƒšáƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒ¢áƒáƒ áƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ¨áƒ”, áƒ¨áƒ”áƒ›áƒ¢áƒ”áƒ•áƒ›áƒ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒáƒ›áƒáƒ˜áƒªáƒœáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜ áƒ¨áƒ”áƒ’áƒ˜áƒªáƒ•áƒáƒšáƒáƒ— áƒ˜áƒ¡ áƒ“áƒ áƒ“áƒáƒ”áƒ£áƒ¤áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ”áƒ¥áƒáƒ£áƒœáƒ—áƒ¡.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ¨áƒ˜ áƒ áƒáƒ“áƒ’áƒáƒœ  .htaccess áƒ¤áƒáƒ˜áƒšáƒ˜ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ™áƒáƒ áƒ”áƒ¥áƒ¢áƒ£áƒšáƒáƒ“ áƒ“áƒáƒ¡áƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒšáƒáƒ“, áƒœáƒáƒ®áƒ”áƒ— áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">áƒ“áƒáƒ™áƒ£áƒ›áƒ”áƒœáƒ¢áƒáƒªáƒ˜áƒ</a>.",
 "Create an <strong>admin account</strong>" => "áƒ¨áƒ”áƒ¥áƒ›áƒ”áƒœáƒ˜ <strong>áƒáƒ“áƒ›áƒ˜áƒœ áƒ”áƒ¥áƒáƒ£áƒœáƒ¢áƒ˜</strong>",
 "Advanced" => "áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ—áƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜",
 "Data folder" => "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
@@ -130,3 +126,4 @@
 "next" => "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudâ€“áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ %sâ€“áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ›áƒ“áƒ”. áƒ”áƒ¡ áƒ›áƒáƒ˜áƒ—áƒ®áƒáƒ•áƒ¡ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒš áƒ“áƒ áƒáƒ¡."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/kn.php b/core/l10n/kn.php
new file mode 100644
index 0000000000000000000000000000000000000000..556cca20dac815a4de6b07d0e85de9636715742e
--- /dev/null
+++ b/core/l10n/kn.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 2ce4f0fd377b9838188e4758aa1eb74f54079695..44738a161a611aac59ddcd4c465b06544127cfb4 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "ë¶„ë¥˜ í˜•ì‹ì´ ì œê³µë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
 "No category to add?" => "ì¶”ê°€í•  ë¶„ë¥˜ê°€ ì—†ìŠµë‹ˆê¹Œ?",
 "This category already exists: %s" => "ë¶„ë¥˜ê°€ ì´ë¯¸ ì¡´ìž¬í•©ë‹ˆë‹¤: %s",
@@ -28,15 +29,13 @@
 "December" => "12ì›”",
 "Settings" => "ì„¤ì •",
 "seconds ago" => "ì´ˆ ì „",
-"1 minute ago" => "1ë¶„ ì „",
-"{minutes} minutes ago" => "{minutes}ë¶„ ì „",
-"1 hour ago" => "1ì‹œê°„ ì „",
-"{hours} hours ago" => "{hours}ì‹œê°„ ì „",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ì˜¤ëŠ˜",
 "yesterday" => "ì–´ì œ",
-"{days} days ago" => "{days}ì¼ ì „",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "ì§€ë‚œ ë‹¬",
-"{months} months ago" => "{months}ê°œì›” ì „",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "ê°œì›” ì „",
 "last year" => "ìž‘ë…„",
 "years ago" => "ë…„ ì „",
@@ -60,6 +59,7 @@
 "Share with link" => "URL ë§í¬ë¡œ ê³µìœ ",
 "Password protect" => "ì•”í˜¸ ë³´í˜¸",
 "Password" => "ì•”í˜¸",
+"Allow Public Upload" => "í¼ë¸”ë¦ ì—…ë¡œë“œ í—ˆìš©",
 "Email link to person" => "ì´ë©”ì¼ ì£¼ì†Œ",
 "Send" => "ì „ì†¡",
 "Set expiration date" => "ë§Œë£Œ ë‚ ì§œ ì„¤ì •",
@@ -82,10 +82,11 @@
 "Email sent" => "ì´ë©”ì¼ ë°œì†¡ë¨",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "ì—…ë°ì´íŠ¸ê°€ ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤. ì´ ë¬¸ì œë¥¼ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ì»¤ë®¤ë‹ˆí‹°</a>ì— ë³´ê³ í•´ ì£¼ì‹ì‹œì˜¤.",
 "The update was successful. Redirecting you to ownCloud now." => "ì—…ë°ì´íŠ¸ê°€ ì„±ê³µí•˜ì˜€ìŠµë‹ˆë‹¤. ownCloudë¡œ ëŒì•„ê°‘ë‹ˆë‹¤.",
-"ownCloud password reset" => "ownCloud ì•”í˜¸ ìž¬ì„¤ì •",
 "Use the following link to reset your password: {link}" => "ë‹¤ìŒ ë§í¬ë¥¼ ì‚¬ìš©í•˜ì—¬ ì•”í˜¸ë¥¼ ìž¬ì„¤ì •í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "ìš”ì²ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!<br>email ì£¼ì†Œì™€ ì‚¬ìš©ìž ëª…ì„ ì •í™•í•˜ê²Œ ë„£ìœ¼ì…¨ë‚˜ìš”?",
 "You will receive a link to reset your password via Email." => "ì´ë©”ì¼ë¡œ ì•”í˜¸ ìž¬ì„¤ì • ë§í¬ë¥¼ ë³´ëƒˆìŠµë‹ˆë‹¤.",
 "Username" => "ì‚¬ìš©ìž ì´ë¦„",
+"Yes, I really want to reset my password now" => "ë„¤, ì „ ì œ ë¹„ë°€ë²ˆí˜¸ë¥¼ ë¦¬ì…‹í•˜ê¸¸ ì›í•©ë‹ˆë‹¤",
 "Request reset" => "ìš”ì² ì´ˆê¸°í™”",
 "Your password was reset" => "ì•”í˜¸ê°€ ìž¬ì„¤ì •ë˜ì—ˆìŠµë‹ˆë‹¤",
 "To login page" => "ë¡œê·¸ì¸ í™”ë©´ìœ¼ë¡œ",
@@ -102,11 +103,9 @@
 "Add" => "ì¶”ê°€",
 "Security Warning" => "ë³´ì•ˆ ê²½ê³ ",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "ì‚¬ìš© ì¤‘ì¸ PHP ë²„ì „ì´ NULL ë°”ì´íŠ¸ ê³µê²©ì— ì·¨ì•½í•©ë‹ˆë‹¤ (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "ownCloudì˜ ë³´ì•ˆì„ ìœ„í•˜ì—¬ PHP ë²„ì „ì„ ì—…ë°ì´íŠ¸í•˜ì‹ì‹œì˜¤.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "ì•ˆì „í•œ ë‚œìˆ˜ ìƒì„±ê¸°ë¥¼ ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. PHPì˜ OpenSSL í™•ìž¥ì„ í™œì„±í™”í•´ ì£¼ì‹ì‹œì˜¤.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ì•ˆì „í•œ ë‚œìˆ˜ ìƒì„±ê¸°ë¥¼ ì‚¬ìš©í•˜ì§€ ì•Šìœ¼ë©´ ê³µê²©ìžê°€ ì•”í˜¸ ì´ˆê¸°í™” í† í°ì„ ì¶”ì¸¡í•˜ì—¬ ê³„ì •ì„ íƒˆì·¨í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess íŒŒì¼ì´ ì²˜ë¦¬ë˜ì§€ ì•Šì•„ì„œ ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ íŒŒì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í•  ìˆ˜ ì—†ì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "ì„œë²„ë¥¼ ì˜¬ë°”ë¥´ê²Œ ì„¤ì •í•˜ëŠ” ë°©ë²•ì„ ì•Œì•„ë³´ë ¤ë©´ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ë¬¸ì„œ</a>ë¥¼ ì°¸ê³ í•˜ì‹ì‹œì˜¤..",
 "Create an <strong>admin account</strong>" => "<strong>ê´€ë¦¬ìž ê³„ì •</strong> ë§Œë“¤ê¸°",
 "Advanced" => "ê³ ê¸‰",
 "Data folder" => "ë°ì´í„° í´ë”",
@@ -130,3 +129,4 @@
 "next" => "ë‹¤ìŒ",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudë¥¼ ë²„ì „ %s(ìœ¼)ë¡œ ì—…ë°ì´íŠ¸í•©ë‹ˆë‹¤. ìž ì‹œ ê¸°ë‹¤ë ¤ ì£¼ì‹ì‹œì˜¤."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 1902e45061372fb84a7b332d67c99b87669221d1..826fa428ef56b4645bcd5c9c9bc0df7892b52a82 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒ",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
 "Error" => "Ù‡Ù‡â€ŒÚµÙ‡",
 "Password" => "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ",
 "Username" => "Ù†Ø§ÙˆÛŒ Ø¨Ù‡â€ŒÚ©Ø§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±",
@@ -22,3 +27,4 @@
 "prev" => "Ù¾ÛŽØ´ØªØ±",
 "next" => "Ø¯ÙˆØ§ØªØ±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 96a3222093f059f0527dba829619ff8ae207e70f..a4b32698c933e869042f0e7dc9d34df42ca5418c 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "Den/D' %s huet Â»%sÂ« mat dir gedeelt",
 "Category type not provided." => "Typ vun der Kategorie net uginn.",
 "No category to add?" => "Keng Kategorie fir bÃ¤izesetzen?",
@@ -29,15 +30,13 @@
 "December" => "Dezember",
 "Settings" => "Astellungen",
 "seconds ago" => "Sekonnen hir",
-"1 minute ago" => "1 Minutt hir",
-"{minutes} minutes ago" => "virun {minutes} Minutten",
-"1 hour ago" => "virun 1 Stonn",
-"{hours} hours ago" => "virun {hours} Stonnen",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "haut",
 "yesterday" => "gÃ«schter",
-"{days} days ago" => "virun {days} Deeg",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "leschte Mount",
-"{months} months ago" => "virun {months} MÃ©int",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "MÃ©int hir",
 "last year" => "Lescht Joer",
 "years ago" => "Joren hir",
@@ -85,7 +84,6 @@
 "Email sent" => "Email geschÃ©ckt",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegrÃ¤ich. Mell dÃ«se Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegrÃ¤ich.  Du gÃ«ss elo bei d'ownCloud Ã«mgeleet.",
-"ownCloud password reset" => "Passwuert-ZrÃ©cksetzung vun der ownCloud",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir dÃ¤i Passwuert zrÃ©ckzesetzen: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De Link fir d'Passwuert zrÃ©ckzesetzen gouf un deng E-Mail-Adress geschÃ©ckt.<br>Falls du d'Mail net an den nÃ¤chste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier.<br>Wann do och keng Mail ass, fro w.e.gl. dÃ¤in Adminstrateur.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Ufro feelfeschloen!<br>Hues du sÃ©chergestallt dass deng Email respektiv dÃ¤i Benotzernumm korrekt sinn?",
@@ -110,11 +108,9 @@
 "Add" => "DobÃ¤isetzen",
 "Security Warning" => "SÃ©cherheets-Warnung",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "AktualisÃ©ier w.e.gl deng PHP-Installatioun fir ownCloud sÃ©cher benotzen ze kÃ«nnen.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Et ass kee sÃ©cheren Zoufallsgenerator verfÃ¼gbar. AktivÃ©ier w.e.gl d'OpenSSL-Erweiderung vu PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sÃ©cheren Zoufallsgenerator kann en UgrÃ¤ifer d'Passwuert-ZrÃ©cksetzungs-SchlÃ«sselen viraussoen an en Account iwwerhuelen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "DÃ¤in Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnÃ©iert.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Kuck w.e.gl. an der <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentatioun</a> fir Informatiounen iwwert eng uerdentlech Konfiguratioun vum Server.",
 "Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeÃ«n",
 "Advanced" => "AvancÃ©iert",
 "Data folder" => "Daten-Dossier",
@@ -140,3 +136,4 @@
 "next" => "weider",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud gÃ«tt op d'Versioun %s aktualisÃ©iert, dat kÃ©int e Moment daueren."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 4faf7388b23b876c5e1b93c78c4089a8a641d7b3..8a3ca044eafbe9e4a6d45292495c15d90585b0a8 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Kategorija nenurodyta.",
 "No category to add?" => "NepridÄ—site jokios kategorijos?",
 "This category already exists: %s" => "Å i kategorija jau egzistuoja: %s",
@@ -28,15 +29,13 @@
 "December" => "Gruodis",
 "Settings" => "Nustatymai",
 "seconds ago" => "prieÅ¡ sekundÄ™",
-"1 minute ago" => "PrieÅ¡ 1 minutÄ™",
-"{minutes} minutes ago" => "PrieÅ¡ {count} minutes",
-"1 hour ago" => "prieÅ¡ 1 valandÄ…",
-"{hours} hours ago" => "prieÅ¡ {hours} valandas",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Å¡iandien",
 "yesterday" => "vakar",
-"{days} days ago" => "PrieÅ¡ {days}  dienas",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "praeitÄ… mÄ—nesÄ¯",
-"{months} months ago" => "prieÅ¡ {months} mÄ—nesiÅ³",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "prieÅ¡ mÄ—nesÄ¯",
 "last year" => "praeitais metais",
 "years ago" => "prieÅ¡ metus",
@@ -83,7 +82,6 @@
 "Email sent" => "LaiÅ¡kas iÅ¡siÅ³stas",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesÄ—kmingas. PApie tai praÅ¡ome praneÅ¡ti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sÄ—kmingas. Nukreipiame Ä¯ jÅ«sÅ³ ownCloud.",
-"ownCloud password reset" => "ownCloud slaptaÅ¾odÅ¾io atkÅ«rimas",
 "Use the following link to reset your password: {link}" => "SlaptaÅ¾odio atkÅ«rimui naudokite Å¡iÄ… nuorodÄ…: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "NuorodÄ… su jÅ«sÅ³ slaptaÅ¾odÅ¾io atkÅ«rimu buvo nusiÅ³sta jums Ä¯ paÅ¡tÄ….<br>Jei jo negausite per atitinkamÄ… laikÄ…, pasiÅ¾iÅ«rÄ—kite brukalo aplankale.<br> Jei jo ir ten nÄ—ra, teiraukitÄ—s administratoriaus.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Klaida!<br>Ar tikrai jÅ«sÅ³ el paÅ¡tas/vartotojo vardas buvo teisingi?",
@@ -105,11 +103,9 @@
 "Add" => "PridÄ—ti",
 "Security Warning" => "Saugumo praneÅ¡imas",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "JÅ«sÅ³ PHP versija yra paÅ¾eidÅ¾iama prieÅ¡ NULL Byte atakÄ… (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "PraÅ¡ome atnaujinti savo PHP norint naudotis savo ownCloud saugiai.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktiniÅ³ skaiÄiÅ³ generatoriaus nÄ—ra, praÅ¡ome Ä¯jungti PHP OpenSSL modulÄ¯.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktiniÅ³ skaiÄiÅ³ generatoriaus, piktavaliai gali atspÄ—ti JÅ«sÅ³ slaptaÅ¾odÄ¯ ir pasisavinti paskyrÄ….",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "JÅ«sÅ³ failai yra tikriausiai prieinami per internetÄ… nes .htaccess failas neveikia.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Norint gauti daugiau informacijos apie tai kaip tinkamai nustatyit savo serverÄ¯, praÅ¡ome perskaityti <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacijÄ…</a>.",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrÄ…</strong>",
 "Advanced" => "IÅ¡plÄ—stiniai",
 "Data folder" => "DuomenÅ³ katalogas",
@@ -134,3 +130,4 @@
 "next" => "kitas",
 "Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud Ä¯ %s versijÄ…. tai gali Å¡iek tiek uÅ¾trukti."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 9552891d7d540ef75f8a93c1bd2f69a6d380e880..ad9643e4835063a0659d40ae3dba8cbda752dbb9 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Kategorijas tips nav norÄdÄ«ts.",
 "No category to add?" => "Nav kategoriju, ko pievienot?",
 "This category already exists: %s" => "Å Äda kategorija jau eksistÄ“ â€” %s",
@@ -28,15 +29,13 @@
 "December" => "Decembris",
 "Settings" => "IestatÄ«jumi",
 "seconds ago" => "sekundes atpakaÄ¼",
-"1 minute ago" => "pirms 1 minÅ«tes",
-"{minutes} minutes ago" => "pirms {minutes} minÅ«tÄ“m",
-"1 hour ago" => "pirms 1 stundas",
-"{hours} hours ago" => "pirms {hours} stundÄm",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Å¡odien",
 "yesterday" => "vakar",
-"{days} days ago" => "pirms {days} dienÄm",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "pagÄjuÅ¡ajÄ mÄ“nesÄ«",
-"{months} months ago" => "pirms {months} mÄ“neÅ¡iem",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "mÄ“neÅ¡us atpakaÄ¼",
 "last year" => "gÄjuÅ¡ajÄ gadÄ",
 "years ago" => "gadus atpakaÄ¼",
@@ -82,7 +81,6 @@
 "Email sent" => "VÄ“stule nosÅ«tÄ«ta",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "AtjauninÄÅ¡ana beidzÄs nesekmÄ«gi. LÅ«dzu, ziÅ†ojiet par Å¡o problÄ“mu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "AtjauninÄÅ¡ana beidzÄs sekmÄ«gi. Tagad pÄrsÅ«ta jÅ«s uz ownCloud.",
-"ownCloud password reset" => "ownCloud paroles maiÅ†a",
 "Use the following link to reset your password: {link}" => "Izmantojiet Å¡o saiti, lai mainÄ«tu paroli: {link}",
 "You will receive a link to reset your password via Email." => "JÅ«s savÄ epastÄ saÅ†emsiet interneta saiti, caur kuru varÄ“siet atjaunot paroli.",
 "Username" => "LietotÄjvÄrds",
@@ -104,7 +102,6 @@
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nav pieejams droÅ¡s nejauÅ¡u skaitÄ¼u Ä£enerators. LÅ«dzu, aktivÄ“jiet PHP OpenSSL paplaÅ¡inÄjumu.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez droÅ¡a nejauÅ¡u skaitÄ¼u Ä£eneratora uzbrucÄ“js var paredzÄ“t paroÄ¼u atjaunoÅ¡anas marÄ·ierus un pÄrÅ†em jÅ«su kontu.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "VisticamÄk, jÅ«su datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Lai uzzinÄtu, kÄ pareizi jÄkonfigurÄ“ Å¡is serveris, skatiet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÄciju</a>.",
 "Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
 "Advanced" => "PaplaÅ¡inÄti",
 "Data folder" => "Datu mape",
@@ -128,3 +125,4 @@
 "next" => "nÄkamÄ",
 "Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizÅ†emt kÄdu laiciÅ†u."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index c2b7907aa32e92d231b9863ec658824b38f05297..b51f8c7b089e23a8815f5bbe9fb709af32821118 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "ÐÐµ Ð±ÐµÑˆÐµ Ð´Ð¾ÑÑ‚Ð°Ð²ÐµÐ½ Ñ‚Ð¸Ð¿ Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð°.",
 "No category to add?" => "ÐÐµÐ¼Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð´Ð° ÑÐµ Ð´Ð¾Ð´Ð°Ð´Ðµ?",
 "Object type not provided." => "ÐÐµ Ð±ÐµÑˆÐµ Ð´Ð¾ÑÑ‚Ð°Ð²ÐµÐ½ Ñ‚Ð¸Ð¿ Ð½Ð° Ð¾Ð±Ñ˜ÐµÐºÑ‚.",
@@ -27,15 +28,13 @@
 "December" => "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸",
 "Settings" => "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°",
 "seconds ago" => "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸",
-"1 minute ago" => "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
-"{minutes} minutes ago" => "Ð¿Ñ€ÐµÐ´ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð¸",
-"1 hour ago" => "Ð¿Ñ€ÐµÐ´ 1 Ñ‡Ð°Ñ",
-"{hours} hours ago" => "Ð¿Ñ€ÐµÐ´ {hours} Ñ‡Ð°ÑÐ¾Ð²Ð¸",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Ð´ÐµÐ½ÐµÑÐºÐ°",
 "yesterday" => "Ð²Ñ‡ÐµÑ€Ð°",
-"{days} days ago" => "Ð¿Ñ€ÐµÐ´ {days} Ð´ÐµÐ½Ð¾Ð²Ð¸",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "Ð¼Ð¸Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð¼ÐµÑÐµÑ†",
-"{months} months ago" => "Ð¿Ñ€ÐµÐ´ {months} Ð¼ÐµÑÐµÑ†Ð¸",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "Ð¿Ñ€ÐµÐ´ Ð¼ÐµÑÐµÑ†Ð¸",
 "last year" => "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°",
 "years ago" => "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸",
@@ -78,7 +77,6 @@
 "Error setting expiration date" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾ÑÑ‚Ð°Ð²ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ñ€Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ",
 "Sending ..." => "ÐŸÑ€Ð°ÑœÐ°ÑšÐµ...",
 "Email sent" => "Ð•-Ð¿Ð¾Ñ€Ð°ÐºÐ° Ð¿Ñ€Ð°Ñ‚ÐµÐ½Ð°",
-"ownCloud password reset" => "Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð·Ð° ownCloud",
 "Use the following link to reset your password: {link}" => "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÐµÑ‚Ðµ Ñ˜Ð° ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð²Ñ€ÑÐºÐ° Ð´Ð° Ñ˜Ð° Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°Ñ‚Ðµ Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°: {link}",
 "You will receive a link to reset your password via Email." => "ÐŒÐµ Ð´Ð¾Ð±Ð¸ÐµÑ‚Ðµ Ð²Ñ€ÑÐºÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ð·Ð° Ð´Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ˜Ð° Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°Ñ‚Ðµ Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°.",
 "Username" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ",
@@ -120,3 +118,4 @@
 "prev" => "Ð¿Ñ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¾",
 "next" => "ÑÐ»ÐµÐ´Ð½Ð¾"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/core/l10n/ml_IN.php b/core/l10n/ml_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..93c8e33f3e2d95d19676fafd4be3416cee37855d
--- /dev/null
+++ b/core/l10n/ml_IN.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 4227a31758280ca9f37661a4ff7166a603756d51..64ad88dcb40511ea9cb8faeca734409430fdf706 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No category to add?" => "Tiada kategori untuk di tambah?",
 "No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
 "Sunday" => "Ahad",
@@ -21,6 +22,10 @@
 "November" => "November",
 "December" => "Disember",
 "Settings" => "Tetapan",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
 "Cancel" => "Batal",
 "Yes" => "Ya",
 "No" => "Tidak",
@@ -28,7 +33,6 @@
 "Error" => "Ralat",
 "Share" => "Kongsi",
 "Password" => "Kata laluan",
-"ownCloud password reset" => "Set semula kata lalaun ownCloud",
 "Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
 "Username" => "Nama pengguna",
@@ -64,3 +68,4 @@
 "prev" => "sebelum",
 "next" => "seterus"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index bfdff351849c3a4f526acad0ea9bcf6377a526dd..e06af3efb98737f1afd0e5dfcad77179d901ddbd 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No category to add?" => "á€‘á€Šá€·á€ºá€›á€”á€ºá€á€±á€«á€„á€ºá€¸á€…á€‰á€ºá€™á€›á€¾á€á€˜á€°á€¸á€œá€¬á€¸",
 "No categories selected for deletion." => "á€–á€»á€€á€ºá€›á€”á€ºá€¡á€á€½á€€á€ºá€á€±á€«á€„á€ºá€¸á€…á€‰á€ºá€™á€›á€½á€±á€¸á€‘á€¬á€¸á€•á€«",
 "January" => "á€‡á€”á€ºá€”á€á€«á€›á€®",
@@ -14,11 +15,13 @@
 "November" => "á€”á€á€¯á€á€„á€ºá€˜á€¬",
 "December" => "á€’á€®á€‡á€„á€ºá€˜á€¬",
 "seconds ago" => "á€…á€€á€¹á€€á€”á€·á€ºá€¡á€”á€Šá€ºá€¸á€„á€šá€ºá€€",
-"1 minute ago" => "á á€™á€á€”á€…á€ºá€¡á€›á€„á€ºá€€",
-"1 hour ago" => "á á€”á€¬á€›á€® á€¡á€›á€„á€ºá€€",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "á€šá€”á€±á€·",
 "yesterday" => "á€™á€”á€±á€·á€€",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "á€•á€¼á€®á€¸á€á€²á€·á€žá€±á€¬á€œ",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "á€™á€”á€¾á€…á€ºá€€",
 "years ago" => "á€”á€¾á€…á€º á€¡á€›á€„á€ºá€€",
 "Choose" => "á€›á€½á€±á€¸á€á€»á€šá€º",
@@ -61,3 +64,4 @@
 "prev" => "á€šá€á€„á€º",
 "next" => "á€”á€±á€¬á€€á€ºá€žá€á€¯á€·"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index dfe0cbaeb81e74cd8e6fe92fd568f17b247206e7..c19e570edbd213683930032758f628b41bc9a197 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,5 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s delte Â»%sÂ« med deg",
 "No category to add?" => "Ingen kategorier Ã¥ legge til?",
+"This category already exists: %s" => "Denne kategorien finnes allerede: %s",
 "No categories selected for deletion." => "Ingen kategorier merket for sletting.",
 "Sunday" => "SÃ¸ndag",
 "Monday" => "Mandag",
@@ -22,15 +25,13 @@
 "December" => "Desember",
 "Settings" => "Innstillinger",
 "seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minutt siden",
-"{minutes} minutes ago" => "{minutes} minutter siden",
-"1 hour ago" => "1 time siden",
-"{hours} hours ago" => "{hours} timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
-"{days} days ago" => "{days} dager siden",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "forrige mÃ¥ned",
-"{months} months ago" => "{months} mÃ¥neder siden",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "mÃ¥neder siden",
 "last year" => "forrige Ã¥r",
 "years ago" => "Ã¥r siden",
@@ -40,8 +41,10 @@
 "No" => "Nei",
 "Ok" => "Ok",
 "Error" => "Feil",
+"Shared" => "Delt",
 "Share" => "Del",
 "Error while sharing" => "Feil under deling",
+"Shared with you by {owner}" => "Delt med deg av {owner}",
 "Share with" => "Del med",
 "Share with link" => "Del med link",
 "Password protect" => "Passordbeskyttet",
@@ -62,7 +65,6 @@
 "Error setting expiration date" => "Kan ikke sette utlÃ¸psdato",
 "Sending ..." => "Sender...",
 "Email sent" => "E-post sendt",
-"ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk fÃ¸lgende lenke for Ã¥ tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om Ã¥ tilbakestille passordet ditt via epost.",
 "Username" => "Brukernavn",
@@ -78,6 +80,7 @@
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei der.âŽ\nâŽ\nVille bare gjÃ¸re deg oppmerksom pÃ¥ at %s delte %s med deg.âŽ\nVis den: %sâŽ\nâŽ\nVI ses!",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Legg til",
 "Security Warning" => "Sikkerhetsadvarsel",
@@ -100,5 +103,7 @@
 "remember" => "husk",
 "Log in" => "Logg inn",
 "prev" => "forrige",
-"next" => "neste"
+"next" => "neste",
+"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ne.php b/core/l10n/ne.php
new file mode 100644
index 0000000000000000000000000000000000000000..93c8e33f3e2d95d19676fafd4be3416cee37855d
--- /dev/null
+++ b/core/l10n/ne.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 9352f595e76d029f2bdebb3b99fcc165ef4adb4e..7530a736330d3d31ff7198f2c5170ca8305a8d4c 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s deelde Â»%sÂ« met jou",
 "Category type not provided." => "Categorie type niet opgegeven.",
 "No category to add?" => "Geen categorie om toe te voegen?",
@@ -29,15 +30,13 @@
 "December" => "december",
 "Settings" => "Instellingen",
 "seconds ago" => "seconden geleden",
-"1 minute ago" => "1 minuut geleden",
-"{minutes} minutes ago" => "{minutes} minuten geleden",
-"1 hour ago" => "1 uur geleden",
-"{hours} hours ago" => "{hours} uren geleden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "vandaag",
 "yesterday" => "gisteren",
-"{days} days ago" => "{days} dagen geleden",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "vorige maand",
-"{months} months ago" => "{months} maanden geleden",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "maanden geleden",
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
@@ -85,7 +84,6 @@
 "Email sent" => "E-mail verzonden",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
-"ownCloud password reset" => "ownCloud-wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
@@ -110,11 +108,11 @@
 "Add" => "Toevoegen",
 "Security Warning" => "Beveiligingswaarschuwing",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken.",
+"Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
@@ -128,6 +126,7 @@
 "Finish setup" => "Installatie afronden",
 "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
+"More apps" => "Meer applicaties",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
 "If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
 "Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
@@ -140,3 +139,4 @@
 "next" => "volgende",
 "Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 2a4902962bd121c89df5e5d94688f4aa0f43ffd0..0cc0944b87901ff5eef2c8898a11e0a1702d41b7 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Ingen kategoritype.",
 "No category to add?" => "Ingen kategori Ã¥ leggja til?",
 "This category already exists: %s" => "Denne kategorien finst alt: %s",
@@ -28,15 +29,13 @@
 "December" => "Desember",
 "Settings" => "Innstillingar",
 "seconds ago" => "sekund sidan",
-"1 minute ago" => "1 minutt sidan",
-"{minutes} minutes ago" => "{minutes} minutt sidan",
-"1 hour ago" => "1 time sidan",
-"{hours} hours ago" => "{hours} timar sidan",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
-"{days} days ago" => "{days} dagar sidan",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "fÃ¸rre mÃ¥nad",
-"{months} months ago" => "{months} mÃ¥nadar sidan",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "mÃ¥nadar sidan",
 "last year" => "i fjor",
 "years ago" => "Ã¥r sidan",
@@ -82,7 +81,6 @@
 "Email sent" => "E-post sendt",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullfÃ¸rt. Sender deg vidare til ownCloud no.",
-"ownCloud password reset" => "Nullstilling av ownCloud-passord",
 "Use the following link to reset your password: {link}" => "Klikk fÃ¸lgjande lenkje til Ã¥ nullstilla passordet ditt: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lenkja til Ã¥ nullstilla passordet med er sendt til e-posten din.<br>SjÃ¥ i spam-/sÃ¸ppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>SpÃ¸r din lokale administrator viss han ikkje er der heller.",
 "Request failed!<br>Did you make sure your email/username was right?" => "FÃ¸respurnaden feila!<br>Er du viss pÃ¥ at du skreiv inn rett e-post/brukarnamn?",
@@ -104,11 +102,9 @@
 "Add" => "Legg til",
 "Security Warning" => "TryggleiksÃ¥tvaring",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgÃ¥va di er sÃ¥rbar for NULL-byteÃ¥taket (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Ver venleg og oppdater PHP-installasjonen din sÃ¥ han kÃ¸yrer ownCloud pÃ¥ ein trygg mÃ¥te.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein Ã¥takar Ã¥ gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frÃ¥ Internett sidan .htaccess-fila ikkje fungerer.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for Ã¥ lÃ¦ra korleis du set opp tenaren din pÃ¥ rett mÃ¥te.",
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
 "Advanced" => "Avansert",
 "Data folder" => "Datamappe",
@@ -133,3 +129,4 @@
 "next" => "neste",
 "Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgÃ¥ve %s, dette kan ta ei stund."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index ad400aa650a422e125e77b77df6304a4866547f0..f47776fb99124a411f45066848d2978115155f60 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No category to add?" => "Pas de categoria d'ajustar ?",
 "No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
 "Sunday" => "Dimenge",
@@ -22,10 +23,13 @@
 "December" => "Decembre",
 "Settings" => "Configuracion",
 "seconds ago" => "segonda a",
-"1 minute ago" => "1 minuta a",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "uÃ¨i",
 "yesterday" => "iÃ¨r",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "mes passat",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "meses  a",
 "last year" => "an passat",
 "years ago" => "ans a",
@@ -58,7 +62,6 @@
 "Password protected" => "Parat per senhal",
 "Error unsetting expiration date" => "Error al metre de la data d'expiracion",
 "Error setting expiration date" => "Error setting expiration date",
-"ownCloud password reset" => "senhal d'ownCloud tornat botar",
 "Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
 "You will receive a link to reset your password via Email." => "ReÃ§auprÃ s un ligam per tornar botar ton senhal via corriÃ¨l.",
 "Username" => "Non d'usanciÃ¨r",
@@ -95,3 +98,4 @@
 "prev" => "dariiÃ¨r",
 "next" => "venent"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 0d7c9eb21c6e09897d56c76b0d36b00f316ee081..1f291be8aa041888e10bf99a7fd6b46cc1859422 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s WspÃ³Å‚dzielone Â»%sÂ« z tobÄ…",
 "Category type not provided." => "Nie podano typu kategorii.",
 "No category to add?" => "Brak kategorii do dodania?",
@@ -29,15 +30,13 @@
 "December" => "GrudzieÅ„",
 "Settings" => "Ustawienia",
 "seconds ago" => "sekund temu",
-"1 minute ago" => "1 minutÄ™ temu",
-"{minutes} minutes ago" => "{minutes} minut temu",
-"1 hour ago" => "1 godzinÄ™ temu",
-"{hours} hours ago" => "{hours} godzin temu",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "dziÅ›",
 "yesterday" => "wczoraj",
-"{days} days ago" => "{days} dni temu",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "w zeszÅ‚ym miesiÄ…cu",
-"{months} months ago" => "{months} miesiÄ™cy temu",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "miesiÄ™cy temu",
 "last year" => "w zeszÅ‚ym roku",
 "years ago" => "lat temu",
@@ -85,12 +84,12 @@
 "Email sent" => "E-mail wysÅ‚any",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakoÅ„czyÅ‚a siÄ™ niepowodzeniem. ZgÅ‚oÅ› ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spolecznoÅ›ci ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakoÅ„czyÅ‚a siÄ™ powodzeniem. PrzekierowujÄ™ do ownCloud.",
-"ownCloud password reset" => "restart hasÅ‚a ownCloud",
 "Use the following link to reset your password: {link}" => "UÅ¼yj tego odnoÅ›nika by zresetowaÄ‡ hasÅ‚o: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link do zresetowania hasÅ‚a zostaÅ‚a wysÅ‚ana na adres email. <br> JeÅ›li nie otrzymasz go w najbliÅ¼szym czasie, sprawdÅº folder ze spamem. <br> JeÅ›li go tam nie ma zwrÃ³ciÄ‡ siÄ™ do administratora tego ownCloud-a.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Å»Ä…danie niepowiodÅ‚o siÄ™!<br>Czy TwÃ³j email/nazwa uÅ¼ytkownika sÄ… poprawne?",
 "You will receive a link to reset your password via Email." => "OdnoÅ›nik sÅ‚uÅ¼Ä…cy do resetowania hasÅ‚a zostanie wysÅ‚any na adres e-mail.",
 "Username" => "Nazwa uÅ¼ytkownika",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Pliki sÄ… szyfrowane. JeÅ›li nie wÅ‚Ä…czono klucza odzyskiwania, nie bÄ™dzie moÅ¼liwe odzyskaÄ‡ dane z powrotem po zresetowaniu hasÅ‚a. JeÅ›li nie masz pewnoÅ›ci, co zrobiÄ‡, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuowaÄ‡?",
 "Yes, I really want to reset my password now" => "Tak, naprawdÄ™ chcÄ™ zresetowaÄ‡ hasÅ‚o teraz",
 "Request reset" => "Å»Ä…danie resetowania",
 "Your password was reset" => "Zresetowano hasÅ‚o",
@@ -104,15 +103,16 @@
 "Help" => "Pomoc",
 "Access forbidden" => "DostÄ™p zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "CzeÅ›Ä‡,\n\nInformujÄ™ ciÄ™ Å¼e %s udostÄ™pnia ci %s.\nZobacz na: %s\n\nPozdrawiam!",
 "Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Security Warning" => "OstrzeÅ¼enie o zabezpieczeniach",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "TwÃ³ja wersja PHP jest naraÅ¼ona na NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "ProszÄ™ uaktualnij swojÄ… instalacje PHP, aby uÅ¼ywaÄ‡ ownCloud bezpiecznie.",
+"Please update your PHP installation to use %s securely." => "ProszÄ™ uaktualnij swojÄ… instalacje PHP aby uÅ¼ywaÄ‡ %s bezpiecznie.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Bezpieczny generator liczb losowych jest niedostÄ™pny. WÅ‚Ä…cz rozszerzenie OpenSSL w PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakujÄ…ca moÅ¼e przewidzieÄ‡ token resetujÄ…cy hasÅ‚o i przejÄ…Ä‡ kontrolÄ™ nad twoim kontem.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "TwÃ³j katalog danych i pliki sÄ… prawdopodobnie dostÄ™pne z poziomu internetu, poniewaÅ¼ plik .htaccess nie dziaÅ‚a.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Aby uzyskaÄ‡ informacje dotyczÄ…ce prawidÅ‚owej konfiguracji serwera, siÄ™gnij do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacji</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskaÄ‡ informacje jak poprawnie skonfigurowaÄ‡ swÃ³j serwer, zapoznaj siÄ™ z <a href=\"%s\" target=\"_blank\">dokumentacjÄ…</a>.",
 "Create an <strong>admin account</strong>" => "UtwÃ³rz <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
@@ -126,6 +126,7 @@
 "Finish setup" => "ZakoÅ„cz konfigurowanie",
 "%s is available. Get more information on how to update." => "%s jest dostÄ™pna. Dowiedz siÄ™ wiÄ™cej na temat aktualizacji.",
 "Log out" => "Wyloguj",
+"More apps" => "WiÄ™cej aplikacji",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
 "If you did not change your password recently, your account may be compromised!" => "JeÅ›li hasÅ‚o byÅ‚o dawno niezmieniane, twoje konto moÅ¼e byÄ‡ zagroÅ¼one!",
 "Please change your password to secure your account again." => "ZmieÅ„ swoje hasÅ‚o, aby ponownie zabezpieczyÄ‡ swoje konto.",
@@ -133,7 +134,9 @@
 "remember" => "pamiÄ™taj",
 "Log in" => "Zaloguj",
 "Alternative Logins" => "Alternatywne loginy",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "CzeÅ›Ä‡,<br><br>InformujÄ™ ciÄ™ Å¼e %s udostÄ™pnia ci Â»%sÂ«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!",
 "prev" => "wstecz",
 "next" => "naprzÃ³d",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. MoÅ¼e to trochÄ™ potrwaÄ‡."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pl_PL.php b/core/l10n/pl_PL.php
index 77febeea3e5e9e7f6c020389cbe72cd5dc6d96be..15c376eb9544ebe6b78ce2e75e48fa8930dcb1e6 100644
--- a/core/l10n/pl_PL.php
+++ b/core/l10n/pl_PL.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "Ustawienia",
 "Username" => "Nazwa uÅ¼ytkownika"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index b36511da60038f435622222bd1f2832891e46c9c..892807452c1e0fc4c522adddc6a57655b055760a 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s compartilhou Â»%sÂ« com vocÃª",
 "Category type not provided." => "Tipo de categoria nÃ£o fornecido.",
 "No category to add?" => "Nenhuma categoria a adicionar?",
@@ -29,15 +30,13 @@
 "December" => "dezembro",
 "Settings" => "Ajustes",
 "seconds ago" => "segundos atrÃ¡s",
-"1 minute ago" => "1 minuto atrÃ¡s",
-"{minutes} minutes ago" => "{minutes} minutos atrÃ¡s",
-"1 hour ago" => "1 hora atrÃ¡s",
-"{hours} hours ago" => "{hours} horas atrÃ¡s",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoje",
 "yesterday" => "ontem",
-"{days} days ago" => "{days} dias atrÃ¡s",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "Ãºltimo mÃªs",
-"{months} months ago" => "{months} meses atrÃ¡s",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "meses atrÃ¡s",
 "last year" => "Ãºltimo ano",
 "years ago" => "anos atrÃ¡s",
@@ -85,7 +84,6 @@
 "Email sent" => "E-mail enviado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualizaÃ§Ã£o falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A atualizaÃ§Ã£o teve Ãªxito. VocÃª serÃ¡ redirecionado ao ownCloud agora.",
-"ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se vocÃª nÃ£o recebÃª-lo dentro de um perÃodo razoÃ¡vel de tempo, verifique o spam/lixo. <br> Se ele nÃ£o estiver lÃ¡ perguntar ao seu administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?",
@@ -110,11 +108,11 @@
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de SeguranÃ§a",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sua versÃ£o do PHP estÃ¡ vulnerÃ¡vel ao ataque NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Por favor atualize sua instalaÃ§Ã£o do PHP para utilizar o ownCloud de forma segura.",
+"Please update your PHP installation to use %s securely." => "Por favor, atualize sua instalaÃ§Ã£o PHP para usar %s seguranÃ§a.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nenhum gerador de nÃºmero aleatÃ³rio de seguranÃ§a disponÃvel. Habilite a extensÃ£o OpenSSL do PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem um gerador de nÃºmero aleatÃ³rio de seguranÃ§a, um invasor pode ser capaz de prever os sÃmbolos de redefiniÃ§Ã£o de senhas e assumir sua conta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretÃ³rio de dados e arquivos sÃ£o provavelmente acessÃveis pela internet, porque o .htaccess nÃ£o funciona.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para obter informaÃ§Ãµes sobre como configurar corretamente o seu servidor, consulte a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaÃ§Ã£o</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informaÃ§Ãµes sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentaÃ§Ã£o</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>",
 "Advanced" => "AvanÃ§ado",
 "Data folder" => "Pasta de dados",
@@ -128,6 +126,7 @@
 "Finish setup" => "Concluir configuraÃ§Ã£o",
 "%s is available. Get more information on how to update." => "%s estÃ¡ disponÃvel. Obtenha mais informaÃ§Ãµes sobre como atualizar.",
 "Log out" => "Sair",
+"More apps" => "Mais aplicativos",
 "Automatic logon rejected!" => "Entrada AutomÃ¡tica no Sistema Rejeitada!",
 "If you did not change your password recently, your account may be compromised!" => "Se vocÃª nÃ£o mudou a sua senha recentemente, a sua conta pode estar comprometida!",
 "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
@@ -140,3 +139,4 @@
 "next" => "prÃ³ximo",
 "Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versÃ£o %s, isto pode levar algum tempo."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index b0afff1ad24bf0159fed82fcdb08cb3648db919e..8459176f266e2f06c5497aea54f1165782a35655 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s partilhado Â»%sÂ« contigo",
 "Category type not provided." => "Tipo de categoria nÃ£o fornecido",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: %s" => "A categoria jÃ¡ existe: %s",
@@ -28,15 +30,13 @@
 "December" => "Dezembro",
 "Settings" => "ConfiguraÃ§Ãµes",
 "seconds ago" => "Minutos atrÃ¡s",
-"1 minute ago" => "HÃ¡ 1 minuto",
-"{minutes} minutes ago" => "{minutes} minutos atrÃ¡s",
-"1 hour ago" => "HÃ¡ 1 horas",
-"{hours} hours ago" => "HÃ¡ {hours} horas atrÃ¡s",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoje",
 "yesterday" => "ontem",
-"{days} days ago" => "{days} dias atrÃ¡s",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "ultÃmo mÃªs",
-"{months} months ago" => "HÃ¡ {months} meses atrÃ¡s",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "meses atrÃ¡s",
 "last year" => "ano passado",
 "years ago" => "anos atrÃ¡s",
@@ -61,6 +61,7 @@
 "Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
 "Password" => "Password",
+"Allow Public Upload" => "Permitir Envios PÃºblicos",
 "Email link to person" => "Enviar o link por e-mail",
 "Send" => "Enviar",
 "Set expiration date" => "Especificar data de expiraÃ§Ã£o",
@@ -83,12 +84,13 @@
 "Email sent" => "E-mail enviado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualizaÃ§Ã£o falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualizaÃ§Ã£o foi concluÃda com sucesso. Vai ser redireccionado para o ownCloud agora.",
-"ownCloud password reset" => "ReposiÃ§Ã£o da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereÃ§o para repor a sua password: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para fazer reset Ã  sua password foi enviado para o seu e-mail. <br> Se nÃ£o o recebeu dentro um espaÃ§o de tempo aceitÃ¡vel, por favor verifique a sua pasta de SPAM.<br> Se nÃ£o o encontrar, por favor contacte o seu administrador.",
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
 "You will receive a link to reset your password via Email." => "Vai receber um endereÃ§o para repor a sua password",
 "Username" => "Nome de utilizador",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os seus ficheiros estÃ£o encriptados. Se nÃ£o activou a chave de recuperaÃ§Ã£o, nÃ£o vai ser possÃvel recuperar os seus dados no caso da sua password ser reinicializada. Se nÃ£o tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+"Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
 "Request reset" => "Pedir reposiÃ§Ã£o",
 "Your password was reset" => "A sua password foi reposta",
 "To login page" => "Para a pÃ¡gina de entrada",
@@ -101,15 +103,16 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "OlÃ¡,\n\nApenas para lhe informar que %s partilhou %s consigo.\nVeja-o: %s\n\nCumprimentos!",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de SeguranÃ§a",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versÃ£o do PHP Ã© vulnerÃ¡vel ao ataque Byte Null (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Por favor atualize a sua versÃ£o PHP instalada para usar o ownCloud com seguranÃ§a.",
+"Please update your PHP installation to use %s securely." => "Por favor atualize a sua versÃ£o PHP instalada para usar o %s com seguranÃ§a.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "NÃ£o existe nenhum gerador seguro de nÃºmeros aleatÃ³rios, por favor, active a extensÃ£o OpenSSL no PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem nenhum gerador seguro de nÃºmeros aleatÃ³rios, uma pessoa mal intencionada pode prever a sua password, reiniciar as seguranÃ§as adicionais e tomar conta da sua conta. ",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarÃ£o provavelmente acessÃveis a partir da internet, pois o ficheiros .htaccess nÃ£o funciona.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para obter informaÃ§Ãµes de como configurar correctamente o servidor, veja em: <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informaÃ§Ãµes de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentaÃ§Ã£o</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
 "Advanced" => "AvanÃ§ado",
 "Data folder" => "Pasta de dados",
@@ -130,7 +133,9 @@
 "remember" => "lembrar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Contas de acesso alternativas",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "OlÃ¡,<br><br>Apenas para lhe informar que %s partilhou Â»%sÂ« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!",
 "prev" => "anterior",
 "next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versÃ£o %s, esta operaÃ§Ã£o pode demorar."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 6f23cea1c2645733620d17fe0fdcb7225df51c35..8c082df6af403ada133643443a7fdd1edc29abf6 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,13 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s Partajat Â»%sÂ« cu tine de",
 "Category type not provided." => "Tipul de categorie nu a fost specificat.",
 "No category to add?" => "Nici o categorie de adÄƒugat?",
 "This category already exists: %s" => "AceastÄƒ categorie deja existÄƒ: %s",
-"Object type not provided." => "Tipul obiectului nu este prevazut",
+"Object type not provided." => "Tipul obiectului nu este prevÄƒzut",
 "%s ID not provided." => "ID-ul %s nu a fost introdus",
-"Error adding %s to favorites." => "Eroare la adÄƒugarea %s la favorite",
-"No categories selected for deletion." => "Nici o categorie selectatÄƒ pentru È™tergere.",
-"Error removing %s from favorites." => "Eroare la È™tergerea %s din favorite",
+"Error adding %s to favorites." => "Eroare la adÄƒugarea %s la favorite.",
+"No categories selected for deletion." => "Nicio categorie selectatÄƒ pentru È™tergere.",
+"Error removing %s from favorites." => "Eroare la È™tergerea %s din favorite.",
 "Sunday" => "DuminicÄƒ",
 "Monday" => "Luni",
 "Tuesday" => "MarÈ›i",
@@ -29,15 +30,13 @@
 "December" => "Decembrie",
 "Settings" => "SetÄƒri",
 "seconds ago" => "secunde Ã®n urmÄƒ",
-"1 minute ago" => "1 minut Ã®n urmÄƒ",
-"{minutes} minutes ago" => "{minutes} minute in urma",
-"1 hour ago" => "Acum o ora",
-"{hours} hours ago" => "{hours} ore Ã®n urmÄƒ",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "astÄƒzi",
 "yesterday" => "ieri",
-"{days} days ago" => "{days} zile in urma",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "ultima lunÄƒ",
-"{months} months ago" => "{months} luni Ã®n urmÄƒ",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "luni Ã®n urmÄƒ",
 "last year" => "ultimul an",
 "years ago" => "ani Ã®n urmÄƒ",
@@ -47,9 +46,9 @@
 "Yes" => "Da",
 "No" => "Nu",
 "Ok" => "Ok",
-"The object type is not specified." => "Tipul obiectului nu a fost specificat",
+"The object type is not specified." => "Tipul obiectului nu este specificat.",
 "Error" => "Eroare",
-"The app name is not specified." => "Numele aplicaÈ›iei nu a fost specificat",
+"The app name is not specified." => "Numele aplicaÈ›iei nu este specificat.",
 "The required file {file} is not installed!" => "FiÈ™ierul obligatoriu {file} nu este instalat!",
 "Shared" => "Partajat",
 "Share" => "PartajeazÄƒ",
@@ -83,13 +82,12 @@
 "Error setting expiration date" => "Eroare la specificarea datei de expirare",
 "Sending ..." => "Se expediazÄƒ...",
 "Email sent" => "Mesajul a fost expediat",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Modernizarea a eÈ™uat! <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Te rugam sa raportezi problema aici.</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Modernizare reusita! Vei fii redirectionat!",
-"ownCloud password reset" => "Resetarea parolei ownCloud ",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Actualizarea a eÈ™uat! RaportaÈ›i problema cÄƒtre <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Actualizare reuÈ™itÄƒ. EÈ™ti redirecÈ›ionat cÄƒtre ownCloud.",
 "Use the following link to reset your password: {link}" => "FoloseÈ™te urmÄƒtorul link pentru a reseta parola: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?",
-"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
+"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email.",
 "Username" => "Nume utilizator",
 "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "FiÈ™ierele tale sunt criptate. DacÄƒ nu ai activat o cheie de recuperare, nu va mai exista nici o metodÄƒ prin care sÄƒ Ã®È›i recuperezi datele dupÄƒ resetarea parole. DacÄƒ nu eÈ™ti sigur Ã®n privinÈ›a la ce ai de fÄƒcut, contacteazÄƒ un administrator Ã®nainte sÄƒ continuii. Chiar vrei sÄƒ continui?",
 "Yes, I really want to reset my password now" => "Da, eu chiar doresc sÄƒ Ã®mi resetez parola acum",
@@ -101,20 +99,20 @@
 "Personal" => "Personal",
 "Users" => "Utilizatori",
 "Apps" => "AplicaÈ›ii",
-"Admin" => "Admin",
+"Admin" => "Administrator",
 "Help" => "Ajutor",
-"Access forbidden" => "Acces interzis",
+"Access forbidden" => "Acces restricÈ›ionat",
 "Cloud not found" => "Nu s-a gÄƒsit",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salutare,\n\nVÄƒ aduc la cunoÈ™tinÈ›Äƒ cÄƒ %s a partajat %s cu tine.\nAcceseazÄƒ la: %s\n\nNumai bine!",
 "Edit categories" => "EditeazÄƒ categorii",
 "Add" => "AdaugÄƒ",
 "Security Warning" => "Avertisment de securitate",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabil la acest atac un octet null  (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "VÄƒ rugÄƒm sÄƒ actualizaÈ›i instalarea dvs. PHP pentru a utiliza ownCloud in siguranÈ›Äƒ.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul de date È™i fiÈ™iere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcÈ›ioneazÄƒ.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pentru informatii despre configurarea corecta a serverului accesati pagina <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Documentare</a>.",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabilÄƒ la un atac cu un octet NULL  (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Te rog actualizeazÄƒ versiunea PHP pentru a utiliza %s Ã®n mod securizat.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nu este disponibil niciun generator securizat de numere aleatoare, vÄƒ rog activaÈ›i extensia PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "FÄƒrÄƒ generatorul securizat de numere aleatoare , un atacator poate anticipa simbolurile de resetare a parolei È™i poate prelua controlul asupra contului tÄƒu.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tÄƒu de date È™i fiÈ™iere sunt probabil accesibile de pe Internet, deoarece fiÈ™ierul .htaccess nu funcÈ›ioneazÄƒ.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informaÈ›ii despre cum sÄƒ configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentaÈ›ia</a>.",
 "Create an <strong>admin account</strong>" => "CreazÄƒ un <strong>cont de administrator</strong>",
 "Advanced" => "Avansat",
 "Data folder" => "Director date",
@@ -128,9 +126,9 @@
 "Finish setup" => "FinalizeazÄƒ instalarea",
 "%s is available. Get more information on how to update." => "%s este disponibil. Vezi mai multe informaÈ›ii despre procesul de actualizare.",
 "Log out" => "IeÈ™ire",
-"Automatic logon rejected!" => "Logare automata respinsa",
-"If you did not change your password recently, your account may be compromised!" => "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis",
-"Please change your password to secure your account again." => "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou.",
+"Automatic logon rejected!" => "Autentificare automatÄƒ respinsÄƒ!",
+"If you did not change your password recently, your account may be compromised!" => "DacÄƒ nu È›i-ai schimbat parola recent, contul tÄƒu ar putea fi compromis!",
+"Please change your password to secure your account again." => "Te rog schimbÄƒ-È›i parola pentru a-È›i securiza din nou contul.",
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "aminteÈ™te",
 "Log in" => "Autentificare",
@@ -140,3 +138,4 @@
 "next" => "urmÄƒtorul",
 "Updating ownCloud to version %s, this may take a while." => "ActualizÄƒm ownCloud la versiunea %s, aceasta poate dura cÃ¢teva momente."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 3369072ba87a415e62febc9cf1fb5d3cf86ccfa0..fe00c89b1c2bc6e5920a8392e965439481a054fe 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s Ð¿Ð¾Ð´ÐµÐ»Ð¸Ð»ÑÑ Â»%sÂ« Ñ Ð²Ð°Ð¼Ð¸",
 "Category type not provided." => "Ð¢Ð¸Ð¿ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸ Ð½Ðµ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½",
 "No category to add?" => "ÐÐµÑ‚ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ?",
@@ -29,15 +30,13 @@
 "December" => "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ",
 "Settings" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ",
 "seconds ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´",
-"1 minute ago" => "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´",
-"{minutes} minutes ago" => "{minutes} Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´",
-"1 hour ago" => "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´",
-"{hours} hours ago" => "{hours} Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "ÑÐµÐ³Ð¾Ð´Ð½Ñ",
 "yesterday" => "Ð²Ñ‡ÐµÑ€Ð°",
-"{days} days ago" => "{days} Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ",
-"{months} months ago" => "{months} Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´",
 "last year" => "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ",
 "years ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´",
@@ -85,7 +84,6 @@
 "Email sent" => "ÐŸÐ¸ÑÑŒÐ¼Ð¾ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¾",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "ÐŸÑ€Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° ÑÐ¾Ð¾Ð±Ñ‰Ð¸Ñ‚Ðµ Ð¾Ð± ÑÑ‚Ð¾Ð¼ Ð² <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ÑÐ¾Ð¾Ð±Ñ‰ÐµÑÑ‚Ð²Ð¾</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾. ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÐµÐ¼ÑÑ Ð² Ð’Ð°Ñˆ ownCloud...",
-"ownCloud password reset" => "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ",
 "Use the following link to reset your password: {link}" => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÑƒÑŽ ÑÑÑ‹Ð»ÐºÑƒ Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÐ±Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ð¡ÑÑ‹Ð»ÐºÐ° Ð´Ð»Ñ ÑÐ±Ñ€Ð¾ÑÐ° Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð° Ð²Ð°Ð¼ â€‹â€‹Ð¿Ð¾ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ðµ.<br>Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚Ðµ Ð¿Ð¸ÑÑŒÐ¼Ð¾ Ð² Ð¿Ñ€ÐµÐ´ÐµÐ»Ð°Ñ… Ð¾Ð´Ð½Ð¾Ð¹-Ð´Ð²ÑƒÑ… Ð¼Ð¸Ð½ÑƒÑ‚, Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ð¡Ð¿Ð°Ð¼. <br>Ð•ÑÐ»Ð¸ Ð¿Ð¸ÑÑŒÐ¼Ð° Ñ‚Ð°Ð¼ Ð½ÐµÑ‚, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ²Ð¾ÐµÐ¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ ÑƒÐ´Ð°Ð»ÑÑ. Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ email Ð¸Ð»Ð¸ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ñ‹ Ð²ÐµÑ€Ð½Ð¾?",
@@ -110,11 +108,11 @@
 "Add" => "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ",
 "Security Warning" => "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ð’Ð°ÑˆÐ° Ð²ÐµÑ€ÑÐ¸Ñ PHP ÑƒÑÐ·Ð²Ð¸Ð¼Ð° Ðº Ð°Ñ‚Ð°ÐºÐµ NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ð’Ð°Ñˆ PHP Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ownCloud Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾.",
+"Please update your PHP installation to use %s securely." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ð’Ð°ÑˆÑƒ PHP ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ Ð´Ð»Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ %s.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð½Ñ‹Ð¹ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€ ÑÐ»ÑƒÑ‡Ð°Ð¹Ð½Ñ‹Ñ… Ñ‡Ð¸ÑÐµÐ», Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ð‘ÐµÐ· Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð° ÑÐ»ÑƒÑ‡Ð°Ð¹Ð½Ñ‹Ñ… Ñ‡Ð¸ÑÐµÐ» Ð·Ð»Ð¾ÑƒÐ¼Ñ‹ÑˆÐ»ÐµÐ½Ð½Ð¸Ðº Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ñ€ÐµÐ´ÑƒÐ³Ð°Ð´Ð°Ñ‚ÑŒ Ñ‚Ð¾ÐºÐµÐ½Ñ‹ ÑÐ±Ñ€Ð¾ÑÐ° Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¸ Ð·Ð°Ð²Ð»Ð°Ð´ÐµÑ‚ÑŒ Ð’Ð°ÑˆÐµÐ¹ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÑŒÑŽ.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ð’Ð°ÑˆÐ° Ð¿Ð°Ð¿ÐºÐ° Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð¸ Ñ„Ð°Ð¹Ð»Ñ‹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð¸Ð· Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð° Ð¿Ð¾Ñ‚Ð¾Ð¼Ñƒ Ñ‡Ñ‚Ð¾ Ñ„Ð°Ð¹Ð» .htaccess Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ð”Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ ÐºÐ°Ðº Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð’Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€, Ð¿Ð¾Ð¶Ð°Ð»Ð¹ÑÑ‚Ð° Ð·Ð°Ð³Ð»ÑÐ½Ð¸Ñ‚Ðµ Ð² <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÑŽ</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ð”Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸, ÐºÐ°Ðº Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð’Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð·Ð°Ð³Ð»ÑÐ½Ð¸Ñ‚Ðµ Ð² <a hrev=\"%s\"target=\"blank\">Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÑŽ</a>.",
 "Create an <strong>admin account</strong>" => "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ <strong>ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°</strong>",
 "Advanced" => "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾",
 "Data folder" => "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸",
@@ -140,3 +138,4 @@
 "next" => "ÑÐ»ÐµÐ´",
 "Updating ownCloud to version %s, this may take a while." => "Ð˜Ð´Ñ‘Ñ‚ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÐ¸Ð¸ %s. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
 );
+$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);";
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 580df5961f80b764fa4dd88d58add1a9aada8036..ad7c7c73000a05f77d2fa29e04ad0b4a62b11f5c 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
 "Cancel" => "ÐžÑ‚Ð¼ÐµÐ½Ð°",
 "Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
 "Share" => "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¼",
 "Add" => "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ"
 );
+$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);";
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 21038a93e88b9b7bff30bcd131dbf5dbb219601a..ff016e6d6c006cd610e39200354f5cd195178851 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No categories selected for deletion." => "à¶¸à¶šà· à¶¯à·à¶¸à·“à¶¸ à·ƒà¶³à·„à· à¶´à·Šâ€à¶»à·€à¶»à·Šà¶œà¶ºà¶±à·Š à¶à·à¶»à· à¶±à·œà¶¸à·à¶.",
 "Sunday" => "à¶‰à¶»à·’à¶¯à·",
 "Monday" => "à·ƒà¶³à·”à¶¯à·",
@@ -21,10 +22,13 @@
 "December" => "à¶¯à·™à·ƒà·à¶¸à·Šà¶¶à¶»à·Š",
 "Settings" => "à·ƒà·’à¶§à·”à·€à¶¸à·Š",
 "seconds ago" => "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»",
-"1 minute ago" => "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à¶…à¶¯",
 "yesterday" => "à¶Šà¶ºà·š",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "à¶´à·™à¶» à¶¸à·à·ƒà¶ºà·š",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "à¶¸à·à·ƒ à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»",
 "last year" => "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š",
 "years ago" => "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»",
@@ -52,7 +56,6 @@
 "Password protected" => "à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·’à¶±à·Š à¶†à¶»à¶šà·Šà·à·à¶šà¶» à¶‡à¶",
 "Error unsetting expiration date" => "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à¶‰à·€à¶à·Š à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š",
 "Error setting expiration date" => "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š",
-"ownCloud password reset" => "ownCloud à¶¸à·”à¶»à¶´à¶¯à¶º à¶´à·Šâ€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· à¶šà¶»à¶±à·Šà¶±",
 "You will receive a link to reset your password via Email." => "à¶”à¶¶à¶œà·š à¶¸à·”à¶»à¶´à¶¯à¶º à¶´à·Šâ€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· à¶šà·’à¶»à·“à¶¸ à·ƒà¶³à·„à· à¶ºà·œà¶¸à·”à·€ à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·‘à¶½à·™à¶±à·Š à¶½à·à¶¶à·™à¶±à·” à¶‡à¶",
 "Username" => "à¶´à¶»à·’à·à·“à¶½à¶š à¶±à¶¸",
 "Your password was reset" => "à¶”à¶¶à·š à¶¸à·”à¶»à¶´à¶¯à¶º à¶´à·Šâ€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· à¶šà¶»à¶± à¶½à¶¯à·“",
@@ -86,3 +89,4 @@
 "prev" => "à¶´à·™à¶»",
 "next" => "à¶Šà·…à¶Ÿ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sk.php b/core/l10n/sk.php
new file mode 100644
index 0000000000000000000000000000000000000000..7285020288b5ca50fc0a189246f93133fa1727d0
--- /dev/null
+++ b/core/l10n/sk.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index e9876c52eac5ed4066c9706c70083cab5af5aeb5..71f50bbdc310acc0a2af85a0b5885448f218beba 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s s Vami zdieÄ¾a Â»%sÂ«",
 "Category type not provided." => "NeposkytnutÃ½ typ kategÃ³rie.",
 "No category to add?" => "Å½iadna kategÃ³ria pre pridanie?",
@@ -29,15 +30,13 @@
 "December" => "December",
 "Settings" => "Nastavenia",
 "seconds ago" => "pred sekundami",
-"1 minute ago" => "pred minÃºtou",
-"{minutes} minutes ago" => "pred {minutes} minÃºtami",
-"1 hour ago" => "Pred 1 hodinou",
-"{hours} hours ago" => "Pred {hours} hodinami.",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "dnes",
 "yesterday" => "vÄera",
-"{days} days ago" => "pred {days} dÅˆami",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "minulÃ½ mesiac",
-"{months} months ago" => "Pred {months} mesiacmi.",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "pred mesiacmi",
 "last year" => "minulÃ½ rok",
 "years ago" => "pred rokmi",
@@ -62,6 +61,7 @@
 "Share with link" => "ZdieÄ¾aÅ¥ cez odkaz",
 "Password protect" => "ChrÃ¡niÅ¥ heslom",
 "Password" => "Heslo",
+"Allow Public Upload" => "PovoliÅ¥ verejnÃ© nahrÃ¡vanie",
 "Email link to person" => "OdoslaÅ¥ odkaz emailom",
 "Send" => "OdoslaÅ¥",
 "Set expiration date" => "NastaviÅ¥ dÃ¡tum expirÃ¡cie",
@@ -84,12 +84,12 @@
 "Email sent" => "Email odoslanÃ½",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "AktualizÃ¡cia nebola ÃºspeÅ¡nÃ¡. ProblÃ©m nahlÃ¡ste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "AktualizÃ¡cia bola ÃºspeÅ¡nÃ¡. PresmerovÃ¡vam na prihlasovaciu strÃ¡nku.",
-"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "PouÅ¾ite nasledujÃºci odkaz pre obnovenie vÃ¡Å¡ho hesla: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenie hesla bol odoslanÃ½ na VaÅ¡u emailovÃº adresu.<br>Ak ho v krÃ¡tkej dobe neobdrÅ¾Ãte, skontrolujte si VÃ¡Å¡ kÃ´Å¡ a prieÄinok spam.<br>Ak ho ani tam nenÃ¡jdete, kontaktujte svojho administrÃ¡tora.",
 "Request failed!<br>Did you make sure your email/username was right?" => "PoÅ¾iadavka zlyhala.<br>Uistili ste sa, Å¾e VaÅ¡e pouÅ¾ÃvateÄ¾skÃ© meno a email sÃº sprÃ¡vne?",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdrÅ¾Ãte e-mailom.",
 "Username" => "Meno pouÅ¾ÃvateÄ¾a",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "VaÅ¡e sÃºbory sÃº Å¡ifrovanÃ©. Ak nemÃ¡te povolenÃ½ kÄ¾ÃºÄ obnovy, nie je spÃ´sob, ako zÃskaÅ¥ po obnove hesla VaÅ¡e dÃ¡ta. Ak nie ste si isÃ tÃ½m, Äo robÃte, obrÃ¡Å¥te sa najskÃ´r na administrÃ¡tora. Naozaj chcete pokraÄovaÅ¥?",
 "Yes, I really want to reset my password now" => "Ãno, Å¾elÃ¡m si teraz obnoviÅ¥ svoje heslo",
 "Request reset" => "PoÅ¾iadaÅ¥ o obnovenie",
 "Your password was reset" => "VaÅ¡e heslo bolo obnovenÃ©",
@@ -108,11 +108,11 @@
 "Add" => "PridaÅ¥",
 "Security Warning" => "BezpeÄnostnÃ© varovanie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia VÃ¡Å¡ho PHP je napadnuteÄ¾nÃ¡ pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Aktualizujte prosÃm VaÅ¡u inÅ¡tanciu PHP pre bezpeÄnÃ© pouÅ¾Ãvanie ownCloud.",
+"Please update your PHP installation to use %s securely." => "Aktualizujte prosÃm vaÅ¡u inÅ¡tanciu PHP pre bezpeÄnÃ© pouÅ¾Ãvanie %s.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nie je dostupnÃ½ Å¾iadny bezpeÄnÃ½ generÃ¡tor nÃ¡hodnÃ½ch ÄÃsel, prosÃm, povoÄ¾te rozÅ¡Ãrenie OpenSSL v PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpeÄnÃ©ho generÃ¡tora nÃ¡hodnÃ½ch ÄÃsel mÃ´Å¾e ÃºtoÄnÃk predpovedaÅ¥ token pre obnovu hesla a prevziaÅ¥ kontrolu nad vaÅ¡Ãm kontom.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "VÃ¡Å¡ prieÄinok s dÃ¡tami a sÃºbormi je dostupnÃ½ z internetu, lebo sÃºbor .htaccess nefunguje.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Pre informÃ¡cie, ako sprÃ¡vne nastaviÅ¥ VÃ¡Å¡ server sa pozrite do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÃ¡cie</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informÃ¡cie, ako sprÃ¡vne nastaviÅ¥ vÃ¡Å¡ server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentÃ¡cie</a>.",
 "Create an <strong>admin account</strong>" => "VytvoriÅ¥ <strong>administrÃ¡torskÃ½ ÃºÄet</strong>",
 "Advanced" => "RozÅ¡ÃrenÃ©",
 "Data folder" => "PrieÄinok dÃ¡t",
@@ -138,3 +138,4 @@
 "next" => "Äalej",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, mÃ´Å¾e to chvÃÄ¾u trvaÅ¥."
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 548a5a3f5157be182d79f6a12acf7337af9d5ede..397ede93fd4d5883c6f0236f74e7510f217ae86e 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s je delil Â»%sÂ« z vami",
 "Category type not provided." => "Vrsta kategorije ni podana.",
 "No category to add?" => "Ali ni kategorije za dodajanje?",
@@ -29,15 +30,13 @@
 "December" => "december",
 "Settings" => "Nastavitve",
 "seconds ago" => "pred nekaj sekundami",
-"1 minute ago" => "pred minuto",
-"{minutes} minutes ago" => "pred {minutes} minutami",
-"1 hour ago" => "Pred 1 uro",
-"{hours} hours ago" => "pred {hours} urami",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
 "today" => "danes",
 "yesterday" => "vÄeraj",
-"{days} days ago" => "pred {days} dnevi",
+"_%n day ago_::_%n days ago_" => array("","","",""),
 "last month" => "zadnji mesec",
-"{months} months ago" => "pred {months} meseci",
+"_%n month ago_::_%n months ago_" => array("","","",""),
 "months ago" => "mesecev nazaj",
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
@@ -85,7 +84,6 @@
 "Email sent" => "Elektronska poÅ¡ta je poslana",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. PoÅ¡ljite poroÄilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspeÅ¡no konÄana. Stran bo preusmerjena na oblak ownCloud.",
-"ownCloud password reset" => "Ponastavitev gesla za oblak ownCloud",
 "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporoÄila ne prejmete v doglednem Äasu, preverite tudi mape vsiljene poÅ¡te.<br>ÄŒe ne bo niti tam, stopite v stik s skrbnikom.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniÅ¡ko ime navedena pravilno?",
@@ -110,11 +108,11 @@
 "Add" => "Dodaj",
 "Security Warning" => "Varnostno opozorilo",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena razliÄica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "PriporoÄeno je posodobiti namestitev PHP in varno uporabljati oblak ownCloud",
+"Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s posodobite PHP",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni nobenega varnega ustvarjalnika nakljuÄnih Å¡tevil. OmogoÄiti je treba razÅ¡iritev PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega ustvarjalnika nakljuÄnih Å¡tevil je mogoÄe napovedati Å¾etone za ponastavitev gesla, s Äimer je mogoÄe prevzeti nadzor nad raÄunom.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Navodila, kako pravilno namestiti streÅ¾nik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacije</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za navodila, kako pravilno nastaviti vaÅ¡ streÅ¾nik, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniÅ¡ki raÄun</strong>",
 "Advanced" => "Napredne moÅ¾nosti",
 "Data folder" => "Podatkovna mapa",
@@ -140,3 +138,4 @@
 "next" => "naprej",
 "Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na razliÄico %s je lahko dolgotrajno."
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 4e6c458f4df4675064f32738840de0781952646c..7817af41b54a8b986031c278a9400a360602ce2a 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Mungon tipi i kategorisÃ«.",
 "No category to add?" => "AsnjÃ« kategori pÃ«r tÃ« shtuar?",
 "This category already exists: %s" => "Kjo kategori tashmÃ« ekziston: %s",
@@ -28,20 +29,19 @@
 "December" => "Dhjetor",
 "Settings" => "Parametra",
 "seconds ago" => "sekonda mÃ« parÃ«",
-"1 minute ago" => "1 minutÃ« mÃ« parÃ«",
-"{minutes} minutes ago" => "{minutes} minuta mÃ« parÃ«",
-"1 hour ago" => "1 orÃ« mÃ« parÃ«",
-"{hours} hours ago" => "{hours} orÃ« mÃ« parÃ«",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "sot",
 "yesterday" => "dje",
-"{days} days ago" => "{days} ditÃ« mÃ« parÃ«",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "muajin e shkuar",
-"{months} months ago" => "{months} muaj mÃ« parÃ«",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "muaj mÃ« parÃ«",
 "last year" => "vitin e shkuar",
 "years ago" => "vite mÃ« parÃ«",
 "Choose" => "Zgjidh",
 "Cancel" => "Anulo",
+"Error loading file picker template" => "Veprim i gabuar gjatÃ« ngarkimit tÃ« modelit tÃ« zgjedhÃ«sit tÃ« skedarÃ«ve",
 "Yes" => "Po",
 "No" => "Jo",
 "Ok" => "NÃ« rregull",
@@ -60,6 +60,7 @@
 "Share with link" => "Nda me lidhje",
 "Password protect" => "Mbro me kod",
 "Password" => "Kodi",
+"Allow Public Upload" => "Lejo Ngarkimin Publik",
 "Email link to person" => "DÃ«rgo email me lidhjen",
 "Send" => "DÃ«rgo",
 "Set expiration date" => "Cakto datÃ«n e pÃ«rfundimit",
@@ -82,12 +83,12 @@
 "Email sent" => "Email-i u dÃ«rgua",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dÃ«shtoi. Ju lutemi njoftoni pÃ«r kÃ«tÃ« problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
-"ownCloud password reset" => "Rivendosja e kodit tÃ« ownCloud-it",
 "Use the following link to reset your password: {link}" => "PÃ«rdorni lidhjen nÃ« vijim pÃ«r tÃ« rivendosur kodin: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lidhja pÃ«r rivendosjen e kodit tuaj u dÃ«rgua tek email-i juaj.<br>NÃ«qoftÃ«se nuk e merrni brenda njÃ« kohe tÃ« arsyeshme, kontrolloni dosjet e postÃ«s sÃ« padÃ«shirueshme (spam).<br>NÃ«qoftÃ«se nuk Ã«shtÃ« as aty, pyesni administratorin tuaj lokal.",
 "Request failed!<br>Did you make sure your email/username was right?" => "KÃ«rkesa dÃ«shtoi!<br>A u siguruat qÃ« email-i/pÃ«rdoruesi juaj ishte i saktÃ«?",
 "You will receive a link to reset your password via Email." => "Do t'iu vijÃ« njÃ« email qÃ« pÃ«rmban njÃ« lidhje pÃ«r ta rivendosur kodin.",
 "Username" => "PÃ«rdoruesi",
+"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
 "Request reset" => "BÃ«j kÃ«rkesÃ« pÃ«r rivendosjen",
 "Your password was reset" => "Kodi yt u rivendos",
 "To login page" => "Tek faqja e hyrjes",
@@ -100,15 +101,14 @@
 "Help" => "NdihmÃ«",
 "Access forbidden" => "Ndalohet hyrja",
 "Cloud not found" => "Cloud-i nuk u gjet",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Tungjatjeta,\n\nju njoftojmÃ« qÃ« %s ka ndarÃ« %s me ju.\nShikojeni: %s\n\nPÃ«shÃ«ndetje!",
 "Edit categories" => "Ndrysho kategoritÃ«",
 "Add" => "Shto",
 "Security Warning" => "ParalajmÃ«rim sigurie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-sÃ« Ã«shtÃ« i cÃ«nueshÃ«m nga sulmi NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Ju lutem azhurnoni instalimin tuaj tÃ« PHP-sÃ« qÃ« tÃ« pÃ«rdorni ownCloud-in nÃ« mÃ«nyrÃ« tÃ« sigurt.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nuk disponohet asnjÃ« krijues numrash tÃ« rastÃ«sishÃ«m, ju lutem aktivizoni shtesÃ«n PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Pa njÃ« krijues numrash tÃ« rastÃ«sishÃ«m tÃ« sigurt njÃ« person i huaj mund tÃ« jetÃ« nÃ« gjendje tÃ« parashikojÃ« kodin dhe tÃ« marri llogarinÃ« tuaj.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarÃ«t e tÃ« dhÃ«nave tuaja mbase janÃ« tÃ« arritshme nga interneti sepse skedari .htaccess nuk po punon.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "PÃ«r mÃ« shumÃ« informacion mbi konfigurimin e duhur tÃ« serverit tuaj, ju lutem shikoni <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacionin</a>.",
 "Create an <strong>admin account</strong>" => "Krijo njÃ« <strong>llogari administruesi</strong>",
 "Advanced" => "TÃ« pÃ«rparuara",
 "Data folder" => "Emri i dosjes",
@@ -132,3 +132,4 @@
 "next" => "para",
 "Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund tÃ« zgjasi pak."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index d68012c505f593aa0a8781811be1999d8b8a328e..d0485ff662cb1f6a687f33ac4066d9a7e5f7b45e 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Ð’Ñ€ÑÑ‚Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ðµ Ð½Ð¸Ñ˜Ðµ ÑƒÐ½ÐµÑ‚.",
 "No category to add?" => "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ñ˜Ð¾Ñˆ Ð½ÐµÐºÑƒ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ñƒ?",
 "Object type not provided." => "Ð’Ñ€ÑÑ‚Ð° Ð¾Ð±Ñ˜ÐµÐºÑ‚Ð° Ð½Ð¸Ñ˜Ðµ ÑƒÐ½ÐµÑ‚Ð°.",
@@ -27,15 +28,13 @@
 "December" => "Ð”ÐµÑ†ÐµÐ¼Ð±Ð°Ñ€",
 "Settings" => "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ",
 "seconds ago" => "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸",
-"1 minute ago" => "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚",
-"{minutes} minutes ago" => "Ð¿Ñ€Ðµ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
-"1 hour ago" => "ÐŸÑ€Ðµ Ñ˜ÐµÐ´Ð½Ð¾Ð³ ÑÐ°Ñ‚Ð°",
-"{hours} hours ago" => "ÐŸÑ€Ðµ {hours} ÑÐ°Ñ‚Ð° (ÑÐ°Ñ‚Ð¸)",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Ð´Ð°Ð½Ð°Ñ",
 "yesterday" => "Ñ˜ÑƒÑ‡Ðµ",
-"{days} days ago" => "Ð¿Ñ€Ðµ {days} Ð´Ð°Ð½Ð°",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³ Ð¼ÐµÑÐµÑ†Ð°",
-"{months} months ago" => "ÐŸÑ€Ðµ {months} Ð¼ÐµÑÐµÑ†Ð° (Ð¼ÐµÑÐµÑ†Ð¸)",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "Ð¼ÐµÑÐµÑ†Ð¸ Ñ€Ð°Ð½Ð¸Ñ˜Ðµ",
 "last year" => "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ",
 "years ago" => "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ",
@@ -77,7 +76,6 @@
 "Error setting expiration date" => "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾ÑÑ‚Ð°Ð²Ñ™Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°",
 "Sending ..." => "Ð¨Ð°Ñ™ÐµÐ¼...",
 "Email sent" => "ÐŸÐ¾Ñ€ÑƒÐºÐ° Ñ˜Ðµ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ð°",
-"ownCloud password reset" => "ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð°Ð²Ð°ÑšÐµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ð·Ð° ownCloud",
 "Use the following link to reset your password: {link}" => "ÐžÐ²Ð¾Ð¼ Ð²ÐµÐ·Ð¾Ð¼ Ñ€ÐµÑÐµÑ‚ÑƒÑ˜Ñ‚Ðµ ÑÐ²Ð¾Ñ˜Ñƒ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ: {link}",
 "You will receive a link to reset your password via Email." => "Ð”Ð¾Ð±Ð¸Ñ›ÐµÑ‚Ðµ Ð²ÐµÐ·Ñƒ Ð·Ð° Ñ€ÐµÑÐµÑ‚Ð¾Ð²Ð°ÑšÐµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ð¿ÑƒÑ‚ÐµÐ¼ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ.",
 "Username" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ",
@@ -120,3 +118,4 @@
 "next" => "ÑÐ»ÐµÐ´ÐµÑ›Ðµ",
 "Updating ownCloud to version %s, this may take a while." => "ÐÐ°Ð´Ð¾Ð³Ñ€Ð°Ð´ÑšÐ° ownCloud-Ð° Ð½Ð° Ð²ÐµÑ€Ð·Ð¸Ñ˜Ñƒ %s, ÑÐ°Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð°Ðº."
 );
+$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);";
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 238843aa1762711c47198fef0f76878141d65a9f..98d227f18a39b6eddc7055cd35884ee8e4e1ae8b 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Sunday" => "Nedelja",
 "Monday" => "Ponedeljak",
 "Tuesday" => "Utorak",
@@ -19,6 +20,10 @@
 "November" => "Novembar",
 "December" => "Decembar",
 "Settings" => "PodeÅ¡avanja",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","",""),
 "Cancel" => "OtkaÅ¾i",
 "Password" => "Lozinka",
 "You will receive a link to reset your password via Email." => "DobiÄ‡ete vezu za resetovanje lozinke putem e-poÅ¡te.",
@@ -49,3 +54,4 @@
 "prev" => "prethodno",
 "next" => "sledeÄ‡e"
 );
+$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);";
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index d6d4b0ff323ac1e337afed98e8d99f28e0a2c056..88639845a5a021bd04b0be5ec5dc32ebb80ae59d 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s delade Â»%sÂ« med dig",
 "Category type not provided." => "Kategorityp inte angiven.",
 "No category to add?" => "Ingen kategori att lÃ¤gga till?",
@@ -29,15 +30,13 @@
 "December" => "December",
 "Settings" => "InstÃ¤llningar",
 "seconds ago" => "sekunder sedan",
-"1 minute ago" => "1 minut sedan",
-"{minutes} minutes ago" => "{minutes} minuter sedan",
-"1 hour ago" => "1 timme sedan",
-"{hours} hours ago" => "{hours} timmar sedan",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
-"{days} days ago" => "{days} dagar sedan",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "fÃ¶rra mÃ¥naden",
-"{months} months ago" => "{months} mÃ¥nader sedan",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "mÃ¥nader sedan",
 "last year" => "fÃ¶rra Ã¥ret",
 "years ago" => "Ã¥r sedan",
@@ -83,9 +82,8 @@
 "Error setting expiration date" => "Fel vid sÃ¤ttning av utgÃ¥ngsdatum",
 "Sending ..." => "Skickar ...",
 "Email sent" => "E-post skickat",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-gemenskapen</a>.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
-"ownCloud password reset" => "ownCloud lÃ¶senordsÃ¥terstÃ¤llning",
 "Use the following link to reset your password: {link}" => "AnvÃ¤nd fÃ¶ljande lÃ¤nk fÃ¶r att Ã¥terstÃ¤lla lÃ¶senordet: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "LÃ¤nken fÃ¶r att Ã¥terstÃ¤lla ditt lÃ¶senorden har skickats till din e-postadress<br>Om du inte har erhÃ¥llit meddelandet inom kort, vÃ¤nligen kontrollera din skrÃ¤ppost-mapp<br>Om den inte finns dÃ¤r, vÃ¤nligen kontakta din administratÃ¶r.",
 "Request failed!<br>Did you make sure your email/username was right?" => "BegÃ¤ran misslyckades!<br>Ã„r du helt sÃ¤ker pÃ¥ att din e-postadress/anvÃ¤ndarnamn Ã¤r korrekt?",
@@ -110,11 +108,11 @@
 "Add" => "LÃ¤gg till",
 "Security Warning" => "SÃ¤kerhetsvarning",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP Ã¤r sÃ¥rbar fÃ¶r NULL byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Uppdatera din PHP-installation fÃ¶r att anvÃ¤nda ownCloud sÃ¤kert.",
+"Please update your PHP installation to use %s securely." => "Var god uppdatera din PHP-installation fÃ¶r att anvÃ¤nda %s sÃ¤kert.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sÃ¤ker slumptalsgenerator finns tillgÃ¤nglig. Du bÃ¶r aktivera PHP OpenSSL-tillÃ¤gget.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en sÃ¤ker slumptalsgenerator kan angripare fÃ¥ mÃ¶jlighet att fÃ¶rutsÃ¤ga lÃ¶senordsÃ¥terstÃ¤llningar och ta Ã¶ver ditt konto.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer Ã¤r fÃ¶rmodligen tillgÃ¤ngliga frÃ¥n Internet, eftersom .htaccess-filen inte fungerar.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "FÃ¶r information hur man korrekt konfigurera servern, var god se <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "FÃ¶r information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratÃ¶rskonto</strong>",
 "Advanced" => "Avancerad",
 "Data folder" => "Datamapp",
@@ -140,3 +138,4 @@
 "next" => "nÃ¤sta",
 "Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sw_KE.php b/core/l10n/sw_KE.php
new file mode 100644
index 0000000000000000000000000000000000000000..93c8e33f3e2d95d19676fafd4be3416cee37855d
--- /dev/null
+++ b/core/l10n/sw_KE.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index e593018aaadd5845793bc1139611d974c629b3fb..b2e847f5fb2401cec0ae7fb0e66902f292088d1f 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "à®ªà®¿à®°à®¿à®µà¯ à®µà®•à¯ˆà®•à®³à¯ à®µà®´à®™à¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ",
 "No category to add?" => "à®šà¯‡à®°à¯à®ªà¯à®ªà®¤à®±à¯à®•à®¾à®© à®µà®•à¯ˆà®•à®³à¯ à®‡à®²à¯à®²à¯ˆà®¯à®¾?",
 "Object type not provided." => "à®ªà¯Šà®°à¯à®³à¯ à®µà®•à¯ˆ à®µà®´à®™à¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ",
@@ -27,15 +28,13 @@
 "December" => "à®®à®¾à®°à¯à®•à®´à®¿",
 "Settings" => "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯",
 "seconds ago" => "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
-"1 minute ago" => "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ ",
-"{minutes} minutes ago" => "{à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯} à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯ ",
-"1 hour ago" => "1 à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯",
-"{hours} hours ago" => "{à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à¯} à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à®‡à®©à¯à®±à¯",
 "yesterday" => "à®¨à¯‡à®±à¯à®±à¯",
-"{days} days ago" => "{à®¨à®¾à®Ÿà¯à®•à®³à¯} à®¨à®¾à®Ÿà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "à®•à®Ÿà®¨à¯à®¤ à®®à®¾à®¤à®®à¯",
-"{months} months ago" => "{à®®à®¾à®¤à®™à¯à®•à®³à¯} à®®à®¾à®¤à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "à®®à®¾à®¤à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
 "last year" => "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯",
 "years ago" => "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
@@ -74,7 +73,6 @@
 "Password protected" => "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®ªà®¾à®¤à¯à®•à®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯",
 "Error unsetting expiration date" => "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®¾à®®à¯ˆà®•à¯à®•à®¾à®© à®µà®´à¯",
 "Error setting expiration date" => "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®µà®¤à®¿à®²à¯ à®µà®´à¯",
-"ownCloud password reset" => "ownCloud à®‡à®©à¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®®à¯€à®³à®®à¯ˆà®ªà¯à®ªà¯",
 "Use the following link to reset your password: {link}" => "à®‰à®™à¯à®•à®³à¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à¯€à®³à®®à¯ˆà®•à¯à®• à®ªà®¿à®©à¯à®µà®°à¯à®®à¯ à®‡à®£à¯ˆà®ªà¯à®ªà¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯ : {à®‡à®£à¯ˆà®ªà¯à®ªà¯}",
 "You will receive a link to reset your password via Email." => "à®¨à¯€à®™à¯à®•à®³à¯ à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯ à®®à¯‚à®²à®®à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à¯€à®³à®®à¯ˆà®ªà¯à®ªà®¤à®±à¯à®•à®¾à®© à®‡à®£à¯ˆà®ªà¯à®ªà¯ˆ à®ªà¯†à®±à¯à®µà¯€à®°à¯à®•à®³à¯. ",
 "Username" => "à®ªà®¯à®©à®¾à®³à®°à¯ à®ªà¯†à®¯à®°à¯",
@@ -116,3 +114,4 @@
 "prev" => "à®®à¯à®¨à¯à®¤à¯ˆà®¯",
 "next" => "à®…à®Ÿà¯à®¤à¯à®¤à¯"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 1469d37296f33e76d3d4cec12ab148a34674946d..f6d165f369f520ad455566b55f464d3c4d26999f 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "This category already exists: %s" => "à°ˆ à°µà°°à±à°—à°‚ à°‡à°ªà±à°ªà°Ÿà°¿à°•à±‡ à°‰à°‚à°¦à°¿: %s",
 "Sunday" => "à°†à°¦à°¿à°µà°¾à°°à°‚",
 "Monday" => "à°¸à±‹à°®à°µà°¾à°°à°‚",
@@ -21,15 +22,13 @@
 "December" => "à°¡à°¿à°¸à±†à°‚à°¬à°°à±",
 "Settings" => "à°…à°®à°°à°¿à°•à°²à±",
 "seconds ago" => "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚",
-"1 minute ago" => "1 à°¨à°¿à°®à°¿à°·à°‚ à°•à±à°°à°¿à°¤à°‚",
-"{minutes} minutes ago" => "{minutes} à°¨à°¿à°®à°¿à°·à°¾à°² à°•à±à°°à°¿à°¤à°‚",
-"1 hour ago" => "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚",
-"{hours} hours ago" => "{hours} à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à°ˆà°°à±‹à°œà±",
 "yesterday" => "à°¨à°¿à°¨à±à°¨",
-"{days} days ago" => "{days} à°°à±‹à°œà±à°² à°•à±à°°à°¿à°¤à°‚",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "à°ªà±‹à°¯à°¿à°¨ à°¨à±†à°²",
-"{months} months ago" => "{months} à°¨à±†à°²à°² à°•à±à°°à°¿à°¤à°‚",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "à°¨à±†à°²à°² à°•à±à°°à°¿à°¤à°‚",
 "last year" => "à°ªà±‹à°¯à°¿à°¨ à°¸à°‚à°µà°¤à±à°¸à°°à°‚",
 "years ago" => "à°¸à°‚à°µà°¤à±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚",
@@ -50,3 +49,4 @@
 "Log out" => "à°¨à°¿à°·à±à°•à±à°°à°®à°¿à°‚à°šà±",
 "Lost your password?" => "à°®à±€ à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚ à°ªà±‹à°¯à°¿à°‚à°¦à°¾?"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 392da561bf81b8511304d39737d5c60a749463d9..b015b940f2b0fe99327757e5ca5f2dd8f63adcc8 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸°à¸šà¸¸à¸Šà¸™à¸´à¸”à¸‚à¸à¸‡à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆ",
 "No category to add?" => "à¹„à¸¡à¹ˆà¸¡à¸µà¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆà¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡?",
 "Object type not provided." => "à¸Šà¸™à¸´à¸”à¸‚à¸à¸‡à¸§à¸±à¸•à¸–à¸¸à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸£à¸°à¸šà¸¸",
@@ -27,15 +28,13 @@
 "December" => "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡",
 "Settings" => "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²",
 "seconds ago" => "à¸§à¸´à¸™à¸²à¸—à¸µ à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"1 minute ago" => "1 à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"{minutes} minutes ago" => "{minutes} à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"1 hour ago" => "1 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"{hours} hours ago" => "{hours} à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "à¸§à¸±à¸™à¸™à¸µà¹‰",
 "yesterday" => "à¹€à¸¡à¸·à¹ˆà¸à¸§à¸²à¸™à¸™à¸µà¹‰",
-"{days} days ago" => "{day} à¸§à¸±à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "à¹€à¸”à¸·à¸à¸™à¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§",
-"{months} months ago" => "{months} à¹€à¸”à¸·à¸à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "à¹€à¸”à¸·à¸à¸™ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²",
 "last year" => "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§",
 "years ago" => "à¸›à¸µ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²",
@@ -81,7 +80,6 @@
 "Email sent" => "à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œà¹à¸¥à¹‰à¸§",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹„à¸¡à¹ˆà¹€à¸›à¹‡à¸™à¸œà¸¥à¸ªà¸³à¹€à¸£à¹‡à¸ˆ à¸à¸£à¸¸à¸“à¸²à¹à¸ˆà¹‰à¸‡à¸›à¸±à¸à¸«à¸²à¸—à¸µà¹ˆà¹€à¸à¸´à¸”à¸‚à¸¶à¹‰à¸™à¹„à¸›à¸¢à¸±à¸‡ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">à¸„à¸à¸¡à¸¡à¸¹à¸™à¸´à¸•à¸µà¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹€à¸ªà¸£à¹‡à¸ˆà¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§ à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—à¸²à¸‡à¹„à¸›à¸—à¸µà¹ˆ ownCloud à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸‚à¸“à¸°à¸™à¸µà¹‰",
-"ownCloud password reset" => "à¸£à¸µà¹€à¸‹à¹‡à¸•à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™ ownCloud",
 "Use the following link to reset your password: {link}" => "à¹ƒà¸Šà¹‰à¸¥à¸´à¸‡à¸„à¹Œà¸•à¹ˆà¸à¹„à¸›à¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹ƒà¸«à¸¡à¹ˆ: {link}",
 "You will receive a link to reset your password via Email." => "à¸„à¸¸à¸“à¸ˆà¸°à¹„à¸”à¹‰à¸£à¸±à¸šà¸¥à¸´à¸‡à¸„à¹Œà¹€à¸žà¸·à¹ˆà¸à¸à¸³à¸«à¸™à¸”à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆà¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œ",
 "Username" => "à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
@@ -124,3 +122,4 @@
 "next" => "à¸–à¸±à¸”à¹„à¸›",
 "Updating ownCloud to version %s, this may take a while." => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹€à¸”à¸— ownCloud à¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸¸à¹ˆà¸™ %s, à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 0a56af94182476fb68e15b1c69ba6e675b5df11f..8628aa60a98e63359281a6b0419ae3bbbaa86df3 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s  sizinle Â»%sÂ« paylaÅŸÄ±mÄ±nda bulundu",
 "Category type not provided." => "Kategori tÃ¼rÃ¼ desteklenmemektedir.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: %s" => "Bu kategori zaten mevcut:  %s",
@@ -28,15 +30,13 @@
 "December" => "AralÄ±k",
 "Settings" => "Ayarlar",
 "seconds ago" => "saniye Ã¶nce",
-"1 minute ago" => "1 dakika Ã¶nce",
-"{minutes} minutes ago" => "{minutes} dakika Ã¶nce",
-"1 hour ago" => "1 saat Ã¶nce",
-"{hours} hours ago" => "{hours} saat Ã¶nce",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "bugÃ¼n",
 "yesterday" => "dÃ¼n",
-"{days} days ago" => "{days} gÃ¼n Ã¶nce",
+"_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "geÃ§en ay",
-"{months} months ago" => "{months} ay Ã¶nce",
+"_%n month ago_::_%n months ago_" => array("",""),
 "months ago" => "ay Ã¶nce",
 "last year" => "geÃ§en yÄ±l",
 "years ago" => "yÄ±l Ã¶nce",
@@ -61,6 +61,7 @@
 "Share with link" => "BaÄŸlantÄ± ile paylaÅŸ",
 "Password protect" => "Åžifre korunmasÄ±",
 "Password" => "Parola",
+"Allow Public Upload" => "Herkes tarafÄ±ndan yÃ¼klemeye izin ver",
 "Email link to person" => "KiÅŸiye e-posta linki",
 "Send" => "GÃ¶nder",
 "Set expiration date" => "Son kullanma tarihini ayarla",
@@ -83,12 +84,13 @@
 "Email sent" => "Eposta gÃ¶nderildi",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "GÃ¼ncelleme baÅŸarÄ±lÄ± olmadÄ±. LÃ¼tfen bu hatayÄ± bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "GÃ¼ncelleme baÅŸarÄ±lÄ±. ownCloud'a yÃ¶nlendiriliyor.",
-"ownCloud password reset" => "ownCloud parola sÄ±fÄ±rlama",
 "Use the following link to reset your password: {link}" => "Bu baÄŸlantÄ±yÄ± kullanarak parolanÄ±zÄ± sÄ±fÄ±rlayÄ±n: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "ParolanÄ±zÄ± deÄŸiÅŸtirme baÄŸlantÄ±sÄ± e-posta adresinize gÃ¶nderildi.<br>I EÄŸer makÃ¼l bir sÃ¼re iÃ§erisinde mesajÄ± almadÄ±ysanÄ±z spam/junk dizinini kontrol ediniz.<br> EÄŸer orada da bulamazsanÄ±z sistem yÃ¶neticinize sorunuz.",
 "Request failed!<br>Did you make sure your email/username was right?" => "IsteÄŸi baÅŸarÄ±sÄ±z oldu!<br>E-posta / kullanÄ±cÄ± adÄ±nÄ±zÄ± doÄŸru olduÄŸundan emin misiniz?",
 "You will receive a link to reset your password via Email." => "ParolanÄ±zÄ± sÄ±fÄ±rlamak iÃ§in bir baÄŸlantÄ± Eposta olarak gÃ¶nderilecek.",
 "Username" => "KullanÄ±cÄ± AdÄ±",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "DosyalarÄ±nÄ±z ÅŸifrelenmiÅŸ. EÄŸer kurtarma anahtarÄ±nÄ± aktif etmediyseniz parola sÄ±fÄ±rlama iÅŸleminden sonra verilerinize eriÅŸmeniz imkansÄ±z olacak. EÄŸer ne yaptÄ±ÄŸÄ±nÄ±zdan emin deÄŸilseniz, devam etmeden Ã¶nce sistem yÃ¶neticiniz ile irtibata geÃ§iniz. GerÃ§ekten devam etmek istiyor musunuz?",
+"Yes, I really want to reset my password now" => "Evet,Åžu anda parolamÄ± sÄ±fÄ±rlamak istiyorum.",
 "Request reset" => "SÄ±fÄ±rlama iste",
 "Your password was reset" => "ParolanÄ±z sÄ±fÄ±rlandÄ±",
 "To login page" => "GiriÅŸ sayfasÄ±na git",
@@ -101,15 +103,14 @@
 "Help" => "YardÄ±m",
 "Access forbidden" => "EriÅŸim yasaklÄ±",
 "Cloud not found" => "Bulut bulunamadÄ±",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Merhaba\n\n%s sizinle %s dosyasÄ±nÄ± paylaÅŸtÄ±ÄŸÄ±\nPaylaÅŸÄ±mÄ± gÃ¶r:%s\n\nÄ°yi gÃ¼nler!",
 "Edit categories" => "Kategorileri dÃ¼zenle",
 "Add" => "Ekle",
 "Security Warning" => "GÃ¼venlik Uyarisi",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sÃ¼rÃ¼mÃ¼nÃ¼z NULL Byte saldÄ±rÄ±sÄ±na aÃ§Ä±k (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "ownCloud'u gÃ¼venli olarak kullanmak iÃ§in, lÃ¼tfen PHP kurulumunuzu gÃ¼ncelleyin.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "GÃ¼venli rasgele sayÄ± Ã¼reticisi bulunamadÄ±. LÃ¼tfen PHP OpenSSL eklentisini etkinleÅŸtirin.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "GÃ¼venli rasgele sayÄ± Ã¼reticisi olmadan saldÄ±rganlar parola sÄ±fÄ±rlama simgelerini tahmin edip hesabÄ±nÄ±zÄ± ele geÃ§irebilir.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasÃ¶rÃ¼nÃ¼z ve dosyalarÄ±nÄ±z .htaccess dosyasÄ± Ã§alÄ±ÅŸmadÄ±ÄŸÄ± iÃ§in internet'ten eriÅŸime aÃ§Ä±k.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Server'Ä±nÄ±zÄ± nasÄ±l ayarlayacaÄŸÄ±nÄ±za dair bilgi iÃ§in, lÃ¼tfen bu linki ziyaret edin <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yÃ¶netici hesabÄ±</strong> oluÅŸturun",
 "Advanced" => "GeliÅŸmiÅŸ",
 "Data folder" => "Veri klasÃ¶rÃ¼",
@@ -130,7 +131,9 @@
 "remember" => "hatÄ±rla",
 "Log in" => "GiriÅŸ yap",
 "Alternative Logins" => "Alternatif GiriÅŸler",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Merhaba, <br><br> %s sizinle Â»%sÂ« paylaÅŸÄ±mÄ±nda bulundu.<br><a href=\"%s\">PaylaÅŸÄ±mÄ± gÃ¶r!</a><br><br>Ä°yi gÃ¼nler!",
 "prev" => "Ã¶nceki",
 "next" => "sonraki",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna gÃ¼ncelleniyor. Biraz zaman alabilir."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index c1bf48e07dded9119c15e733ebc761836cc69f57..cf1c28a0d2fd29a74ea8d8d94988941fe3dd22f3 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Sunday" => "ÙŠÛ•ÙƒØ´Û•Ù†Ø¨Û•",
 "Monday" => "Ø¯ÛˆØ´Û•Ù†Ø¨Û•",
 "Tuesday" => "Ø³Û•ÙŠØ´Û•Ù†Ø¨Û•",
@@ -19,10 +20,12 @@
 "November" => "Ø¦ÙˆØºÙ„Ø§Ù‚",
 "December" => "ÙƒÛ†Ù†Û•Ùƒ",
 "Settings" => "ØªÛ•ÚØ´Û•ÙƒÙ„Û•Ø±",
-"1 minute ago" => "1 Ù…Ù‰Ù†Û‡Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰",
-"1 hour ago" => "1 Ø³Ø§Ø¦Û•Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "Ø¨ÛˆÚ¯ÛˆÙ†",
 "yesterday" => "ØªÛˆÙ†ÛˆÚ¯ÛˆÙ†",
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
 "Cancel" => "Û‹Ø§Ø² ÙƒÛ•Ú†",
 "Yes" => "Ú¾Û•Ø¦Û•",
 "No" => "ÙŠØ§Ù‚",
@@ -46,3 +49,4 @@
 "Finish setup" => "ØªÛ•ÚØ´Û•Ùƒ ØªØ§Ù…Ø§Ù…",
 "Log out" => "ØªÙ‰Ø²Ù‰Ù…Ø¯Ù‰Ù† Ú†Ù‰Ù‚"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 8e67a470956505dba87f0fdd846c5eaa9a54609d..baf756ab7a9fae8f913108cb4a6ec40f62776f70 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "ÐÐµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ Ñ‚Ð¸Ð¿ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ—.",
 "No category to add?" => "Ð’Ñ–Ð´ÑÑƒÑ‚Ð½Ñ– ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ— Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ?",
 "This category already exists: %s" => "Ð¦Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ Ð²Ð¶Ðµ Ñ–ÑÐ½ÑƒÑ”: %s",
@@ -28,15 +29,13 @@
 "December" => "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ",
 "Settings" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
 "seconds ago" => "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ",
-"1 minute ago" => "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ",
-"{minutes} minutes ago" => "{minutes} Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ",
-"1 hour ago" => "1 Ð³Ð¾Ð´Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ",
-"{hours} hours ago" => "{hours} Ð³Ð¾Ð´Ð¸Ð½Ð¸ Ñ‚Ð¾Ð¼Ñƒ",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–",
 "yesterday" => "Ð²Ñ‡Ð¾Ñ€Ð°",
-"{days} days ago" => "{days} Ð´Ð½Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ",
+"_%n day ago_::_%n days ago_" => array("","",""),
 "last month" => "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ð¼Ñ–ÑÑÑ†Ñ",
-"{months} months ago" => "{months} Ð¼Ñ–ÑÑÑ†Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "Ð¼Ñ–ÑÑÑ†Ñ– Ñ‚Ð¾Ð¼Ñƒ",
 "last year" => "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ",
 "years ago" => "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ",
@@ -82,7 +81,6 @@
 "Email sent" => "Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð°Ð´Ñ–ÑÐ»Ð°Ð½Ð°",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ Ð½ÐµÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ñ‚Ðµ Ð¿Ñ€Ð¾ Ñ†ÑŽ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ Ð² <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¾Ñ‚Ñ– ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾. ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ”Ð¼Ð¾ Ð²Ð°Ñ Ð½Ð°  ownCloud.",
-"ownCloud password reset" => "ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ownCloud",
 "Use the following link to reset your password: {link}" => "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ðµ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}",
 "You will receive a link to reset your password via Email." => "Ð’Ð¸ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ”Ñ‚Ðµ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ Ð½Ð° Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ñƒ.",
 "Username" => "Ð†Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°",
@@ -102,11 +100,9 @@
 "Add" => "Ð”Ð¾Ð´Ð°Ñ‚Ð¸",
 "Security Warning" => "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÐºÑƒ",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ð’Ð°ÑˆÐ° Ð²ÐµÑ€ÑÑ–Ñ PHP Ð²Ñ€Ð°Ð·Ð»Ð¸Ð²Ð° Ð´Ð»Ñ Ð°Ñ‚Ð°Ðº NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¾Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ñ–Ð½ÑÑ‚Ð°Ð»ÑÑ†Ñ–ÑŽ PHP Ð´Ð»Ñ Ð±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ ownCloud.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "ÐÐµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¸Ð¹ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€ Ð²Ð¸Ð¿Ð°Ð´ÐºÐ¾Ð²Ð¸Ñ… Ñ‡Ð¸ÑÐµÐ», Ð±ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð°ÐºÑ‚Ð¸Ð²ÑƒÐ¹Ñ‚Ðµ PHP OpenSSL Ð´Ð¾Ð´Ð°Ñ‚Ð¾Ðº.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ð‘ÐµÐ· Ð±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¾Ð³Ð¾ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²Ð¸Ð¿Ð°Ð´ÐºÐ¾Ð²Ð¸Ñ… Ñ‡Ð¸ÑÐµÐ» Ð·Ð»Ð¾Ð²Ð¼Ð¸ÑÐ½Ð¸Ðº Ð¼Ð¾Ð¶Ðµ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ñ‚Ð¾ÐºÐµÐ½Ð¸ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ– Ð·Ð°Ð²Ð¾Ð»Ð¾Ð´Ñ–Ñ‚Ð¸ Ð’Ð°ÑˆÐ¸Ð¼ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¼ Ð·Ð°Ð¿Ð¸ÑÐ¾Ð¼.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ð’Ð°ÑˆÑ– Ð´Ð°Ð½Ñ– ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ–Ð² Ñ– Ñ„Ð°Ð¹Ð»Ñ–Ð², Ð¹Ð¼Ð¾Ð²Ñ–Ñ€Ð½Ð¾, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ– Ð· Ñ–Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ, Ñ‚Ð¾Ð¼Ñƒ Ñ‰Ð¾  .htaccess Ñ„Ð°Ð¹Ð» Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—, ÑÐº Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐµÑ€Ð²ÐµÑ€, Ð·Ð²ÐµÑ€Ð½Ñ–Ñ‚ÑŒÑÑ Ð´Ð¾  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ—</a>.",
 "Create an <strong>admin account</strong>" => "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ <strong>Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°</strong>",
 "Advanced" => "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾",
 "Data folder" => "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð´Ð°Ð½Ð¸Ñ…",
@@ -130,3 +126,4 @@
 "next" => "Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹",
 "Updating ownCloud to version %s, this may take a while." => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÑ–Ñ— %s, Ñ†Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ Ð´ÐµÑÐºÐ¸Ð¹ Ñ‡Ð°Ñ."
 );
+$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);";
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index b27033b80e808e5ea30580620da65e37d2e6937a..de6a58cea26070293ac7bb07f1a35c38fcd67cb2 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "No category to add?" => "Ø´Ø§Ù…Ù„ Ú©Ø±Ù†Û’ Ú©Û’ Ù„ÛŒÛ’ Ú©ÙˆØ¦ÛŒ Ø²Ù…Ø±Û Ù†ÛÛŒÚºØŸ",
 "No categories selected for deletion." => "Ø®ØªÙ… Ú©Ø±Ù†Û’ Ú©Û’ Ù„ÛŒÛ’ Ú©Ø³ÛŒ Ø²Ù…Ø±Û Ø¬Ø§Øª Ú©Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ù†ÛÛŒÚº Ú©ÛŒØ§ Ú¯ÛŒØ§Û”",
 "January" => "Ø¬Ù†ÙˆØ±ÛŒ",
@@ -14,6 +15,10 @@
 "November" => "Ù†ÙˆÙ…Ø¨Ø±",
 "December" => "Ø¯Ø³Ù…Ø¨Ø±",
 "Settings" => "Ø³ÛŒÙ¹ÛŒÙ†Ú¯Ø²",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
 "Choose" => "Ù…Ù†ØªØ®Ø¨ Ú©Ø±ÛŒÚº",
 "Cancel" => "Ù…Ù†Ø³ÙˆØ® Ú©Ø±ÛŒÚº",
 "Yes" => "ÛØ§Úº",
@@ -39,7 +44,6 @@
 "delete" => "Ø®ØªÙ… Ú©Ø±ÛŒÚº",
 "share" => "Ø´Ø¦ÛŒØ± Ú©Ø±ÛŒÚº",
 "Password protected" => "Ù¾Ø§Ø³ÙˆØ±Úˆ Ø³Û’ Ù…ØÙÙˆØ¸ Ú©ÛŒØ§ Ú¯ÛŒØ§ ÛÛ’",
-"ownCloud password reset" => "Ø§ÙˆÙ† Ú©Ù„Ø§Ø¤Úˆ Ù¾Ø§Ø³ÙˆØ±Úˆ Ø±ÛŒ Ø³ÛŒÙ¹",
 "Use the following link to reset your password: {link}" => "Ø§Ù¾Ù†Ø§ Ù¾Ø§Ø³ÙˆØ±Úˆ Ø±ÛŒ Ø³ÛŒÙ¹ Ú©Ø±Ù†Û’ Ú©Û’ Ù„ÛŒÛ’ Ø§Ø³ Ù„Ù†Ú© Ù¾Ø± Ú©Ù„Ú© Ú©Ø±ÛŒÚºÛ”  {link}",
 "You will receive a link to reset your password via Email." => "Ø¢Ù¾ Ø§ÛŒ Ù…ÛŒÙ„ Ú©Û’ Ø°Ø±ÛŒØ¹Û’ Ø§Ù¾Ù†Û’ Ù¾Ø§Ø³ÙˆØ±Úˆ Ø±ÛŒ Ø³ÛŒÙ¹ Ú©Ø§ Ù„Ù†Ú© Ù…ÙˆØµÙˆÙ„ Ú©Ø±ÛŒÚº Ú¯Û’",
 "Username" => "ÛŒÙˆØ²Ø± Ù†ÛŒÙ…",
@@ -75,3 +79,4 @@
 "prev" => "Ù¾Ú†Ú¾Ù„Ø§",
 "next" => "Ø§Ú¯Ù„Ø§"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 37ed47de765a8b3609725b3a02ed50aa421aef69..265d83a4266cad52a707c2dd84a3243abf87839b 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Category type not provided." => "Kiá»ƒu háº¡ng má»¥c khÃ´ng Ä‘Æ°á»£c cung cáº¥p.",
 "No category to add?" => "KhÃ´ng cÃ³ danh má»¥c Ä‘Æ°á»£c thÃªm?",
 "This category already exists: %s" => "Danh má»¥c nÃ y Ä‘Ã£ tá»“n táº¡i: %s",
@@ -28,15 +29,13 @@
 "December" => "ThÃ¡ng 12",
 "Settings" => "CÃ i Ä‘áº·t",
 "seconds ago" => "vÃ i giÃ¢y trÆ°á»›c",
-"1 minute ago" => "1 phÃºt trÆ°á»›c",
-"{minutes} minutes ago" => "{minutes} phÃºt trÆ°á»›c",
-"1 hour ago" => "1 giá» trÆ°á»›c",
-"{hours} hours ago" => "{hours} giá» trÆ°á»›c",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "hÃ´m nay",
 "yesterday" => "hÃ´m qua",
-"{days} days ago" => "{days} ngÃ y trÆ°á»›c",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "thÃ¡ng trÆ°á»›c",
-"{months} months ago" => "{months} thÃ¡ng trÆ°á»›c",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "thÃ¡ng trÆ°á»›c",
 "last year" => "nÄƒm trÆ°á»›c",
 "years ago" => "nÄƒm trÆ°á»›c",
@@ -82,7 +81,6 @@
 "Email sent" => "Email Ä‘Ã£ Ä‘Æ°á»£c gá»i",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cáºp nháºt khÃ´ng thÃ nh cÃ´ng . Vui lÃ²ng thÃ´ng bÃ¡o Ä‘áº¿n <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cá»™ng Ä‘á»“ng ownCloud </a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Cáºp nháºt thÃ nh cÃ´ng .Há»‡ thá»‘ng sáº½ Ä‘Æ°a báº¡n tá»›i ownCloud.",
-"ownCloud password reset" => "KhÃ´i phá»¥c máºt kháº©u Owncloud ",
 "Use the following link to reset your password: {link}" => "DÃ¹ng Ä‘Æ°á»ng dáº«n sau Ä‘á»ƒ khÃ´i phá»¥c láº¡i máºt kháº©u : {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "LiÃªn káº¿t táº¡o láº¡i máºt kháº©u Ä‘Ã£ Ä‘Æ°á»£c gá»i tá»›i há»™p thÆ° cá»§a báº¡n.<br>Náº¿u báº¡n khÃ´ng tháº¥y nÃ³ sau má»™t khoáº£ng thá»i gian, vui lÃ²ng kiá»ƒm tra trong thÆ° má»¥c Spam/RÃ¡c.<br>Náº¿u váº«n khÃ´ng tháº¥y, vui lÃ²ng há»i ngÆ°á»i quáº£n trá»‹ há»‡ thá»‘ng.",
 "Request failed!<br>Did you make sure your email/username was right?" => "YÃªu cáº§u tháº¥t báº¡i!<br>Báº¡n cÃ³ cháº¯c lÃ  email/tÃªn Ä‘Äƒng nháºp cá»§a báº¡n chÃnh xÃ¡c?",
@@ -104,11 +102,9 @@
 "Add" => "ThÃªm",
 "Security Warning" => "Cáº£nh báº£o báº£o máºt",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PhiÃªn báº£n PHP cá»§a báº¡n cÃ³ lá»— há»•ng NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Vui lÃ²ng cáºp nháºt báº£n cÃ i Ä‘áº·t PHP Ä‘á»ƒ sá» dá»¥ng ownCloud má»™t cÃ¡ch an toÃ n.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "KhÃ´ng an toÃ n ! chá»©c nÄƒng random number generator Ä‘Ã£ cÃ³ sáºµn ,vui lÃ²ng báºt  PHP OpenSSL extension.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Náº¿u khÃ´ng cÃ³ random number generator , Hacker cÃ³ thá»ƒ  thiáº¿t láºp láº¡i máºt kháº©u vÃ  chiáº¿m tÃ i khoáº£n cá»§a báº¡n.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "ThÆ° má»¥c vÃ  file dá»¯ liá»‡u cá»§a báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c truy cáºp tá»« internet bá»Ÿi vÃ¬ file .htaccess khÃ´ng hoáº¡t Ä‘á»™ng",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Äá»ƒ biáº¿t thÃªm cÃ¡ch cáº¥u hÃ¬nh mÃ¡y chá»§ cá»§a báº¡n, xin xem <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">tÃ i liá»‡u</a>.",
 "Create an <strong>admin account</strong>" => "Táº¡o má»™t <strong>tÃ i khoáº£n quáº£n trá»‹</strong>",
 "Advanced" => "NÃ¢ng cao",
 "Data folder" => "ThÆ° má»¥c dá»¯ liá»‡u",
@@ -133,3 +129,4 @@
 "next" => "Káº¿ tiáº¿p",
 "Updating ownCloud to version %s, this may take a while." => "Cáºp nháºt ownCloud lÃªn phiÃªn báº£n %s, cÃ³ thá»ƒ sáº½ máº¥t thá»i gian"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 237f0bb14bbc58ea396a760c2035cdaae5b6e2a9..6d55d7f5121d8374acc7ca6071ffb2c44930a77a 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -1,8 +1,11 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s ä¸Žæ‚¨å…±äº«äº† Â»%sÂ« ",
 "Category type not provided." => "æœªé€‰æ‹©åˆ†ç±»ç±»åž‹ã€‚",
 "No category to add?" => "æ²¡æœ‰åˆ†ç±»æ·»åŠ äº†?",
 "This category already exists: %s" => "æ¤åˆ†ç±»å·²å˜åœ¨ï¼š%s",
 "Object type not provided." => "æœªé€‰æ‹©å¯¹è±¡ç±»åž‹ã€‚",
+"%s ID not provided." => "%s æ²¡æœ‰æä¾› ID",
 "Error adding %s to favorites." => "åœ¨æ·»åŠ  %s åˆ°æ”¶è—å¤¹æ—¶å‘ç”Ÿé”™è¯¯ã€‚",
 "No categories selected for deletion." => "æ²¡æœ‰é€‰ä¸è¦åˆ é™¤çš„åˆ†ç±»ã€‚",
 "Error removing %s from favorites." => "åœ¨ç§»é™¤æ”¶è—å¤¹ä¸çš„ %s æ—¶å‘ç”Ÿé”™è¯¯ã€‚",
@@ -27,20 +30,19 @@
 "December" => "åäºŒæœˆ",
 "Settings" => "è®¾ç½®",
 "seconds ago" => "ç§’å‰",
-"1 minute ago" => "1 åˆ†é’Ÿå‰",
-"{minutes} minutes ago" => "{minutes} åˆ†é’Ÿå‰",
-"1 hour ago" => "1å°æ—¶å‰",
-"{hours} hours ago" => "{hours}å°æ—¶å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
-"{days} days ago" => "{days} å¤©å‰",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "ä¸Šä¸ªæœˆ",
-"{months} months ago" => "{months}æœˆå‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "æœˆå‰",
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹´å‰",
 "Choose" => "é€‰æ‹©",
 "Cancel" => "å–æ¶ˆ",
+"Error loading file picker template" => "åŠ è½½æ–‡ä»¶é€‰å–æ¨¡æ¿å‡ºé”™",
 "Yes" => "æ˜¯",
 "No" => "å¦",
 "Ok" => "å¥½çš„",
@@ -59,6 +61,7 @@
 "Share with link" => "åˆ†äº«é“¾æŽ¥",
 "Password protect" => "å¯†ç ä¿æŠ¤",
 "Password" => "å¯†ç ",
+"Allow Public Upload" => "å…è®¸å…¬ä¼—ä¸Šä¼ ",
 "Email link to person" => "é¢å‘ä¸ªäººçš„ç”µåé‚®ä»¶é“¾æŽ¥",
 "Send" => "å‘é€",
 "Set expiration date" => "è®¾ç½®å¤±æ•ˆæ—¥æœŸ",
@@ -81,10 +84,13 @@
 "Email sent" => "ç”µåé‚®ä»¶å·²å‘é€",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "å‡çº§å¤±è´¥ã€‚è¯·å‘<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloudç¤¾åŒº</a>æŠ¥å‘Šæ¤é—®é¢˜ã€‚",
 "The update was successful. Redirecting you to ownCloud now." => "å‡çº§æˆåŠŸã€‚çŽ°åœ¨ä¸ºæ‚¨è·³è½¬åˆ°ownCloudã€‚",
-"ownCloud password reset" => "ç§æœ‰äº‘å¯†ç é‡ç½®",
 "Use the following link to reset your password: {link}" => "ä½¿ç”¨ä¸‹é¢çš„é“¾æŽ¥æ¥é‡ç½®ä½ çš„å¯†ç :{link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "é‡ç½®å¯†ç çš„è¿žæŽ¥å·²ç»é€šè¿‡é‚®ä»¶åˆ°æ‚¨çš„é‚®ç®±ã€‚<br> å¦‚æžœä½ æ²¡æœ‰æ”¶åˆ°é‚®ä»¶ï¼Œå¯èƒ½æ˜¯ç”±äºŽè¦å†ç‰ä¸€ä¸‹ï¼Œæˆ–è€…æ£€æŸ¥ä¸€ä¸‹æ‚¨çš„åžƒåœ¾é‚®ä»¶å¤¹ã€‚<br> å¦‚æžœè¿˜æ˜¯æ²¡æœ‰æ”¶åˆ°ï¼Œè¯·è”ç³»æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜ã€‚",
+"Request failed!<br>Did you make sure your email/username was right?" => "è¯·æ±‚å¤±è´¥ï¼<br> ä½ ç¡®å®šä½ çš„é‚®ä»¶åœ°å€/ç”¨æˆ·åæ˜¯æ£ç¡®çš„ï¼Ÿ",
 "You will receive a link to reset your password via Email." => "ä½ å°†ä¼šæ”¶åˆ°ä¸€ä¸ªé‡ç½®å¯†ç çš„é“¾æŽ¥",
 "Username" => "ç”¨æˆ·å",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "æ‚¨çš„æ–‡ä»¶æ˜¯åŠ å¯†çš„ã€‚å¦‚æžœæ‚¨è¿˜æ²¡æœ‰å¯ç”¨æ¢å¤å¯†é’¥ï¼Œåœ¨é‡ç½®äº†å¯†ç åŽï¼Œæ‚¨çš„æ•°æ®è®²æ— æ³•æ¢å¤å›žæ¥ã€‚å¦‚æžœæ‚¨ä¸ç¡®å®šæ˜¯å¦è¿™ä¹ˆåšï¼Œè¯·è”ç³»æ‚¨çš„ç®¡ç†å‘˜åœ¨ç»§ç»è¿™ä¸ªæ“ä½œã€‚ä½ å´æ˜¯æƒ³ç»§ç»ä¹ˆï¼Ÿ",
+"Yes, I really want to reset my password now" => "æ˜¯çš„ï¼Œæˆ‘æƒ³çŽ°åœ¨é‡ç½®å¯†ç ã€‚",
 "Request reset" => "è¦æ±‚é‡ç½®",
 "Your password was reset" => "ä½ çš„å¯†ç å·²ç»è¢«é‡ç½®äº†",
 "To login page" => "è½¬è‡³ç™»é™†é¡µé¢",
@@ -97,14 +103,16 @@
 "Help" => "å¸®åŠ©",
 "Access forbidden" => "ç¦æ¢è®¿é—®",
 "Cloud not found" => "äº‘ æ²¡æœ‰è¢«æ‰¾åˆ°",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "ä½ å¥½ï¼âŽ\nâŽ\næ¸©é¦¨æç¤ºï¼š %s ä¸Žæ‚¨å…±äº«äº† %s ã€‚âŽ\næŸ¥çœ‹ï¼š %sâŽ\nâŽ\nç¥é¡ºåˆ©ï¼",
 "Edit categories" => "ç¼–è¾‘åˆ†ç±»",
 "Add" => "æ·»åŠ ",
 "Security Warning" => "å®‰å…¨è¦å‘Š",
-"Please update your PHP installation to use ownCloud securely." => "è¯·å‡çº§æ‚¨çš„PHPç‰ˆæœ¬ä»¥ç¨³å®šè¿è¡ŒownCloudã€‚",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "æ‚¨çš„PHPç‰ˆæœ¬æ˜¯ä¼šå—åˆ°NULLå—èŠ‚æ¼æ´žæ”»å‡»çš„(CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "è¯·å®‰å…¨åœ°å‡çº§æ‚¨çš„PHPç‰ˆæœ¬åˆ° %s ã€‚",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "æ²¡æœ‰å®‰å…¨éšæœºç ç”Ÿæˆå™¨ï¼Œè¯·å¯ç”¨ PHP OpenSSL æ‰©å±•ã€‚",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "æ²¡æœ‰å®‰å…¨éšæœºç ç”Ÿæˆå™¨ï¼Œé»‘å®¢å¯ä»¥é¢„æµ‹å¯†ç é‡ç½®ä»¤ç‰Œå¹¶æŽ¥ç®¡ä½ çš„è´¦æˆ·ã€‚",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "å› ä¸º.htaccessæ–‡ä»¶æ— æ•ˆï¼Œæ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹åŠæ–‡ä»¶å¯èƒ½å¯ä»¥åœ¨äº’è”ç½‘ä¸Šè®¿é—®ã€‚",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "è¦èŽ·å¾—å¤§æ¦‚å¦‚ä½•é…ç½®æ‚¨çš„æœåŠ¡å™¨çš„ç›¸å…³ä¿¡æ¯ï¼Œå‚è§<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">è¯´æ˜Žæ–‡æ¡£</a>ã€‚",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "æœ‰å…³å¦‚ä½•æ£ç¡®åœ°é…ç½®æ‚¨çš„æœåŠ¡å™¨ï¼Œè¯·æŸ¥çœ‹ <a href=\"%s\" target=\"_blank\">æ–‡æ¡£</a>ã€‚",
 "Create an <strong>admin account</strong>" => "å»ºç«‹ä¸€ä¸ª <strong>ç®¡ç†å¸æˆ·</strong>",
 "Advanced" => "è¿›é˜¶",
 "Data folder" => "æ•°æ®å˜æ”¾æ–‡ä»¶å¤¹",
@@ -116,6 +124,7 @@
 "Database tablespace" => "æ•°æ®åº“è¡¨æ ¼ç©ºé—´",
 "Database host" => "æ•°æ®åº“ä¸»æœº",
 "Finish setup" => "å®Œæˆå®‰è£…",
+"%s is available. Get more information on how to update." => "%s æ˜¯å¯ç”¨çš„ã€‚èŽ·å–æ›´å¤šå…³äºŽå‡çº§çš„ä¿¡æ¯ã€‚",
 "Log out" => "æ³¨é”€",
 "Automatic logon rejected!" => "è‡ªåŠ¨ç™»å½•è¢«æ‹’ç»ï¼",
 "If you did not change your password recently, your account may be compromised!" => "å¦‚æžœæ‚¨æœ€è¿‘æ²¡æœ‰ä¿®æ”¹æ‚¨çš„å¯†ç ï¼Œé‚£æ‚¨çš„å¸å·å¯èƒ½è¢«æ”»å‡»äº†ï¼",
@@ -124,7 +133,9 @@
 "remember" => "è®°ä½ç™»å½•",
 "Log in" => "ç™»é™†",
 "Alternative Logins" => "å¤‡é€‰ç™»å½•",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "ä½ å¥½ï¼<br><br>æ¸©é¦¨æç¤ºï¼š %s ä¸Žæ‚¨å…±äº«äº† %s ã€‚<br><br>\næŸ¥çœ‹ï¼š %s <br><br> ç¥é¡ºåˆ©ï¼",
 "prev" => "åŽé€€",
 "next" => "å‰è¿›",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudæ£åœ¨å‡çº§è‡³ %s ç‰ˆï¼Œè¿™å¯èƒ½éœ€è¦ä¸€ç‚¹æ—¶é—´ã€‚"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 0c73fe31b3f8a9d223000314087487c8baa4c574..c216584494c2cbe287fd8db03b59f9e0d23ceeef 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "%s shared Â»%sÂ« with you" => "%s å‘æ‚¨åˆ†äº«äº† Â»%sÂ«",
 "Category type not provided." => "æœªæä¾›åˆ†ç±»ç±»åž‹ã€‚",
 "No category to add?" => "æ²¡æœ‰å¯æ·»åŠ åˆ†ç±»ï¼Ÿ",
@@ -29,15 +30,13 @@
 "December" => "åäºŒæœˆ",
 "Settings" => "è®¾ç½®",
 "seconds ago" => "ç§’å‰",
-"1 minute ago" => "ä¸€åˆ†é’Ÿå‰",
-"{minutes} minutes ago" => "{minutes} åˆ†é’Ÿå‰",
-"1 hour ago" => "1å°æ—¶å‰",
-"{hours} hours ago" => "{hours} å°æ—¶å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
-"{days} days ago" => "{days} å¤©å‰",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "ä¸Šæœˆ",
-"{months} months ago" => "{months} æœˆå‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "æœˆå‰",
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹´å‰",
@@ -85,7 +84,6 @@
 "Email sent" => "é‚®ä»¶å·²å‘é€",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "æ›´æ–°ä¸æˆåŠŸã€‚è¯·æ±‡æŠ¥å°†æ¤é—®é¢˜æ±‡æŠ¥ç»™  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ç¤¾åŒº</a>ã€‚",
 "The update was successful. Redirecting you to ownCloud now." => "æ›´æ–°æˆåŠŸã€‚æ£åœ¨é‡å®šå‘è‡³ ownCloudã€‚",
-"ownCloud password reset" => "é‡ç½® ownCloud å¯†ç ",
 "Use the following link to reset your password: {link}" => "ä½¿ç”¨ä»¥ä¸‹é“¾æŽ¥é‡ç½®æ‚¨çš„å¯†ç ï¼š{link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "é‡ç½®å¯†ç çš„é“¾æŽ¥å·²å‘é€åˆ°æ‚¨çš„é‚®ç®±ã€‚<br>å¦‚æžœæ‚¨è§‰å¾—åœ¨åˆç†çš„æ—¶é—´å†…è¿˜æœªæ”¶åˆ°é‚®ä»¶ï¼Œè¯·æŸ¥çœ‹ spam/junk ç›®å½•ã€‚<br>å¦‚æžœæ²¡æœ‰åœ¨é‚£é‡Œï¼Œè¯·è¯¢é—®æ‚¨çš„æœ¬åœ°ç®¡ç†å‘˜ã€‚",
 "Request failed!<br>Did you make sure your email/username was right?" => "è¯·æ±‚å¤±è´¥<br>æ‚¨ç¡®å®šæ‚¨çš„é‚®ç®±/ç”¨æˆ·åæ˜¯æ£ç¡®çš„ï¼Ÿ",
@@ -110,11 +108,9 @@
 "Add" => "å¢žåŠ ",
 "Security Warning" => "å®‰å…¨è¦å‘Š",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "ä½ çš„PHPç‰ˆæœ¬å®¹æ˜“å—åˆ°ç©ºå—èŠ‚æ”»å‡» (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "ä¸ºä¿è¯å®‰å…¨ä½¿ç”¨ ownCloud è¯·æ›´æ–°æ‚¨çš„PHPã€‚",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "éšæœºæ•°ç”Ÿæˆå™¨æ— æ•ˆï¼Œè¯·å¯ç”¨PHPçš„OpenSSLæ‰©å±•",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "æ²¡æœ‰å®‰å…¨éšæœºç ç”Ÿæˆå™¨ï¼Œæ”»å‡»è€…å¯èƒ½ä¼šçŒœæµ‹å¯†ç é‡ç½®ä¿¡æ¯ä»Žè€Œçªƒå–æ‚¨çš„è´¦æˆ·",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "æ‚¨çš„æ•°æ®ç›®å½•å’Œæ–‡ä»¶å¯èƒ½å¯ä»¥ç›´æŽ¥è¢«äº’è”ç½‘è®¿é—®ï¼Œå› ä¸º .htaccess å¹¶æœªæ£å¸¸å·¥ä½œã€‚",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "å…³äºŽå¦‚ä½•é…ç½®æœåŠ¡å™¨ï¼Œè¯·å‚è§ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">æ¤æ–‡æ¡£</a>ã€‚",
 "Create an <strong>admin account</strong>" => "åˆ›å»º<strong>ç®¡ç†å‘˜è´¦å·</strong>",
 "Advanced" => "é«˜çº§",
 "Data folder" => "æ•°æ®ç›®å½•",
@@ -140,3 +136,4 @@
 "next" => "ä¸‹ä¸€é¡µ",
 "Updating ownCloud to version %s, this may take a while." => "æ›´æ–° ownCloud åˆ°ç‰ˆæœ¬ %sï¼Œè¿™å¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 21418fe2eeb9bdf1742c05e3f77f86c8cf9a59df..0a3134f65da42cfdb1103c793f480c8703b2ce5d 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Sunday" => "æ˜ŸæœŸæ—¥",
 "Monday" => "æ˜ŸæœŸä¸€",
 "Tuesday" => "æ˜ŸæœŸäºŒ",
@@ -19,9 +20,13 @@
 "November" => "åä¸€æœˆ",
 "December" => "åäºŒæœˆ",
 "Settings" => "è¨å®š",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šæ—¥",
 "yesterday" => "æ˜¨æ—¥",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "å‰ä¸€æœˆ",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "å€‹æœˆä¹‹å‰",
 "Cancel" => "å–æ¶ˆ",
 "Yes" => "Yes",
@@ -86,3 +91,4 @@
 "next" => "ä¸‹ä¸€æ¥",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)æ›´æ–°ä¸, è«‹è€å¿ƒç‰ä¾¯"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 4afa6ea116fb05fd558a6bcdfa8e794eb4e72321..d620866bbb8b459302b24b2bbaa4de260d5bc2e6 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared Â»%sÂ« with you" => "%s èˆ‡æ‚¨åˆ†äº«äº† %s",
 "Category type not provided." => "æœªæä¾›åˆ†é¡žé¡žåž‹ã€‚",
 "No category to add?" => "æ²’æœ‰å¯å¢žåŠ çš„åˆ†é¡žï¼Ÿ",
 "This category already exists: %s" => "åˆ†é¡žå·²ç¶“å˜åœ¨ï¼š %s",
@@ -28,15 +30,13 @@
 "December" => "åäºŒæœˆ",
 "Settings" => "è¨å®š",
 "seconds ago" => "å¹¾ç§’å‰",
-"1 minute ago" => "1 åˆ†é˜å‰",
-"{minutes} minutes ago" => "{minutes} åˆ†é˜å‰",
-"1 hour ago" => "1 å°æ™‚ä¹‹å‰",
-"{hours} hours ago" => "{hours} å°æ™‚å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
-"{days} days ago" => "{days} å¤©å‰",
+"_%n day ago_::_%n days ago_" => array(""),
 "last month" => "ä¸Šå€‹æœˆ",
-"{months} months ago" => "{months} å€‹æœˆå‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "months ago" => "å¹¾å€‹æœˆå‰",
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹¾å¹´å‰",
@@ -61,6 +61,7 @@
 "Share with link" => "ä½¿ç”¨é€£çµåˆ†äº«",
 "Password protect" => "å¯†ç¢¼ä¿è·",
 "Password" => "å¯†ç¢¼",
+"Allow Public Upload" => "å…è¨±ä»»ä½•äººä¸Šå‚³",
 "Email link to person" => "å°‡é€£çµ email çµ¦åˆ¥äºº",
 "Send" => "å¯„å‡º",
 "Set expiration date" => "è¨ç½®åˆ°æœŸæ—¥",
@@ -83,12 +84,12 @@
 "Email sent" => "Email å·²å¯„å‡º",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "å‡ç´šå¤±æ•—ï¼Œè«‹å°‡æ¤å•é¡Œå›žå ± <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ç¤¾ç¾¤</a>ã€‚",
 "The update was successful. Redirecting you to ownCloud now." => "å‡ç´šæˆåŠŸï¼Œæ£å°‡æ‚¨é‡æ–°å°Žå‘è‡³ ownCloud ã€‚",
-"ownCloud password reset" => "ownCloud å¯†ç¢¼é‡è¨",
 "Use the following link to reset your password: {link}" => "è«‹è‡³ä»¥ä¸‹é€£çµé‡è¨æ‚¨çš„å¯†ç¢¼ï¼š {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "é‡è¨å¯†ç¢¼çš„é€£çµå·²ç¶“å¯„è‡³æ‚¨çš„é›»åéƒµä»¶ä¿¡ç®±ï¼Œå¦‚æžœæ‚¨éŽäº†ä¸€æ®µæ™‚é–“é‚„æ˜¯æ²’æœ‰æ”¶åˆ°å®ƒï¼Œè«‹æª¢æŸ¥çœ‹çœ‹å®ƒæ˜¯ä¸æ˜¯è¢«æ”¾åˆ°åžƒåœ¾éƒµä»¶äº†ï¼Œå¦‚æžœé‚„æ˜¯æ²’æœ‰çš„è©±ï¼Œè«‹è¯çµ¡æ‚¨çš„ ownCloud ç³»çµ±ç®¡ç†å“¡ã€‚",
 "Request failed!<br>Did you make sure your email/username was right?" => "è«‹æ±‚å¤±æ•—ï¼<br>æ‚¨ç¢ºå®šå¡«å…¥çš„é›»åéƒµä»¶åœ°å€æˆ–æ˜¯å¸³è™Ÿåç¨±æ˜¯æ£ç¢ºçš„å—Žï¼Ÿ",
-"You will receive a link to reset your password via Email." => "é‡è¨å¯†ç¢¼çš„é€£çµå°‡æœƒå¯„åˆ°ä½ çš„é›»åéƒµä»¶ä¿¡ç®±ã€‚",
+"You will receive a link to reset your password via Email." => "é‡è¨å¯†ç¢¼çš„é€£çµå°‡æœƒå¯„åˆ°æ‚¨çš„é›»åéƒµä»¶ä¿¡ç®±ã€‚",
 "Username" => "ä½¿ç”¨è€…åç¨±",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "æ‚¨çš„æª”æ¡ˆå·²åŠ å¯†ï¼Œå¦‚æžœæ‚¨æ²’æœ‰è¨å®šé‚„åŽŸé‡‘é‘°ï¼Œæœªä¾†é‡è¨å¯†ç¢¼å¾Œå°‡ç„¡æ³•å–å›žæ‚¨çš„è³‡æ–™ã€‚å¦‚æžœæ‚¨ä¸ç¢ºå®šè©²æ€Žéº¼åšï¼Œè«‹æ´½è©¢ç³»çµ±ç®¡ç†å“¡å¾Œå†ç¹¼çºŒã€‚æ‚¨ç¢ºå®šè¦ç¾åœ¨ç¹¼çºŒå—Žï¼Ÿ",
 "Yes, I really want to reset my password now" => "å°ï¼Œæˆ‘ç¾åœ¨æƒ³è¦é‡è¨æˆ‘çš„å¯†ç¢¼ã€‚",
 "Request reset" => "è«‹æ±‚é‡è¨",
 "Your password was reset" => "æ‚¨çš„å¯†ç¢¼å·²é‡è¨",
@@ -102,15 +103,16 @@
 "Help" => "èªªæ˜Ž",
 "Access forbidden" => "å˜å–è¢«æ‹’",
 "Cloud not found" => "æœªç™¼ç¾é›²ç«¯",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "å—¨ï¼Œ\n\né€šçŸ¥æ‚¨ï¼Œ%s èˆ‡æ‚¨åˆ†äº«äº† %s ã€‚\nçœ‹ä¸€ä¸‹ï¼š%s",
 "Edit categories" => "ç·¨è¼¯åˆ†é¡ž",
 "Add" => "å¢žåŠ ",
 "Security Warning" => "å®‰å…¨æ€§è¦å‘Š",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "æ‚¨çš„ PHP ç‰ˆæœ¬ç„¡æ³•æŠµæŠ— NULL Byte æ”»æ“Š (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "è«‹æ›´æ–°æ‚¨çš„ PHP å®‰è£ä»¥æ›´å®‰å…¨åœ°ä½¿ç”¨ ownCloud ã€‚",
+"Please update your PHP installation to use %s securely." => "è«‹æ›´æ–° PHP ä»¥å®‰å…¨åœ°ä½¿ç”¨ %sã€‚",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "æ²’æœ‰å¯ç”¨çš„äº‚æ•¸ç”¢ç”Ÿå™¨ï¼Œè«‹å•Ÿç”¨ PHP ä¸çš„ OpenSSL æ“´å……åŠŸèƒ½ã€‚",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "è‹¥æ²’æœ‰å®‰å…¨çš„äº‚æ•¸ç”¢ç”Ÿå™¨ï¼Œæ”»æ“Šè€…å¯èƒ½å¯ä»¥é æ¸¬å¯†ç¢¼é‡è¨ä¿¡ç‰©ï¼Œç„¶å¾ŒæŽ§åˆ¶æ‚¨çš„å¸³æˆ¶ã€‚",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "æ‚¨çš„è³‡æ–™ç›®éŒ„çœ‹èµ·ä¾†å¯ä»¥è¢« Internet å…¬é–‹å˜å–ï¼Œå› ç‚º .htaccess è¨å®šä¸¦æœªç”Ÿæ•ˆã€‚",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "è«‹åƒè€ƒ<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">èªªæ˜Žæ–‡ä»¶</a>ä»¥çžè§£å¦‚ä½•æ£ç¢ºè¨å®šæ‚¨çš„ä¼ºæœå™¨ã€‚",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "è«‹åƒè€ƒ<a href=\"%s\" target=\"_blank\">èªªæ˜Žæ–‡ä»¶</a>ä»¥çžè§£å¦‚ä½•æ£ç¢ºè¨å®šæ‚¨çš„ä¼ºæœå™¨ã€‚",
 "Create an <strong>admin account</strong>" => "å»ºç«‹ä¸€å€‹<strong>ç®¡ç†è€…å¸³è™Ÿ</strong>",
 "Advanced" => "é€²éšŽ",
 "Data folder" => "è³‡æ–™å¤¾",
@@ -131,7 +133,9 @@
 "remember" => "è¨˜ä½",
 "Log in" => "ç™»å…¥",
 "Alternative Logins" => "æ›¿ä»£ç™»å…¥æ–¹æ³•",
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "å—¨ï¼Œ<br><br>é€šçŸ¥æ‚¨ï¼Œ%s èˆ‡æ‚¨åˆ†äº«äº† %s ï¼Œ<br><a href=\"%s\">çœ‹ä¸€ä¸‹å§</a>",
 "prev" => "ä¸Šä¸€é ",
 "next" => "ä¸‹ä¸€é ",
 "Updating ownCloud to version %s, this may take a while." => "æ£åœ¨å°‡ Owncloud å‡ç´šè‡³ç‰ˆæœ¬ %s ï¼Œé€™å¯èƒ½éœ€è¦ä¸€é»žæ™‚é–“ã€‚"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 2f9963652190b2f457f912a85c65c017b2b7d5cf..74a5be2b96f002c4dcd28ccef8f4214d4a4563c3 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -57,7 +57,8 @@ class OC_Core_LostPassword_Controller {
 				$l = OC_L10N::get('core');
 				$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
 				try {
-					OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+					$defaults = new OC_Defaults();
+					OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
 				} catch (Exception $e) {
 					OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
 				}
diff --git a/core/templates/404.php b/core/templates/404.php
index ee17f0de8e1957c5b66335010ee163005a52409a..bf1e03e6bc9852acb23bda8f7824c66a891efeb5 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -7,9 +7,13 @@ if(!isset($_)) {//also provide standalone error page
 	exit;
 }
 ?>
-<ul>
-	<li class='error'>
-		<?php p($l->t( 'Cloud not found' )); ?><br/>
-		<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
-	</li>
-</ul>
+<?php if (isset($_['content'])): ?>
+	<?php print_unescaped($_['content']) ?>
+<?php else: ?>
+	<ul>
+		<li class="error">
+			<?php p($l->t( 'Cloud not found' )); ?><br/>
+			<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
+		</li>
+	</ul>
+<?php endif; ?>
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index a7df29a2446d244cc27371d81d0cfdd649424b46..2551473c6f0939364d95f3739201709281b08a41 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,9 +1,7 @@
 <?php
-$defaults = new OC_Defaults();
-
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
 ?>
 
 --
-<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?>
-<?php print_unescaped("\n".$defaults->getBaseUrl());
+<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php print_unescaped("\n".$theme->getBaseUrl());
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 7f2796a4b319e8e4fe3ac20da509bb16b9e7d177..77c455304d3258118cef825cf3d23ed6670d44a4 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -23,7 +23,7 @@
 	<fieldset class="warning">
 		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
 		<p><?php p($l->t('Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)'));?><br/>
-		<?php p($l->t('Please update your PHP installation to use ownCloud securely.'));?></p>
+		<?php p($l->t('Please update your PHP installation to use %s securely.', $theme->getName() )); ?></p>
 	</fieldset>
 	<?php endif; ?>
 	<?php if(!$_['secureRNG']): ?>
@@ -37,7 +37,10 @@
 	<fieldset class="warning">
 		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
 		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
-		<?php print_unescaped($l->t('For information how to properly configure your server, please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html" target="_blank">documentation</a>.'));?></p>
+		<?php print_unescaped($l->t(
+			'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.',
+			$theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html'
+		)); ?></p>
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
@@ -118,7 +121,7 @@
 			<?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
-        
+
 		<?php if($_['hasMSSQL']): ?>
 		<input type='hidden' id='hasMSSQL' value='true'/>
 		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
@@ -128,7 +131,7 @@
 		<label class="mssql" for="mssql">MS SQL</label>
 		<input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/>
 		<?php endif; ?>
-		<?php endif; ?>        
+		<?php endif; ?>
 		</div>
 
 		<?php if($hasOtherDB): ?>
@@ -151,22 +154,22 @@
 					value="<?php p(OC_Helper::init_var('dbname')); ?>"
 					autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
 			</p>
-		</div>
-		<?php endif; ?>
-		<?php if($_['hasOracle']): ?>
-		<div id="use_oracle_db">
-			<p class="infield groupmiddle">
-				<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
-				<input type="text" name="dbtablespace" id="dbtablespace" placeholder=""
-					value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" />
+			<?php if($_['hasOracle']): ?>
+			<div id="use_oracle_db">
+				<p class="infield groupmiddle">
+					<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
+					<input type="text" name="dbtablespace" id="dbtablespace" placeholder=""
+						value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" />
+				</p>
+			</div>
+			<?php endif; ?>
+			<p class="infield groupbottom">
+				<label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label>
+				<input type="text" name="dbhost" id="dbhost" placeholder=""
+					value="<?php p(OC_Helper::init_var('dbhost')); ?>" />
 			</p>
 		</div>
 		<?php endif; ?>
-		<p class="infield groupbottom">
-			<label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label>
-			<input type="text" name="dbhost" id="dbhost" placeholder=""
-				value="<?php p(OC_Helper::init_var('dbhost')); ?>" />
-		</p>
 	</fieldset>
 
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 09e1006d507bf06b95e32e4e5c6a5dc6a29192cc..ea10c3042b592f7f192d9723be89e68493a14e6e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -6,11 +6,9 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 
-	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-
 	<head>
 		<title>
-		<?php p($defaults->getName()); ?>
+		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 329744e3824eb93093b3b13c173d22bbba0aff5e..9c9eb63382fff615bb93777b226c6570f94e9e89 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -6,11 +6,9 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 
-	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
-		<?php p($defaults->getName()); ?>
+		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
@@ -22,7 +20,7 @@
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
-	
+
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				print_unescaped('<'.$header['tag'].' ');
@@ -35,16 +33,21 @@
 	</head>
 
 	<body id="body-login">
-		<div id="login">
+		<div class="wrapper"><!-- for sticky footer -->
 			<header><div id="header">
-				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
-				<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
+				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($theme->getName()); ?>" />
+				<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			</div></header>
+
 			<?php print_unescaped($_['content']); ?>
+
+			<div class="push"></div><!-- for sticky footer -->
 		</div>
+
 		<footer>
 			<p class="info">
-				<?php print_unescaped($defaults->getLongFooter()); ?>
-			</p></footer>
+				<?php print_unescaped($theme->getLongFooter()); ?>
+			</p>
+		</footer>
 	</body>
 </html>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index dacbe79bd342ee0303ddda2cebcfa0f1b5026da2..3c1114492cb3d59362015f6ad483714f56d572cf 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -6,12 +6,10 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 
-	<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-	
 	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
 			<?php p(!empty($_['application'])?$_['application'].' | ':'');
-			p($defaults->getName());
+			p($theme->getTitle());
 			p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
 		</title>
 		<meta charset="utf-8">
@@ -45,8 +43,8 @@
 	</div>
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
-				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-			<div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
+				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
+			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			<ul id="settings" class="svg">
 				<span id="expand" tabindex="0" role="link">
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
@@ -91,6 +89,19 @@
 						</a>
 					</li>
 				<?php endforeach; ?>
+
+				<!-- show "More apps" link to app administration directly in app navigation -->
+				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
+					<li id="apps-management">
+						<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
+							<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+							<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
+							<span>
+								<?php p($l->t('More apps')); ?>
+							</span>
+						</a>
+					</li>
+				<?php endif; ?>
 			</ul>
 		</div></nav>
 
diff --git a/core/templates/login.php b/core/templates/login.php
index 571e0a865d96bcc959439b4530330672e5a471f1..9143510f75732046ffa104f07c4228205d9d3175 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -35,8 +35,8 @@
 		</a>
 		<?php endif; ?>
 
-		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
-			for="remember_login"><?php p($l->t('remember')); ?></label>
+		<input type="checkbox" name="remember_login" value="1" id="remember_login" checked />
+		<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
 	</fieldset>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index 562ad82e953ad7ce38ea4aa476fbeefa085fc721..de72b136b135149a73b09bf04b7dbb2b55b12cc4 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -1,11 +1,10 @@
-<?php $defaults = new OC_Defaults() // initialize themable default strings and urls ?>
 <table cellspacing="0" cellpadding="0" border="0" width="100%">
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
 <td bgcolor="#1d2d44" width="20px">&nbsp;</td>
 <td bgcolor="#1d2d44">
-<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/>
+<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
 <tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
@@ -21,9 +20,9 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared Â»
 <tr>
 <td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
 <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
-<?php p($defaults->getName()); ?> -
-<?php p($defaults->getSlogan()); ?>
-<br><a href="<?php print_unescaped($defaults->getBaseUrl()); ?>"><?php print_unescaped($defaults->getBaseUrl());?></a></td>
+<?php p($theme->getName()); ?> -
+<?php p($theme->getSlogan()); ?>
+<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a></td>
 </tr>
 <tr>
 <td bgcolor="#f8f8f8" colspan="2">&nbsp;</td>
diff --git a/db_structure.xml b/db_structure.xml
index cefb7fc52c91c31a6300d966736554936a4707bc..f926ab44cd4064d466e033a336c9b31d96e7d71d 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -32,7 +32,7 @@
 			<field>
 				<name>configvalue</name>
 				<type>clob</type>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 			</field>
 
 			<index>
@@ -308,7 +308,7 @@
 				<name>etag</name>
 				<type>text</type>
 				<default></default>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 				<length>40</length>
 			</field>
 
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 126054f6f327ad6c5447e8963f33ea63c93de98f..2aa42f705fb51c2e12b9b976dfb849cfb8a2b0e1 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Wagwoord"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Gebruikersnaam"
@@ -461,11 +462,11 @@ msgstr "Hulp"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Wolk nie gevind"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skep `n <strong>admin-rekening</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Gevorderd"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Stel databasis op"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "sal gebruik word"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Databasis-gebruiker"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Databasis-wagwoord"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Databasis naam"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Teken uit"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr "Teken aan"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index b44ec5ede5bf57ba2c4f48290b195809bfd99c62..2eb2aa7bceecfc6ec58fc1e16164c216d68b789c 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-04 09:30+0200\n"
-"PO-Revision-Date: 2013-07-04 07:31+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -27,54 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:39
+#: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:22
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:55
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:62
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:63
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:65
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:66
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:68
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:87
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:119
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 920cb218987ebd3cc97ebd7f5423f89855282e9c..6e1898259c6d85035948e9632aff07bac270a62f 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index ff1a3d94c283c205a98c6626107315eeb03628df..a51530f213fa95a095d6e7a11a7db8c90f8f1290 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Wagwoord"
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 59b6ea0942ba2798b3d9aee9163d51e33a2f6382..020abe02dd91b116e7d1bd9b06ba32f1c280efd2 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/af_ZA/files_versions.po b/l10n/af_ZA/files_versions.po
index a663f48e1751178506b8c9d837661e7a0a0f07c0..85fc84090038a534b7a7a0c4df63da7d79797b84 100644
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 1d31fcf99084d7193a06ef1ae6bc756cdda1c327..491052f17f05870d131cd406dce58086915345ef 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Toepassings"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 5daaa64d26b99985bbef21638b36ec7a326c22f8..64a38fbef8a4ef7cc27677593928550152bbaec7 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 4856d0902bf6cd2ba627d55e0621b176690e5229..1d1d4695a717d42fd6629504865402b6ed15fff1 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-23 01:59+0200\n"
-"PO-Revision-Date: 2013-06-22 10:24+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/af_ZA/user_webdavauth.po b/l10n/af_ZA/user_webdavauth.po
index cf6125d605359a13059b727dbf2340d94364f691..4a6c5f4684d647e25e659beb725184ad29d32242 100644
--- a/l10n/af_ZA/user_webdavauth.po
+++ b/l10n/af_ZA/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index abed04f08612604424ede5616eee3cae243c56e8..8a6009ccb392d2dbdc1d72804a3f421e9ebbcea9 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,75 @@ msgstr "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ"
 msgid "December"
 msgstr "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} Ù…Ù†Ø° Ø¯Ù‚Ø§Ø¦Ù‚"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "Ø§Ù„ÙŠÙˆÙ…"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ÙŠÙˆÙ… Ø£Ù…Ø³"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} ÙŠÙˆÙ… Ø³Ø§Ø¨Ù‚"
-
-#: js/js.js:729
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:821
 msgid "last month"
 msgstr "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} Ø´Ù‡Ø± Ù…Ø¶Øª"
-
-#: js/js.js:731
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:823
 msgid "months ago"
 msgstr "Ø´Ù‡Ø± Ù…Ø¶Ù‰"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ø§Ù„Ø³Ù†Ø©Ø§Ù„Ù…Ø§Ø¶ÙŠØ©"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ø³Ù†Ø© Ù…Ø¶Øª"
 
@@ -225,8 +241,8 @@ msgstr "Ù†ÙˆØ¹ Ø§Ù„Ø¹Ù†ØµØ± ØºÙŠØ± Ù…ØØ¯Ø¯."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
@@ -246,140 +262,141 @@ msgstr "Ù…Ø´Ø§Ø±Ùƒ"
 msgid "Share"
 msgstr "Ø´Ø§Ø±Ùƒ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø²Ø§Ù„Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† Ø§Ù„ØªØµØ±ÙŠØ Ø¨Ø§Ù„ØªÙˆØµÙ„"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ø´ÙˆØ±Ùƒ Ù…Ø¹Ùƒ ÙˆÙ…Ø¹ Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© {group} Ù…Ù† Ù‚Ø¨Ù„ {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Ø´ÙˆØ±Ùƒ Ù…Ø¹Ùƒ Ù…Ù† Ù‚Ø¨Ù„ {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Ø´Ø§Ø±Ùƒ Ù…Ø¹"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Ø´Ø§Ø±Ùƒ Ù…Ø¹ Ø±Ø§Ø¨Ø·"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ØÙ…Ø§ÙŠØ© ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Ø§Ø±Ø³Ù„ Ø§Ù„Ø±Ø§Ø¨Ø· Ø¨Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ù‰ ØµØ¯ÙŠÙ‚"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Ø£Ø±Ø³Ù„"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "ØªØ¹ÙŠÙŠÙ† ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ø¨Ø± Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£ÙŠ Ø´Ø®Øµ"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Ù„Ø§ ÙŠØ³Ù…Ø Ø¨Ø¹Ù…Ù„ÙŠØ© Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Ø´ÙˆØ±Ùƒ ÙÙŠ {item} Ù…Ø¹ {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ø§Ù„ØªØØ±ÙŠØ± Ù…Ø³Ù…ÙˆØ"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Ø¶Ø¨Ø· Ø§Ù„ÙˆØµÙˆÙ„"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "Ø¥Ù†Ø´Ø§Ø¡"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "ØªØØ¯ÙŠØ«"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "ØØ°Ù"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Ù…ØÙ…ÙŠ Ø¨ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø²Ø§Ù„Ø© ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© ØªØ¹ÙŠÙŠÙ† ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Ø¬Ø§Ø±ÙŠ Ø§Ù„Ø§Ø±Ø³Ø§Ù„ ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "ØªÙ… Ø§Ø±Ø³Ø§Ù„ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø§Ù„ÙƒØªØ±ÙˆÙ†ÙŠ"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "ØØµÙ„ Ø®Ø·Ø£ ÙÙŠ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ØªØØ¯ÙŠØ«, ÙŠØ±Ø¬Ù‰ Ø§Ø±Ø³Ø§Ù„ ØªÙ‚Ø±ÙŠØ± Ø¨Ù‡Ø°Ù‡ Ø§Ù„Ù…Ø´ÙƒÙ„Ø© Ø§Ù„Ù‰ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "ØªÙ… Ø§Ù„ØªØØ¯ÙŠØ« Ø¨Ù†Ø¬Ø§Ø , ÙŠØªÙ… Ø§Ø¹Ø§Ø¯Ø© ØªÙˆØ¬ÙŠÙ‡Ùƒ Ø§Ù„Ø§Ù† Ø§Ù„Ù‰ Owncloud"
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† ÙƒÙ„Ù…Ø© Ø³Ø± ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +417,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ø³ÙˆÙ Ù†Ø±Ø³Ù„ Ù„Ùƒ Ø¨Ø±ÙŠØ¯ ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØµÙ„Ø© Ù„ØªØ¬Ø¯ÙŠØ¯ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Ø¥Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
@@ -461,11 +478,11 @@ msgstr "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©"
 msgid "Access forbidden"
 msgstr "Ø§Ù„ØªÙˆØµÙ‘Ù„ Ù…ØØ¸ÙˆØ±"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Ù„Ù… ÙŠØªÙ… Ø¥ÙŠØ¬Ø§Ø¯"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,8 +511,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -515,68 +533,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Ù…Ø¬Ù„Ø¯Ø§Øª Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª ÙˆØ§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø®Ø§ØµØ© Ù‚Ø¯ ØªÙƒÙˆÙ† Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª ÙˆØ°Ù„Ùƒ Ø¨Ø³Ø¨Ø¨ Ø§Ù† Ù…Ù„Ù .htaccess  Ù„Ø§ ÙŠØ¹Ù…Ù„ Ø¨Ø´ÙƒÙ„ ØµØÙŠØ."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø¹Ù† ÙƒÙŠÙÙŠØ© Ø§Ø¹Ø¯Ø§Ø¯ Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ , ÙŠØ±Ø¬Ù‰ Ø²ÙŠØ§Ø±Ø© Ø§Ù„Ø±Ø§Ø¨Ø·  Ø§Ù„ØªØ§Ù„ÙŠ  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ø£Ø¶Ù </strong>Ù…Ø³ØªØ®Ø¯Ù… Ø±Ø¦ÙŠØ³ÙŠ <strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "ØªØ¹Ø¯ÙŠÙ„Ø§Øª Ù…ØªÙ‚Ø¯Ù…Ù‡"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Ø£Ø³Ø³ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ø³ÙŠØªÙ… Ø§Ø³ØªØ®Ø¯Ù…Ù‡"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Ù…Ø³ØªØ®Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ÙƒÙ„Ù…Ø© Ø³Ø± Ù…Ø³ØªØ®Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ø¥Ø³Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Ù…Ø³Ø§ØØ© Ø¬Ø¯ÙˆÙ„ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ø®Ø§Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ø§Ù†Ù‡Ø§Ø¡ Ø§Ù„ØªØ¹Ø¯ÙŠÙ„Ø§Øª"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ø§Ù„Ø®Ø±ÙˆØ¬"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ØªÙ… Ø±ÙØ¶ ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„ Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ!"
@@ -607,7 +629,7 @@ msgstr "Ø£Ø¯Ø®Ù„"
 msgid "Alternative Logins"
 msgstr "Ø§Ø³Ù…Ø§Ø¡ Ø¯Ø®ÙˆÙ„ Ø¨Ø¯ÙŠÙ„Ø©"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 6b838865c66dbf0175e91385a3597ed8ffa42003..2f9759aeb7116d3bcd87dad598263a4b36014dca 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Ø´Ø§Ø±Ùƒ"
 msgid "Delete permanently"
 msgstr "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ø¥Ù„ØºØ§Ø¡"
 
@@ -128,43 +128,49 @@ msgstr "Ø¥Ù„ØºØ§Ø¡"
 msgid "Rename"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© ØªØ³Ù…ÙŠÙ‡"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ù‚ÙŠØ¯ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø±"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Ù…ÙˆØ¬ÙˆØ¯ Ù…Ø³Ø¨Ù‚Ø§"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ø§Ø³ØªØ¨Ø¯Ø§Ù„"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Ø§Ù‚ØªØ±Ø Ø¥Ø³Ù…"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Ø¥Ù„ØºØ§Ø¡"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ø§Ø³ØªØ¨Ø¯Ù„ {new_name}  Ø¨Ù€  {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "ØªØ±Ø§Ø¬Ø¹"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Ø¬Ø§Ø±ÙŠ ØªÙ†ÙÙŠØ° Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ØØ°Ù"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "Ø¬Ø§Ø±ÙŠ Ø±ÙØ¹ 1 Ù…Ù„Ù"
-
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +206,37 @@ msgstr "Ø¬Ø§Ø±ÙŠ ØªØ¬Ù‡ÙŠØ² Ø¹Ù…Ù„ÙŠØ© Ø§Ù„ØªØÙ…ÙŠÙ„. Ù‚Ø¯ ØªØ³ØªØºØ±Ù‚ Ø¨Ø¹Ø¶
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ø¥Ø³Ù… Ù…Ø¬Ù„Ø¯ ØºÙŠØ± ØµØÙŠØ. Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù…ØµØ·Ù„Ø \"Shared\" Ù…ØØ¬ÙˆØ² Ù„Ù„Ù†Ø¸Ø§Ù…"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ø§Ø³Ù…"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "ØØ¬Ù…"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Ù…Ø¹Ø¯Ù„"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "Ù…Ø¬Ù„Ø¯ Ø¹Ø¯Ø¯ 1"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ù…Ø¬Ù„Ø¯Ø§Øª"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "Ù…Ù„Ù ÙˆØ§ØØ¯"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Ù…Ù„ÙØ§Øª"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +295,61 @@ msgstr "Ù…Ø¬Ù„Ø¯"
 msgid "From link"
 msgstr "Ù…Ù† Ø±Ø§Ø¨Ø·"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "ØØ°Ù Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ø±ÙØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Ù„Ø§ ØªÙ…Ù„Ùƒ ØµÙ„Ø§ØÙŠØ§Øª Ø§Ù„ÙƒØªØ§Ø¨Ø© Ù‡Ù†Ø§."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´ÙŠØ¡ Ù‡Ù†Ø§. Ø¥Ø±ÙØ¹ Ø¨Ø¹Ø¶ Ø§Ù„Ù…Ù„ÙØ§Øª!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ØªØÙ…ÙŠÙ„"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "ØØ¬Ù… Ø§Ù„ØªØ±ÙÙŠØ¹ Ø£Ø¹Ù„Ù‰ Ù…Ù† Ø§Ù„Ù…Ø³Ù…ÙˆØ"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ØØ¬Ù… Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„ØªÙŠ ØªØ±ÙŠØ¯ ØªØ±ÙÙŠØ¹Ù‡Ø§ Ø£Ø¹Ù„Ù‰ Ù…Ù† Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¹Ù„Ù‰ Ø§Ù„Ø®Ø§Ø¯Ù…."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "ÙŠØ±Ø¬Ù‰ Ø§Ù„Ø§Ù†ØªØ¸Ø§Ø± , Ø¬Ø§Ø±ÙŠ ÙØØµ Ø§Ù„Ù…Ù„ÙØ§Øª ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Ø§Ù„ÙØØµ Ø§Ù„ØØ§Ù„ÙŠ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index b364ef0b1af6be2a3f2bd625ae80265976f3351b..871a6b180016122d2c94ea40194805dc81af439d 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 086ee491a6fbb0a8401a402ba077f31e337d170c..598bb2d827da32e7b936423d3017f2d54ad7f594 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 9e91825fda045b2ae8bd2f9d1773bff4513f61e0..d8d3d8214a180b009098082e4804b0754f5553de 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
 msgid "Submit"
 msgstr "ØªØ·Ø¨ÙŠÙ‚"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s Ø´Ø§Ø±Ùƒ Ø§Ù„Ù…Ø¬Ù„Ø¯ %s Ù…Ø¹Ùƒ"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s Ø´Ø§Ø±Ùƒ Ø§Ù„Ù…Ù„Ù %s Ù…Ø¹Ùƒ"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ØªØÙ…ÙŠÙ„"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ø±ÙØ¹"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ø±ÙØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø¹Ø±Ø¶ Ù…Ø³Ø¨Ù‚ Ù„Ù€"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index bfd8424ef308a798148ebd0f95b0e3a2d6ef5b3e..f07045eb588d3c08914429a3fe984f2a95fcb279 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,53 @@ msgstr "ØªØ¹Ø°Ù‘Ø± ØØ°Ù%s Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…"
 msgid "Couldn't restore %s"
 msgstr "ØªØ¹Ø°Ù‘Ø± Ø§Ø³ØªØ±Ø¬Ø§Ø¹ %s "
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Ø¥Ø¨Ø¯Ø¡ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ø¥Ø³ØªØ¹Ø§Ø¯Ø©"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "ØØ°Ù Ø¨Ø´ÙƒÙ„ Ø¯Ø§Ø¦Ù…"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ø§Ø³Ù…"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "ØªÙ… Ø§Ù„ØØ°Ù"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "Ù…Ø¬Ù„Ø¯ Ø¹Ø¯Ø¯ 1"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ù…Ø¬Ù„Ø¯Ø§Øª"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "Ù…Ù„Ù ÙˆØ§ØØ¯"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Ù…Ù„ÙØ§Øª"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 9066fe25fafa54cb1db92342cdfe4f8905b8f84e..d8cdfb73168aac12b368460f44af92c2dfcd3d1c 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ar\n"
 "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;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ø§Ø³ØªØ¹ÙŠØ¯"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 5cffbe342b782efe172f2e3c41965b14a14b8f83..040d66a42c41137bb7cab044add09f682fe8cb8a 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Ø§Ù„Ù…Ø¯ÙŠØ±"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ø®Ø¯Ù…Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ© ØªØØª Ø³ÙŠØ·Ø±ØªÙƒ"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ØªØÙ…ÙŠÙ„ Ù…Ù„ÙØ§Øª ZIP Ù…ØªÙˆÙ‚Ù"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª Ø¨ØØ§Ø¬Ø© Ø§Ù„Ù‰ Ø§Ù† ÙŠØªÙ… ØªØÙ…ÙŠÙ„Ù‡Ø§ ÙˆØ§ØØ¯ ØªÙ„Ùˆ Ø§Ù„Ø§Ø®Ø±"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Ø§Ù„Ø¹ÙˆØ¯Ø© Ø§Ù„Ù‰ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…ØØ¯Ø¯Ø© ÙƒØ¨ÙŠØ±Ø© Ø¬Ø¯Ø§ Ù„ÙŠØªÙ… Ø¶ØºØ·Ù‡Ø§ ÙÙŠ Ù…Ù„Ù zip"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ØªØ¹Ø°Ù‘Ø± ØªØØ¯ÙŠØ¯Ù‡"
 
@@ -170,77 +182,93 @@ msgstr "Ø§Ù„Ø£Ù…Ø± Ø§Ù„Ù…Ø®Ø§Ù„Ù ÙƒØ§Ù† : \"%s\", Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… : %s,
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… / Ø£Ùˆ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù€PostgreSQL ØºÙŠØ± ØµØÙŠØØ©"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Ø§Ø¹Ø¯Ø§Ø¯ Ø§Ø³Ù… Ù…Ø³ØªØ®Ø¯Ù… Ù„Ù„Ù…Ø¯ÙŠØ±"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Ø§Ø¹Ø¯Ø§Ø¯ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ù„Ù„Ù…Ø¯ÙŠØ±"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø®Ø§Ø¯Ù…Ùƒ ØºÙŠØ± ØµØÙŠØØ© Ø¨Ø´ÙƒÙ„ ØªØ³Ù…Ø Ù„Ùƒ Ø¨Ù…Ø²Ø§Ù…Ù†Ø© Ù…Ù„ÙØ§ØªÙƒ ÙˆØ°Ù„Ùƒ Ø¨Ø³Ø¨Ø¨ Ø£Ù† ÙˆØ§Ø¬Ù‡Ø© WebDAV ØªØ¨Ø¯Ùˆ Ù…Ø¹Ø·Ù„Ø©"
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† <a href='%s'>Ø¯Ù„ÙŠÙ„ Ø§Ù„ØªÙ†ØµÙŠØ¨</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d Ø¯Ù‚ÙŠÙ‚Ø© Ù…Ø¶Øª"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d Ø³Ø§Ø¹Ø© Ù…Ø¶Øª"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "Ø§Ù„ÙŠÙˆÙ…"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ÙŠÙˆÙ… Ø£Ù…Ø³"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d ÙŠÙˆÙ… Ù…Ø¶Ù‰"
-
-#: template.php:121
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d Ø´Ù‡Ø± Ù…Ø¶Øª"
-
-#: template.php:123
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ø§Ù„Ø³Ù†Ø©Ø§Ù„Ù…Ø§Ø¶ÙŠØ©"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ø³Ù†Ø© Ù…Ø¶Øª"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 700da28b6f9432c95b67b05fa1e37aa9045c2be6..668bdd1a446522584acd44cf324cb147b6ad35fa 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr "ÙŠØ¬Ø¨ Ø§Ø¯Ø®Ø§Ù„ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± ØµØÙŠØØ©"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "ØªØØ°ÙŠØ± Ø£Ù…Ø§Ù†"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ù…Ø¬Ù„Ø¯Ø§Øª data  ÙˆÙ…Ù„ÙØ§ØªÙƒ Ù‚Ø¯ ØªÙƒÙˆÙ† Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù…Ù„Ù .htaccess Ø§Ù„Ø°ÙŠ ÙˆÙØ±ØªÙ‡ Owncloud Ù„Ø§ ÙŠØ¹Ù…Ù„ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨Ø§Ø¹Ø¯Ø§Ø¯ Ø®Ø§Ø¯Ù…Ùƒ Ø¨Ø·Ø±ÙŠÙ‚Ø© ØªØ¬Ø¹Ù„ Ù…Ø¬Ù„Ø¯ data ØºÙŠØ± Ù‚Ø§Ø¨Ù„ Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ø£Ùˆ Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØºÙŠÙŠØ± Ù…Ø³Ø§Ø±Ù‡ Ø§Ù„Ù‰ Ø®Ø§Ø±Ø¬ Ù…Ø³Ø§Ø± Ù…Ø¬Ù„Ø¯ Ø§Ù„ØµÙØØ§Øª Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ document root Ø§Ù„Ø®Ø§Øµ Ø¨Ø®Ø§Ø¯Ù… Ø§Ù„ÙˆÙŠØ¨ ."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "ØªØØ°ÙŠØ± ÙÙŠ Ø§Ù„ØªÙ†ØµÙŠØ¨"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø®Ø§Ø¯Ù…Ùƒ ØºÙŠØ± ØµØÙŠØØ© Ø¨Ø´ÙƒÙ„ ØªØ³Ù…Ø Ù„Ùƒ Ø¨Ù…Ø²Ø§Ù…Ù†Ø© Ù…Ù„ÙØ§ØªÙƒ ÙˆØ°Ù„Ùƒ Ø¨Ø³Ø¨Ø¨ Ø£Ù† ÙˆØ§Ø¬Ù‡Ø© WebDAV ØªØ¨Ø¯Ùˆ Ù…Ø¹Ø·Ù„Ø©"
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† <a href='%s'>Ø¯Ù„ÙŠÙ„ Ø§Ù„ØªÙ†ØµÙŠØ¨</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Ø§Ù„Ù…ÙˆØ¯ÙŠÙ„ 'fileinfo' Ù…ÙÙ‚ÙˆØ¯"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Ù…ÙˆØ¯ÙŠÙ„  'fileinfo' Ø§Ù„Ø®Ø§Øµ Ø¨Ø§Ù„Ù€PHP  Ù…ÙÙ‚ÙˆØ¯ . Ù†ÙˆØµÙŠ Ø¨ØªÙØ¹ÙŠÙ„ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆØ¯ÙŠÙ„ Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ø£ÙØ¶Ù„ Ø§Ù„Ù†ØªØ§Ø¦Ø¬ Ù…Ø¹ Ø®Ø§ØµÙŠØ© Ø§Ù„ØªØÙ‚Ù‚ "
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Ø§Ù„Ù„ØºÙ‡ Ù„Ø§ ØªØ¹Ù…Ù„"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ø®Ø§Ø¯Ù… ownCloud Ù‡Ø°Ø§ ÙƒÙ… Ø¶Ø¨Ø· Ù„ØºØ© Ø§Ù„Ù†Ø¸Ø§Ù… Ø§Ù„Ù‰ %s . Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø§Ù†Ù‡ Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ù‡Ù†Ø§Ùƒ Ø£Ø®Ø·Ø§Ø¡ ÙÙŠ Ø§Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ù„ÙØ§Øª. Ù†ØÙ† Ù†ÙˆØµÙŠ Ø§Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØ±ÙƒÙŠØ¨ Ø§Ù„ØØ²Ù… Ø§Ù„Ù„Ø§Ø²Ù…Ø© Ù„Ø¯Ø¹Ù… %s Ø¹Ù„Ù‰ Ù†Ø¸Ø§Ù…Ùƒ . "
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ù„Ø§ ÙŠØ¹Ù…Ù„"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Ø®Ø§Ø¯Ù… Ø§Ù„Ù€ Owncloud  Ù‡Ø°Ø§ ØºÙŠØ± Ù…ØªØµÙ„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø£Ù† Ø¨Ø¹Ø¶ Ø§Ù„Ù…ÙŠØ²Ø§Øª Ù…Ø«Ù„ Ø§Ù„Ø±Ø¨Ø· Ø¨ÙˆØØ¯Ø© ØªØ®Ø²ÙŠÙ†ÙŠØ© Ø®Ø§Ø±Ø¬ÙŠÙ‡, Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ø§Ù„ØªØØ¯ÙŠØ«Ø§Øª Ø£Ùˆ ØªØ±ÙƒÙŠØ¨ ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ù…Ù† Ù…ØµØ§Ø¯Ø± Ø®Ø§Ø±Ø¬ÙŠØ© Ù„Ù† ÙŠØ¹Ù…Ù„ . ÙƒÙ…Ø§ Ø§Ù† Ø§Ù„ÙˆØµÙˆÙ„ Ø§Ù„Ù‰ Ø§Ù„Ù…Ù„ÙØ§Øª Ù…Ù† Ø®Ø§Ø±Ø¬ Ø§Ù„Ø®Ø§Ø¯Ù… ÙˆØ§Ø±Ø³Ø§Ù„ Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡ÙŠØ© Ù„Ù† ØªØ¹Ù…Ù„ Ø£ÙŠØ¶Ø§ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙØ¹Ù„ Ø®Ø¯Ù…Ø© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ø°Ø§ Ø£Ø±Ø¯Øª Ø§Ù† ØªØ³ØªÙÙŠØ¯ Ù…Ù† ÙƒØ§ÙØ© Ù…ÙŠØ²Ø§Øª Owncloud"
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Ù…Ø¬Ø¯ÙˆÙ„"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Ù‚Ù… Ø¨ØªÙ†ÙÙŠØ° Ù…Ù‡Ù…Ø© ÙˆØ§ØØ¯Ø© Ù…Ø¹ ÙƒÙ„ ØµÙØØ© ØªÙ… ØªØÙ…ÙŠÙ„Ù‡Ø§"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php Ù…Ø³Ø¬Ù„Ø© ÙÙŠ Ø®Ø¯Ù…Ø© webcron . Ù‚Ù… Ø¨Ø§Ø³ØªØ¯Ø¹Ø§Ø¡ ØµÙØØ© cron.php Ø§Ù„Ù…ÙˆØ¬ÙˆØ¯Ø© ÙÙŠ owncloud root Ù…Ø±Ù‡ ÙƒÙ„ Ø¯Ù‚ÙŠÙ‚Ø© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ http"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Ù‚Ù… Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø®Ø¯Ù…Ø© cron . Ù‚Ù… Ø¨Ø§Ø³ØªØ¯Ø¹Ø§Ø¡ Ù…Ù„Ù cron.php Ø§Ù„Ù…ÙˆØ¬ÙˆØ¯ ÙÙŠ Ù…Ø¬Ù„Ø¯ Owncloud  Ø¹Ù† Ø·Ø±ÙŠÙ‚ system cronjob Ù…Ø±Ù‡ ÙƒÙ„ Ø¯Ù‚ÙŠÙ‚Ø©"
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„API "
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø¨Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ø¹Ù†Ø§ÙˆÙŠÙ†"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† Ø¨Ù…Ø´Ø§Ø±ÙƒØ© Ø§Ù„Ø¨Ù†ÙˆØ¯ Ù„Ù„Ø¹Ù…ÙˆÙ… Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„Ø±ÙˆØ§Ø¨Ø· "
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© "
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø¨Ø§Ø¹Ø§Ø¯Ø© Ù…Ø´Ø§Ø±ÙƒØ© Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„ØªÙŠ ØªÙ… Ù…Ø´Ø§Ø±ÙƒØªÙ‡Ø§ Ù…Ø¹Ù‡Ù…"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† Ø¨Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© Ù…Ø¹ Ø£ÙŠ Ø£ØØ¯  "
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…ÙŠÙ†Ù Ù„Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© ÙÙ‚Ø· Ù…Ø¹ Ø§Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† ÙÙŠ Ù…Ø¬Ù…ÙˆØ¹Ø§ØªÙ‡Ù…"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "ØÙ…Ø§ÙŠØ©"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ÙØ±Ø¶ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Owncloud  Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§ØªØµØ§Ù„ Ù…Ø´ÙØ±"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Ø®Ø§Ø¯Ù… Owncloud  Ù‡Ø°Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ HTTPS Ù„ØªÙØ¹ÙŠÙ„ Ø£Ùˆ ØªØ¹Ø·ÙŠÙ„ Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ø¯Ø®ÙˆÙ„ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… "
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Ø³Ø¬Ù„"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Ù…Ø³ØªÙˆÙ‰ Ø§Ù„Ø³Ø¬Ù„"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Ø§Ù„Ù…Ø²ÙŠØ¯"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Ø£Ù‚Ù„"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ø¥ØµØ¯Ø§Ø±"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "ØªØ¹Ù‚Ø¨ Ø¹Ù„Ø©"
 msgid "Commercial Support"
 msgstr "Ø¯Ø¹Ù… ØªØ¬Ø§Ø±ÙŠ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Ø§ØØµÙ„ Ø¹Ù„Ù‰ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ù„Ù…Ø²Ø§Ù…Ù†Ø© Ù…Ù„ÙØ§ØªÙƒ"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Ø§Ø¨Ø¯Ø£ Ø®Ø·ÙˆØ§Øª Ø¨Ø¯Ø§ÙŠØ© Ø§Ù„ØªØ´ØºÙŠÙ„ Ù…Ù† Ø¬Ø¯ÙŠØ¯"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "ØªÙ… Ø¥Ø³ØªÙ‡Ù„Ø§Ùƒ <strong>%s</strong> Ù…Ù† Ø§Ù„Ù…ØªÙˆÙØ± <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ù„Ù‚Ø¯ ØªÙ… ØªØºÙŠÙŠØ± ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ù„Ù… ÙŠØªÙ… ØªØ¹Ø¯ÙŠÙ„ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± Ø¨Ù†Ø¬Ø§Ø"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø³Ø± Ø§Ù„ØØ§Ù„ÙŠØ©"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÙƒÙ„Ù…Ø§Øª Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø©"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ø¹Ø¯Ù„ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Ø§Ø³Ù… Ø§Ù„ØØ³Ø§Ø¨"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†Ù‰"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ø¹Ù†ÙˆØ§Ù†Ùƒ Ø§Ù„Ø¨Ø±ÙŠØ¯ÙŠ"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ø£Ø¯Ø®Ù„ Ø¹Ù†ÙˆØ§Ù†Ùƒ Ø§Ù„Ø¨Ø±ÙŠØ¯ÙŠ Ù„ØªÙØ¹ÙŠÙ„ Ø§Ø³ØªØ±Ø¬Ø§Ø¹ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Ø§Ù„Ù„ØºØ©"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ø³Ø§Ø¹Ø¯ ÙÙŠ Ø§Ù„ØªØ±Ø¬Ù…Ù‡"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 5cbf80786a8311dcc84722dcd566997b9c5923cf..3489c7b818462007f5ff80476a575da0b04a99dc 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index fccc6ae2c32882e584b04029f675e74c16a2cd51..69332b724f6a9ad2b069bd00697a59c9cb6ba029 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "ØªØ£ÙƒØ¯ Ø´Ø®ØµÙŠØ© Ø§Ù„ WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/be/core.po b/l10n/be/core.po
index c829cb46e4639538767a4cb57d57a656adfcecd6..fb9c15d2ccc6d650bdb485995b90996c061b61ef 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,67 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +233,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +254,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +409,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +470,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +503,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +525,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ð”Ð°ÑÐ²ÐµÐ´Ñ‡Ð°Ð½Ñ‹"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÑÑ€ÑˆÑ‹Ñ†ÑŒ ÑžÑÑ‚Ð°Ð½Ð¾ÑžÐºÑƒ."
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +621,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 206fa61fc4eceb2c2d6fa3088e8f0e543c0900ee..66c2d81dabc53afed69199df6936dde65d2620d9 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-04 09:30+0200\n"
-"PO-Revision-Date: 2013-07-04 07:31+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,54 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:39
+#: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:22
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:55
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:62
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:63
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:65
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:66
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:68
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:87
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:119
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,47 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +204,33 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +289,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index 3fc7cf19381221f0b70f934e4421786d207217bd..4f5399874b4a583df790c0fd4af3321654320130 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index 43b93d5cffeddf956df984c3ebb1f496fa5fabc0..d8ea6184ffa147773b2410eaddcd022e5078bbdf 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 41c6a308ab9e306dad13db706d6c883d3350859d..770cceb542cbcc8659f7a27e06814e48c5561ec8 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,48 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:196
-msgid "{count} files"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/be/files_versions.po b/l10n/be/files_versions.po
index 2ec579f88f7bf46a6c6b63a40c05d4b7924756e8..91cb8002226eba7932186578234d4c0e5f1554ae 100644
--- a/l10n/be/files_versions.po
+++ b/l10n/be/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 4d50e77416a9faff675788fe493e9c1d5cae6740..c95cd9291f690544a8bcd59096eb49f5fcbf9f27 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,85 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 542805e0dc911cb088c572c52e991a853ee39dea..6a5d16012be6edfb77c7b615bca49f247271efa1 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 9f896e71d17f88e2d9913c67c8f6496e9196b2fc..581d1b1dcc0f83493a015840a3949e6c462f14ed 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/be/user_webdavauth.po b/l10n/be/user_webdavauth.po
index 34e6bd83127472da1d0b7d72174d60ae8bd2a053..b528cfad4ab99dfc9fc66987b735b9733e5c1270 100644
--- a/l10n/be/user_webdavauth.po
+++ b/l10n/be/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index af0e97cb7f76723d40cfc1477bd4eee492a327b3..cf34714ed71956948bf66b2c164ea2d123175bdd 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸"
 msgid "December"
 msgstr "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ñ‡Ð°Ñ"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "Ð´Ð½ÐµÑ"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ðµ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ Ñ"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "ÑÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ð©Ðµ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚Ðµ Ð²Ñ€ÑŠÐ·ÐºÐ° Ð·Ð° Ð½ÑƒÐ»Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°Ñ‚Ð° Ð’Ð¸."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»"
@@ -461,11 +462,11 @@ msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰"
 msgid "Access forbidden"
 msgstr "Ð”Ð¾ÑÑ‚ÑŠÐ¿ÑŠÑ‚ Ðµ Ð·Ð°Ð±Ñ€Ð°Ð½ÐµÐ½"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Ð¾Ð±Ð»Ð°ÐºÑŠÑ‚ Ð½Ðµ Ð½Ð°Ð¼ÐµÑ€ÐµÐ½"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ð¡ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° <strong>Ð°Ð´Ð¼Ð¸Ð½ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ð Ð°Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¾"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° Ð´Ð°Ð½Ð½Ð¸"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ñ‰Ðµ ÑÐµ Ð¿Ð¾Ð»Ð·Ð²Ð°"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ» Ð·Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð° Ð·Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ð˜Ð¼Ðµ Ð½Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ð¥Ð¾ÑÑ‚ Ð·Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÑŠÑ€ÑˆÐ²Ð°Ð½Ðµ Ð½Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ð˜Ð·Ñ…Ð¾Ð´"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr "Ð’Ñ…Ð¾Ð´"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 7d9a9c5aec4ecb2d8a37391b2e3c93887cd51802..3dc6cd15d875a463f2ac69527d7ece46cd8ae0d2 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ðµ"
 msgid "Delete permanently"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
 
@@ -128,43 +128,45 @@ msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
 msgid "Rename"
 msgstr "ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ðµ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ð§Ð°ÐºÐ°Ñ‰Ð¾"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ð¿Ñ€ÐµÐ¿Ð¾ÐºÑ€Ð¸Ð²Ð°Ð½Ðµ"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð·"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¾"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿ÐºÐ¸"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ð°"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ð¡Ð¿Ñ€Ð¸ ÐºÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "ÐÑÐ¼Ð° Ð½Ð¸Ñ‰Ð¾ Ñ‚ÑƒÐº. ÐšÐ°Ñ‡ÐµÑ‚Ðµ Ð½ÐµÑ‰Ð¾."
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½Ðµ"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð»ÑŠÑ‚ ÐºÐ¾Ð¹Ñ‚Ð¾ ÑÑ‚Ðµ Ð¸Ð·Ð±Ñ€Ð°Ð»Ð¸ Ð·Ð° ÐºÐ°Ñ‡Ð²Ð°Ð½Ðµ Ðµ Ð¿Ñ€ÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð³Ð¾Ð»ÑÐ¼"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ ÐºÐ¾Ð¸Ñ‚Ð¾ ÑÐµ Ð¾Ð¿Ð¸Ñ‚Ð²Ð°Ñ‚Ðµ Ð´Ð° ÐºÐ°Ñ‡Ð¸Ñ‚Ðµ ÑÐ° Ð¿Ð¾-Ð³Ð¾Ð»ÐµÐ¼Ð¸ Ð¾Ñ‚ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾Ñ‚Ð¾ Ð·Ð° ÑÑŠÑ€Ð²ÑŠÑ€Ð°."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ ÑÐµ Ð¿Ñ€ÐµÑ‚ÑŠÑ€ÑÐ²Ð°Ñ‚, Ð¸Ð·Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Ñ„Ð°Ð¹Ð»"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 6fda53b831ba4e7bf984c1e1b6ffe38f0ce02f0e..2d57c79ed2d8c2444eb9d1f207c5aed15b217f0b 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index e4bcac6a71aeb9905912dbb4bc434a4a68104f96..0bf82bd4a4de190a9fe942a0125e92f67801bd96 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index f898d7fc6330a8c812f9d98aaf4d4be6cdf088a0..9c95c045cdb5e1cb27c38d1be92522d25d3a03b7 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°"
 msgid "Submit"
 msgstr "ÐŸÐ¾Ñ‚Ð²ÑŠÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð°Ð¿ÐºÐ°Ñ‚Ð° %s Ñ Ð’Ð°Ñ"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ñ„Ð°Ð¹Ð»Ð° %s Ñ Ð’Ð°Ñ"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½Ðµ"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Ð¡Ð¿Ñ€Ð¸ ÐºÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ÐÑÐ¼Ð° Ð½Ð°Ð»Ð¸Ñ‡ÐµÐ½ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´ Ð·Ð°"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 4c9d70296b7088aa587f9bbf32888dc10a0ffc3f..1b16c5b40973dad0a08455a9bd43995cbbfbc551 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Ð”Ð¸Ð¼Ð¸Ñ‚ÑŠÑ€ ÐšÑ€ÑŠÑÑ‚ÐµÐ² <dimitar.t.krastev@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +28,45 @@ msgstr "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑ€Ð¼Ð°Ð½ÐµÐ½Ñ‚Ð½Ð¾Ñ‚Ð¾ Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð°
 msgid "Couldn't restore %s"
 msgstr "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Ð¸Ð·Ð²ÑŠÑ€ÑˆÐ²Ð°Ð½Ðµ Ð½Ð° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð¿Ð¾ Ð²ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "Ð¸Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð° Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ Ð·Ð°Ð²Ð¸Ð½Ð°Ð³Ð¸"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ñ‚Ð¾"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿ÐºÐ¸"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ð°"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index 1d86aa6d8d3b10a63b55f9516fc5babdac85959c..908fe475844931b46b011b49478a42432dd4acb1 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr "ÑƒÑÐ¿ÐµÑˆÐ½Ð¾"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Ð¤Ð°Ð¹Ð»ÑŠÑ‚ %s Ð±Ðµ Ð²ÑŠÑ€Ð½Ð°Ñ‚ ÐºÑŠÐ¼ Ð²ÐµÑ€ÑÐ¸Ñ %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
 
-#: history.php:49
-msgid "failure"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr ""
-
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ð’ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index c8ffb5ee9a5d78c93d91cea3e9e8f41cdeef8e59..1aa83779f3d37e47d7da3f0a51bb1c849acbf2e4 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸"
 
 #: app.php:409
-msgid "Apps"
-msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "ÑƒÐµÐ± ÑƒÑÐ»ÑƒÐ³Ð¸ Ð¿Ð¾Ð´ Ð’Ð°Ñˆ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½ÐµÑ‚Ð¾ ÐºÐ°Ñ‚Ð¾ ZIP Ðµ Ð¸Ð·ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° ÑÐµ Ð¸Ð·Ñ‚ÐµÐ³Ð»ÑÑ‚ ÐµÐ´Ð¸Ð½ Ð¿Ð¾ ÐµÐ´Ð¸Ð½."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ ÐºÑŠÐ¼ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Ð˜Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ ÑÐ° Ð¿Ñ€ÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð³Ð¾Ð»ÐµÐ¼Ð¸ Ð·Ð° Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° ZIP Ð°Ñ€Ñ…Ð¸Ð²."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸"
 
@@ -171,77 +183,77 @@ msgstr "ÐŸÑ€Ð¾Ð±Ð»ÐµÐ¼Ð½Ð°Ñ‚Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð±ÐµÑˆÐµ: \"%s\", Ð¸Ð¼Ðµ: %s, Ð¿Ð°
 msgid "PostgreSQL username and/or password not valid"
 msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¾ PostgreSQL Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Ð’ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð·Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Ð’ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ð° Ð·Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’Ð°ÑˆÐ¸ÑÑ‚ web ÑÑŠÑ€Ð²ÑŠÑ€ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ ÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð´Ð° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐ²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ, Ð·Ð°Ñ‰Ð¾Ñ‚Ð¾ WebDAV Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÑŠÑ‚ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð° ÑÐ¿Ñ€Ð°Ð²ÐºÐ° Ñ <a href='%s'>Ñ€ÑŠÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾Ñ‚Ð¾ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð¸"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ñ‡Ð°Ñ"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ñ‡Ð°ÑÐ°"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "Ð´Ð½ÐµÑ"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð´Ð½Ð¸"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð¼ÐµÑÐµÑ†Ð°"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index d9de6d9a5548691dcb4fbe5e7ad0928406d09d78..7741c170207dcde65abb39b4587dfc772c0b6877 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’Ð°ÑˆÐ¸ÑÑ‚ web ÑÑŠÑ€Ð²ÑŠÑ€ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ ÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð´Ð° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐ²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ, Ð·Ð°Ñ‰Ð¾Ñ‚Ð¾ WebDAV Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÑŠÑ‚ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð° ÑÐ¿Ñ€Ð°Ð²ÐºÐ° Ñ <a href='%s'>Ñ€ÑŠÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾Ñ‚Ð¾ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "ÐšÑ€Ð¾Ð½"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ðµ"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "ÐžÑ‰Ðµ"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "ÐŸÐ¾-Ð¼Ð°Ð»ÐºÐ¾"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "Ð”Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ð½Ð¸ Ð³Ñ€ÐµÑˆÐºÐ¸"
 msgid "Commercial Support"
 msgstr "ÐŸÐ»Ð°Ñ‚ÐµÐ½Ð° Ð¿Ð¾Ð´Ð´Ñ€ÑŠÐ¶ÐºÐ°"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "ÐŸÐ¾ÐºÐ°Ð¶Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð·Ð° Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¾ Ð·Ð°Ñ€ÐµÐ¶Ð´Ð°Ð½Ðµ Ð¾Ñ‚Ð½Ð¾Ð²Ð¾"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ÐŸÑ€Ð¾Ð¼ÑÐ½Ð°Ñ‚Ð° Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°Ñ‚Ð° Ð½Ðµ Ð±ÐµÑˆÐµ Ð¸Ð·Ð²ÑŠÑ€ÑˆÐµÐ½Ð°"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Ð¢ÐµÐºÑƒÑ‰Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÐÐ¾Ð²Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ÐŸÑ€Ð¾Ð¼ÑÐ½Ð° Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°Ñ‚Ð°"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Ð•ÐºÑ€Ð°Ð½Ð½Ð¾ Ð¸Ð¼Ðµ"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ð’Ð°ÑˆÐ¸Ñ email Ð°Ð´Ñ€ÐµÑ"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ð’ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ðµ-Ð¿Ð¾Ñ‰Ð° Ð·Ð° Ð²ÑŠÐ·ÑÑ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð°Ñ‚Ð°"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Ð•Ð·Ð¸Ðº"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ð³Ð½ÐµÑ‚Ðµ Ñ Ð¿Ñ€ÐµÐ²Ð¾Ð´Ð°"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 5222d660f8a8dbd3d2ed2f6227d03a4dc8574d81..7cbdd75fe6b09667159553921c37c0f4876dc1e5 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 3b2e883a6182bfb876ad861d9484c07489b1f5a6..dd51b6caad149d0360a9110f243e871d3005417c 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud Ñ‰Ðµ Ð¸Ð·Ð¿Ñ€Ð°Ñ‚Ð¸ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÐºÐ¸Ñ‚Ðµ Ð´Ð°Ð½Ð½Ð¸ Ð´Ð¾ Ñ‚Ð¾Ð·Ð¸ URL. "
+msgstr ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index b0659d3f162c914815cadba13fe0ff03d6584700..ab30218562343410f8455b4de517f150eaf9b089 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "à¦¨à¦à§‡à¦®à§à¦¬à¦°"
 msgid "December"
 msgstr "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "à¦¨à¦¿à§Ÿà¦¾à¦®à¦•à¦¸à¦®à§‚à¦¹"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "à§§ à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "à¦†à¦œ"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "à¦—à¦¤à¦•à¦¾à¦²"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} à¦¦à¦¿à¦¨ à¦ªà§‚à¦°à§à¦¬à§‡"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "à¦—à¦¤ à¦®à¦¾à¦¸"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "à¦—à¦¤ à¦¬à¦›à¦°"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "à¦¬à¦›à¦° à¦ªà§‚à¦°à§à¦¬à§‡"
 
@@ -225,8 +225,8 @@ msgstr "à¦…à¦¬à¦œà§‡à¦•à§à¦Ÿà§‡à¦° à¦§à¦°à¦£à¦Ÿà¦¿ à¦¸à§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "à¦¸à¦®à¦¸à§à¦¯à¦¾"
 
@@ -246,140 +246,141 @@ msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿à¦•à§ƒà¦¤"
 msgid "Share"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡  "
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "à¦…à¦¨à§à¦®à¦¤à¦¿à¦¸à¦®à§‚à¦¹  à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} à¦†à¦ªà¦¨à¦¾à¦° à¦à¦¬à¦‚ {group} à¦—à§‹à¦·à§à¦ à§€à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "à¦¯à¦¾à¦¦à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "à¦²à¦¿à¦‚à¦•à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "à¦¬à§à¦¯à¦•à§à¦¤à¦¿à¦° à¦¸à¦¾à¦¥à§‡ à¦‡-à¦®à§‡à¦‡à¦² à¦¯à§à¦•à§à¦¤ à¦•à¦°"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "à¦ªà¦¾à¦ à¦¾à¦“"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à§à¦¨"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦–"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "à¦‡-à¦®à§‡à¦‡à¦²à§‡à¦° à¦®à¦¾à¦§à§à¦¯à¦®à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§à¦¨à¦ƒ"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "à¦•à§‹à¦¨ à¦¬à§à¦¯à¦•à§à¦¤à¦¿ à¦–à§à¦à¦œà§‡ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦—à§‡à¦² à¦¨à¦¾"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "à¦ªà§‚à¦¨à¦ƒà¦°à¦¾à§Ÿ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à§Ÿ"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "{user} à¦à¦° à¦¸à¦¾à¦¥à§‡ {item} à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² "
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨à¦¾ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à¦¬à§‡à¦¨"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "à¦…à¦§à¦¿à¦—à¦®à§à¦¯à¦¤à¦¾ à¦¨à¦¿à§Ÿà¦¨à§à¦¤à§à¦°à¦£"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "à¦¤à§ˆà¦°à§€ à¦•à¦°à§à¦¨"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§à¦§à¦¨ à¦•à¦°"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦à¦¦à§à¦¬à¦¾à¦°à¦¾ à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à¦šà§à¦›à§‡......"
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "à¦‡-à¦®à§‡à¦‡à¦² à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£à§‡à¦° à¦œà¦¨à§à¦¯ à¦à¦•à¦Ÿà¦¿ à¦Ÿà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦²à¦¿à¦‚à¦•à¦Ÿà¦¿ à¦†à¦ªà¦¨à¦¾à¦•à§‡ à¦‡-à¦®à§‡à¦‡à¦²à§‡ à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à§Ÿà§‡à¦›à§‡ à¥¤"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
@@ -461,11 +462,11 @@ msgstr "à¦¸à¦¹à¦¾à§Ÿà¦¿à¦•à¦¾"
 msgid "Access forbidden"
 msgstr "à¦…à¦§à¦¿à¦—à¦®à¦¨à§‡à¦° à¦…à¦¨à§à¦®à¦¤à¦¿ à¦¨à§‡à¦‡"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "à¦•à§à¦²à¦¾à¦‰à¦¡ à¦–à§à¦à¦œà§‡ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦—à§‡à¦² à¦¨à¦¾"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>à¦ªà§à¦°à¦¶à¦¾à¦¸à¦• à¦à¦•à¦¾à¦‰à¦¨à§à¦Ÿ</strong> à¦¤à§ˆà¦°à§€ à¦•à¦°à§à¦¨"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "à¦¸à§à¦šà¦¾à¦°à§"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾ à¦«à§‹à¦²à§à¦¡à¦¾à¦° "
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦š à¦•à¦¨à¦«à¦¿à¦—à¦¾à¦° à¦•à¦°à§à¦¨"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "à¦¬à§à¦¯à¦¬à¦¹à§ƒà¦¤ à¦¹à¦¬à§‡"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œà§‡à¦° à¦¨à¦¾à¦®"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦Ÿà§‡à¦¬à¦²à¦¸à§à¦ªà§‡à¦¸"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦¹à§‹à¦¸à§à¦Ÿ"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "à¦¸à§‡à¦Ÿà¦†à¦ª à¦¸à§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ à¦•à¦°"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "à¦ªà§à¦°à¦¸à§à¦¥à¦¾à¦¨"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr "à¦ªà§à¦°à¦¬à§‡à¦¶"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index df9858f234c1fca3f01386f66221aefb54d4dc44..09289f17be2163c31fcc3ebb79707379cadf6773 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "à¦®à§à¦›à§‡"
 
@@ -128,43 +128,45 @@ msgstr "à¦®à§à¦›à§‡"
 msgid "Rename"
 msgstr "à¦ªà§‚à¦¨à¦ƒà¦¨à¦¾à¦®à¦•à¦°à¦£"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "à¦®à§à¦²à¦¤à§à¦¬à¦¿"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} à¦Ÿà¦¿ à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "à¦¨à¦¾à¦® à¦¸à§à¦ªà¦¾à¦°à¦¿à¦¶ à¦•à¦°à§à¦¨"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦²"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} à¦•à§‡ {old_name} à¦¨à¦¾à¦®à§‡ à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "à¦•à§à¦°à¦¿à§Ÿà¦¾ à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "à¦«à§‹à¦²à§à¦¡à¦¾à¦°à§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦• à¦¨à§Ÿà¥¤ 'à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾' à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° Owncloud  à¦à¦° à¦œà¦¨à§à¦¯ à¦¸à¦‚à¦°à¦•à§à¦·à¦¿à¦¤à¥¤"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "à¦°à¦¾à¦®"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "à¦†à¦•à¦¾à¦°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¿à¦¤"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "à§§à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
 msgid "From link"
 msgstr " à¦²à¦¿à¦‚à¦• à¦¥à§‡à¦•à§‡"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "à¦à¦–à¦¾à¦¨à§‡ à¦•à¦¿à¦›à§à¦‡ à¦¨à§‡à¦‡à¥¤ à¦•à¦¿à¦›à§ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à§à¦¨ !"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² "
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡à§‡à¦° à¦†à¦•à¦¾à¦°à¦Ÿà¦¿ à¦…à¦¨à§‡à¦• à¦¬à§œ"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à¦†à¦ªà¦¨à¦¿ à¦à¦‡ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¸à¦°à§à¦¬à§‹à¦šà§à¦š à¦†à¦•à¦¾à¦°à§‡à¦° à¦šà§‡à§Ÿà§‡ à¦¬à§ƒà¦¹à¦¦à¦¾à¦•à¦¾à¦° à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾à¦° à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à¦°à¦›à§‡à¦¨ "
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "à¦«à¦¾à¦‡à¦²à¦—à§à¦²à§‹ à¦¸à§à¦•à§à¦¯à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦¦à§Ÿà¦¾ à¦•à¦°à§‡ à¦…à¦ªà§‡à¦•à§à¦·à¦¾ à¦•à¦°à§à¦¨à¥¤"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "à¦¬à¦°à§à¦¤à¦®à¦¾à¦¨ à¦¸à§à¦•à§à¦¯à¦¾à¦¨à¦¿à¦‚"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 6b42829178e714620fc093a4d2de270d3ab0674f..f029e2534bca872d25b0cb383fe91e3a9f0a73c5 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 7ad7396436bf15b40e66738d6e14bf7f392ad320..296d25d0bde4993ac5e436b289fcdc55df008f8e 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "à¦¦à§Ÿà¦¾ à¦•à¦°à§‡ à¦¸à¦ à¦¿à¦• à¦à¦¬à¦‚ à¦¬à§ˆà¦§ Dropbox app key and
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦° à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ "
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index d2e4afed536a6634d82af3ddf49f5f41fe11e631..f4120be967e7ca8dedb0d7f2ab217ff8c7ed9df2 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 msgid "Submit"
 msgstr "à¦œà¦®à¦¾ à¦¦à¦¿à¦¨"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ %s à¦«à§‹à¦²à§à¦¡à¦¾à¦°à¦Ÿà¦¿ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ %s à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "à¦à¦° à¦œà¦¨à§à¦¯ à¦•à§‹à¦¨ à¦ªà§à¦°à¦¾à¦•à¦¬à§€à¦•à§à¦·à¦£ à¦¸à§à¦²à¦ à¦¨à§Ÿ"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 4cc98627d2c37e69f92e7af875f5755d057092b5..eba36ccfd6b1431a1c5e14582c4b2e79c3772629 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "à¦¸à¦®à¦¸à§à¦¯à¦¾"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "à¦°à¦¾à¦®"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "à§§à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 7bc652b6c84833aab793db37f66fddb5a1987208..2910e627278a6c71363d6430a4f7633a89129373 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index fcb82bdb1f172e184d82611420b80d3e1e63f7e5..9f5df0a9649dfc6612fd9cf75225c2689c52c3a5 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€"
 
 #: app.php:409
-msgid "Apps"
-msgstr "à¦…à§à¦¯à¦¾à¦ª"
-
-#: app.php:417
 msgid "Admin"
 msgstr "à¦ªà§à¦°à¦¶à¦¾à¦¸à¦¨"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "à¦“à§Ÿà§‡à¦¬ à¦¸à¦¾à¦°à§à¦à¦¿à¦¸ à¦†à¦ªà¦¨à¦¾à¦° à¦¹à¦¾à¦¤à§‡à¦° à¦®à§à¦ à§‹à§Ÿ"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦¬à¦¨à§à¦§ à¦•à¦°à¦¾ à¦†à¦›à§‡à¥¤"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "à¦«à¦¾à¦‡à¦²à¦—à§à¦²à§‹ à¦à¦•à§‡ à¦à¦•à§‡ à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦†à¦¬à¦¶à§à¦¯à¦•à¥¤"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "à¦«à¦¾à¦‡à¦²à§‡ à¦«à¦¿à¦°à§‡ à¦šà¦²"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¿à¦¤ à¦«à¦¾à¦‡à¦²à¦—à§à¦²à§‹ à¦à¦¤à¦‡ à¦¬à§ƒà¦¹à§Ž à¦¯à§‡ à¦œà¦¿à¦ª à¦«à¦¾à¦‡à¦² à¦¤à§ˆà¦°à§€ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¨à§Ÿà¥¤"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "à§§ à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "à¦†à¦œ"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "à¦—à¦¤à¦•à¦¾à¦²"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d  à¦¦à¦¿à¦¨ à¦ªà§‚à¦°à§à¦¬à§‡"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "à¦—à¦¤ à¦®à¦¾à¦¸"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "à¦—à¦¤ à¦¬à¦›à¦°"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "à¦¬à¦›à¦° à¦ªà§‚à¦°à§à¦¬à§‡"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 9fddb0635165d347269e1316a8ebb93674f10f4e..6e3dfcafa4cc775b5a61bcfdbedbcdbe983de699 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§à¦¤à¦¾à¦œà¦¨à¦¿à¦¤ à¦¸à¦¤à¦°à§à¦•à¦¤à¦¾"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "à¦¬à§‡à¦¶à§€"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "à¦•à¦®"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "à¦¬à¦¾à¦—à¦Ÿà§à¦°à§à¦¯à¦¾à¦•à¦¾à¦°"
 msgid "Commercial Support"
 msgstr "à¦¬à¦¾à¦£à¦¿à¦œà§à¦¯à¦¿à¦• à¦¸à¦¾à¦ªà§‹à¦°à§à¦Ÿ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "à¦ªà§à¦°à¦¥à¦®à¦¬à¦¾à¦° à¦šà¦¾à¦²à¦¾à¦¨à§‹à¦° à¦¯à¦¾à¦¦à§à¦•à¦° à¦ªà§‚à¦¨à¦°à¦¾à§Ÿ à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¨ à¦•à¦°"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "à¦†à¦ªà¦¨à¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à¦›à§‡à¦¨  <strong>%s</strong>, à¦¸à§à¦²à¦  <strong>%s</strong> à¦à¦° à¦®à¦§à§à¦¯à§‡à¥¤"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "à¦†à¦ªà¦¨à¦¾à¦° à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦à¦Ÿà¦¿ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡ "
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "à¦†à¦ªà¦¨à¦¾à¦° à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦à¦Ÿà¦¿ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à¦¤à§‡ à¦¸à¦•à§à¦·à¦® à¦¨à§Ÿ"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "à¦¬à¦°à§à¦¤à¦®à¦¾à¦¨ à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "à¦¨à¦¤à§à¦¨ à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à§à¦¨"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "à¦‡à¦®à§‡à¦‡à¦²"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "à¦†à¦ªà¦¨à¦¾à¦° à¦‡-à¦®à§‡à¦‡à¦² à¦ à¦¿à¦•à¦¾à¦¨à¦¾"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà§‚à¦¨à¦°à§‚à¦¦à§à¦§à¦¾à¦° à¦¸à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦‡-à¦®à§‡à¦‡à¦² à¦ à¦¿à¦•à¦¾à¦¨à¦¾à¦Ÿà¦¿ à¦ªà§‚à¦°à¦£ à¦•à¦°à§à¦¨"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "à¦à¦¾à¦·à¦¾"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "à¦…à¦¨à§à¦¬à¦¾à¦¦ à¦•à¦°à¦¤à§‡ à¦¸à¦¹à¦¾à§Ÿà¦¤à¦¾ à¦•à¦°à§à¦¨"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 531890ba839da48521a8ddaf865036fd8406ad34..56f857f49ae45bfe8ada259054f7e353b3c752aa 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "SSL à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦° à¦¯à¦¾à¦šà¦¾à¦‡à¦•à¦°à¦£ à¦¬à¦¨à§à¦§ à¦°à¦¾à¦•à¥¤"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦¯à¦¦à¦¿ à¦à¦‡ à¦¬à¦¿à¦•à¦²à§à¦ªà¦Ÿà¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à§‡à¦‡ à¦¸à¦‚à¦¯à§‹à¦— à¦•à¦¾à¦°à§à¦¯à¦•à¦°à§€ à¦¹à§Ÿ à¦¤à¦¬à§‡ à¦†à¦ªà¦¨à¦¾à¦° ownCloud à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡ LDAP à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡à¦° SSL à¦¸à¦¨à¦¦à¦ªà¦¤à§à¦°à¦Ÿà¦¿ à¦†à¦®à¦¦à¦¾à¦¨à¦¿ à¦•à¦°à§à¦¨à¥¤"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤à¦¬à§à¦¯ à¦¨à¦¾à¦®à§‡à¦° à¦•à§à¦·à§‡à¦¤à§à¦°"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° ownCloud à¦¨à¦¾à¦® à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¬à§à¦¯à¦à¦¹à§ƒà¦¤ LDAP à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯à¥¤"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "à¦—à§‹à¦·à§à¦ à§€à¦° à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤à¦¬à§à¦¯ à¦¨à¦¾à¦®à§‡à¦° à¦•à§à¦·à§‡à¦¤à§à¦°"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "à¦—à§‹à¦·à§à¦ à§€à¦° ownCloud à¦¨à¦¾à¦® à¦¤à§ˆà¦°à¦¿ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦¬à§à¦¯à¦à¦¹à§ƒà¦¤ LDAP à¦¬à§ˆà¦¶à¦¿à¦·à§à¦Ÿà§à¦¯à¥¤"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index c4bf197ff78e71d3096daf2bef1c49fef5c1c913..bc58e7fccf36a43d65e06ca1b52f128fc29bf3a1 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index b0c40e26fe5dadae4f46decbc02c2a75951bff28..d544fc01ed139660a3d9991679aa4d2a8def6fc7 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +229,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +250,140 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +405,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +466,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +499,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +617,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 968ecfab8f484f314857987fa21cb5299bc196ef..f628bc21898d97d5559352209c4ab93b921ac23d 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Podijeli"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,46 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +203,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "VeliÄina"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +286,61 @@ msgstr "Fasikla"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
index 15de964f5c6e9c322a13a734de2248425adb206f..8e55996135c976418c13f8ee4605cec19c33b61e 100644
--- a/l10n/bs/files_encryption.po
+++ b/l10n/bs/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index 6893cf5162b3b13592e593b33c10ae8dde9d8ffa..47ff900767acf32658bf32295d9e042b91307bfe 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index 736bfaee517daffac72fe95b110f1e84e49100fd..319adc5d239e28576fa5b9fc505e3efd5be81b7f 100644
--- a/l10n/bs/files_trashbin.po
+++ b/l10n/bs/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,46 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/bs/files_versions.po b/l10n/bs/files_versions.po
index 221060a5ffda7a75fbcf48b5dd34e0d727ebde4b..ac7a80d9c4b31cdcdfb6c1a352dc33ca0b703f67 100644
--- a/l10n/bs/files_versions.po
+++ b/l10n/bs/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-13 02:16+0200\n"
-"PO-Revision-Date: 2013-06-12 21:41+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: bs\n"
 "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);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 815a68397d76344764eb4358f9ff4791785c40ec..aaa796e1039071b633588e48a5988c1676c2b063 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,81 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index 49240912ef2f094ff0ec897b829540a82e237d77..f5e22a8b729244d3d8cff9bd3fbc12d8feacfbef 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index 2d85a9f6eb8ccb7ef8530ce25461055ed4b53932..8205b382a53b8e52adf0687e8f17f44e30e29eb1 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-13 02:16+0200\n"
-"PO-Revision-Date: 2013-06-12 21:41+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/bs/user_webdavauth.po b/l10n/bs/user_webdavauth.po
index 93f72af76555c0451884fa9c2d65ae81ee00a835..11abb30867fd137f41fb8f2c166bcc3cf80ea2e9 100644
--- a/l10n/bs/user_webdavauth.po
+++ b/l10n/bs/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index cc29340a5ea6eb45138cf940687e0768ba4e0e95..a9864b9876a2af44c6f7a2b988248c9d2879890e 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Desembre"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ConfiguraciÃ³"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "fa 1 minut"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "fa {minutes} minuts"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "fa 1 hora"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "fa {hours} hores"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "fa {days} dies"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "fa {months} mesos"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -227,8 +227,8 @@ msgstr "No s'ha especificat el tipus d'objecte."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Error"
 
@@ -248,140 +248,141 @@ msgstr "Compartit"
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Error en deixar de compartir"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Error en canviar els permisos"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartit amb vos i amb el grup {group} per {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Compartit amb vos per {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Comparteix amb"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Comparteix amb enllaÃ§"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Contrasenya"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Permet pujada pÃºblica"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "EnllaÃ§ per correu electrÃ³nic amb la persona"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Envia"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Estableix la data de venciment"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data de venciment"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Comparteix per correu electrÃ²nic"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "No s'ha trobat ningÃº"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "control d'accÃ©s"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "El correu electrÃ³nic s'ha enviat"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "L'actualitzaciÃ³ ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'actualitzaciÃ³ ha estat correcte. Ara us redirigim a ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "estableix de nou la contrasenya Owncloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +403,7 @@ msgstr "La peticiÃ³ ha fallat!<br>Esteu segur que el correu/nom d'usuari Ã©s cor
 msgid "You will receive a link to reset your password via Email."
 msgstr "Rebreu un enllaÃ§ al correu electrÃ²nic per reiniciar la contrasenya."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nom d'usuari"
@@ -463,11 +464,11 @@ msgstr "Ajuda"
 msgid "Access forbidden"
 msgstr "AccÃ©s prohibit"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "No s'ha trobat el nÃºvol"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "La versiÃ³ de PHP que useu Ã©s vulnerable a l'atac per NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Actualitzeu la instalÂ·laciÃ³ de PHP per usar ownCloud de forma segura."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Actualitzeu la instalÂ·laciÃ³ de PHP per usar %s de forma segura."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "La carpeta de dades i els seus fitxers probablement sÃ³n accessibles des d'internet perquÃ¨ el fitxer .htaccess no funciona."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Per mÃ©s informaciÃ³ sobre com configurar correctament el servidor, mireu la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Per informaciÃ³ de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentaciÃ³</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "AvanÃ§at"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "s'usarÃ "
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Espai de taula de la base de dades"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Acaba la configuraciÃ³"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s estÃ  disponible. Obtingueu mÃ©s informaciÃ³ de com actualitzar."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Surt"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "L'ha rebutjat l'acceditaciÃ³ automÃ tica!"
@@ -609,7 +615,7 @@ msgstr "Inici de sessiÃ³"
 msgid "Alternative Logins"
 msgstr "Acreditacions alternatives"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 0fc57097d821eca5e05cc4a30248e8780f068277..3840ad7971d272baa5b6061e4fb83cd667a51095 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: Josep TomÃ s <jtomas.binsoft@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,7 @@ msgstr "Comparteix"
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Esborra"
 
@@ -130,43 +130,45 @@ msgstr "Esborra"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelÂ·la"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituÃ¯t {old_name} per {new_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfÃ©s"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "executa d'operaciÃ³ d'esborrar"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fitxer pujant"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "fitxers pujant"
 
@@ -202,33 +204,29 @@ msgstr "S'estÃ  preparant la baixada. Pot trigar una estona si els fitxers sÃ³n
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de carpeta no vÃ lid. L'Ãºs de 'Shared' estÃ  reservat per Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 carpeta"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} carpetes"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fitxer"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} fitxers"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -287,61 +285,61 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Des d'enllaÃ§"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Fitxers esborrats"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "CancelÂ·la la pujada"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "No teniu permisos d'escriptura aquÃ."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquÃ. Pugeu alguna cosa!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "La pujada Ã©s massa gran"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Els fitxers que esteu intentant pujar excedeixen la mida mÃ xima de pujada del servidor"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "directori"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "directoris"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fitxer"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fitxers"
 
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 7e7d5f535ea4383662480a988a78cb36dae321a3..b7b99faec20e561c6aff54f14ab8a09a3f556996 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 15:50+0000\n"
-"Last-Translator: Josep TomÃ s <jtomas.binsoft@gmail.com>\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-09 13:30+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,10 +70,14 @@ msgstr "Manca de requisits."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr "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."
+msgstr "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."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "Els usuaris segÃ¼ents no estan configurats per a l'encriptaciÃ³:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index a59a8700b77283c9e1c7494a96027d971cef8ece..66a1a76942d44ec99ab6382eedd40ad383a284b2 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Proporcioneu una clau d'aplicaciÃ³ i secret vÃ lids per a Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Error en configurar l'emmagatzemament Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>AvÃs:</b> \"smbclient\" no estÃ  instalÂ·lat. No es pot muntar la comparticiÃ³ CIFS/SMB. Demaneu a l'administrador del sistema que l'instalÂ·li."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>AvÃs:</b> El suport FTP per PHP no estÃ  activat o no estÃ  instalÂ·lat. No es pot muntar la comparticiÃ³ FTP. Demaneu a l'administrador del sistema que l'instalÂ·li."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 1e0414590290e3b92aaf62fa56ff5c1c2643039e..90e87e114979ad0e8a8dddb56ed59def3b8c9d73 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "Contrasenya"
 msgid "Submit"
 msgstr "Envia"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Aquest enllaÃ§ sembla que no funciona."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Les raons podrien ser:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "l'element ha estat eliminat"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "l'enllaÃ§ ha venÃ§ut"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "s'ha desactivat la comparticiÃ³"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Per mÃ©s informaciÃ³ contacteu amb qui us ha enviat l'enllaÃ§."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha compartit la carpeta %s amb vÃ³s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha compartit el fitxer %s amb vÃ³s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Puja"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "CancelÂ·la la pujada"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "No hi ha vista prÃ¨via disponible per a"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index f908618ed31d84eb17639ccb699418854ef3146b..69f190dc6aef4bdfb8df52516a40a581716d768b 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "No s'ha pogut esborrar permanentment %s"
 msgid "Couldn't restore %s"
 msgstr "No s'ha pogut restaurar %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "executa l'operaciÃ³ de restauraciÃ³"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "esborra el fitxer permanentment"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 carpeta"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} carpetes"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fitxer"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} fitxers"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "restaurat"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index c1e4d1db8d646f91c09239b8435899f5c3f613bf..0ded7de3c6e26e3b06226314b6ef1e00b096fc2b 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-01 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 07:50+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "No s'ha pogut revertir: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "Ã¨xit"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "El fitxer %s s'ha revertit a la versiÃ³ %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "fallada"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "El fitxer %s no s'ha pogut revertir a la versiÃ³ %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versions"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "No hi ha versiÃ³ns antigues disponibles"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Ha fallat en retornar {file} a la revisiÃ³ {timestamp}"
 
-#: history.php:74
-msgid "No path specified"
-msgstr "No heu especificat el camÃ"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "MÃ©s versions..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "No hi ha altres versions disponibles"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Reverteix un fitxer a una versiÃ³ anterior fent clic en el seu botÃ³ de reverteix"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Recupera"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 49603f8c0cd5ae5ec43ede49cf1e116e71a6ab67..28c2be4f31ce9cc9ad5ee1c7c078adfc56de9e52 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Usuaris"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplicacions"
-
-#: app.php:417
 msgid "Admin"
 msgstr "AdministraciÃ³"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Ha fallat l'actualitzaciÃ³ \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "no es pot obrir \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP estÃ  desactivada."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "no s'ha pogut determinar"
 
@@ -171,77 +183,77 @@ msgstr "L'ordre en conflicte Ã©s: \"%s\", nom: %s, contrasenya: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vÃ lids"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Establiu un nom d'usuari per l'administrador."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Establiu una contrasenya per l'administrador."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "El servidor web no estÃ  configurat correctament per permetre la sincronitzaciÃ³ de fitxers perquÃ¨ la interfÃcie WebDAV sembla no funcionar correctament."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instalÂ·laciÃ³</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "fa 1 minut"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "fa %d minuts"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "fa 1 hora"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "fa %d hores"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "avui"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ahir"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "fa %d dies"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "el mes passat"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "fa %d mesos"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "l'any passat"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "anys enrere"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Provocat per:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 3063123929d07d928ba2116f01b6851de19548a7..bfb24dfb9de2b3a2a78ab858e84647ad7eecac7d 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,166 +171,173 @@ msgstr "Heu de facilitar una contrasenya vÃ lida"
 msgid "__language_name__"
 msgstr "CatalÃ "
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "AvÃs de seguretat"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "La carpeta de dades i els fitxers provablement sÃ³n accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "La carpeta de dades i els vostres fitxersprobablement sÃ³n accessibles des d'Internet. La fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "AvÃs de configuraciÃ³"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "El servidor web no estÃ  configurat correctament per permetre la sincronitzaciÃ³ de fitxers perquÃ¨ la interfÃcie WebDAV sembla no funcionar correctament."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instalÂ·laciÃ³</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "No s'ha trobat el mÃ²dul 'fileinfo'"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "El mÃ²dul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mÃ²dul per obtenir millors resultats amb la detecciÃ³ mime-type."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Locale no funciona"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Aquest servidor ownCloud no pot establir el locale del sistema a %s. AixÃ² significa que hi poden haver problemes amb alguns carÃ cters en el nom dels fitxers. Us recomanem instalÂ·lar els paquets necessaris al sistema per donar suport a %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "Les locale del sistema no es poden establir en %s. AixÃ² significa que hi poden haver problemes amb alguns carÃ cters en el nom dels fitxers. Us recomanem instalÂ·lar els paquets necessaris al sistema per donar suport a %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "La connexiÃ³ a internet no funciona"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Aquest servidor ownCloud no tÃ© cap connexiÃ³ a internet que funcioni. AixÃ² significa que algunes de les caracterÃstiques com el muntatge d'emmagatzemament externs, les notificacions quant a actualitzacions o la instalÂ·laciÃ³ d'aplicacions de tercers no funcionarÃ . L'accÃ©s remot a fitxers i l'enviament de correus electrÃ²nics podria tampoc no funcionar. Us suggerim que habiliteu la connexiÃ³ a internet per aquest servidor si voleu gaudir de totes les possibilitats d'ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Aquest servidor no tÃ© cap connexiÃ³ a internet que funcioni. AixÃ² significa que algunes de les caracterÃstiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instalÂ·laciÃ³ d'aplicacions de tercers no funcionarÃ . L'accÃ©s remot a fitxers i l'enviament de correus electrÃ²nics podria tampoc no funcionar. Us suggerim que habiliteu la connexiÃ³ a internet per aquest servidor si voleu tenir totes les caracterÃstiques."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Executa una tasca per cada paquet carregat"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php estÃ  registrat en un servei webcron. Feu la crida a cron.php a l'arrel d'ownCloud cada minut a travÃ©s de http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php estÃ  registrat en un servei webcron que fa una crida cada minut a la pÃ gina cron.php a travÃ©s de http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Usa un servei cron del sistema. Feu la crida al fitxer cron.php a travÃ©s d'un cronjob del sistema cada minut."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Utilitzeu el sistema de servei cron per cridar el fitxer cron.php cada minut."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartir"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Habilita l'API de compartir"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permet que les aplicacions utilitzin l'API de compartir"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permet enllaÃ§os"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permet als usuaris compartir elements amb el pÃºblic amb enllaÃ§os"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Permet pujada pÃºblica"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al pÃºblic"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Permet als usuaris compartir nomÃ©s amb els usuaris del seu grup"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ForÃ§a HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "ForÃ§a als clients la connexiÃ³ amb ownCloud via una connexiÃ³ encriptada."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "ForÃ§a la connexiÃ³ dels clients a %s a travÃ©s d'una connexiÃ³ encriptada."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Connecteu aquesta instÃ ncia onwCloud via HTTPS per habilitar o deshabilitar el forÃ§ament SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Connecteu a %s a travÃ©s de HTTPS per habilitar o inhabilitar l'accÃ©s SSL."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "MÃ©s"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "VersiÃ³"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,77 +395,77 @@ msgstr "Seguiment d'errors"
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ObtÃ©n les aplicacions per sincronitzar fitxers"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Torna a mostrar l'assistent de primera execuciÃ³"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "La seva contrasenya s'ha canviat"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nom a mostrar"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Correu electrÃ²nic"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Correu electrÃ²nic"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ompliu el correu electrÃ²nic per activar la recuperaciÃ³ de contrasenya"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducciÃ³"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Useu aquesta adreÃ§a per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 701d2c6f65bfb461e8d27d0b8a84f77e51512a8c..4f81fa85c21a1730751e0a2db693a79450bce796 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -89,9 +89,9 @@ msgstr "Confirma l'eliminaciÃ³"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth sÃ³n incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una."
+msgstr "<b>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth sÃ³n incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi una."
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "Desactiva el servidor principal"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Quan estÃ  connectat, ownCloud nomÃ©s es connecta al servidor de la rÃ¨plica."
+msgid "Only connect to the replica server."
+msgstr "Connecta nomÃ©s al servidor rÃ¨plica."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Desactiva la validaciÃ³ de certificat SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Si la connexiÃ³ nomÃ©s funciona amb aquesta opciÃ³, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
+"certificate in your %s server."
+msgstr "Si la connexiÃ³ nomÃ©s funciona amb aquesta opciÃ³, importeu el certificat SSL del servidor LDAP en el vostre servidor %s."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Camp per mostrar el nom d'usuari"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "Atribut LDAP a usar per generar el nom a mostrar de l'usuari."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Camp per mostrar el nom del grup"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "Atribut LDAP a usar per generar el nom a mostrar del grup."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Per defecte el nom d'usuari intern es crearÃ  a partir de l'atribut UUID. AixÃ² assegura que el nom d'usuari Ã©s Ãºnic i que els carÃ cters no s'han de convertir. El nom d'usuari intern tÃ© la restricciÃ³ que nomÃ©s estan permesos els carÃ cters: [ a-zA-Z0-9_.@- ]. Els altres carÃ cters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de colÂ·lisiÃ³ s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. TambÃ© Ã©s el nom per defecte de la carpeta home a ownCloud. Ã‰s tambÃ© un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp segÃ¼ent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte nomÃ©s en els nous usuaris LDAP mapats (afegits)."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "Per defecte el nom d'usuari intern es crearÃ  a partir de l'atribut UUID. AixÃ² assegura que el nom d'usuari Ã©s Ãºnic i que els carÃ cters no s'han de convertir. El nom d'usuari intern tÃ© la restricciÃ³ que nomÃ©s estan permesos els carÃ cters: [ a-zA-Z0-9_.@- ]. Els altres carÃ cters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de colÂ·lisiÃ³ s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. TambÃ© Ã©s el nom per defecte de la carpeta home d'usuari. Ã‰s tambÃ© un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp segÃ¼ent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte nomÃ©s en els nous usuaris LDAP mapats (afegits)."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "Sobrescriu la detecciÃ³ UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. TambÃ© el nom d'usuari intern es crearÃ  en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que Ã©s Ãºnic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits)."
+msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. TambÃ© el nom d'usuari intern es crearÃ  en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que Ã©s Ãºnic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits)."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrÃ  un nom d'usuari intern. AixÃ² requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memÃ²ria de cau per reduÃ¯r la interacciÃ³ LDAP, perÃ² no s'usa per a identificaciÃ³. Si la DN canvia, els canvis sÃ³n detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrÃ  efectues per tot arreu. L'eliminaciÃ³ dels mapatges no Ã©s sensible a la configuraciÃ³, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producciÃ³. Elimineu-los nomÃ©s en un estadi experimental o de prova."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisiÃ³ i reconÃ¨ixer els usuaris, cada usuari LDAP tindrÃ  un nom d'usuari intern. AixÃ² requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A mÃ©s, la DN es posa a la memÃ²ria de cau per reduir la interacciÃ³ LDAP, perÃ² no s'usa per identificaciÃ³. En cas que la DN canvÃ¯i, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no Ã©s sensible a la configuraciÃ³, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producciÃ³, nomÃ©s en un estadi de prova o experimental."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index ca202c2dd7979730659f1d48c177356948007717..ce6c92011258ead08a8083b8e9b954a2b3eaa84c 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 21:00+0000\n"
+"POT-Creation-Date: 2013-08-01 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 08:00+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "AutenticaciÃ³ WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "AdreÃ§a:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud enviarÃ  les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarÃ  els codis d'estat 401 i 403 com a credencials no vÃ lides, i qualsevol altra resposta com a credencials vÃ lides."
+msgstr "Les credencials d'usuari s'enviaran a aquesta adreÃ§a. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vÃ lides, i qualsevol altra resposta com a credencials vÃ lides."
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 78d2239053d6b725d91493eee2e6bf511145eb06..2ee7bf18d26262b707da67bb7b4b5232f2947a14 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -3,14 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# janinko <janinko.g@gmail.com>, 2013
 # Honza K. <honza889@gmail.com>, 2013
+# Martin <fireball@atlas.cz>, 2013
+# pstast <petr@stastny.eu>, 2013
 # TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +142,63 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Prosinec"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "NastavenÃ"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "pÅ™ed pÃ¡r vteÅ™inami"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "pÅ™ed minutou"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "pÅ™ed {minutes} minutami"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "pÅ™ed hodinou"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "pÅ™ed {hours} hodinami"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "vÄera"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "pÅ™ed {days} dny"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "minulÃ½ mÄ›sÃc"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "pÅ™ed {months} mÄ›sÃci"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "pÅ™ed mÄ›sÃci"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "pÅ™ed lety"
 
@@ -227,8 +234,8 @@ msgstr "NenÃ urÄen typ objektu."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Chyba"
 
@@ -238,7 +245,7 @@ msgstr "NenÃ urÄen nÃ¡zev aplikace."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "PoÅ¾adovanÃ½ soubor {file} nenÃ nainstalovÃ¡n."
+msgstr "PoÅ¾adovanÃ½ soubor {file} nenÃ nainstalovÃ¡n!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
@@ -248,140 +255,141 @@ msgstr "SdÃlenÃ©"
 msgid "Share"
 msgstr "SdÃlet"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Chyba pÅ™i sdÃlenÃ"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Chyba pÅ™i ruÅ¡enÃ sdÃlenÃ"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Chyba pÅ™i zmÄ›nÄ› oprÃ¡vnÄ›nÃ"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "S VÃ¡mi a skupinou {group} sdÃlÃ {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "S VÃ¡mi sdÃlÃ {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "SdÃlet s"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "SdÃlet s odkazem"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ChrÃ¡nit heslem"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Povolit veÅ™ejnÃ© nahrÃ¡vÃ¡nÃ"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Odeslat osobÄ› odkaz e-mailem"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Odeslat"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Nastavit datum vyprÅ¡enÃ platnosti"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Datum vyprÅ¡enÃ platnosti"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "SdÃlet e-mailem:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Å½Ã¡dnÃ lidÃ© nenalezeni"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "SdÃlenÃ jiÅ¾ sdÃlenÃ© poloÅ¾ky nenÃ povoleno"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "SdÃleno v {item} s {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "ZruÅ¡it sdÃlenÃ"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Å™ÃzenÃ pÅ™Ãstupu"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "vytvoÅ™it"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "sdÃlet"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "ChrÃ¡nÄ›no heslem"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Chyba pÅ™i odstraÅˆovÃ¡nÃ data vyprÅ¡enÃ platnosti"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Chyba pÅ™i nastavenÃ data vyprÅ¡enÃ platnosti"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "OdesÃlÃ¡m ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-mail odeslÃ¡n"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Aktualizace neprobÄ›hla ÃºspÄ›Å¡nÄ›. Nahlaste prosÃm problÃ©m do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>"
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizace byla ÃºspÄ›Å¡nÃ¡. PÅ™esmÄ›rovÃ¡vÃ¡m na ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ObnovenÃ hesla pro ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -396,13 +404,13 @@ msgstr "Odkaz na obnovenÃ hesla byl odeslÃ¡n na vaÅ¡i e-mailovou adresu.<br>Pok
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "PoÅ¾adavek selhal.<br>Ujistili jste se, Å¾e vaÅ¡e uÅ¾ivatelskÃ© jmÃ©no a e-mail jsou sprÃ¡vnÄ›?"
+msgstr "PoÅ¾adavek selhal!<br>Ujistili jste se, Å¾e vaÅ¡e uÅ¾ivatelskÃ© jmÃ©no a e-mail jsou sprÃ¡vnÄ›?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "Bude VÃ¡m e-mailem zaslÃ¡n odkaz pro obnovu hesla."
+msgstr "E-mailem VÃ¡m bude zaslÃ¡n odkaz pro obnovu hesla."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no"
@@ -413,11 +421,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr "VaÅ¡e soubory jsou Å¡ifrovÃ¡ny. Pokud nemÃ¡te povolen klÃÄ obnovy, neexistuje zpÅ¯sob jak zÃskat po obnovÄ› hesla vaÅ¡e data. Pokud si nejste jisti co dÄ›lat, kontaktujte nejprve svÃ©ho sprÃ¡vce. Opravdu si pÅ™ejete pokraÄovat?"
+msgstr "VaÅ¡e soubory jsou Å¡ifrovÃ¡ny. Pokud nemÃ¡te povolen klÃÄ pro obnovu, neexistuje zpÅ¯sob jak zÃskat, po zmÄ›nÄ› hesla, vaÅ¡e data. Pokud si nejste jisti co dÄ›lat, kontaktujte nejprve svÃ©ho sprÃ¡vce. Opravdu si pÅ™ejete pokraÄovat?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr "Ano, opravdu si nynÃ pÅ™eji obnovit svÃ© heslo"
+msgstr "Ano, opravdu si nynÃ pÅ™eji obnovit mÃ© heslo"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -463,11 +471,11 @@ msgstr "NÃ¡povÄ›da"
 msgid "Access forbidden"
 msgstr "PÅ™Ãstup zakÃ¡zÃ¡n"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud nebyl nalezen"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -476,7 +484,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr "Ahoj,\n\njenom vÃ¡m chci oznÃ¡mit Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete zde: %s\n\nDÃky"
+msgstr "Ahoj,\n\njenom vÃ¡m chci oznÃ¡mit, Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete zde: %s\n\nDÃky"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -496,8 +504,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Verze vaÅ¡eho PHP je napadnutelnÃ¡ pomocÃ techniky \"NULL Byte\" (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Aktualizujte prosÃm vaÅ¡i instanci PHP pro bezpeÄnÃ© pouÅ¾ÃvÃ¡nÃ ownCloud."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Aktualizujte prosÃm vaÅ¡i instanci PHP pro bezpeÄnÃ© pouÅ¾ÃvÃ¡nÃ %s."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,77 +526,81 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "VÃ¡Å¡ adresÃ¡Å™ s daty a soubory jsou dostupnÃ© z internetu, protoÅ¾e soubor .htaccess nefunguje."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Pro informace jak sprÃ¡vnÄ› nastavit vÃ¡Å¡ server se podÃvejte do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentace</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Pro informace, jak sprÃ¡vnÄ› nastavit vÃ¡Å¡ server, se podÃvejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "VytvoÅ™it <strong>ÃºÄet sprÃ¡vce</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "PokroÄilÃ©"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "SloÅ¾ka s daty"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Nastavit databÃ¡zi"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "bude pouÅ¾ito"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "UÅ¾ivatel databÃ¡ze"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Heslo databÃ¡ze"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "NÃ¡zev databÃ¡ze"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "TabulkovÃ½ prostor databÃ¡ze"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Hostitel databÃ¡ze"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "DokonÄit nastavenÃ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupnÃ¡. ZÃskejte vÃce informacÃ k postupu aktualizace."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "OdhlÃ¡sit se"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "VÃce aplikacÃ"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "AutomatickÃ© pÅ™ihlÃ¡Å¡enÃ odmÃtnuto."
+msgstr "AutomatickÃ© pÅ™ihlÃ¡Å¡enÃ odmÃtnuto!"
 
 #: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "V nedÃ¡vnÃ© dobÄ› jste nezmÄ›nili svÃ© heslo, VÃ¡Å¡ ÃºÄet mÅ¯Å¾e bÃ½t kompromitovÃ¡n."
+msgstr "Pokud jste v nedÃ¡vnÃ© dobÄ› nemÄ›nili svÃ© heslo, VÃ¡Å¡ ÃºÄet mÅ¯Å¾e bÃ½t kompromitovÃ¡n!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
@@ -609,12 +622,12 @@ msgstr "PÅ™ihlÃ¡sit"
 msgid "Alternative Logins"
 msgstr "AlternativnÃ pÅ™ihlÃ¡Å¡enÃ"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr "Ahoj,<br><br>jenom vÃ¡m chci oznÃ¡mit Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete <br><a href=\"%s\">zde</a>.<br><br>DÃky"
+msgstr "Ahoj,<br><br>jenom vÃ¡m chci oznÃ¡mit, Å¾e %s s vÃ¡mi sdÃlÃ %s.\nPodÃvat se mÅ¯Å¾ete <br><a href=\"%s\">zde</a>.<br><br>DÃky"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 122e15835a8b54b9bc5ba499cfe9c18000fad305..ca77eae4c1e991bbd62118f4e98712616ec44c7b 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Honza K. <honza889@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
 # TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Nelze pÅ™esunout %s - existuje soubor se stejnÃ½m nÃ¡zvem"
+msgstr "Nelze pÅ™esunout %s - jiÅ¾ existuje soubor se stejnÃ½m nÃ¡zvem"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
@@ -39,7 +40,7 @@ msgstr "NeplatnÃ½ token"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
-msgstr "Soubor nebyl odeslÃ¡n. NeznÃ¡mÃ¡ chyba"
+msgstr "Å½Ã¡dnÃ½ soubor nebyl odeslÃ¡n. NeznÃ¡mÃ¡ chyba"
 
 #: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
@@ -54,7 +55,7 @@ msgstr "OdesÃlanÃ½ soubor pÅ™esahuje velikost upload_max_filesize povolenou v p
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "OdeslanÃ½ soubor pÅ™esÃ¡hl svou velikostÃ parametr MAX_FILE_SIZE specifikovanÃ½ v formulÃ¡Å™i HTML"
+msgstr "OdeslanÃ½ soubor pÅ™esÃ¡hl svou velikostÃ parametr MAX_FILE_SIZE specifikovanÃ½ ve formulÃ¡Å™i HTML"
 
 #: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
@@ -86,11 +87,11 @@ msgstr "Soubory"
 
 #: js/file-upload.js:11
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nelze odeslat VÃ¡Å¡ soubor, protoÅ¾e je to adresÃ¡Å™, nebo je jeho velikost 0 bajtÅ¯"
+msgstr "Nelze odeslat VÃ¡Å¡ soubor, protoÅ¾e je to adresÃ¡Å™ nebo jeho velikost je 0 bajtÅ¯"
 
 #: js/file-upload.js:24
 msgid "Not enough space available"
-msgstr "Nedostatek dostupnÃ©ho mÃsta"
+msgstr "Nedostatek volnÃ©ho mÃsta"
 
 #: js/file-upload.js:64
 msgid "Upload cancelled."
@@ -99,11 +100,11 @@ msgstr "OdesÃlÃ¡nÃ zruÅ¡eno."
 #: js/file-upload.js:167 js/files.js:266
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "ProbÃhÃ¡ odesÃlÃ¡nÃ souboru. OpuÅ¡tÄ›nÃ strÃ¡nky vyÃºstÃ ve zruÅ¡enÃ nahrÃ¡vÃ¡nÃ."
+msgstr "ProbÃhÃ¡ odesÃlÃ¡nÃ souboru. OpuÅ¡tÄ›nÃ strÃ¡nky zpÅ¯sobÃ zruÅ¡enÃ nahrÃ¡vÃ¡nÃ."
 
 #: js/file-upload.js:233 js/files.js:339
 msgid "URL cannot be empty."
-msgstr "URL nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ¡"
+msgstr "URL nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ¡."
 
 #: js/file-upload.js:238 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
@@ -122,7 +123,7 @@ msgstr "SdÃlet"
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Smazat"
 
@@ -130,43 +131,46 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "PÅ™ejmenovat"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "NevyÅ™ÃzenÃ©"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jiÅ¾ existuje"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "navrhnout nÃ¡zev"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "zruÅ¡it"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
-msgstr "zpÄ›t"
+msgstr "vrÃ¡tit zpÄ›t"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "provÃ©st smazÃ¡nÃ"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "odesÃlÃ¡ se 1 soubor"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "soubory se odesÃlajÃ"
 
@@ -196,44 +200,42 @@ msgstr "VaÅ¡e ÃºloÅ¾iÅ¡tÄ› je tÃ©mÄ›Å™ plnÃ© ({usedSpacePercent}%)"
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "VaÅ¡e soubory ke staÅ¾enÃ se pÅ™ipravujÃ. Pokud jsou velkÃ© mÅ¯Å¾e to chvÃli trvat."
+msgstr "VaÅ¡e soubory ke staÅ¾enÃ se pÅ™ipravujÃ. Pokud jsou velkÃ©, mÅ¯Å¾e to chvÃli trvat."
 
 #: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "NeplatnÃ½ nÃ¡zev sloÅ¾ky. PouÅ¾itÃ 'Shared' je rezervovÃ¡no pro vnitÅ™nÃ potÅ™eby Owncloud"
+msgstr "NeplatnÃ½ nÃ¡zev sloÅ¾ky. PojmenovÃ¡nÃ 'Shared' je rezervovÃ¡no pro vnitÅ™nÃ potÅ™eby ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "NÃ¡zev"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 sloÅ¾ka"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} sloÅ¾ky"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 soubor"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} soubory"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s nemÅ¯Å¾e bÃ½t pÅ™ejmenovÃ¡n"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -287,61 +289,61 @@ msgstr "SloÅ¾ka"
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "OdstranÄ›nÃ© soubory"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ZruÅ¡it odesÃlÃ¡nÃ"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "NemÃ¡te zde prÃ¡va zÃ¡pisu."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Å½Ã¡dnÃ½ obsah. Nahrajte nÄ›co."
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "StÃ¡hnout"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "ZruÅ¡it sdÃlenÃ"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "OdesÃlanÃ½ soubor je pÅ™ÃliÅ¡ velkÃ½"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubory, kterÃ© se snaÅ¾Ãte odeslat, pÅ™ekraÄujÃ limit velikosti odesÃlÃ¡nÃ na tomto serveru."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledÃ¡vajÃ, prosÃm Äekejte."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "AktuÃ¡lnÃ prohledÃ¡vÃ¡nÃ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "adresÃ¡Å™"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "adresÃ¡Å™e"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "soubor"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "soubory"
 
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 1d95d95e25f32cd5d60180c19f2117c98968b5d3..1ae1e6e02fa5bc47cd33a0466b0a750af43dc84e 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,15 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# janinko <janinko.g@gmail.com>, 2013
 # Honza K. <honza889@gmail.com>, 2013
+# Martin <fireball@atlas.cz>, 2013
+# pstast <petr@stastny.eu>, 2013
 # TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-14 17:00+0000\n"
+"Last-Translator: janinko <janinko.g@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +38,7 @@ msgstr "ZÃ¡chrannÃ½ klÃÄ byl ÃºspÄ›Å¡nÄ› zakÃ¡zÃ¡n"
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr "Nelze zakÃ¡zat zÃ¡chrannÃ½ klÃÄ. Zkontrolujte prosÃm heslo vaÅ¡eho zÃ¡chrannÃ©ho klÃÄe."
+msgstr "Nelze zakÃ¡zat zÃ¡chrannÃ½ klÃÄ. Zkontrolujte prosÃm heslo vaÅ¡eho zÃ¡chrannÃ©ho klÃÄe!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -43,7 +46,7 @@ msgstr "Heslo bylo ÃºspÄ›Å¡nÄ› zmÄ›nÄ›no."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr "Nelze zmÄ›nit heslo. PravdÄ›podobnÄ› nebylo stÃ¡vajÃcÃ heslo zadÃ¡no sprÃ¡vnÄ›."
+msgstr "ZmÄ›na hesla se nezdaÅ™ila. PravdÄ›podobnÄ› nebylo stÃ¡vajÃcÃ heslo zadÃ¡no sprÃ¡vnÄ›."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
@@ -61,18 +64,22 @@ msgid ""
 "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."
-msgstr ""
+msgstr "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."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "NesplnÄ›nÃ© zÃ¡vislosti."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr "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."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "NÃ¡sledujÃcÃ uÅ¾ivatelÃ© nemajÃ nastavenÃ© Å¡ifrovÃ¡nÃ:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -82,15 +89,15 @@ msgstr "UklÃ¡dÃ¡m..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "VÃ¡Å¡ soukromÃ½ klÃÄ nenÃ platnÃ½! PravdÄ›podobnÄ› bylo vaÅ¡e heslo zmÄ›nÄ›no zvenÄÃ."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "MÅ¯Å¾ete odemknout vÃ¡Å¡ soukromÃ½ klÃÄ ve vaÅ¡em"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "osobnÃ nastavenÃ"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -99,11 +106,11 @@ msgstr "Å ifrovÃ¡nÃ"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Povolit klÃÄ pro obnovu (umoÅ¾Åˆuje obnovu uÅ¾ivatelskÃ½ch souborÅ¯ v pÅ™ÃpadÄ› ztrÃ¡ty hesla)"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "Heslo klÃÄe pro obnovu"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -115,15 +122,15 @@ msgstr "ZakÃ¡zÃ¡no"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "ZmÄ›na hesla klÃÄe pro obnovu:"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "PÅ¯vodnÃ heslo klÃÄe pro obnovu"
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "NovÃ© heslo klÃÄe pro obnovu"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -131,29 +138,29 @@ msgstr "ZmÄ›nit heslo"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Heslo vaÅ¡eho soukromÃ©ho klÃÄe se jiÅ¾ neshoduje s vaÅ¡Ãm pÅ™ihlaÅ¡ovacÃm heslem:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "ZmÄ›Åˆte heslo vaÅ¡e soukromÃ©ho klÃÄe na stejnÃ© jako vaÅ¡e pÅ™ihlaÅ¡ovacÃ heslo."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Pokud si nepamatujete vaÅ¡e pÅ¯vodnÃ heslo, mÅ¯Å¾ete poÅ¾Ã¡dat sprÃ¡vce o obnovu vaÅ¡ich souborÅ¯."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "PÅ¯vodnÃ pÅ™ihlaÅ¡ovacÃ heslo"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "AktuÃ¡lnÃ pÅ™ihlaÅ¡ovacÃ heslo"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "ZmÄ›nit heslo soukromÃ©ho klÃÄe"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
@@ -163,12 +170,12 @@ msgstr "Povolit obnovu hesla:"
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr "PovolenÃ vÃ¡m umoÅ¾nÃ znovu zÃskat pÅ™Ãstup k vaÅ¡im zaÅ¡ifrovanÃ½m souborÅ¯m pokud ztratÃte heslo"
+msgstr "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"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr "MoÅ¾nosti obnovy souborÅ¯ aktualizovÃ¡ny"
+msgstr "MoÅ¾nosti zÃ¡chrany souborÅ¯ aktualizovÃ¡ny"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr "Nelze aktualizovat obnovu souborÅ¯"
+msgstr "Nelze nastavit zÃ¡chranu souborÅ¯"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 8187a780da3b5a4a617f3064af11215ea33126ba..a9e29ba28e7829572bdf937afd2e2ffdd15bccb1 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pstast <petr@stastny.eu>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-05 18:50+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
 msgid "Access granted"
 msgstr "PÅ™Ãstup povolen"
 
@@ -25,7 +26,7 @@ msgstr "PÅ™Ãstup povolen"
 msgid "Error configuring Dropbox storage"
 msgstr "Chyba pÅ™i nastavenÃ ÃºloÅ¾iÅ¡tÄ› Dropbox"
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
 msgid "Grant access"
 msgstr "Povolit pÅ™Ãstup"
 
@@ -33,29 +34,29 @@ msgstr "Povolit pÅ™Ãstup"
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Zadejte, prosÃm, platnÃ½ klÃÄ a bezpeÄnostnÃ frÃ¡zi aplikace Dropbox."
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba pÅ™i nastavenÃ ÃºloÅ¾iÅ¡tÄ› Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:448
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡n program \"smbclient\". NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ CIFS/SMB. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ jej nainstaluje."
 
-#: lib/config.php:434
+#: lib/config.php:451
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡na, nebo povolena, podpora FTP v PHP. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ FTP. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje."
+msgstr "<b>VarovÃ¡nÃ:</b> podpora FTP v PHP nenÃ povolena nebo nenÃ nainstalovÃ¡na. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ FTP. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje."
 
-#: lib/config.php:437
+#: lib/config.php:454
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡na, nebo povolena, podpora Curl v PHP. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ ownCloud, WebDAV, Äi GoogleDrive. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje."
+msgstr "<b>VarovÃ¡nÃ:</b> podpora CURL v PHP nenÃ povolena nebo nenÃ nainstalovÃ¡na. NenÃ moÅ¾nÃ© pÅ™ipojenÃ oddÃlÅ¯ ownCloud, WebDAV, Äi GoogleDrive. ProsÃm poÅ¾Ã¡dejte svÃ©ho sprÃ¡vce systÃ©mu aÅ¥ ji nainstaluje."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 0c9eb434a380d132c5b56aa26165c8d81b017220..a6be32abb2ff63ef3c3e138633ab9c7418fd8880 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pstast <petr@stastny.eu>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Heslo nenÃ sprÃ¡vnÃ©. Zkuste to znovu."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Heslo"
 msgid "Submit"
 msgstr "Odeslat"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Je nÃ¡m lÃto, ale tento odkaz jiÅ¾ nenÃ funkÄnÃ."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "MoÅ¾nÃ© dÅ¯vody:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "poloÅ¾ka byla odebrÃ¡na"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "platnost odkazu vyprÅ¡ela"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "sdÃlenÃ je zakÃ¡zanÃ©"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Pro vÃce informacÃ kontaktujte osobu, kterÃ¡ vÃ¡m zaslala tento odkaz."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s s VÃ¡mi sdÃlÃ sloÅ¾ku %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s s VÃ¡mi sdÃlÃ soubor %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "StÃ¡hnout"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Odeslat"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ZruÅ¡it odesÃlÃ¡nÃ"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "NÃ¡hled nenÃ dostupnÃ½ pro"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 98416bd81b96b8afccb4e5fb8e8efc45a11e7d8c..52c74099704f5415fc8d85cc9d9d6106952a41c2 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,47 @@ msgstr "Nelze trvale odstranit %s"
 msgid "Couldn't restore %s"
 msgstr "Nelze obnovit %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "provÃ©st obnovu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Chyba"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "trvale odstranit soubor"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "NÃ¡zev"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "SmazÃ¡no"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 sloÅ¾ka"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} sloÅ¾ky"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 soubor"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} soubory"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "obnoveno"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 11930a8b793d8417ce25bed12750ed3efa6bdf51..b1ed4bcc88fbeee0eda77a73ade5f4468ffd4544 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-30 01:55-0400\n"
+"PO-Revision-Date: 2013-07-29 18:50+0000\n"
+"Last-Translator: Honza K. <honza889@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Nelze navrÃ¡tit: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "ÃºspÄ›ch"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Soubor %s byl navrÃ¡cen na verzi %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "sehlhÃ¡nÃ"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Soubor %s nemohl bÃ½t navrÃ¡cen na verzi %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Verze"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Nejsou dostupnÃ© Å¾Ã¡dnÃ© starÅ¡Ã verze"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Selhalo navrÃ¡cenÃ souboru {file} na verzi {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "NezadÃ¡na cesta"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "VÃce verzÃ..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Verze"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Å½Ã¡dnÃ© dalÅ¡Ã verze nejsou dostupnÃ©"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "NavraÅ¥te soubor do pÅ™edchozÃ verze kliknutÃm na tlaÄÃtko navrÃ¡tit"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Obnovit"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index f3f843d8dab915a9511cb68811d05b9372e4a88b..5cde1831012b13f8cf60ca2979ae4460e7c7a11d 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
 # TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +37,46 @@ msgid "Users"
 msgstr "UÅ¾ivatelÃ©"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplikace"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administrace"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Selhala aktualizace verze \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
-msgstr "sluÅ¾by webu pod VaÅ¡Ã kontrolou"
+msgstr "webovÃ© sluÅ¾by pod VaÅ¡Ã kontrolou"
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "nelze otevÅ™Ãt \"%s\""
 
-#: files.php:210
+#: files.php:226
 msgid "ZIP download is turned off."
-msgstr "StahovÃ¡nÃ ZIPu je vypnuto."
+msgstr "StahovÃ¡nÃ v ZIPu je vypnuto."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musÃ bÃ½t stahovÃ¡ny jednotlivÄ›."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ZpÄ›t k souborÅ¯m"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
-msgstr "VybranÃ© soubory jsou pÅ™ÃliÅ¡ velkÃ© pro vytvoÅ™enÃ zip souboru."
+msgstr "VybranÃ© soubory jsou pÅ™ÃliÅ¡ velkÃ© pro vytvoÅ™enÃ ZIP souboru."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "StÃ¡hnÄ›te soubory po menÅ¡Ãch ÄÃ¡stech, samostatnÄ›, nebo se obraÅ¥te na sprÃ¡vce."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nelze zjistit"
 
@@ -108,16 +122,16 @@ msgstr "V nÃ¡zvu databÃ¡ze %s nesmÃte pouÅ¾Ãvat teÄky."
 #: setup/mssql.php:20
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo MSSQL nenÃ platnÃ©: %s"
+msgstr "UÅ¾ivatelskÃ© jmÃ©no Äi heslo MSSQL nenÃ platnÃ©: %s"
 
 #: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
 #: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
-msgstr "MusÃte zadat existujÃcÃ ÃºÄet, Äi sprÃ¡vce."
+msgstr "MusÃte zadat existujÃcÃ ÃºÄet Äi sprÃ¡vce."
 
 #: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo MySQL nenÃ platnÃ©"
+msgstr "UÅ¾ivatelskÃ© jmÃ©no Äi heslo MySQL nenÃ platnÃ©"
 
 #: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
 #: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
@@ -126,7 +140,7 @@ msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo MySQL nenÃ platnÃ©"
 #: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr "Chyba DB: \"%s\""
+msgstr "Chyba databÃ¡ze: \"%s\""
 
 #: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
 #: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
@@ -134,7 +148,7 @@ msgstr "Chyba DB: \"%s\""
 #: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr "PodezÅ™elÃ½ pÅ™Ãkaz byl: \"%s\""
+msgstr "PÅ™ÃsluÅ¡nÃ½ pÅ™Ãkaz byl: \"%s\""
 
 #: setup/mysql.php:85
 #, php-format
@@ -143,7 +157,7 @@ msgstr "UÅ¾ivatel '%s'@'localhost' jiÅ¾ v MySQL existuje."
 
 #: setup/mysql.php:86
 msgid "Drop this user from MySQL"
-msgstr "Zahodit uÅ¾ivatele z MySQL"
+msgstr "ZruÅ¡te tohoto uÅ¾ivatele z MySQL"
 
 #: setup/mysql.php:91
 #, php-format
@@ -152,7 +166,7 @@ msgstr "UÅ¾ivatel '%s'@'%%' jiÅ¾ v MySQL existuje"
 
 #: setup/mysql.php:92
 msgid "Drop this user from MySQL."
-msgstr "Zahodit uÅ¾ivatele z MySQL."
+msgstr "ZruÅ¡te tohoto uÅ¾ivatele z MySQL"
 
 #: setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -160,88 +174,92 @@ msgstr "SpojenÃ s Oracle nemohlo bÃ½t navÃ¡zÃ¡no"
 
 #: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo Oracle nenÃ platnÃ©"
+msgstr "UÅ¾ivatelskÃ© jmÃ©no Äi heslo Oracle nenÃ platnÃ©"
 
 #: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr "PodezÅ™elÃ½ pÅ™Ãkaz byl: \"%s\", jmÃ©no: %s, heslo: %s"
+msgstr "PÅ™ÃsluÅ¡nÃ½ pÅ™Ãkaz byl: \"%s\", jmÃ©no: %s, heslo: %s"
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo PostgreSQL nenÃ platnÃ©"
+msgstr "UÅ¾ivatelskÃ© jmÃ©no Äi heslo PostgreSQL nenÃ platnÃ©"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Zadejte uÅ¾ivatelskÃ© jmÃ©no sprÃ¡vce."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Zadejte heslo sprÃ¡vce."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, protoÅ¾e rozhranÃ WebDAV je rozbitÃ©."
+msgstr "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, rozhranÃ WebDAV se zdÃ¡ bÃ½t rozbitÃ©."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Zkonzultujte, prosÃm, <a href='%s'>prÅ¯vodce instalacÃ</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
-msgstr "pÅ™ed pÃ¡r vteÅ™inami"
-
-#: template.php:114
-msgid "1 minute ago"
-msgstr "pÅ™ed minutou"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "pÅ™ed %d minutami"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "pÅ™ed hodinou"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "pÅ™ed %d hodinami"
-
-#: template.php:118
+msgstr "pÅ™ed pÃ¡r sekundami"
+
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "dnes"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "vÄera"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "pÅ™ed %d dny"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "minulÃ½ mÄ›sÃc"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "PÅ™ed %d mÄ›sÃci"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "pÅ™ed lety"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "PÅ™ÃÄina:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 74a87d1b2999c93266ff36814a1a7a7fc5e431c3..ccdfe4c30f48e32d827d160b36f59f46c3a94d7a 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
 # TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +27,7 @@ msgstr "Nelze naÄÃst seznam z App Store"
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Chyba ovÄ›Å™enÃ"
+msgstr "Chyba pÅ™ihlÃ¡Å¡enÃ"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
@@ -83,7 +85,7 @@ msgstr "Nelze pÅ™idat uÅ¾ivatele do skupiny %s"
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "Nelze odstranit uÅ¾ivatele ze skupiny %s"
+msgstr "Nelze odebrat uÅ¾ivatele ze skupiny %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
@@ -131,7 +133,7 @@ msgstr "smazÃ¡no"
 
 #: js/users.js:47
 msgid "undo"
-msgstr "zpÄ›t"
+msgstr "vrÃ¡tit zpÄ›t"
 
 #: js/users.js:79
 msgid "Unable to remove user"
@@ -170,166 +172,173 @@ msgstr "MusÃte zadat platnÃ© heslo"
 msgid "__language_name__"
 msgstr "ÄŒesky"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "BezpeÄnostnÃ upozornÄ›nÃ"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "VÃ¡Å¡ adresÃ¡Å™ dat a vÅ¡echny VaÅ¡e soubory jsou pravdÄ›podobnÄ› pÅ™ÃstupnÃ© z internetu. Soubor .htaccess, kterÃ½ je poskytovÃ¡n ownCloud, nefunguje. DÅ¯raznÄ› VÃ¡m doporuÄujeme nastavit vÃ¡Å¡ webovÃ½ server tak, aby nebyl adresÃ¡Å™ dat pÅ™ÃstupnÃ½, nebo pÅ™esunout adresÃ¡Å™ dat mimo koÅ™enovou sloÅ¾ku dokumentÅ¯ webovÃ©ho serveru."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "VÃ¡Å¡ datovÃ½ adresÃ¡Å™ i vaÅ¡e soubory jsou pravdÄ›podobnÄ› pÅ™ÃstupnÃ© z internetu. Soubor .htaccess nefunguje. DÅ¯raznÄ› doporuÄujeme nakonfigurovat webovÃ½ server tak, aby datovÃ½ adresÃ¡Å™ nebyl nadÃ¡le pÅ™ÃstupnÃ½, nebo pÅ™esunout datovÃ½ adresÃ¡Å™ mimo prostor zpÅ™ÃstupÅˆovanÃ½ webovÃ½m serverem."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "UpozornÄ›nÃ nastavenÃ"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, protoÅ¾e rozhranÃ WebDAV je rozbitÃ©."
+msgstr "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, protoÅ¾e rozhranÃ WebDAV se zdÃ¡ nefunkÄnÃ."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Zkonzultujte, prosÃm, <a href='%s'>prÅ¯vodce instalacÃ</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Zkontrolujte prosÃm znovu <a href=\"%s\">instalaÄnÃ pÅ™ÃruÄku</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "SchÃ¡zÃ modul 'fileinfo'"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "SchÃ¡zÃ modul PHP 'fileinfo'. DoporuÄujeme jej povolit pro nejlepÅ¡Ã vÃ½sledky detekce typÅ¯ MIME."
+msgstr "SchÃ¡zÃ PHP modul 'fileinfo'. DoporuÄujeme jej povolit pro nejlepÅ¡Ã vÃ½sledky detekce typÅ¯ MIME."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
-msgstr "Locale nefunguje"
+msgstr "Lokalizace nefunguje"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Server ownCloud nemÅ¯Å¾e nastavit locale systÃ©mu na %s. MÅ¯Å¾ete tedy mÃt problÃ©my s nÄ›kterÃ½mi znaky v nÃ¡zvech souborÅ¯. DÅ¯raznÄ› doporuÄujeme nainstalovat potÅ™ebnÃ© balÃÄky pro podporu %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "SystÃ©movÃ© nastavenÃ lokalizace nemohlo bÃ½t nastaveno na %s. To znamenÃ¡, Å¾e se mohou vyskytnout problÃ©my s nÄ›kterÃ½mi znaky v nÃ¡zvech souborÅ¯. DÅ¯raznÄ› doporuÄujeme nainstalovat do vaÅ¡eho systÃ©mu balÃÄky potÅ™ebnÃ© pro podporu %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr "SpojenÃ s internetem nefujguje"
+msgstr "PÅ™ipojenÃ k internetu nefunguje"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Server ownCloud nemÃ¡ funkÄnÃ spojenÃ s internetem. NÄ›kterÃ© moduly jako externÃ ÃºloÅ¾iÅ¡tÄ›, oznÃ¡menÃ o dostupnÃ½ch aktualizacÃch, nebo instalace aplikacÃ tÅ™etÃch stran nefungujÃ. PÅ™Ãstup k souborÅ¯m z jinÃ½ch mÃst a odesÃlÃ¡nÃ oznamovacÃch e-mailÅ¯ takÃ© nemusÃ fungovat. Pokud si pÅ™ejete vyuÅ¾Ãvat vÅ¡ech vlastnostÃ ownCloud, doporuÄujeme povolit internetovÃ© spojenÃ pro tento server."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Server nemÃ¡ funkÄnÃ pÅ™ipojenÃ k internetu. NÄ›kterÃ© moduly jako napÅ™. externÃ ÃºloÅ¾iÅ¡tÄ›, oznÃ¡menÃ o dostupnÃ½ch aktualizacÃch nebo instalace aplikacÃ tÅ™etÃch stran nebudou fungovat. PÅ™Ãstup k souborÅ¯m z jinÃ½ch mÃst a odesÃlÃ¡nÃ oznamovacÃch e-mailÅ¯ takÃ© nemusÃ fungovat. Pokud si pÅ™ejete vyuÅ¾Ãvat vÅ¡ech vlastnostÃ ownCloud, doporuÄujeme povolit pÅ™ipojenÃ k internetu tomuto serveru."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr "Spustit jednu Ãºlohu s kaÅ¾dou naÄtenou strÃ¡nkou"
+msgstr "Spustit jednu Ãºlohu s kaÅ¾dÃ½m naÄtenÃm strÃ¡nky"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php je registrovÃ¡n u sluÅ¾by webcron. ZavolÃ¡ strÃ¡nku cron.php v koÅ™enovÃ©m adresÃ¡Å™i owncloud kaÅ¾dou minutu skrze http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php je registrovÃ¡n u sluÅ¾by webcron pro zavolÃ¡nÃ strÃ¡nky cron.php jednou za minutu pÅ™es HTTP."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "PouÅ¾Ãt systÃ©movou sluÅ¾bu cron. Zavolat soubor cron.php ze sloÅ¾ky owncloud pomocÃ systÃ©movÃ© Ãºlohy cron kaÅ¾dou minutu."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "PouÅ¾Ãt systÃ©movou sluÅ¾bu cron pro spouÅ¡tÄ›nÃ souboru cron.php jednou za minutu."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "SdÃlenÃ"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Povolit API sdÃlenÃ"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Povolit aplikacÃm pouÅ¾Ãvat API sdÃlenÃ"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr "Povolit uÅ¾ivatelÅ¯m sdÃlet poloÅ¾ky s veÅ™ejnostÃ pomocÃ odkazÅ¯"
+msgstr "Povolit uÅ¾ivatelÅ¯m sdÃlet poloÅ¾ky veÅ™ejnÄ› pomocÃ odkazÅ¯"
+
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Povolit veÅ™ejnÃ© nahrÃ¡vÃ¡nÃ souborÅ¯"
 
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Povolit uÅ¾ivatelÅ¯m, aby mohli ostatnÃm umoÅ¾nit nahrÃ¡vat do jejich veÅ™ejnÄ› sdÃlenÃ© sloÅ¾ky"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdÃlenÃ"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Povolit uÅ¾ivatelÅ¯m znovu sdÃlet poloÅ¾ky, kterÃ© jsou pro nÄ› sdÃleny"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Povolit uÅ¾ivatelÅ¯m sdÃlet s kÃ½mkoliv"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Povolit uÅ¾ivatelÅ¯m sdÃlet pouze s uÅ¾ivateli v jejich skupinÃ¡ch"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "ZabezpeÄenÃ"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "VynutÃ pÅ™ipojovÃ¡nÃ klientÅ¯ ownCloud skrze Å¡ifrovanÃ© spojenÃ."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "VynutÃ pÅ™ipojovÃ¡nÃ klientÅ¯ k %s Å¡ifrovanÃ½m spojenÃm."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "PÅ™ipojte se, prosÃm, k tÃ©to instanci ownCloud skrze HTTPS pro povolenÃ, nebo zakaÅ¾te vynucenÃ SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "PÅ™ipojte se k %s skrze HTTPS pro povolenÃ nebo zakÃ¡zÃ¡nÃ vynucovÃ¡nÃ SSL."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "ZÃ¡znam"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
-msgstr "ÃšroveÅˆ zÃ¡znamu"
+msgstr "ÃšroveÅˆ zaznamenÃ¡vÃ¡nÃ"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "VÃce"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "MÃ©nÄ›"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -341,7 +350,7 @@ msgstr "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komun
 
 #: templates/apps.php:13
 msgid "Add your App"
-msgstr "PÅ™idat VaÅ¡Ã aplikaci"
+msgstr "PÅ™idat VaÅ¡i aplikaci"
 
 #: templates/apps.php:28
 msgid "More Apps"
@@ -387,77 +396,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "PlacenÃ¡ podpora"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ZÃskat aplikace pro synchronizaci vaÅ¡ich souborÅ¯"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobrazit prÅ¯vodce prvnÃm spuÅ¡tÄ›nÃm"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "PouÅ¾ÃvÃ¡te <strong>%s</strong> z <strong>%s</strong> dostupnÃ½ch"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "VaÅ¡e heslo bylo zmÄ›nÄ›no"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
-msgstr "VaÅ¡e heslo nelze zmÄ›nit"
+msgstr "ZmÄ›na vaÅ¡eho hesla se nezdaÅ™ila"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "SouÄasnÃ© heslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "NovÃ© heslo"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ZmÄ›nit heslo"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "ZobrazovanÃ© jmÃ©no"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "VaÅ¡e e-mailovÃ¡ adresa"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
-msgstr "Pro povolenÃ zmÄ›ny hesla vyplÅˆte adresu e-mailu"
+msgstr "Pro povolenÃ obnovy hesla vyplÅˆte e-mailovou adresu"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Pomoci s pÅ™ekladem"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "PouÅ¾ijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborÅ¯m pÅ™es WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 122b49821572696d409d49fd41b35d77044319ba..7f676fdca3702f68e094972c8c74714e3f253787 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: Honza K. <honza889@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,9 +90,9 @@ msgstr "Potvrdit smazÃ¡nÃ"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>VarovÃ¡nÃ:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilnÃ. MÅ¯Å¾e nastÃ¡vat neoÄekÃ¡vanÃ© chovÃ¡nÃ. PoÅ¾Ã¡dejte, prosÃm, sprÃ¡vce systÃ©mu aby jednu z nich zakÃ¡zal."
+msgstr "<b>VarovÃ¡nÃ:</b> Aplikace user_ldap a user_webdavauth jsou vzÃ¡jemnÄ› nekompatibilnÃ. MÅ¯Å¾ete zaznamenat neoÄekÃ¡vanÃ© chovÃ¡nÃ. PoÅ¾Ã¡dejte prosÃm vaÅ¡eho systÃ©movÃ©ho administrÃ¡tora o zakÃ¡zÃ¡nÃ jednoho z nich."
 
 #: templates/settings.php:12
 msgid ""
@@ -223,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "ZakÃ¡zat hlavnÃ serveru"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "PÅ™i zapnutÃ se ownCloud pÅ™ipojÃ pouze k zÃ¡loÅ¾nÃmu serveru"
+msgid "Only connect to the replica server."
+msgstr "PÅ™ipojit jen k replikujÃcÃmu serveru."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -243,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Vypnout ovÄ›Å™ovÃ¡nÃ SSL certifikÃ¡tu."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Pokud pÅ™ipojenÃ pracuje pouze s touto moÅ¾nostÃ, tak importujte SSL certifikÃ¡t SSL serveru do VaÅ¡eho serveru ownCloud"
+"certificate in your %s server."
+msgstr "Pokud spojenÃ funguje jen s touto volbou, importujte SSL certifikÃ¡t vaÅ¡eho LDAP serveru na server %s."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -266,11 +267,11 @@ msgstr "NastavenÃ adresÃ¡Å™e"
 
 #: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr "Pole pro zobrazovanÃ© jmÃ©no uÅ¾ivatele"
+msgstr "Pole zobrazovanÃ©ho jmÃ©na uÅ¾ivatele"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Atribut LDAP pouÅ¾itÃ½ k vytvoÅ™enÃ jmÃ©na uÅ¾ivatele ownCloud"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "LDAP atribut pouÅ¾itÃ½ k vytvoÅ™enÃ zobrazovanÃ©ho jmÃ©na uÅ¾ivatele."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -290,11 +291,11 @@ msgstr "VolitelnÃ©, atribut na Å™Ã¡dku"
 
 #: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr "Pole pro zobrazenÃ jmÃ©na skupiny"
+msgstr "Pole zobrazovanÃ©ho jmÃ©na skupiny"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Atribut LDAP pouÅ¾itÃ½ k vytvoÅ™enÃ jmÃ©na skupiny ownCloud"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "LDAP atribut pouÅ¾itÃ½ k vytvoÅ™enÃ zobrazovanÃ©ho jmÃ©na skupiny."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -354,13 +355,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "Ve vÃ½chozÃm nastavenÃ bude uÅ¾ivatelskÃ© jmÃ©no vytvoÅ™eno z UUID atributu. To zajistÃ unikÃ¡tnost uÅ¾ivatelskÃ©ho jmÃ©na bez potÅ™eby konverze znakÅ¯. InternÃ uÅ¾ivatelskÃ© jmÃ©no je omezena na znaky: [ a-zA-Z0-9_.@- ]. OstatnÃ znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduÅ¡e vynechÃ¡ny. V pÅ™ÃpadÄ› kolize uÅ¾ivatelskÃ½ch jmen bude pÅ™idÃ¡no/navÃ½Å¡eno ÄÃslo. InternÃ uÅ¾ivatelskÃ© jmÃ©no je pouÅ¾ÃvÃ¡no k internÃ identifikaci uÅ¾ivatele. Je takÃ© vÃ½chozÃm nÃ¡zvem uÅ¾ivatelskÃ©ho domovskÃ©ho adresÃ¡Å™e. Je takÃ© souÄÃ¡stÃ URL pro vzdÃ¡lenÃ½ pÅ™Ãstup, napÅ™Ãklad vÅ¡ech *DAV sluÅ¾eb. S tÃmto nastavenÃm bude vÃ½chozÃ chovÃ¡nÃ pÅ™epsÃ¡no. Pro dosaÅ¾enÃ podobnÃ©ho chovÃ¡nÃ jako pÅ™ed ownCloudem 5 uveÄte atribut zobrazovanÃ©ho jmÃ©na do pole nÃÅ¾e. Ponechte prÃ¡zdnÃ© pro vÃ½chozÃ chovÃ¡nÃ. ZmÄ›na bude mÃt vliv jen na novÄ› namapovanÃ© (pÅ™idanÃ©) uÅ¾ivatele z LDAP."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -372,14 +373,14 @@ msgstr "Nastavit ruÄnÄ› UUID atribut"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Ve vÃ½chozÃm nastavenÃ je UUID atribut nalezen automaticky. UUID atribut je pouÅ¾ÃvÃ¡n pro nezpochybnitelnou identifikaci uÅ¾ivatelÅ¯ a skupin z LDAP. NavÃc je na zÃ¡kladÄ› UUID tvoÅ™eno takÃ© internÃ uÅ¾ivatelskÃ© jmÃ©no, pokud nenÃ nastaveno jinak. MÅ¯Å¾ete vÃ½chozÃ nastavenÃ pÅ™epsat a pouÅ¾Ãt atribut kterÃ½ sami zvolÃte. MusÃte se ale ujistit Å¾e atribut kterÃ½ vyberete bude uveden jak u uÅ¾ivatelÅ¯, tak i u skupin a je unikÃ¡tnÃ. Ponechte prÃ¡zdnÃ© pro vÃ½chozÃ chovÃ¡nÃ. ZmÄ›na bude mÃt vliv jen na novÄ› namapovanÃ© (pÅ™idanÃ©) uÅ¾ivatele a skupiny z LDAP."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -391,18 +392,17 @@ msgstr "MapovÃ¡nÃ uÅ¾ivatelskÃ½ch jmen z LDAPu"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "UÅ¾ivatelskÃ¡ jmÃ©na jsou pouÅ¾ÃvÃ¡ny pro uchovÃ¡vÃ¡nÃ a pÅ™iÅ™azovÃ¡nÃ (meta)dat. Pro sprÃ¡vnou identifikaci a rozpoznÃ¡nÃ uÅ¾ivatelÅ¯ bude mÃt kaÅ¾dÃ½ uÅ¾ivatel z LDAP internÃ uÅ¾ivatelskÃ© jmÃ©no. To je nezbytnÃ© pro mapovÃ¡nÃ uÅ¾ivatelskÃ½ch jmen na uÅ¾ivatele LDAP. VytvoÅ™enÃ© uÅ¾ivatelskÃ© jmÃ©no je mapovÃ¡no na UUID uÅ¾ivatele v LDAP. NavÃc je cachovÃ¡na DN pro reprodukci interakce s LDAP, ale nenÃ pouÅ¾ÃvÃ¡na pro identifikaci. Pokud se DN zmÄ›nÃ, bude to sprÃ¡vnÄ› rozpoznÃ¡no. VyÄiÅ¡tÄ›nÃ mapovÃ¡nÃ zanechÃ¡ zbytky vÅ¡ude. VyÄiÅ¡tÄ›nÃ navÃc nenÃ specifickÃ© konfiguraci, bude mÃt vliv na vÅ¡echny LDAP konfigurace! Nikdy neÄistÄ›te mapovÃ¡nÃ v produkÄnÃm prostÅ™edÃ, jen v testovacÃ nebo experimentÃ¡lnÃ fÃ¡zi."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 6cbaabde3fc067a7ea9a414897e68c37919b5a80..27661055ff63a116a4fd9406f60154ffd198ec5a 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
 # TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 17:20+0000\n"
-"Last-Translator: TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-08-02 01:56-0400\n"
+"PO-Revision-Date: 2013-08-01 19:28+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "OvÄ›Å™enÃ WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr "Adresa:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud odeÅ¡le uÅ¾ivatelskÃ© Ãºdaje na zadanou URL. Plugin zkontroluje odpovÄ›Ä a povaÅ¾uje nÃ¡vratovou hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡echny ostatnÃ hodnoty jako platnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje."
+msgstr "UÅ¾ivatelskÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje budou odeslÃ¡ny na tuto adresu. Tento plugin zkontroluje odpovÄ›Ä serveru a interpretuje nÃ¡vratovÃ½ kÃ³d HTTP 401 a 403 jako neplatnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje a jakÃ½koli jinÃ½ jako platnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje."
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 76ece913007e641432ea3780efb4c0b48ede09ab..eda31fda90771099784b91e20db9b599d3e86a15 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,67 @@ msgstr "Tachwedd"
 msgid "December"
 msgstr "Rhagfyr"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "eiliad yn Ã´l"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 munud yn Ã´l"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} munud yn Ã´l"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 awr yn Ã´l"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} awr yn Ã´l"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} diwrnod yn Ã´l"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} mis yn Ã´l"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "misoedd yn Ã´l"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "blwyddyn yn Ã´l"
 
@@ -226,8 +234,8 @@ msgstr "Nid yw'r math o wrthrych wedi cael ei nodi."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Gwall"
 
@@ -247,140 +255,141 @@ msgstr "Rhannwyd"
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Gwall wrth rannu"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Gwall wrth ddad-rannu"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Gwall wrth newid caniatÃ¢d"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Rhannwyd Ã¢ chi a'r grÅµp {group} gan {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Rhannwyd Ã¢ chi gan {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Rhannu gyda"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Dolen ar gyfer rhannu"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Diogelu cyfrinair"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "E-bostio dolen at berson"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Anfon"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Gosod dyddiad dod i ben"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Dyddiad dod i ben"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Rhannu drwy e-bost:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Heb ganfod pobl"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Does dim hawl ail-rannu"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Rhannwyd yn {item} Ã¢ {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Dad-rannu"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "yn gallu golygu"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "rheolaeth mynediad"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "creu"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "diweddaru"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "dileu"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "rhannu"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Diogelwyd Ã¢ chyfrinair"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ailosod cyfrinair ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +410,7 @@ msgstr "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost."
 msgid "You will receive a link to reset your password via Email."
 msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Enw defnyddiwr"
@@ -462,11 +471,11 @@ msgstr "Cymorth"
 msgid "Access forbidden"
 msgstr "Mynediad wedi'i wahardd"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Methwyd canfod cwmwl"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +504,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Diweddarwch eich PHP i ddefnyddio ownCloud yn ddiogel."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +526,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. "
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Am wybodaeth ar sut i gyflunio'r gweinydd yn gywir, cyfeiriwch at y <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ddogfennaeth</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crewch <strong>gyfrif gweinyddol</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Uwch"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Plygell data"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Cyflunio'r gronfa ddata"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "ddefnyddir"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Defnyddiwr cronfa ddata"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Cyfrinair cronfa ddata"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Enw cronfa ddata"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tablespace cronfa ddata"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Gwesteiwr cronfa ddata"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Gorffen sefydlu"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Allgofnodi"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Gwrthodwyd mewngofnodi awtomatig!"
@@ -608,7 +622,7 @@ msgstr "Mewngofnodi"
 msgid "Alternative Logins"
 msgstr "Mewngofnodiadau Amgen"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index b706831fd4514879239de34b289b5fec3581bf58..5ef5e6ef8d4efd232d4b6dcdc1c89a39bb6ab0a2 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Rhannu"
 msgid "Delete permanently"
 msgstr "Dileu'n barhaol"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Dileu"
 
@@ -128,43 +128,47 @@ msgstr "Dileu"
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "amnewid"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "awgrymu enw"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "diddymu"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "newidiwyd {new_name} yn lle {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "cyflawni gweithred dileu"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 ffeil yn llwytho i fyny"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "ffeiliau'n llwytho i fyny"
 
@@ -200,33 +204,33 @@ msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 blygell"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} plygell"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 ffeil"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} ffeil"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +289,61 @@ msgstr "Plygell"
 msgid "From link"
 msgstr "Dolen o"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ffeiliau ddilewyd"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Diddymu llwytho i fyny"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Nid oes gennych hawliau ysgrifennu fan hyn."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Dad-rannu"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Maint llwytho i fyny'n rhy fawr"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Sganio cyfredol"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 580563b10a4555796ce48dffe6e496d0c61d6dca..0b6627605f1bbf8c11d81039d61c21cd8acc61e2 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index c1c841fbdd2c409905aac3948b10481fbea0b74b..c9721c7493732ce0907354918b29b4641905155d 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index c6c29307a1d449bd92fe0c4ec8dd6d7c9f585041..6c8d5f69531ce20f22cfb9d541acb1aea76ca22e 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Cyfrinair"
 msgid "Submit"
 msgstr "Cyflwyno"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "Rhannodd %s blygell %s Ã¢ chi"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "Rhannodd %s ffeil %s Ã¢ chi"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Llwytho i fyny"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Diddymu llwytho i fyny"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Does dim rhagolwg ar gael ar gyfer"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index baf068993f1b6bddcd06e12e08b65f9d5c6656f2..b9b366cf6367b6da3651a35311d407b2cbf09d96 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +27,49 @@ msgstr "Methwyd dileu %s yn barhaol"
 msgid "Couldn't restore %s"
 msgstr "Methwyd adfer %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "gweithrediad adfer"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Gwall"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "dileu ffeil yn barhaol"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Dileu'n barhaol"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Enw"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Wedi dileu"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 blygell"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} plygell"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 ffeil"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} ffeil"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/cy_GB/files_versions.po b/l10n/cy_GB/files_versions.po
index ee2268ca74e97c311ce3894553a36d19d246d95a..d8a7a8ea90fe3b754ad5f57e9774bfccbab08b27 100644
--- a/l10n/cy_GB/files_versions.po
+++ b/l10n/cy_GB/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Adfer"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 9079ec300c3aa7bfb227eb9f5b553c5890bdb59f..f53ef9f6f27368e4f4efffb3d7dad3fe371f72f9 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Defnyddwyr"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Pecynnau"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Gweinyddu"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "gwasanaethau gwe a reolir gennych"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Mae llwytho ZIP wedi ei ddiffodd."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "NÃ´l i Ffeiliau"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "methwyd pennu"
 
@@ -170,77 +182,85 @@ msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Creu enw defnyddiwr i'r gweinyddwr."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Gosod cyfrinair y gweinyddwr."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatÃ¡u cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "eiliad yn Ã´l"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 munud yn Ã´l"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d munud yn Ã´l"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 awr yn Ã´l"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d awr yn Ã´l"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "heddiw"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ddoe"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d diwrnod yn Ã´l"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d mis yn Ã´l"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "y llynedd"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "blwyddyn yn Ã´l"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 289b9ed1700aa652eaf9f266c7adf8eec2066afd..bf5e3f365c636c3cf44de9972ed88e78afcaae3e 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatÃ¡u cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Cyfrinair newydd"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-bost"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index a44c8dfffa43e4f97360f4175b8f4ff19e0ac3dd..99af3545bfad5d31dbc48d8c406b966bd46b388e 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/cy_GB/user_webdavauth.po b/l10n/cy_GB/user_webdavauth.po
index d034799f1886f2fc77fb41d7f5f6f4917f67769c..2658b11cd1cee24b608496b1de6fd91485441322 100644
--- a/l10n/cy_GB/user_webdavauth.po
+++ b/l10n/cy_GB/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 8f31a51c597b9847bf08170b05d7ce3cfe700c8d..2966aa984946305e55aa22ddaf011a9dd70755e1 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
 # Peter Jespersen <flywheeldk@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +24,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr ""
+msgstr "%s delte Â»%sÂ« med sig"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -139,59 +141,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minut siden"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutter siden"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 time siden"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} timer siden"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dage siden"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "sidste mÃ¥ned"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} mÃ¥neder siden"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mÃ¥neder siden"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "sidste Ã¥r"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -227,8 +229,8 @@ msgstr "Objekttypen er ikke angivet."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Fejl"
 
@@ -248,140 +250,141 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Fejl under annullering af deling"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Fejl under justering af rettigheder"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med dig og gruppen {group} af {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Delt med dig af {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Kodeord"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Tillad Offentlig Upload"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "E-mail link til person"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "VÃ¦lg udlÃ¸bsdato"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "UdlÃ¸bsdato"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "del"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udlÃ¸bsdato"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Fejl under sÃ¦tning af udlÃ¸bsdato"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Opdateringen blev ikke udfÃ¸rt korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Opdateringen blev udfÃ¸rt korrekt. Du bliver nu viderestillet til ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Nulstil ownCloud kodeord"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +405,7 @@ msgstr "Anmodning mislykkedes!<br>Er du sikker pÃ¥ at din e-post / brugernavn va
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Brugernavn"
@@ -413,11 +416,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnÃ¸glen kan du ikke fÃ¥ dine data tilbage efter at du har Ã¦ndret adgangskode. HVis du ikke er sikker pÃ¥, hvad du skal gÃ¸re sÃ¥ kontakt din administrator fÃ¸r du fortsÃ¦tter. Vil du fortsÃ¦tte?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ja, Jeg Ã¸nsker virkelig at nulstille mit kodeord"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -463,11 +466,11 @@ msgstr "HjÃ¦lp"
 msgid "Access forbidden"
 msgstr "Adgang forbudt"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Sky ikke fundet"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -476,7 +479,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "Hallo\n\ndette blot for at lade dig vide, at %s har delt %s med dig.\nSe det: %s\n\nHej"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -496,8 +499,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Din PHP-version er sÃ¥rbar overfor et NULL Byte angreb (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Opdater venligs din PHP-installation for at kunne bruge ownCloud sikkert."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Opdater venligst din PHP installation for at anvende %s sikkert."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Dine data mappe og filer er sandsynligvis tilgÃ¦ngelige fra internettet fordi .htaccess filen ikke virker."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "For at vide mere om hvordan du konfigurerer din server ordentligt, se venligst <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentationen</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Navn pÃ¥ database"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Database tabelplads"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Afslut opsÃ¦tning"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgÃ¦ngelig. FÃ¥ mere information om, hvordan du opdaterer."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Log ud"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Flere programmer"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk login afvist!"
@@ -609,12 +617,12 @@ msgstr "Log ind"
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index e6619512657a0a682caa42180dc9f561486d0577..8a78acb722abf5c7542455b988d74984105a60b2 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +31,11 @@ msgstr "Kunne ikke flytte %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Ude af stand til at vÃ¦lge upload mappe."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "Ugyldig Token "
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -121,7 +122,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Slet"
 
@@ -129,43 +130,45 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "OmdÃ¸b"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "foreslÃ¥ navn"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "udfÃ¸r slet operation"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fil uploades"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "uploader filer"
 
@@ -201,38 +204,34 @@ msgstr "Dit download forberedes. Dette kan tage lidt tid ved stÃ¸rre filer."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Ã†ndret"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mapper"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s kunne ikke omdÃ¸bes"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,61 +285,61 @@ msgstr "Mappe"
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Du har ikke skriverettigheder her."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Upload er for stor"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerne, du prÃ¸ver at uploade, er stÃ¸rre end den maksimale stÃ¸rrelse for fil-upload pÃ¥ denne server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlÃ¦st, vent venligst."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "IndlÃ¦ser"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "mappe"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "Mapper"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fil"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 9df3c49abd129994dca82422a4407faf4bf66e57..105ba059f9e98fd43c8132d145e282ed9fac6b96 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-14 19:40+0000\n"
+"Last-Translator: claus_chr <claus_chr@webspeed.dk>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,39 +21,39 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "GendannelsesnÃ¸gle aktiveret med succes"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Kunne ikke aktivere gendannelsesnÃ¸gle. Kontroller venligst dit gendannelsesnÃ¸gle kodeord!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "GendannelsesnÃ¸gle deaktiveret succesfuldt"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Kunne ikke deaktivere gendannelsesnÃ¸gle. Kontroller din gendannelsesnÃ¸gle kodeord!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Kodeordet blev Ã¦ndret succesfuldt"
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Kunne ikke Ã¦ndre kodeordet. MÃ¥ske var det gamle kodeord ikke korrekt."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Privat nÃ¸gle kodeord succesfuldt opdateret."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Kunne ikke opdatere det private nÃ¸gle kodeord-. MÃ¥ske var det gamle kodeord forkert."
 
 #: files/error.php:7
 msgid ""
@@ -59,18 +61,22 @@ msgid ""
 "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."
-msgstr ""
+msgstr "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."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Manglende betingelser."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr "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."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "FÃ¸lgende brugere er ikke sat op til kryptering:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -80,15 +86,15 @@ msgstr "Gemmer..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Din private nÃ¸gle er ikke gyldig. MÃ¥ske blev dit kodeord Ã¦ndre udefra."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Du kan lÃ¥se din private nÃ¸gle op i din "
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "Personlige indstillinger"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -97,76 +103,76 @@ msgstr "Kryptering"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Aktiver gendannelsesnÃ¸gle (Tillad gendannelse af brugerfiler i tilfÃ¦lde af tab af kodeord):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "GendannelsesnÃ¸gle kodeord"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Aktiveret"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Deaktiveret"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "Skift gendannelsesnÃ¸gle kodeord:"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Gammel GendannelsesnÃ¸gle kodeord"
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "Ny GendannelsesnÃ¸gle kodeord"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "Skift Kodeord"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Dit private nÃ¸gle kodeord stemmer ikke lÃ¦ngere overens med dit login kodeord:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "SÃ¦t dit gamle private nÃ¸gle kodeord til at vÃ¦re dit nuvÃ¦rende login kodeord. "
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Gammelt login kodeord"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Nuvrende login kodeord"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Opdater Privat NÃ¸gle Kodeord"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Aktiver kodeord gendannelse:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfÃ¦lde af tab af kodeord"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Filgendannelsesindstillinger opdateret"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Kunne ikke opdatere filgendannelse"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index d638a7eceda92a194edf9b581dee2bdb7c06d0ae..22fc3c7b82455ff6d8fcbee7250791e79befe6a7 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Angiv venligst en valid Dropbox app nÃ¸gle og hemmelighed"
 msgid "Error configuring Google Drive storage"
 msgstr "Fejl ved konfiguration af Google Drive plads"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. SpÃ¸rg din systemadministrator om at installere det."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b> Advarsel: </ b> FTP-understÃ¸ttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. SpÃ¸rg din systemadministrator om at installere det."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 993bdf6a3c681de1372639fad2e6d2b8775de6c2..6ce42eb608a45e243e1913ff69a3229507fbc368 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Kodeordet er forkert. PrÃ¸v igen."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Kodeord"
 msgid "Submit"
 msgstr "Send"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "DesvÃ¦rre, dette link ser ikke ud til at fungerer lÃ¦ngere."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Ã…rsagen kan vÃ¦re:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Filen blev fjernet"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "linket udlÃ¸b"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "deling er deaktiveret"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "For yderligere information, kontakt venligst personen der sendte linket. "
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med dig"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med dig"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ForhÃ¥ndsvisning ikke tilgÃ¦ngelig for"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 56a9979e043e14937a07afca9347e613e8115781..a629083f8baf4bc33cf08cbb7e819765d257891c 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "Kunne ikke slette %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "udfÃ¸r gendannelsesoperation"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Fejl"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "slet fil permanent"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Gendannet"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 23356455f8ad4de249771b40eb869e1b579320de..3467e6621074c385c5aed4775f78b6d1c5be8eaa 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-29 01:56-0400\n"
+"PO-Revision-Date: 2013-07-28 18:20+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Kunne ikke genskabe: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "success"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Filen %s blev genskabt til version: %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "fejl"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Filen %s blev genskabt til version: %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versioner"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Ingen gamle version tilgÃ¦ngelige"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Kunne ikke tilbagerulle {file} til den tidligere udgave: {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ingen sti specificeret"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Flere versioner..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versioner"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Ingen andre versioner tilgÃ¦ngelig"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Genskab en fil til en tidligere version ved at klikke pÃ¥ denne genskab knap."
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Gendan"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 876e85789c097f8f5b47f8c341c51dfc72bf6b42..1d132880f9d6dedac7829cf09d8d53e030cf33d1 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "Brugere"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Upgradering af \"%s\" fejlede"
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Kan ikke Ã¥bne \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slÃ¥et fra."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Download filerne i smÃ¥ bider, seperat, eller kontakt venligst din administrator."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "kunne ikke fastslÃ¥s"
 
@@ -171,77 +184,77 @@ msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Angiv et admin brugernavn."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Angiv et admin kodeord."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grÃ¦nsefladen virker Ã¸delagt."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minut siden"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutter siden"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d timer siden"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d dage siden"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "sidste mÃ¥ned"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d mÃ¥neder siden"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "sidste Ã¥r"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ã¥r siden"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "ForÃ¥rsaget af:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index f531ff2d23de4ae6266b65d9adec702ffc99b4b3..9bff35b5b3d3602b2150f2c39bd964dd6551a391 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
+# Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>, 2013
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,166 +172,173 @@ msgstr "En gyldig adgangskode skal angives"
 msgid "__language_name__"
 msgstr "Dansk"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Din data mappe og dine filer er muligvis tilgÃ¦ngelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler pÃ¥ det kraftigste at du konfigurerer din webserver pÃ¥ en mÃ¥ske sÃ¥ data mappen ikke  lÃ¦ngere er tilgÃ¦ngelig eller at du flytter data mappen uden for webserverens dokument rod.  "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Din data mappe og dine filer er muligvis tilgÃ¦ngelige fra internettet. .htaccess filen virker ikke. Vi anbefaler pÃ¥ det kraftigste at du konfigurerer din webserver sÃ¥ data mappen ikke lÃ¦ngere er tilgÃ¦ngelig, eller at du flytter data mappen uden for webserverens dokument rod.  "
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "OpsÃ¦tnings Advarsel"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grÃ¦nsefladen virker Ã¸delagt."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' mangler"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP modulet 'fileinfo' mangler. Vi anbefaler stÃ¦rkt at aktivere dette modul til at fÃ¥ de bedste resultater med mime-type detektion."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Landestandard fungerer ikke"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan vÃ¦re problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nÃ¸dvendige pakker pÃ¥ dit system til at understÃ¸tte %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "Systemet kan ikke indstille systemets landestandard for %s. Det betyder, at der kan vÃ¦re problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nÃ¸dvendige pakker pÃ¥ dit system til at understÃ¸tte %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Internetforbindelse fungerer ikke"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af eksterne applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgÃ¥ filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, sÃ¥fremt du Ã¸nsker alle ownClouds funktioner."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgÃ¥ filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, sÃ¥fremt du Ã¸nsker samtlige funktioner."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "UdfÃ¸re en opgave med hver side indlÃ¦st"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php er registeret hos en webcron-tjeneste til at kalde cron.php en gang i minuttet over http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Brug systemets cron service til at kalde cron.php filen en gang i minuttet"
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Aktiver Share API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Tillad apps til at bruge Share API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Tillad links"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Tillad brugere at dele elementer til offentligheden med links"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Tillad offentlig upload"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Tillad videredeling"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Tillad brugere at dele elementer delt med dem igen"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Tillad brugere at dele med alle"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "HÃ¥ndhÃ¦ver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Tving klienten til at forbinde til %s via en kryptetet forbindelse."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL hÃ¥ndhÃ¦velse."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +396,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerciel support"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Hent applikationerne for at synkronisere dine filer"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Vis FÃ¸rste KÃ¸rsels Guiden igen."
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brugt <strong>%s</strong> af den tilgÃ¦ngelige <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Din adgangskode blev Ã¦ndret"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ude af stand til at Ã¦ndre dit kodeord"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "NuvÃ¦rende adgangskode"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nyt kodeord"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "SkÃ¦rmnavn"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Indtast en emailadresse for at kunne fÃ¥ pÃ¥mindelse om adgangskode"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "HjÃ¦lp med oversÃ¦ttelsen"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgÃ¥ dine filer via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 5d77b5c32312cbf51def3c5f59d8a556d8b4ea2f..480233b211a5612b41aef9b56c9b7102db16e01d 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:16+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +24,11 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Kunne ikke slette server konfigurationen"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Konfigurationen er korrekt og forbindelsen kunne etableres!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
@@ -39,7 +40,7 @@ msgstr ""
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Konfigurationen er ugyldig. Se venligst ownCloud loggen for yderligere detaljer."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -51,11 +52,11 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Behold indstillinger?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Kan ikke tilfÃ¸je serverkonfiguration"
 
 #: js/settings.js:111
 msgid "mappings cleared"
@@ -71,24 +72,24 @@ msgstr "Fejl"
 
 #: js/settings.js:141
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "Forbindelsestest lykkedes"
 
 #: js/settings.js:146
 msgid "Connection test failed"
-msgstr ""
+msgstr "Forbindelsestest mislykkedes"
 
 #: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Ã˜nsker du virkelig at slette den nuvÃ¦rende Server Konfiguration?"
 
 #: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "BekrÃ¦ft Sletning"
 
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -100,11 +101,11 @@ msgstr ""
 
 #: templates/settings.php:16
 msgid "Server configuration"
-msgstr ""
+msgstr "Server konfiguration"
 
 #: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "TilfÃ¸j Server Konfiguration"
 
 #: templates/settings.php:37
 msgid "Host"
@@ -172,7 +173,7 @@ msgstr "Definere filteret der bruges ved indlÃ¦sning af brugere."
 
 #: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "Uden stedfortrÃ¦der, f.eks. \"objectClass=person\"."
 
 #: templates/settings.php:61
 msgid "Group Filter"
@@ -184,15 +185,15 @@ msgstr "Definere filteret der bruges nÃ¥r der indlÃ¦ses grupper."
 
 #: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "Uden stedfortrÃ¦der, f.eks. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "Forbindelsesindstillinger "
 
 #: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "Konfiguration Aktiv"
 
 #: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
@@ -204,7 +205,7 @@ msgstr "Port"
 
 #: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Backup (Replika) VÃ¦rt"
 
 #: templates/settings.php:73
 msgid ""
@@ -214,15 +215,15 @@ msgstr ""
 
 #: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Backup (Replika) Port"
 
 #: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Deaktiver Hovedserver"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgid "Only connect to the replica server."
+msgstr "Forbind kun til replika serveren."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -230,7 +231,7 @@ msgstr "Brug TLS"
 
 #: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Benyt ikke flere LDAPS forbindelser, det vil mislykkeds. "
 
 #: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
@@ -241,9 +242,10 @@ msgid "Turn off SSL certificate validation."
 msgstr "Deaktiver SSL certifikat validering"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +269,7 @@ msgid "User Display Name Field"
 msgstr "User Display Name Field"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +293,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -328,7 +330,7 @@ msgstr "i bytes"
 
 #: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Email Felt"
 
 #: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
@@ -342,7 +344,7 @@ msgstr ""
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Internt Brugernavn"
 
 #: templates/settings.php:102
 msgid ""
@@ -352,12 +354,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +372,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +391,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
@@ -412,7 +413,7 @@ msgstr ""
 
 #: templates/settings.php:111
 msgid "Test Configuration"
-msgstr ""
+msgstr "Test Konfiguration"
 
 #: templates/settings.php:111
 msgid "Help"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 5a46dae8fe24a6318877dcb9a772d7f9b53cf48c..da378dda3d6fa2524d5befc46ff8e162b521a231 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sappe, 2013
 # cronner <cronner@gmail.com>, 2012
 # Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 15:20+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-godkendelse"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr ""
+msgid "Address: "
+msgstr "Adresse:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud vil sende brugerens oplysninger til denne URL. Plugin'et registrerer responsen og fortolker HTTP-statuskoder 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
+msgstr "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
diff --git a/l10n/de/core.po b/l10n/de/core.po
index d45d7eeeef82d3fde895a29c0d142bd380a09f23..47ffc3c14582a79f4b34d404dc9cbec1819e8f2d 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -4,16 +4,19 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
+# Pwnicorn <pwnicorndev@gmail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -142,59 +145,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "vor einer Minute"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "Vor {minutes} Minuten"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "Vor {hours} Stunden"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "Vor {days} Tag(en)"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "Vor {months} Monaten"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -230,8 +233,8 @@ msgstr "Der Objekttyp ist nicht angegeben."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Fehler"
 
@@ -251,140 +254,141 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Fehler beim Ã„ndern der Rechte"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} hat dies mit Dir geteilt"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Teilen mit"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Ãœber einen Link freigegeben"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Ã–ffentliches Hochladen erlauben"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Ãœber eine E-Mail teilen:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "FÃ¼r {user} in {item} freigegeben"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "lÃ¶schen"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Durch ein Passwort geschÃ¼tzt"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-Passwort zurÃ¼cksetzen"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -405,7 +409,7 @@ msgstr "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/De
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du erhÃ¤ltst einen Link per E-Mail, um Dein Passwort zurÃ¼ckzusetzen."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Benutzername"
@@ -466,11 +470,11 @@ msgstr "Hilfe"
 msgid "Access forbidden"
 msgstr "Zugriff verboten"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud nicht gefunden"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -499,8 +503,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu kÃ¶nnen."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Bitte aktualisiere deine PHP-Installation um %s sicher nutzen zu kÃ¶nnen."
 
 #: templates/installation.php:32
 msgid ""
@@ -520,68 +525,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Bitte lieÃŸ die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> fÃ¼r Informationen, wie Du Deinen Server konfigurierst."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "FÃ¼r Informationen, wie du deinen Server richtig konfigurierst lese bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Installation abschlieÃŸen"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfÃ¼gbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Abmelden"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatischer Login zurÃ¼ckgewiesen!"
@@ -612,7 +621,7 @@ msgstr "Einloggen"
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 4d05fad27ee111565d9da9102f9f258fe81bc1d9..25793863df12171b010458beb0349d3b991bbb3c 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -5,12 +5,14 @@
 # Translators:
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
+# Pwnicorn <pwnicorndev@gmail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -31,11 +33,11 @@ msgstr "Konnte %s nicht verschieben"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "UngÃ¼ltiges Merkmal"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -122,7 +124,7 @@ msgstr "Teilen"
 msgid "Delete permanently"
 msgstr "EndgÃ¼ltig lÃ¶schen"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "LÃ¶schen"
 
@@ -130,43 +132,45 @@ msgstr "LÃ¶schen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "LÃ¶schvorgang ausfÃ¼hren"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 Datei wird hochgeladen"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -202,38 +206,34 @@ msgstr "Dein Download wird vorbereitet. Dies kann bei grÃ¶ÃŸeren Dateien etwas d
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "UngÃ¼ltiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "GeÃ¤ndert"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ordner"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ordner"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s konnte nicht umbenannt werden"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -287,61 +287,61 @@ msgstr "Ordner"
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "GelÃ¶schte Dateien"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Du hast hier keine Schreib-Berechtigung."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Der Upload ist zu groÃŸ"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei Ã¼berschreitet die MaximalgrÃ¶ÃŸe fÃ¼r Uploads auf diesem Server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "Verzeichnis"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "Verzeichnisse"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Datei"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Dateien"
 
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index a1ca99ba2672a8188cbd718a15259a0a07bdcd69..0505a2086482bef02a5e4252bd2ea7b503f71493 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -5,14 +5,18 @@
 # Translators:
 # iLennart21 <a12s34d56f78@live.com>, 2013
 # Stephan KÃ¶ninger <mail@stekoe.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
+# Pwnicorn <pwnicorndev@gmail.com>, 2013
+# thillux, 2013
+# kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-09 14:10+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +58,7 @@ msgstr "Passwort des privaten SchlÃ¼ssels erfolgreich aktualisiert"
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Das Passwort des privaten SchlÃ¼ssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch."
 
 #: files/error.php:7
 msgid ""
@@ -62,18 +66,22 @@ msgid ""
 "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."
-msgstr ""
+msgstr "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."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Fehlende Vorraussetzungen"
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr "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."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "FÃ¼r folgende Nutzer ist keine VerschlÃ¼sselung eingerichtet:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -83,11 +91,11 @@ msgstr "Speichern..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Ihr privater SchlÃ¼ssel ist ungÃ¼ltig! Eventuell wurde Ihr Passwort von auÃŸerhalb geÃ¤ndert."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Du kannst den privaten SchlÃ¼ssel Ã¤ndern und zwar in deinem"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
@@ -100,11 +108,11 @@ msgstr "VerschlÃ¼sselung"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "WiederherstellungsschlÃ¼ssel aktivieren (ermÃ¶glicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "WiederherstellungsschlÃ¼ssel-Passwort"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -116,15 +124,15 @@ msgstr "Deaktiviert"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "WiederherstellungsschlÃ¼ssel-Passwort Ã¤ndern:"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Altes WiederherstellungsschlÃ¼ssel-Passwort"
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "Neues WiederherstellungsschlÃ¼ssel-Passwort"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -132,17 +140,17 @@ msgstr "Passwort Ã¤ndern"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Ihr Passwort fÃ¼r ihren privaten SchlÃ¼ssel stimmt nicht mehr mit ihrem Loginpasswort Ã¼berein."
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Setzen Sie ihr altes Passwort fÃ¼r ihren privaten SchlÃ¼ssel auf ihr aktuelles Login-Passwort"
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Wenn Sie Ihr altes Passwort vergessen haben, kÃ¶nnen Sie den Administrator bitten, Ihre Daten wiederherzustellen."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
@@ -154,17 +162,17 @@ msgstr "Aktuelles Passwort"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Passwort fÃ¼r den privaten SchlÃ¼ssel aktualisieren"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Passwortwiederherstellung aktivvieren:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Wenn Sie diese Option aktivieren, kÃ¶nnen Sie Ihre verschlÃ¼sselten Dateien wiederherstellen, falls Sie Ihr Passwort vergessen"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
@@ -172,4 +180,4 @@ msgstr "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Dateiwiederherstellung konnte nicht aktualisiert werden"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 178b330900cfbbe5a7825128ad9cc06fe7268966..e2285c753a0e89b57824ebeec9ce88b1f868360e 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Bitte trage einen gÃ¼ltigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das EinhÃ¤ngen von CIFS/SMB-Freigaben ist nicht mÃ¶glich. Bitte Deinen System-Administrator, dies zu installieren."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Warnung::</b> Die FTP UnterstÃ¼tzung  von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 099085727cdc3c2cfb9ff2c3344586150a1553fd..a8263e4c718377d63e69a8f6bb16c8662521c8b0 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Pwnicorn <pwnicorndev@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +21,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Bitte Ã¼berprÃ¼fen sie Ihr Passwort und versuchen Sie es erneut."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +31,52 @@ msgstr "Passwort"
 msgid "Submit"
 msgstr "Absenden"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "GrÃ¼nde kÃ¶nnten sein:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Die Elemente wurden entfernt"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "Der Link ist abgelaufen"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "Teilen ist deaktiviert"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "FÃ¼r mehr Informationen, frage bitte die Person, die dir diesen Link geschickt hat."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Dir geteilt"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Dir geteilt"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfÃ¼gbar fÃ¼r"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 027aecc0690f6fdc65cdde0f6c2765464c105934..65d345b8f646719fed42bb4998cc7f5b83795267 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +28,45 @@ msgstr "Konnte %s nicht dauerhaft lÃ¶schen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausfÃ¼hren"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Fehler"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "Datei dauerhaft lÃ¶schen"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "EndgÃ¼ltig lÃ¶schen"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "gelÃ¶scht"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ordner"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ordner"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Wiederhergestellt"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 24dc7347362b9ee228964ebb7443888b2eeed196..a59108a04125e5b83cc326d7d80810c0cc388a5b 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-07-29 01:56-0400\n"
+"PO-Revision-Date: 2013-07-28 16:00+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Konnte %s nicht zurÃ¼cksetzen"
 
-#: history.php:40
-msgid "success"
-msgstr "Erfolgreich"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Datei %s wurde auf Version %s zurÃ¼ckgesetzt"
-
-#: history.php:49
-msgid "failure"
-msgstr "Fehlgeschlagen"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Datei %s konnte nicht auf Version %s zurÃ¼ckgesetzt werden"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versionen"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Keine Ã¤lteren Versionen verfÃ¼gbar"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Konnte {file} der Revision {timestamp} nicht rÃ¼ckgÃ¤nging machen."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Kein Pfad angegeben"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Mehrere Versionen..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versionen"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Keine anderen Versionen verfÃ¼gbar"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Setze eine Datei durch klicken auf den ZurÃ¼cksetzen Button zurÃ¼ck"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Wiederherstellen"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 8c6058964afcf0baa80e7d0ce3d5188ef2da6181..c6fc4ba5f1a137548dabbdaf930d6d63bfaae70b 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,34 +37,46 @@ msgid "Users"
 msgstr "Benutzer"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administration"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Konnte \"%s\" nicht aktualisieren."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Web-Services unter Deiner Kontrolle"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Ã–ffnen von \"%s\" fehlgeschlagen"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien mÃ¼ssen einzeln heruntergeladen werden."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ZurÃ¼ck zu \"Dateien\""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewÃ¤hlten Dateien sind zu groÃŸ, um eine ZIP-Datei zu erstellen."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Lade die Dateien in kleineren, separaten, StÃ¼cken herunter oder bitte deinen Administrator."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "konnte nicht festgestellt werden"
 
@@ -172,77 +185,77 @@ msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Setze Administrator Benutzername."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Dein Web-Server ist noch nicht fÃ¼r Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prÃ¼fe die <a href='%s'>Installationsanleitungen</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "vor einer Minute"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "Vor %d Minuten"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Vor %d Stunden"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "Heute"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Gestern"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "Vor %d Tag(en)"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Vor %d Monaten"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Vor Jahren"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Verursacht durch:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 809d895c8d857092608be01ec4c9f5f3b49157cb..548de28a30de231713f7ad0d0d950ea9caffc924 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -6,14 +6,15 @@
 # arkascha <foss@christian-reiner.info>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
+# Pwnicorn <pwnicorndev@gmail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,166 +174,173 @@ msgstr "Es muss ein gÃ¼ltiges Passwort angegeben werden"
 msgid "__language_name__"
 msgstr "Deutsch (PersÃ¶nlich)"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht lÃ¤nger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Dein Datenverzeichnis und deine Dateien sind mÃ¶glicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht lÃ¤nger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis auÃŸerhalb des Wurzelverzeichnisses des Webservers."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Dein Web-Server ist noch nicht fÃ¼r Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Bitte Ã¼berprÃ¼fe die <a href=\"%s\">Instalationsanleitungen</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modul 'fileinfo' fehlt "
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "LÃ¤ndereinstellung funktioniert nicht"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Dieser ownCloud Server kann die LÃ¤ndereinstellung nicht auf %s Ã¤ndern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen die fÃ¼r %s benÃ¶tigten Pakete auf Deinem System zu installieren."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "Die System-LÃ¤ndereinstellung kann nicht auf %s geÃ¤ndert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Keine Netzwerkverbindung"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung fÃ¼r diesen Server zu aktivieren, wenn Du alle Funktionen von ownCloud nutzen mÃ¶chtest."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "FÃ¼hre eine Aufgabe mit jeder geladenen Seite aus"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php ist an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute Ã¼ber http abgerufen."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minÃ¼tlich per HTTP aufruft."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute Ã¼ber einen Cronjob auf."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Benutze den System-Crondienst um die cron.php minÃ¼tlich aufzurufen."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Aktiviere Sharing-API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Erlaubt Apps die Nutzung der Share-API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Erlaubt Links"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Erlaubt Benutzern, Inhalte Ã¼ber Ã¶ffentliche Links zu teilen"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Ã–ffentliches Hochladen erlauben"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren Ã¶ffentlich freigegebene Ordner hochladen zu dÃ¼rfen"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Erlaubt erneutes Teilen"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Erzwingt die Verwendung einer verschlÃ¼sselten Verbindung"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung zu %s zu verbinden."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Bitte verbinde Dich Ã¼ber eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu Ã¤ndern"
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Bitte verbinde dich zu deinem %s Ã¼ber HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -390,77 +398,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Erstinstallation erneut durchfÃ¼hren"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du verwendest <strong>%s</strong> der verfÃ¼gbaren <strong>%s<strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Dein Passwort wurde geÃ¤ndert."
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Passwort konnte nicht geÃ¤ndert werden"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Passwort Ã¤ndern"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Hilf bei der Ãœbersetzung"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index cb5772e5c3cade23f1d1ea8c603510b7bd901a4c..8f5ae1cdcbc8fec050fcd87f696598c6e4103379 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -4,13 +4,16 @@
 # 
 # Translators:
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Pwnicorn <pwnicorndev@gmail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +23,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "LÃ¶schen der Zuordnung fehlgeschlagen."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -60,7 +63,7 @@ msgstr "Das HinzufÃ¼gen der Serverkonfiguration schlug fehl"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Zuordnungen gelÃ¶scht"
 
 #: js/settings.js:112
 msgid "Success"
@@ -89,9 +92,9 @@ msgstr "LÃ¶schung bestÃ¤tigen"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte\ndeinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +225,8 @@ msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn aktiviert, wird ownCloud ausschlieÃŸlich den Backupserver verwenden."
+msgid "Only connect to the replica server."
+msgstr "Nur zum Replikat-Server verbinden."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +245,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-ZertifikatsprÃ¼fung aus."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
+"certificate in your %s server."
+msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +272,8 @@ msgid "User Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen des Benutzers"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Das LDAP-Attribut fÃ¼r die Generierung des Benutzernamens in ownCloud. "
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +296,8 @@ msgid "Group Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen der Gruppe"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Das LDAP-Attribut fÃ¼r die Generierung des Gruppennamens in ownCloud. "
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -343,7 +347,7 @@ msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall tra
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Interner Benutzername"
 
 #: templates/settings.php:102
 msgid ""
@@ -353,63 +357,62 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "StandardmÃ¤ÃŸig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden mÃ¼ssen. Der interne Benutzername unterliegt BeschrÃ¤nkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein ZÃ¤hler hinzugefÃ¼gt bzw. der ZÃ¤hler um einen Wert erhÃ¶ht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmÃ¤ÃŸig vorausgewÃ¤hlte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel fÃ¼r alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten Ã¼berschrieben werden. Um ein Ã¤hnliches Verhalten wie vor ownCloud 5 zu erzielen, fÃ¼gen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen fÃ¼r das Standardverhalten leer. Die Ã„nderungen werden sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer auswirken."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Attribut fÃ¼r interne Benutzernamen:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "UUID-Erkennung Ã¼berschreiben"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "StandardmÃ¤ÃŸig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. AuÃŸerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewÃ¤hlten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden kÃ¶nnen. Lasse es frei, um es beim Standardverhalten zu belassen. Ã„nderungen wirken sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer und -Gruppen aus."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID-Attribut:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "LDAP-Benutzernamenzuordnung"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und prÃ¤zise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. ZusÃ¤tzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ã„ndert sich der DN, werden die Ã„nderungen durch gefunden. Der interne Benutzername, wird in Ã¼berall verwendet. Werden die Zuordnungen gelÃ¶scht, bleiben Ã¼berall Reste zurÃ¼ck. Die LÃ¶schung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! LÃ¶schen Sie niemals die Zuordnungen in einer produktiven Umgebung. LÃ¶sche die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "LÃ¶sche LDAP-Benutzernamenzuordnung"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "LÃ¶sche LDAP-Gruppennamenzuordnung"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 47b68e0fd1ff51182bed5b720dcef41541092eaf..b9ceaaa95d0253133b38e9a58788bff3f4081e55 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -5,15 +5,17 @@
 # Translators:
 # Mirodin <blobbyjj@ymail.com>, 2012
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # AndryXY <mibunrui@gmx.de>, 2013
+# Pwnicorn <pwnicorndev@gmail.com>, 2013
 # seeed <seeed@freenet.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-29 01:56-0400\n"
+"PO-Revision-Date: 2013-07-28 16:10+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,12 +28,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Authentifikation"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr ""
+msgid "Address: "
+msgstr "Addresse: "
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prÃ¼ft die Antwort und wird die Statuscodes 401 und 403 als ungÃ¼ltige Daten und alle anderen Antworten als gÃ¼ltige Daten interpretieren."
+msgstr "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prÃ¼ft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungÃ¼ltige Daten interpretieren und alle anderen Antworten als gÃ¼ltige Daten."
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..621763a9b8ede46cb7d7e7aa88a84c9706894982
--- /dev/null
+++ b/l10n/de_AT/core.po
@@ -0,0 +1,635 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# I Robot <owncloud-bot@tmit.eu>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared Â»%sÂ« with you"
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:33
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:43
+msgid "January"
+msgstr ""
+
+#: js/config.php:44
+msgid "February"
+msgstr ""
+
+#: js/config.php:45
+msgid "March"
+msgstr ""
+
+#: js/config.php:46
+msgid "April"
+msgstr ""
+
+#: js/config.php:47
+msgid "May"
+msgstr ""
+
+#: js/config.php:48
+msgid "June"
+msgstr ""
+
+#: js/config.php:49
+msgid "July"
+msgstr ""
+
+#: js/config.php:50
+msgid "August"
+msgstr ""
+
+#: js/config.php:51
+msgid "September"
+msgstr ""
+
+#: js/config.php:52
+msgid "October"
+msgstr ""
+
+#: js/config.php:53
+msgid "November"
+msgstr ""
+
+#: js/config.php:54
+msgid "December"
+msgstr ""
+
+#: js/js.js:355
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:815
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:818
+msgid "today"
+msgstr ""
+
+#: js/js.js:819
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:821
+msgid "last month"
+msgstr ""
+
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:823
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:824
+msgid "last year"
+msgstr ""
+
+#: js/js.js:825
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:122
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
+
+#: js/oc-dialogs.js:164
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr ""
+
+#: js/share.js:131 js/share.js:683
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:183
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr ""
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:203
+msgid "Send"
+msgstr ""
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:243
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:281
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:317
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:338
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:350
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:352
+msgid "access control"
+msgstr ""
+
+#: js/share.js:355
+msgid "create"
+msgstr ""
+
+#: js/share.js:358
+msgid "update"
+msgstr ""
+
+#: js/share.js:361
+msgid "delete"
+msgstr ""
+
+#: js/share.js:364
+msgid "share"
+msgstr ""
+
+#: js/share.js:398 js/share.js:630
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:643
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:655
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:670
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:681
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:66
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:34
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:39
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:41
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:47
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..c6a4736092c7b188e0d1d4e0547ad24c844fe8b7
--- /dev/null
+++ b/l10n/de_AT/files.po
@@ -0,0 +1,346 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:123
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr ""
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:194
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:303 js/filelist.js:305
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:303 js/filelist.js:305
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:303
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:303 js/filelist.js:305
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:350
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:350
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:375
+msgid "perform delete operation"
+msgstr ""
+
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:520
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:231
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:344
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:744 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:745 templates/index.php:78
+msgid "Size"
+msgstr ""
+
+#: js/files.js:746 templates/index.php:80
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You donâ€™t have write permissions here."
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:105
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:107
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:112
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Current scanning"
+msgstr ""
+
+#: templates/part.list.php:74
+msgid "directory"
+msgstr ""
+
+#: templates/part.list.php:76
+msgid "directories"
+msgstr ""
+
+#: templates/part.list.php:85
+msgid "file"
+msgstr ""
+
+#: templates/part.list.php:87
+msgid "files"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/de_AT/files_encryption.po b/l10n/de_AT/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..59daa54beab84f48b383bc6a2924cf006f41590e
--- /dev/null
+++ b/l10n/de_AT/files_encryption.po
@@ -0,0 +1,176 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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."
+msgstr ""
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/de_AT/files_external.po b/l10n/de_AT/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..8eaf2edc158bf0a386857fcb5c195c66a4b8062a
--- /dev/null
+++ b/l10n/de_AT/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:448
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:451
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:454
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..4e09271a0bb84356cb339d02ff9d3634b030c4b8
--- /dev/null
+++ b/l10n/de_AT/files_sharing.po
@@ -0,0 +1,80 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:26 templates/public.php:88
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:85
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/de_AT/files_trashbin.po b/l10n/de_AT/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..a05dc1411b2fa2608006ab8174e61bed04c8aace
--- /dev/null
+++ b/l10n/de_AT/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:100
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:36
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:127
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:182 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:183 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/de_AT/files_versions.po b/l10n/de_AT/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..8abfcfe23adda0f0a3aa43d9affad0f873be474c
--- /dev/null
+++ b/l10n/de_AT/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:149
+msgid "Restore"
+msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..0984165a8405a55878beb380c86da6f6d13a53e6
--- /dev/null
+++ b/l10n/de_AT/lib.po
@@ -0,0 +1,259 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:360
+msgid "Help"
+msgstr ""
+
+#: app.php:373
+msgid "Personal"
+msgstr ""
+
+#: app.php:384
+msgid "Settings"
+msgstr ""
+
+#: app.php:396
+msgid "Users"
+msgstr ""
+
+#: app.php:409
+msgid "Admin"
+msgstr ""
+
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
+msgid "couldn't be determined"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template/functions.php:80
+msgid "seconds ago"
+msgstr ""
+
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:83
+msgid "today"
+msgstr ""
+
+#: template/functions.php:84
+msgid "yesterday"
+msgstr ""
+
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:86
+msgid "last month"
+msgstr ""
+
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:88
+msgid "last year"
+msgstr ""
+
+#: template/functions.php:89
+msgid "years ago"
+msgstr ""
+
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..97a2d199c8e344e3a4718ad8d3951091062ce1d3
--- /dev/null
+++ b/l10n/de_AT/settings.po
@@ -0,0 +1,516 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:11
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:35
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:41 js/apps.js:81
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:60
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:98
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:101
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:118
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:164
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:428
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:429 js/users.js:435 js/users.js:450
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:434
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:37 personal.php:38
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:101
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:111
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
+
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
+
+#: templates/admin.php:128
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:142
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:161
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:168
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:171
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:178
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:191
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:199
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:244
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:250 templates/personal.php:114
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:254 templates/personal.php:117
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:58 templates/users.php:85
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:85 templates/personal.php:86
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:104
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:106
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr ""
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:142
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:157
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:91
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:102
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:106
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:137
+msgid "Default"
+msgstr ""
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..2affcc0727d5a32b59be58a49f7eb874837169a7
--- /dev/null
+++ b/l10n/de_AT/user_ldap.po
@@ -0,0 +1,419 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:55
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:56
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:78
+#, php-format
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Help"
+msgstr ""
diff --git a/l10n/de_AT/user_webdavauth.po b/l10n/de_AT/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..c63e57c165e5b3acf489bcdcfecc3c9e8d924d33
--- /dev/null
+++ b/l10n/de_AT/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_AT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..78e1a2ea08345a9d0b8a265338c38320afdd9d46
--- /dev/null
+++ b/l10n/de_CH/core.po
@@ -0,0 +1,642 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# arkascha <foss@christian-reiner.info>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
+# SteinQuadrat, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared Â»%sÂ« with you"
+msgstr "%s teilt Â»%sÂ« mit Ihnen"
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr "Kategorie nicht angegeben."
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr "Keine Kategorie hinzuzufÃ¼gen?"
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Die nachfolgende Kategorie existiert bereits: %s"
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr "Objekttyp nicht angegeben."
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr "%s ID nicht angegeben."
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr "Fehler beim HinzufÃ¼gen von %s zu den Favoriten."
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr "Es wurden keine Kategorien zum LÃ¶schen ausgewÃ¤hlt."
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr "Fehler beim Entfernen von %s von den Favoriten."
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: js/config.php:33
+msgid "Monday"
+msgstr "Montag"
+
+#: js/config.php:34
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: js/config.php:35
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: js/config.php:36
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: js/config.php:37
+msgid "Friday"
+msgstr "Freitag"
+
+#: js/config.php:38
+msgid "Saturday"
+msgstr "Samstag"
+
+#: js/config.php:43
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:44
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:45
+msgid "March"
+msgstr "MÃ¤rz"
+
+#: js/config.php:46
+msgid "April"
+msgstr "April"
+
+#: js/config.php:47
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:48
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:49
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:50
+msgid "August"
+msgstr "August"
+
+#: js/config.php:51
+msgid "September"
+msgstr "September"
+
+#: js/config.php:52
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:53
+msgid "November"
+msgstr "November"
+
+#: js/config.php:54
+msgid "December"
+msgstr "Dezember"
+
+#: js/js.js:355
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: js/js.js:815
+msgid "seconds ago"
+msgstr "Gerade eben"
+
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:818
+msgid "today"
+msgstr "Heute"
+
+#: js/js.js:819
+msgid "yesterday"
+msgstr "Gestern"
+
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:821
+msgid "last month"
+msgstr "Letzten Monat"
+
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:823
+msgid "months ago"
+msgstr "Vor Monaten"
+
+#: js/js.js:824
+msgid "last year"
+msgstr "Letztes Jahr"
+
+#: js/js.js:825
+msgid "years ago"
+msgstr "Vor Jahren"
+
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "AuswÃ¤hlen"
+
+#: js/oc-dialogs.js:122
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr "Es ist ein Fehler in der Vorlage des Datei-AuswÃ¤hlers aufgetreten."
+
+#: js/oc-dialogs.js:164
+msgid "Yes"
+msgstr "Ja"
+
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nein"
+
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr "OK"
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr "Der Objekttyp ist nicht angegeben."
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
+msgid "Error"
+msgstr "Fehler"
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr "Der App-Name ist nicht angegeben."
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr "Die benÃ¶tigte Datei {file} ist nicht installiert!"
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr "Geteilt"
+
+#: js/share.js:90
+msgid "Share"
+msgstr "Teilen"
+
+#: js/share.js:131 js/share.js:683
+msgid "Error while sharing"
+msgstr "Fehler beim Teilen"
+
+#: js/share.js:142
+msgid "Error while unsharing"
+msgstr "Fehler beim Aufheben der Freigabe"
+
+#: js/share.js:149
+msgid "Error while changing permissions"
+msgstr "Fehler bei der Ã„nderung der Rechte"
+
+#: js/share.js:158
+msgid "Shared with you and the group {group} by {owner}"
+msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
+
+#: js/share.js:160
+msgid "Shared with you by {owner}"
+msgstr "Von {owner} mit Ihnen geteilt."
+
+#: js/share.js:183
+msgid "Share with"
+msgstr "Teilen mit"
+
+#: js/share.js:188
+msgid "Share with link"
+msgstr "Ãœber einen Link teilen"
+
+#: js/share.js:191
+msgid "Password protect"
+msgstr "Passwortschutz"
+
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+msgid "Password"
+msgstr "Passwort"
+
+#: js/share.js:198
+msgid "Allow Public Upload"
+msgstr "Ã–ffentliches Hochladen erlauben"
+
+#: js/share.js:202
+msgid "Email link to person"
+msgstr "Link per E-Mail verschicken"
+
+#: js/share.js:203
+msgid "Send"
+msgstr "Senden"
+
+#: js/share.js:208
+msgid "Set expiration date"
+msgstr "Ein Ablaufdatum setzen"
+
+#: js/share.js:209
+msgid "Expiration date"
+msgstr "Ablaufdatum"
+
+#: js/share.js:241
+msgid "Share via email:"
+msgstr "Mittels einer E-Mail teilen:"
+
+#: js/share.js:243
+msgid "No people found"
+msgstr "Niemand gefunden"
+
+#: js/share.js:281
+msgid "Resharing is not allowed"
+msgstr "Das Weiterverteilen ist nicht erlaubt"
+
+#: js/share.js:317
+msgid "Shared in {item} with {user}"
+msgstr "Freigegeben in {item} von {user}"
+
+#: js/share.js:338
+msgid "Unshare"
+msgstr "Freigabe aufheben"
+
+#: js/share.js:350
+msgid "can edit"
+msgstr "kann bearbeiten"
+
+#: js/share.js:352
+msgid "access control"
+msgstr "Zugriffskontrolle"
+
+#: js/share.js:355
+msgid "create"
+msgstr "erstellen"
+
+#: js/share.js:358
+msgid "update"
+msgstr "aktualisieren"
+
+#: js/share.js:361
+msgid "delete"
+msgstr "lÃ¶schen"
+
+#: js/share.js:364
+msgid "share"
+msgstr "teilen"
+
+#: js/share.js:398 js/share.js:630
+msgid "Password protected"
+msgstr "PasswortgeschÃ¼tzt"
+
+#: js/share.js:643
+msgid "Error unsetting expiration date"
+msgstr "Fehler beim Entfernen des Ablaufdatums"
+
+#: js/share.js:655
+msgid "Error setting expiration date"
+msgstr "Fehler beim Setzen des Ablaufdatums"
+
+#: js/share.js:670
+msgid "Sending ..."
+msgstr "Sende ..."
+
+#: js/share.js:681
+msgid "Email sent"
+msgstr "Email gesendet"
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
+
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurÃ¼ckzusetzen: {link}"
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr "Der Link zum RÃ¼cksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernÃ¼nftigen Zeitspanne erhalten, prÃ¼fen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator."
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?"
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurÃ¼ckzusetzen."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
+#: templates/login.php:19
+msgid "Username"
+msgstr "Benutzername"
+
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Ihre Dateien sind verschlÃ¼sselt. Wenn Sie den WiederherstellungsschlÃ¼ssel nicht aktiviert haben, wird es keine MÃ¶glichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurÃ¼ckgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ja, ich mÃ¶chte jetzt mein Passwort wirklich zurÃ¼cksetzen."
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Request reset"
+msgstr "ZurÃ¼cksetzung anfordern"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Ihr Passwort wurde zurÃ¼ckgesetzt."
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "Zur Login-Seite"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Neues Passwort"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Passwort zurÃ¼cksetzen"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "PersÃ¶nlich"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Benutzer"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Apps"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Administrator"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Hilfe"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr "Zugriff verboten"
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr "Cloud wurde nicht gefunden"
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele GrÃ¼sse!"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr "Kategorien Ã¤ndern"
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr "HinzufÃ¼gen"
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr "Sicherheitshinweis"
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar"
+
+#: templates/installation.php:26
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu kÃ¶nnen."
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr "Es ist kein sicherer Zufallszahlengenerator verfÃ¼gbar, bitte aktivieren Sie die PHP-Erweiterung fÃ¼r OpenSSL."
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens fÃ¼r das ZurÃ¼cksetzen der PasswÃ¶rter vorherzusehen und Ihr Konto zu Ã¼bernehmen."
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
+
+#: templates/installation.php:41
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "FÃ¼r Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>."
+
+#: templates/installation.php:47
+msgid "Create an <strong>admin account</strong>"
+msgstr "<strong>Administrator-Konto</strong> anlegen"
+
+#: templates/installation.php:65
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
+#: templates/installation.php:67
+msgid "Data folder"
+msgstr "Datenverzeichnis"
+
+#: templates/installation.php:77
+msgid "Configure the database"
+msgstr "Datenbank einrichten"
+
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
+msgid "will be used"
+msgstr "wird verwendet"
+
+#: templates/installation.php:140
+msgid "Database user"
+msgstr "Datenbank-Benutzer"
+
+#: templates/installation.php:147
+msgid "Database password"
+msgstr "Datenbank-Passwort"
+
+#: templates/installation.php:152
+msgid "Database name"
+msgstr "Datenbank-Name"
+
+#: templates/installation.php:160
+msgid "Database tablespace"
+msgstr "Datenbank-Tablespace"
+
+#: templates/installation.php:167
+msgid "Database host"
+msgstr "Datenbank-Host"
+
+#: templates/installation.php:175
+msgid "Finish setup"
+msgstr "Installation abschliessen"
+
+#: templates/layout.user.php:41
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s ist verfÃ¼gbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
+
+#: templates/layout.user.php:66
+msgid "Log out"
+msgstr "Abmelden"
+
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr "Automatische Anmeldung verweigert!"
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geÃ¤ndert haben, kÃ¶nnte Ihr\nAccount kompromittiert sein!"
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr "Bitte Ã¤ndern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
+
+#: templates/login.php:34
+msgid "Lost your password?"
+msgstr "Passwort vergessen?"
+
+#: templates/login.php:39
+msgid "remember"
+msgstr "merken"
+
+#: templates/login.php:41
+msgid "Log in"
+msgstr "Einloggen"
+
+#: templates/login.php:47
+msgid "Alternative Logins"
+msgstr "Alternative Logins"
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele GrÃ¼sse!"
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "ZurÃ¼ck"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "Weiter"
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c11b8866e7abe9231051bc0cce0337e090ed081
--- /dev/null
+++ b/l10n/de_CH/files.po
@@ -0,0 +1,354 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
+# SteinQuadrat, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits."
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr "Konnte %s nicht verschieben"
+
+#: ajax/upload.php:16 ajax/upload.php:45
+msgid "Unable to set upload directory."
+msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
+
+#: ajax/upload.php:22
+msgid "Invalid Token"
+msgstr "UngÃ¼ltiges Merkmal"
+
+#: ajax/upload.php:59
+msgid "No file was uploaded. Unknown error"
+msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
+
+#: ajax/upload.php:66
+msgid "There is no error, the file uploaded with success"
+msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
+
+#: ajax/upload.php:67
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "Die hochgeladene Datei Ã¼berschreitet die upload_max_filesize Vorgabe in php.ini"
+
+#: ajax/upload.php:69
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "Die Datei ist grÃ¶sser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist"
+
+#: ajax/upload.php:70
+msgid "The uploaded file was only partially uploaded"
+msgstr "Die Datei konnte nur teilweise Ã¼bertragen werden"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded"
+msgstr "Keine Datei konnte Ã¼bertragen werden."
+
+#: ajax/upload.php:72
+msgid "Missing a temporary folder"
+msgstr "Kein temporÃ¤rer Ordner vorhanden"
+
+#: ajax/upload.php:73
+msgid "Failed to write to disk"
+msgstr "Fehler beim Schreiben auf die Festplatte"
+
+#: ajax/upload.php:91
+msgid "Not enough storage available"
+msgstr "Nicht genug Speicher vorhanden."
+
+#: ajax/upload.php:123
+msgid "Invalid directory."
+msgstr "UngÃ¼ltiges Verzeichnis."
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr "Dateien"
+
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist."
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "Nicht genÃ¼gend Speicherplatz verfÃ¼gbar"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "Upload abgebrochen."
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Dateiupload lÃ¤uft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "Die URL darf nicht leer sein."
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "UngÃ¼ltiger Ordnername. Die Verwendung von Â«SharedÂ» ist ownCloud vorbehalten."
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "Fehler"
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Teilen"
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr "EndgÃ¼ltig lÃ¶schen"
+
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "LÃ¶schen"
+
+#: js/fileactions.js:194
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
+msgid "Pending"
+msgstr "Ausstehend"
+
+#: js/filelist.js:303 js/filelist.js:305
+msgid "{new_name} already exists"
+msgstr "{new_name} existiert bereits"
+
+#: js/filelist.js:303 js/filelist.js:305
+msgid "replace"
+msgstr "ersetzen"
+
+#: js/filelist.js:303
+msgid "suggest name"
+msgstr "Namen vorschlagen"
+
+#: js/filelist.js:303 js/filelist.js:305
+msgid "cancel"
+msgstr "abbrechen"
+
+#: js/filelist.js:350
+msgid "replaced {new_name} with {old_name}"
+msgstr "{old_name} wurde ersetzt durch {new_name}"
+
+#: js/filelist.js:350
+msgid "undo"
+msgstr "rÃ¼ckgÃ¤ngig machen"
+
+#: js/filelist.js:375
+msgid "perform delete operation"
+msgstr "LÃ¶schvorgang ausfÃ¼hren"
+
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:520
+msgid "files uploading"
+msgstr "Dateien werden hoch geladen"
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr "'.' ist kein gÃ¼ltiger Dateiname."
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr "Der Dateiname darf nicht leer sein."
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "UngÃ¼ltiger Name, Â«\\Â», Â«/Â», Â«<Â», Â«>Â», Â«:Â», Â«\"Â», Â«|Â», Â«?Â» und Â«*Â» sind nicht zulÃ¤ssig."
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Ihr Speicher ist voll, daher kÃ¶nnen keine Dateien mehr aktualisiert oder synchronisiert werden!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
+
+#: js/files.js:231
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Ihr Download wird vorbereitet. Dies kann bei grÃ¶sseren Dateien etwas dauern."
+
+#: js/files.js:344
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr "UngÃ¼ltiger Verzeichnisname. Die Nutzung von Â«SharedÂ» ist ownCloud vorbehalten"
+
+#: js/files.js:744 templates/index.php:67
+msgid "Name"
+msgstr "Name"
+
+#: js/files.js:745 templates/index.php:78
+msgid "Size"
+msgstr "GrÃ¶sse"
+
+#: js/files.js:746 templates/index.php:80
+msgid "Modified"
+msgstr "GeÃ¤ndert"
+
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/app.php:73
+#, php-format
+msgid "%s could not be renamed"
+msgstr "%s konnte nicht umbenannt werden"
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Hochladen"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr "Dateibehandlung"
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "Maximale Upload-GrÃ¶sse"
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr "maximal mÃ¶glich:"
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr "FÃ¼r Mehrfachdatei- und Ordnerdownloads benÃ¶tigt:"
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr "ZIP-Download aktivieren"
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr "0 bedeutet unbegrenzt"
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr "Maximale GrÃ¶sse fÃ¼r ZIP-Dateien"
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr "Speichern"
+
+#: templates/index.php:7
+msgid "New"
+msgstr "Neu"
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr "Textdatei"
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr "Ordner"
+
+#: templates/index.php:14
+msgid "From link"
+msgstr "Von einem Link"
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr "GelÃ¶schte Dateien"
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr "Upload abbrechen"
+
+#: templates/index.php:52
+msgid "You donâ€™t have write permissions here."
+msgstr "Sie haben hier keine Schreib-Berechtigungen."
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr "Alles leer. Laden Sie etwas hoch!"
+
+#: templates/index.php:73
+msgid "Download"
+msgstr "Herunterladen"
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Unshare"
+msgstr "Freigabe aufheben"
+
+#: templates/index.php:105
+msgid "Upload too large"
+msgstr "Der Upload ist zu gross"
+
+#: templates/index.php:107
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Die Datei Ã¼berschreitet die MaximalgrÃ¶sse fÃ¼r Uploads auf diesem Server."
+
+#: templates/index.php:112
+msgid "Files are being scanned, please wait."
+msgstr "Dateien werden gescannt, bitte warten."
+
+#: templates/index.php:115
+msgid "Current scanning"
+msgstr "Scanne"
+
+#: templates/part.list.php:74
+msgid "directory"
+msgstr "Verzeichnis"
+
+#: templates/part.list.php:76
+msgid "directories"
+msgstr "Verzeichnisse"
+
+#: templates/part.list.php:85
+msgid "file"
+msgstr "Datei"
+
+#: templates/part.list.php:87
+msgid "files"
+msgstr "Dateien"
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..3f0472c11a8a4ee9c065d2c13c3b6bec5b3e463b
--- /dev/null
+++ b/l10n/de_CH/files_encryption.po
@@ -0,0 +1,181 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# ako84 <a0306265@unet.univie.ac.at>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Der WiederherstellungsschlÃ¼ssel wurde erfolgreich aktiviert."
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Der WiederherstellungsschlÃ¼ssel konnte nicht aktiviert werden. Bitte Ã¼berprÃ¼fen Sie das Passwort fÃ¼r den WiederherstellungsschlÃ¼ssel!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Der WiederherstellungsschlÃ¼ssel wurde erfolgreich deaktiviert."
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Der WiederherstellungsschlÃ¼ssel konnte nicht deaktiviert werden. Bitte Ã¼berprÃ¼fen Sie das Passwort fÃ¼r den WiederherstellungsschlÃ¼ssel!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Das Passwort wurde erfolgreich geÃ¤ndert."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Das Passwort konnte nicht geÃ¤ndert werden. Vielleicht war das alte Passwort nicht richtig."
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Das Passwort des privaten SchlÃ¼ssels wurde erfolgreich aktualisiert."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Das Passwort des privaten SchlÃ¼ssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig."
+
+#: files/error.php:7
+msgid ""
+"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."
+msgstr "Ihr privater SchlÃ¼ssel ist ungÃ¼ltig. MÃ¶glicher Weise wurde von ausserhalb 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."
+
+#: hooks/hooks.php:44
+msgid "Missing requirements."
+msgstr "Fehlende Voraussetzungen"
+
+#: hooks/hooks.php:45
+msgid ""
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "FÃ¼r folgende Nutzer ist keine VerschlÃ¼sselung eingerichtet:"
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "Ihr privater SchlÃ¼ssel ist ungÃ¼ltig! Vielleicht wurde Ihr Passwort von ausserhalb geÃ¤ndert."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Sie kÃ¶nnen den privaten SchlÃ¼ssel Ã¤ndern und zwar in Ihrem"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "PersÃ¶nliche Einstellungen"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr "VerschlÃ¼sselung"
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Aktivieren Sie den WiederherstellungsschlÃ¼ssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
+
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr "WiederherstellungschlÃ¼sselpasswort"
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "WiederherstellungsschlÃ¼sselpasswort Ã¤ndern"
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "Altes WiederherstellungsschlÃ¼sselpasswort"
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr "Neues WiederherstellungsschlÃ¼sselpasswort "
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr "Passwort Ã¤ndern"
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "Das PrivatschlÃ¼sselpasswort darf nicht lÃ¤nger mit den Login-Passwort Ã¼bereinstimmen."
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Setzen Sie Ihr altes PrivatschlÃ¼sselpasswort auf Ihr aktuelles LogIn-Passwort."
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern kÃ¶nnen, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Altes Login-Passwort"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Momentanes Login-Passwort"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Das Passwort des privaten SchlÃ¼ssels aktualisieren"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Die Passwort-Wiederherstellung aktivieren:"
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr "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."
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr "Die Einstellungen fÃ¼r die Dateiwiederherstellung wurden aktualisiert."
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_CH/files_external.po b/l10n/de_CH/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..8d124a52de5003a9a08a62d89391cd6895f2bcc6
--- /dev/null
+++ b/l10n/de_CH/files_external.po
@@ -0,0 +1,124 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 14:02+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+msgid "Access granted"
+msgstr "Zugriff gestattet"
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr "Fehler beim Einrichten von Dropbox"
+
+#: js/dropbox.js:65 js/google.js:86
+msgid "Grant access"
+msgstr "Zugriff gestatten"
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr "Bitte tragen Sie einen gÃ¼ltigen Dropbox-App-Key mit Secret ein."
+
+#: js/google.js:42 js/google.js:121
+msgid "Error configuring Google Drive storage"
+msgstr "Fehler beim Einrichten von Google Drive"
+
+#: lib/config.php:448
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr "<b>Warnung:</b> Â«smbclientÂ» ist nicht installiert. Das EinhÃ¤ngen von CIFS/SMB-Freigaben ist nicht mÃ¶glich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
+
+#: lib/config.php:451
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr "<b>Warnung::</b> Die FTP UnterstÃ¼tzung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
+
+#: lib/config.php:454
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr "<b>Achtung:</b> Die Curl-UnterstÃ¼tzung  von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht mÃ¶glich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren."
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr "Externer Speicher"
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr "Ordnername"
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr "Externer Speicher"
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr "Optionen"
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr "Zutreffend"
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr "Speicher hinzufÃ¼gen"
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr "Nicht definiert"
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr "Alle Benutzer"
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr "Gruppen"
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr "Benutzer"
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr "LÃ¶schen"
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr "Externen Speicher fÃ¼r Benutzer aktivieren"
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden"
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr "SSL-Root-Zertifikate"
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..c17931aa32bbc9a596356d46fe8b8d1fcf469160
--- /dev/null
+++ b/l10n/de_CH/files_sharing.po
@@ -0,0 +1,83 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 14:30+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "The password is wrong. Try again."
+msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
+
+#: templates/authenticate.php:7
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/authenticate.php:9
+msgid "Submit"
+msgstr "BestÃ¤tigen"
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "GrÃ¼nde kÃ¶nnten sein:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Das Element wurde entfernt"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "Der Link ist abgelaufen"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "Teilen ist deaktiviert"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "FÃ¼r mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
+
+#: templates/public.php:15
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr "%s hat den Ordner %s mit Ihnen geteilt"
+
+#: templates/public.php:18
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr "%s hat die Datei %s mit Ihnen geteilt"
+
+#: templates/public.php:26 templates/public.php:88
+msgid "Download"
+msgstr "Herunterladen"
+
+#: templates/public.php:43 templates/public.php:46
+msgid "Upload"
+msgstr "Hochladen"
+
+#: templates/public.php:56
+msgid "Cancel upload"
+msgstr "Upload abbrechen"
+
+#: templates/public.php:85
+msgid "No preview available for"
+msgstr "Es ist keine Vorschau verfÃ¼gbar fÃ¼r"
diff --git a/l10n/de_CH/files_trashbin.po b/l10n/de_CH/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..1d80e2f4371bad1f5e42d4a26b49bb193d22e347
--- /dev/null
+++ b/l10n/de_CH/files_trashbin.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Konnte %s nicht dauerhaft lÃ¶schen"
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Konnte %s nicht wiederherstellen"
+
+#: js/trash.js:7 js/trash.js:100
+msgid "perform restore operation"
+msgstr "Wiederherstellung ausfÃ¼hren"
+
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+msgid "Error"
+msgstr "Fehler"
+
+#: js/trash.js:36
+msgid "delete file permanently"
+msgstr "Datei dauerhaft lÃ¶schen"
+
+#: js/trash.js:127
+msgid "Delete permanently"
+msgstr "EndgÃ¼ltig lÃ¶schen"
+
+#: js/trash.js:182 templates/index.php:17
+msgid "Name"
+msgstr "Name"
+
+#: js/trash.js:183 templates/index.php:27
+msgid "Deleted"
+msgstr "GelÃ¶scht"
+
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Wiederhergestellt"
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Nichts zu lÃ¶schen, Ihr Papierkorb ist leer!"
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr "Wiederherstellen"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "LÃ¶schen"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr "GelÃ¶schte Dateien"
diff --git a/l10n/de_CH/files_versions.po b/l10n/de_CH/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..d055e276f7ae4336455ee49f66df62fa268564b2
--- /dev/null
+++ b/l10n/de_CH/files_versions.po
@@ -0,0 +1,45 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 14:02+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr "Konnte %s nicht zurÃ¼cksetzen"
+
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versionen"
+
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Konnte {file} der Revision {timestamp} nicht rÃ¼ckgÃ¤nging machen."
+
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Mehrere Versionen..."
+
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Keine anderen Versionen verfÃ¼gbar"
+
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Wiederherstellen"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..b694523ffe88671348b7a16d92142916cb6fa501
--- /dev/null
+++ b/l10n/de_CH/lib.po
@@ -0,0 +1,262 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:360
+msgid "Help"
+msgstr "Hilfe"
+
+#: app.php:373
+msgid "Personal"
+msgstr "PersÃ¶nlich"
+
+#: app.php:384
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: app.php:396
+msgid "Users"
+msgstr "Benutzer"
+
+#: app.php:409
+msgid "Admin"
+msgstr "Administrator"
+
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Konnte \"%s\" nicht aktualisieren."
+
+#: defaults.php:35
+msgid "web services under your control"
+msgstr "Web-Services unter Ihrer Kontrolle"
+
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Ã–ffnen von \"%s\" fehlgeschlagen"
+
+#: files.php:226
+msgid "ZIP download is turned off."
+msgstr "Der ZIP-Download ist deaktiviert."
+
+#: files.php:227
+msgid "Files need to be downloaded one by one."
+msgstr "Die Dateien mÃ¼ssen einzeln heruntergeladen werden."
+
+#: files.php:228 files.php:256
+msgid "Back to Files"
+msgstr "ZurÃ¼ck zu \"Dateien\""
+
+#: files.php:253
+msgid "Selected files too large to generate zip file."
+msgstr "Die gewÃ¤hlten Dateien sind zu gross, um eine ZIP-Datei zu erstellen."
+
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Laden Sie die Dateien in kleineren, separaten, StÃ¼cken herunter oder bitten Sie Ihren Administrator."
+
+#: helper.php:235
+msgid "couldn't be determined"
+msgstr "konnte nicht ermittelt werden"
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr "Die Anwendung ist nicht aktiviert"
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr "Authentifizierungs-Fehler"
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr "Token abgelaufen. Bitte laden Sie die Seite neu."
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr "Dateien"
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr "Text"
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr "Bilder"
+
+#: setup/abstractdatabase.php:22
+#, php-format
+msgid "%s enter the database username."
+msgstr "%s geben Sie den Datenbank-Benutzernamen an."
+
+#: setup/abstractdatabase.php:25
+#, php-format
+msgid "%s enter the database name."
+msgstr "%s geben Sie den Datenbank-Namen an."
+
+#: setup/abstractdatabase.php:28
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
+
+#: setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "MS SQL Benutzername und/oder Passwort ungÃ¼ltig: %s"
+
+#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
+#: setup/postgresql.php:24 setup/postgresql.php:70
+msgid "You need to enter either an existing account or the administrator."
+msgstr "Sie mÃ¼ssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
+
+#: setup/mysql.php:12
+msgid "MySQL username and/or password not valid"
+msgstr "MySQL Benutzername und/oder Passwort ungÃ¼ltig"
+
+#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
+#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
+#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
+#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
+#: setup/postgresql.php:125 setup/postgresql.php:134
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr "DB Fehler: \"%s\""
+
+#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
+#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
+#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
+#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr "Fehlerhafter Befehl war: \"%s\""
+
+#: setup/mysql.php:85
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
+
+#: setup/mysql.php:86
+msgid "Drop this user from MySQL"
+msgstr "LÃ¶sche diesen Benutzer aus MySQL"
+
+#: setup/mysql.php:91
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
+
+#: setup/mysql.php:92
+msgid "Drop this user from MySQL."
+msgstr "LÃ¶sche diesen Benutzer aus MySQL."
+
+#: setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr "Die Oracle-Verbindung konnte nicht aufgebaut werden."
+
+#: setup/oci.php:41 setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle Benutzername und/oder Passwort ungÃ¼ltig"
+
+#: setup/oci.php:173 setup/oci.php:205
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
+
+#: setup/postgresql.php:23 setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr "PostgreSQL Benutzername und/oder Passwort ungÃ¼ltig"
+
+#: setup.php:28
+msgid "Set an admin username."
+msgstr "Setze Administrator Benutzername."
+
+#: setup.php:31
+msgid "Set an admin password."
+msgstr "Setze Administrator Passwort"
+
+#: setup.php:184
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
+
+#: setup.php:185
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>."
+
+#: template/functions.php:80
+msgid "seconds ago"
+msgstr "Gerade eben"
+
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:83
+msgid "today"
+msgstr "Heute"
+
+#: template/functions.php:84
+msgid "yesterday"
+msgstr "Gestern"
+
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:86
+msgid "last month"
+msgstr "Letzten Monat"
+
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: template/functions.php:88
+msgid "last year"
+msgstr "Letztes Jahr"
+
+#: template/functions.php:89
+msgid "years ago"
+msgstr "Vor  Jahren"
+
+#: template.php:297
+msgid "Caused by:"
+msgstr "Verursacht durch:"
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "Die Kategorie Â«%sÂ» konnte nicht gefunden werden."
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..776bfefdefddf32d59b42a486f4d09046503a213
--- /dev/null
+++ b/l10n/de_CH/settings.po
@@ -0,0 +1,523 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# arkascha <foss@christian-reiner.info>, 2013
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
+msgid "Authentication error"
+msgstr "Authentifizierungs-Fehler"
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Dein Anzeigename ist geÃ¤ndert worden."
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr "Das Ã„ndern des Anzeigenamens ist nicht mÃ¶glich"
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr "Die Gruppe existiert bereits"
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr "Die Gruppe konnte nicht angelegt werden"
+
+#: ajax/enableapp.php:11
+msgid "Could not enable app. "
+msgstr "Die Anwendung konnte nicht aktiviert werden."
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr "E-Mail-Adresse gespeichert"
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr "UngÃ¼ltige E-Mail-Adresse"
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr "Die Gruppe konnte nicht gelÃ¶scht werden"
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr "Der Benutzer konnte nicht gelÃ¶scht werden"
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr "Sprache geÃ¤ndert"
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr "UngÃ¼ltige Anforderung"
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr "Administratoren kÃ¶nnen sich nicht selbst aus der admin-Gruppe lÃ¶schen"
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr "Der Benutzer konnte nicht zur Gruppe %s hinzugefÃ¼gt werden"
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr "Die App konnte nicht aktualisiert werden."
+
+#: js/apps.js:35
+msgid "Update to {appversion}"
+msgstr "Update zu {appversion}"
+
+#: js/apps.js:41 js/apps.js:81
+msgid "Disable"
+msgstr "Deaktivieren"
+
+#: js/apps.js:41 js/apps.js:69 js/apps.js:88
+msgid "Enable"
+msgstr "Aktivieren"
+
+#: js/apps.js:60
+msgid "Please wait...."
+msgstr "Bitte warten...."
+
+#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
+msgid "Error"
+msgstr "Fehler"
+
+#: js/apps.js:95
+msgid "Updating...."
+msgstr "Update..."
+
+#: js/apps.js:98
+msgid "Error while updating app"
+msgstr "Es ist ein Fehler wÃ¤hrend des Updates aufgetreten"
+
+#: js/apps.js:101
+msgid "Updated"
+msgstr "Aktualisiert"
+
+#: js/personal.js:118
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: js/users.js:47
+msgid "deleted"
+msgstr "gelÃ¶scht"
+
+#: js/users.js:47
+msgid "undo"
+msgstr "rÃ¼ckgÃ¤ngig machen"
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr "Der Benutzer konnte nicht entfernt werden."
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
+msgid "Groups"
+msgstr "Gruppen"
+
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
+msgid "Group Admin"
+msgstr "Gruppenadministrator"
+
+#: js/users.js:115 templates/users.php:164
+msgid "Delete"
+msgstr "LÃ¶schen"
+
+#: js/users.js:269
+msgid "add group"
+msgstr "Gruppe hinzufÃ¼gen"
+
+#: js/users.js:428
+msgid "A valid username must be provided"
+msgstr "Es muss ein gÃ¼ltiger Benutzername angegeben werden"
+
+#: js/users.js:429 js/users.js:435 js/users.js:450
+msgid "Error creating user"
+msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
+
+#: js/users.js:434
+msgid "A valid password must be provided"
+msgstr "Es muss ein gÃ¼ltiges Passwort angegeben werden"
+
+#: personal.php:37 personal.php:38
+msgid "__language_name__"
+msgstr "Deutsch (FÃ¶rmlich: Sie)"
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr "Sicherheitshinweis"
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Ihr Datenverzeichnis und Ihre Dateien sind mÃ¶glicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht lÃ¤nger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers."
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr "Einrichtungswarnung"
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Bitte Ã¼berprÃ¼fen Sie die <a href=\"%s\">Instalationsanleitungen</a>."
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr "Das Modul 'fileinfo' fehlt"
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr "Die Lokalisierung funktioniert nicht"
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "Die System-LÃ¤ndereinstellung kann nicht auf %s geÃ¤ndert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren."
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr "Keine Internetverbindung"
+
+#: templates/admin.php:78
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:101
+msgid "Execute one task with each page loaded"
+msgstr "Eine Aufgabe bei jedem Laden der Seite ausfÃ¼hren"
+
+#: templates/admin.php:111
+msgid ""
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minÃ¼tlich per HTTP aufruft."
+
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Benutzen Sie den System-Crondienst um die cron.php minÃ¼tlich aufzurufen."
+
+#: templates/admin.php:128
+msgid "Sharing"
+msgstr "Teilen"
+
+#: templates/admin.php:134
+msgid "Enable Share API"
+msgstr "Share-API aktivieren"
+
+#: templates/admin.php:135
+msgid "Allow apps to use the Share API"
+msgstr "Anwendungen erlauben, die Share-API zu benutzen"
+
+#: templates/admin.php:142
+msgid "Allow links"
+msgstr "Links erlauben"
+
+#: templates/admin.php:143
+msgid "Allow users to share items to the public with links"
+msgstr "Benutzern erlauben, Inhalte per Ã¶ffentlichem Link zu teilen"
+
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Erlaube Ã¶ffentliches hochladen"
+
+#: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren Ã¶ffentlich freigegebene Ordner hochladen zu dÃ¼rfen"
+
+#: templates/admin.php:160
+msgid "Allow resharing"
+msgstr "Erlaube Weiterverteilen"
+
+#: templates/admin.php:161
+msgid "Allow users to share items shared with them again"
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
+
+#: templates/admin.php:168
+msgid "Allow users to share with anyone"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
+
+#: templates/admin.php:171
+msgid "Allow users to only share with users in their groups"
+msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
+
+#: templates/admin.php:178
+msgid "Security"
+msgstr "Sicherheit"
+
+#: templates/admin.php:191
+msgid "Enforce HTTPS"
+msgstr "HTTPS erzwingen"
+
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung zu %s zu verbinden."
+
+#: templates/admin.php:199
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Bitte verbinden Sie sich zu Ihrem %s Ã¼ber HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
+
+#: templates/admin.php:211
+msgid "Log"
+msgstr "Log"
+
+#: templates/admin.php:212
+msgid "Log level"
+msgstr "Log-Level"
+
+#: templates/admin.php:243
+msgid "More"
+msgstr "Mehr"
+
+#: templates/admin.php:244
+msgid "Less"
+msgstr "Weniger"
+
+#: templates/admin.php:250 templates/personal.php:114
+msgid "Version"
+msgstr "Version"
+
+#: templates/admin.php:254 templates/personal.php:117
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr "FÃ¼gen Sie Ihre Anwendung hinzu"
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr "Weitere Anwendungen"
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr "WÃ¤hlen Sie eine Anwendung aus"
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
+
+#: templates/apps.php:43
+msgid "Update"
+msgstr "Update durchfÃ¼hren"
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentation fÃ¼r Benutzer"
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr "Dokumentation fÃ¼r Administratoren"
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr "Online-Dokumentation"
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr "Forum"
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr "Bugtracker"
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr "Kommerzieller Support"
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr "Den Einrichtungsassistenten erneut anzeigen"
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Sie verwenden <strong>%s</strong> der verfÃ¼gbaren <strong>%s</strong>"
+
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr "Ihr Passwort wurde geÃ¤ndert."
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr "Das Passwort konnte nicht geÃ¤ndert werden"
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr "Aktuelles Passwort"
+
+#: templates/personal.php:44
+msgid "New password"
+msgstr "Neues Passwort"
+
+#: templates/personal.php:46
+msgid "Change password"
+msgstr "Passwort Ã¤ndern"
+
+#: templates/personal.php:58 templates/users.php:85
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#: templates/personal.php:73
+msgid "Email"
+msgstr "E-Mail"
+
+#: templates/personal.php:75
+msgid "Your email address"
+msgstr "Ihre E-Mail-Adresse"
+
+#: templates/personal.php:76
+msgid "Fill in an email address to enable password recovery"
+msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
+
+#: templates/personal.php:85 templates/personal.php:86
+msgid "Language"
+msgstr "Sprache"
+
+#: templates/personal.php:98
+msgid "Help translate"
+msgstr "Helfen Sie bei der Ãœbersetzung"
+
+#: templates/personal.php:104
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/personal.php:106
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
+"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
+
+#: templates/users.php:21
+msgid "Login Name"
+msgstr "Loginname"
+
+#: templates/users.php:30
+msgid "Create"
+msgstr "Erstellen"
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr "Admin-Passwort-Wiederherstellung"
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wÃ¤hrend PasswortÃ¤nderung wiederherzustellen"
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr "Standard-Speicher"
+
+#: templates/users.php:48 templates/users.php:142
+msgid "Unlimited"
+msgstr "Unbegrenzt"
+
+#: templates/users.php:66 templates/users.php:157
+msgid "Other"
+msgstr "Andere"
+
+#: templates/users.php:84
+msgid "Username"
+msgstr "Benutzername"
+
+#: templates/users.php:91
+msgid "Storage"
+msgstr "Speicher"
+
+#: templates/users.php:102
+msgid "change display name"
+msgstr "Anzeigenamen Ã¤ndern"
+
+#: templates/users.php:106
+msgid "set new password"
+msgstr "Neues Passwort setzen"
+
+#: templates/users.php:137
+msgid "Default"
+msgstr "Standard"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..20049b695c2eb9274d732561744cc2d71f46082f
--- /dev/null
+++ b/l10n/de_CH/user_ldap.po
@@ -0,0 +1,426 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# multimill <multimill@gmail.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012-2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "LÃ¶schen der Zuordnung fehlgeschlagen."
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr "LÃ¶schen der Serverkonfiguration fehlgeschlagen"
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr "Die Konfiguration ist gÃ¼ltig und die Verbindung konnte hergestellt werden!"
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr "Die Konfiguration ist gÃ¼ltig aber die Verbindung ist fehlgeschlagen. Bitte Ã¼berprÃ¼fen Sie die Servereinstellungen und die Anmeldeinformationen."
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr "Die Konfiguration ist ungÃ¼ltig, sehen Sie fÃ¼r weitere Details bitte im ownCloud Log nach"
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr "LÃ¶schen fehlgeschlagen"
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr "Einstellungen von letzter Konfiguration Ã¼bernehmen?"
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr "Einstellungen beibehalten?"
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr "Das HinzufÃ¼gen der Serverkonfiguration schlug fehl"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "Zuordnungen gelÃ¶scht"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Erfolg"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr "Verbindungstest erfolgreich"
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr "Verbindungstest fehlgeschlagen"
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr "MÃ¶chten Sie die aktuelle Serverkonfiguration wirklich lÃ¶schen?"
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr "LÃ¶schung bestÃ¤tigen"
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Warnung:</b> Da das PHP-Modul fÃ¼r LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr "Serverkonfiguration"
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr "Serverkonfiguration hinzufÃ¼gen"
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr "Host"
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr "Sie kÃ¶nnen das Protokoll auslassen, ausser wenn Sie SSL benÃ¶tigen. Beginnen Sie dann mit ldaps://"
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr "Basis-DN"
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr "Ein Basis-DN pro Zeile"
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "Sie kÃ¶nnen Basis-DN fÃ¼r Benutzer und Gruppen in dem Â«ErweitertÂ»-Reiter konfigurieren"
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr "Benutzer-DN"
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr "Der DN des Benutzers fÃ¼r LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. FÃ¼r einen anonymen Zugriff lassen Sie DN und Passwort leer."
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr "Lassen Sie die Felder DN und Passwort fÃ¼r einen anonymen Zugang leer."
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr "Benutzer-Login-Filter"
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgefÃ¼hrt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
+
+#: templates/settings.php:55
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr "verwenden Sie %%uid Platzhalter, z. B. Â«uid=%%uidÂ»"
+
+#: templates/settings.php:56
+msgid "User List Filter"
+msgstr "Benutzer-Filter-Liste"
+
+#: templates/settings.php:59
+msgid "Defines the filter to apply, when retrieving users."
+msgstr "Definiert den Filter fÃ¼r die Anfrage der Benutzer."
+
+#: templates/settings.php:60
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr "ohne Platzhalter, z.B.: Â«objectClass=personÂ»"
+
+#: templates/settings.php:61
+msgid "Group Filter"
+msgstr "Gruppen-Filter"
+
+#: templates/settings.php:64
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr "Definiert den Filter fÃ¼r die Anfrage der Gruppen."
+
+#: templates/settings.php:65
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr "ohne Platzhalter, z.B.: Â«objectClass=posixGroupÂ»"
+
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr "Verbindungseinstellungen"
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr "Konfiguration aktiv"
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr "Wenn nicht angehakt, wird diese Konfiguration Ã¼bersprungen."
+
+#: templates/settings.php:72
+msgid "Port"
+msgstr "Port"
+
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
+msgstr "Backup Host (Kopie)"
+
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
+
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
+msgstr "Backup Port"
+
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr "Hauptserver deaktivieren"
+
+#: templates/settings.php:75
+msgid "Only connect to the replica server."
+msgstr "Nur zum Replikat-Server verbinden."
+
+#: templates/settings.php:76
+msgid "Use TLS"
+msgstr "Nutze TLS"
+
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
+
+#: templates/settings.php:77
+msgid "Case insensitve LDAP server (Windows)"
+msgstr "LDAP-Server (Windows: Gross- und Kleinschreibung bleibt unbeachtet)"
+
+#: templates/settings.php:78
+msgid "Turn off SSL certificate validation."
+msgstr "Schalten Sie die SSL-ZertifikatsprÃ¼fung aus."
+
+#: templates/settings.php:78
+#, php-format
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your %s server."
+msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server."
+
+#: templates/settings.php:78
+msgid "Not recommended, use for testing only."
+msgstr "Nicht empfohlen, nur zu Testzwecken."
+
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr "Speichere Time-To-Live zwischen"
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr "in Sekunden. Eine Ã„nderung leert den Cache."
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr "Ordnereinstellungen"
+
+#: templates/settings.php:83
+msgid "User Display Name Field"
+msgstr "Feld fÃ¼r den Anzeigenamen des Benutzers"
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
+
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr "Basis-Benutzerbaum"
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr "Ein Benutzer Basis-DN pro Zeile"
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr "Benutzersucheigenschaften"
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr "Optional; ein Attribut pro Zeile"
+
+#: templates/settings.php:86
+msgid "Group Display Name Field"
+msgstr "Feld fÃ¼r den Anzeigenamen der Gruppe"
+
+#: templates/settings.php:86
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
+
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr "Basis-Gruppenbaum"
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr "Ein Gruppen Basis-DN pro Zeile"
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr "Gruppensucheigenschaften"
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr "Assoziation zwischen Gruppe und Benutzer"
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr "Spezielle Eigenschaften"
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr "Kontingent-Feld"
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr "Standard-Kontingent"
+
+#: templates/settings.php:94
+msgid "in bytes"
+msgstr "in Bytes"
+
+#: templates/settings.php:95
+msgid "Email Field"
+msgstr "E-Mail-Feld"
+
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr "Benennungsregel fÃ¼r das Home-Verzeichnis des Benutzers"
+
+#: templates/settings.php:96
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interner Benutzername"
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "StandardmÃ¤ssig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden mÃ¼ssen. Der interne Benutzername unterliegt BeschrÃ¤nkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein ZÃ¤hler hinzugefÃ¼gt bzw. der ZÃ¤hler um einen Wert erhÃ¶ht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmÃ¤ssig vorausgewÃ¤hlte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel fÃ¼r alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten Ã¼berschrieben werden. Um ein Ã¤hnliches Verhalten wie vor ownCloud 5 zu erzielen, fÃ¼gen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen fÃ¼r das Standardverhalten leer. Die Ã„nderungen werden sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer auswirken."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Interne Eigenschaften des Benutzers:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "UUID-Erkennung Ã¼berschreiben"
+
+#: templates/settings.php:105
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr "StandardmÃ¤ssig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie mÃ¼ssen allerdings sicherstellen, dass Ihre gewÃ¤hlten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden kÃ¶nnen. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Ã„nderungen wirken sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer und -Gruppen aus."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID-Attribut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "LDAP-Benutzernamenzuordnung"
+
+#: templates/settings.php:108
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und prÃ¤zise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. ZusÃ¤tzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ã„ndert sich der DN, werden die Ã„nderungen durch gefunden. Der interne Benutzername, wird in Ã¼berall verwendet. Werden die Zuordnungen gelÃ¶scht, bleiben Ã¼berall Reste zurÃ¼ck. Die LÃ¶schung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! LÃ¶schen Sie niemals die Zuordnungen in einer produktiven Umgebung. LÃ¶schen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "LÃ¶sche LDAP-Benutzernamenzuordnung"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "LÃ¶sche LDAP-Gruppennamenzuordnung"
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr "Testkonfiguration"
+
+#: templates/settings.php:111
+msgid "Help"
+msgstr "Hilfe"
diff --git a/l10n/de_CH/user_webdavauth.po b/l10n/de_CH/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..ef0fb2e26cadf9f0d92a6593a5b0ef7fc20eb601
--- /dev/null
+++ b/l10n/de_CH/user_webdavauth.po
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# multimill <multimill@gmail.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012-2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 13:40+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
+"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV-Authentifizierung"
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr "Adresse:"
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prÃ¼ft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungÃ¼ltige Daten interpretieren und alle anderen Antworten als gÃ¼ltige Daten."
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 0dbe55b8c1099b20507057c747c2534029a9740b..80603ff03ae13593e3a4e621193696798c4eaf1a 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -5,6 +5,7 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
 # SteinQuadrat, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -143,59 +144,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "Vor 1 Minute"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "Vor {minutes} Minuten"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "Vor {hours} Stunden"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "Vor {days} Tag(en)"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "Vor {months} Monaten"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -231,8 +232,8 @@ msgstr "Der Objekttyp ist nicht angegeben."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Fehler"
 
@@ -252,140 +253,141 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Fehler bei der Ã„nderung der Rechte"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Von {owner} mit Ihnen geteilt."
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Teilen mit"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Ãœber einen Link teilen"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr "Erlaube Ã¶ffentliches hochladen"
+msgstr "Ã–ffentliches Hochladen erlauben"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "lÃ¶schen"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "PasswortgeschÃ¼tzt"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-Passwort zurÃ¼cksetzen"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -406,7 +408,7 @@ msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adress
 msgid "You will receive a link to reset your password via Email."
 msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurÃ¼ckzusetzen."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Benutzername"
@@ -417,7 +419,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr "Ihre Dateien sind verschlÃ¼sselt. Wenn Sie den WiederherstellungsschlÃ¼ssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurÃ¼ckgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
+msgstr "Ihre Dateien sind verschlÃ¼sselt. Wenn Sie den WiederherstellungsschlÃ¼ssel nicht aktiviert haben, wird es keine MÃ¶glichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurÃ¼ckgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
@@ -467,11 +469,11 @@ msgstr "Hilfe"
 msgid "Access forbidden"
 msgstr "Zugriff verboten"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud wurde nicht gefunden"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -500,8 +502,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Bitte bringen Sie Ihre PHP Version auf den neuesten Stand um ownCloud sicher nutzen zu kÃ¶nnen."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu kÃ¶nnen."
 
 #: templates/installation.php:32
 msgid ""
@@ -521,68 +524,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> fÃ¼r Informationen, wie Sie Ihren Server konfigurieren."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "FÃ¼r Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Installation abschlieÃŸen"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfÃ¼gbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Abmelden"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatische Anmeldung verweigert!"
@@ -613,7 +620,7 @@ msgstr "Einloggen"
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 452d764c2957bf7071ffb893b7fdafda81bdc461..cad3b191dc2a8097be72ebefd88a839586dd1733 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -7,14 +7,17 @@
 # SteinQuadrat, 2013
 # I Robot <owncloud-bot@tmit.eu>, 2013
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:50+0000\n"
+"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +28,7 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits"
+msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits."
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
@@ -125,7 +128,7 @@ msgstr "Teilen"
 msgid "Delete permanently"
 msgstr "EndgÃ¼ltig lÃ¶schen"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "LÃ¶schen"
 
@@ -133,43 +136,45 @@ msgstr "LÃ¶schen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Namen vorschlagen"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "LÃ¶schvorgang ausfÃ¼hren"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 Datei wird hochgeladen"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Es werden %n Dateien hochgeladen"
+msgstr[1] "Es werden %n Dateien hochgeladen"
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -205,33 +210,29 @@ msgstr "Ihr Download wird vorbereitet. Dies kann bei grÃ¶ÃŸeren Dateien etwas da
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "UngÃ¼ltiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "GeÃ¤ndert"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ordner"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ordner"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -290,61 +291,61 @@ msgstr "Ordner"
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "GelÃ¶schte Dateien"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Sie haben hier keine Schreib-Berechtigungen."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Der Upload ist zu groÃŸ"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei Ã¼berschreitet die MaximalgrÃ¶ÃŸe fÃ¼r Uploads auf diesem Server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Scanne"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "Verzeichnisse"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Datei"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Dateien"
 
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 752ceee589922855f3419c5ddf18e091237ef126..7e0878a9eb18c2524ddb06e207f303489dd17f90 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # ako84 <a0306265@unet.univie.ac.at>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-08 02:02+0200\n"
-"PO-Revision-Date: 2013-07-07 05:50+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-09 14:10+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,10 +71,14 @@ msgstr "Fehlende Voraussetzungen"
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr "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."
+msgstr "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."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "FÃ¼r folgende Nutzer ist keine VerschlÃ¼sselung eingerichtet:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
@@ -158,7 +163,7 @@ msgstr "Das Passwort des privaten SchlÃ¼ssels aktualisieren"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr "Passwort-Wiederherstellung aktivieren:"
+msgstr "Die Passwort-Wiederherstellung aktivieren:"
 
 #: templates/settings-personal.php:47
 msgid ""
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 43dbbe7dcbcb431117864f4a06add93b8c3087f1..7dc5677d12e749c5723e59ea9cfaef3eb8aae8af 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -39,20 +39,20 @@ msgstr "Bitte tragen Sie einen gÃ¼ltigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das EinhÃ¤ngen von CIFS/SMB-Freigaben ist nicht mÃ¶glich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Warnung::</b> Die FTP UnterstÃ¼tzung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 514d838f64cf52c0fa135df9ffec6d232b815239..22a6aa0d50deb22d6a8b1f7edf4fb6f5e7d24f8e 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +31,52 @@ msgstr "Passwort"
 msgid "Submit"
 msgstr "BestÃ¤tigen"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "GrÃ¼nde kÃ¶nnten sein:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Das Element wurde entfernt"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "Der Link ist abgelaufen"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "Teilen ist deaktiviert"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "FÃ¼r mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Ihnen geteilt"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Ihnen geteilt"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfÃ¼gbar fÃ¼r"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 6dac395b417a543011f585f13d493acc5f86bd23..d42fec3eb75255cd185a37766321be66906e4fc8 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +28,45 @@ msgstr "Konnte %s nicht dauerhaft lÃ¶schen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausfÃ¼hren"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Fehler"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "Datei dauerhaft lÃ¶schen"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "EndgÃ¼ltig lÃ¶schen"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "GelÃ¶scht"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ordner"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ordner"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Wiederhergestellt"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 7d3c1a83c4472ed7dff76099fc21ffdeb139cebf..56dd696d6d91b253e990c5a197a48eb6790d20f3 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-08-01 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 21:33+0000\n"
 "Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Konnte %s nicht zurÃ¼cksetzen"
 
-#: history.php:40
-msgid "success"
-msgstr "Erfolgreich"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Die Datei %s wurde auf die Version %s zurÃ¼ckgesetzt"
-
-#: history.php:49
-msgid "failure"
-msgstr "Fehlgeschlagen"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Die Datei %s konnte nicht auf die Version %s zurÃ¼ckgesetzt werden"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versionen"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Keine Ã¤lteren Versionen verfÃ¼gbar"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Konnte {file} der Revision {timestamp} nicht rÃ¼ckgÃ¤nging machen."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Kein Pfad angegeben"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Mehrere Versionen..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versionen"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Keine anderen Versionen verfÃ¼gbar"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Setze eine Datei durch Klicken auf den ZurÃ¼cksetzen-Button auf eine frÃ¼here Version zurÃ¼ck"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Wiederherstellen"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 7d6941ea49dd92f8f6074222f37bf9b8dd895c97..3a5acf702794aa435e0c2c0bb957b4387ed56228 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "Benutzer"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administrator"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Konnte \"%s\" nicht aktualisieren."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Ã–ffnen von \"%s\" fehlgeschlagen"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien mÃ¼ssen einzeln heruntergeladen werden."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ZurÃ¼ck zu \"Dateien\""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewÃ¤hlten Dateien sind zu groÃŸ, um eine ZIP-Datei zu erstellen."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Laden Sie die Dateien in kleineren, separaten, StÃ¼cken herunter oder bitten Sie Ihren Administrator."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "konnte nicht ermittelt werden"
 
@@ -171,77 +184,77 @@ msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungÃ¼ltig"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Setze Administrator Benutzername."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "Vor 1 Minute"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "Vor %d Minuten"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Vor %d Stunden"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "Heute"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Gestern"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "Vor %d Tag(en)"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Vor %d Monaten"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Vor  Jahren"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Verursacht durch:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 63e9fbe7c08dabfafa623fe11424cdd58c00a613..6a320fe6518f8d6e12ac26f2fd3be201a3a487cf 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -8,13 +8,14 @@
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -174,166 +175,173 @@ msgstr "Es muss ein gÃ¼ltiges Passwort angegeben werden"
 msgid "__language_name__"
 msgstr "Deutsch (FÃ¶rmlich: Sie)"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich Ã¼ber das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr Ã¼ber das Internet erreichbar ist. Alternativ kÃ¶nnen Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Ihr Datenverzeichnis und Ihre Dateien sind mÃ¶glicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht lÃ¤nger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis auÃŸerhalb des Wurzelverzeichnisses des Webservers."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Bitte Ã¼berprÃ¼fen Sie die <a href=\"%s\">Instalationsanleitungen</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Das Modul 'fileinfo' fehlt"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Die Lokalisierung funktioniert nicht"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Dieser ownCloud-Server kann die LÃ¤ndereinstellung nicht auf %s Ã¤ndern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "Die System-LÃ¤ndereinstellung kann nicht auf %s geÃ¤ndert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Keine Internetverbindung"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Dieser ownCloud-Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungs-E-Mails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren, wenn Sie alle Funktionen von ownCloud nutzen wollen."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Eine Aufgabe bei jedem Laden der Seite ausfÃ¼hren"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud-Wurzelverzeichniss wird einmal pro Minute Ã¼ber http abgerufen."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minÃ¼tlich per HTTP aufruft."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Nutzen Sie den Cron-Systemdienst. Rufen Sie die Datei cron.php im ownCloud-Ordner einmal pro Minute Ã¼ber einen Cronjob auf."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Benutzen Sie den System-Crondienst um die cron.php minÃ¼tlich aufzurufen."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per Ã¶ffentlichem Link zu teilen"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Erlaube Ã¶ffentliches hochladen"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren Ã¶ffentlich freigegebene Ordner hochladen zu dÃ¼rfen"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung mit ownCloud zu verbinden."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung zu %s zu verbinden."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS, um SSL-Erzwingung zu aktivieren oder deaktivieren."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Bitte verbinden Sie sich zu Ihrem %s Ã¼ber HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,77 +399,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Den Einrichtungsassistenten erneut anzeigen"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Sie verwenden <strong>%s</strong> der verfÃ¼gbaren <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ihr Passwort wurde geÃ¤ndert."
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geÃ¤ndert werden"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Passwort Ã¤ndern"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Helfen Sie bei der Ãœbersetzung"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
 
 #: templates/users.php:21
 msgid "Login Name"
@@ -473,7 +481,7 @@ msgstr "Erstellen"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr "Admin-Paswort-Wiederherstellung"
+msgstr "Admin-Passwort-Wiederherstellung"
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 5494e08f7959857348e64fd47302f5577230b296..e6a37a71fc4367b8a477230d4513970b946e19d8 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -5,15 +5,16 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,9 +93,9 @@ msgstr "LÃ¶schung bestÃ¤tigen"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
 
 #: templates/settings.php:12
 msgid ""
@@ -225,8 +226,8 @@ msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn aktiviert, wird ownCloud ausschlieÃŸlich den Backupserver verwenden."
+msgid "Only connect to the replica server."
+msgstr "Nur zum Replikat-Server verbinden."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -245,10 +246,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-ZertifikatsprÃ¼fung aus."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
+"certificate in your %s server."
+msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -271,8 +273,8 @@ msgid "User Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen des Benutzers"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Das LDAP-Attribut fÃ¼r die Generierung des Benutzernamens in ownCloud. "
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -295,8 +297,8 @@ msgid "Group Display Name Field"
 msgstr "Feld fÃ¼r den Anzeigenamen der Gruppe"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Das LDAP-Attribut fÃ¼r die Generierung des Gruppennamens in ownCloud. "
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -356,13 +358,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "StandardmÃ¤ÃŸig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden mÃ¼ssen. Der interne Benutzername unterliegt BeschrÃ¤nkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Ãœbereinstimmungen wird ein ZÃ¤hler hinzugefÃ¼gt bzw. der ZÃ¤hler um einen Wert erhÃ¶ht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmÃ¤ÃŸig vorausgewÃ¤hlte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port fÃ¼r Remote-URLs - zum Beispiel fÃ¼r alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten Ã¼berschrieben werden. Um ein Ã¤hnliches Verhalten wie vor ownCloud 5 zu erzielen, fÃ¼gen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen fÃ¼r das Standardverhalten leer. Die Ã„nderungen werden sich einzig und allein nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer auswirken."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "StandardmÃ¤ÃŸig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden mÃ¼ssen. Der interne Benutzername unterliegt BeschrÃ¤nkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein ZÃ¤hler hinzugefÃ¼gt bzw. der ZÃ¤hler um einen Wert erhÃ¶ht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmÃ¤ÃŸig vorausgewÃ¤hlte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel fÃ¼r alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten Ã¼berschrieben werden. Um ein Ã¤hnliches Verhalten wie vor ownCloud 5 zu erzielen, fÃ¼gen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen fÃ¼r das Standardverhalten leer. Die Ã„nderungen werden sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer auswirken."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -374,14 +376,14 @@ msgstr "UUID-Erkennung Ã¼berschreiben"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "StandardmÃ¤ÃŸig erkennt OwnCloud die UUID-Eigenschaften des Benutzers selbststÃ¤ndig. Die UUID-Eigenschaften werden genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. AuÃŸerdem wird ein interner Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie kÃ¶nnen diese Eigenschaften Ã¼berschreiben und selbst Eigenschaften nach Wahl vorgeben. Sie mÃ¼ssen allerdings sicherstellen, dass die Eigenschaften zur Identifikation fÃ¼r Benutzer und Gruppen eindeutig sind. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Ã„nderungen wirken sich nur auf neu zugeordnete (neu erstellte) LDAP-Benutzer und -Gruppen aus."
+msgstr "StandardmÃ¤ÃŸig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. AuÃŸerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie mÃ¼ssen allerdings sicherstellen, dass Ihre gewÃ¤hlten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden kÃ¶nnen. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Ã„nderungen wirken sich nur auf neu gemappte (hinzugefÃ¼gte) LDAP-Benutzer und -Gruppen aus."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -393,18 +395,17 @@ msgstr "LDAP-Benutzernamenzuordnung"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und prÃ¤zise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. ZusÃ¤tzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ã„ndert sich der DN, werden die Ã„nderungen durch gefunden. Der interne Benutzername, wird in Ã¼berall verwendet. Werden die Zuordnungen gelÃ¶scht, bleiben Ã¼berall Reste zurÃ¼ck. Die LÃ¶schung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! LÃ¶schen Sie niemals die Zuordnungen in einer produktiven Umgebung. LÃ¶schen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index c47c7321512f3e4b8ff3c78f13085993982692fd..e282ff5473e6148b62e3a668fa7cb163027bb903 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -3,8 +3,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
 # a.tangemann <a.tangemann@web.de>, 2012-2013
 # Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # multimill <multimill@gmail.com>, 2012
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
@@ -12,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-04 10:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-01 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 21:30+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,12 +29,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-Authentifizierung"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "Adresse:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prÃ¼ft die Antwort und wird die Statuscodes 401 und 403 als ungÃ¼ltige Daten und alle anderen Antworten als gÃ¼ltige Daten interpretieren."
+msgstr "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prÃ¼ft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungÃ¼ltige Daten interpretieren und alle anderen Antworten als gÃ¼ltige Daten."
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 50fed645ba10f0f2fd0d59aabf1b45e27894321c..9ce695662a3de33de48d311bb41e2218d89c8559 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -144,59 +144,59 @@ msgstr "ÎÎ¿ÎÎ¼Î²ÏÎ¹Î¿Ï‚"
 msgid "December"
 msgstr "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} Î»ÎµÏ€Ï„Î¬ Ï€ÏÎ¹Î½"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 ÏŽÏÎ± Ï€ÏÎ¹Î½"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} ÏŽÏÎµÏ‚ Ï€ÏÎ¹Î½"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ÏƒÎ®Î¼ÎµÏÎ±"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ï‡Ï„ÎµÏ‚"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½"
 
@@ -210,7 +210,7 @@ msgstr "Î†ÎºÏ…ÏÎ¿"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Î£Ï†Î¬Î»Î¼Î± Ï†ÏŒÏÏ„Ï‰ÏƒÎ·Ï‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÎµÏ€Î¹Î»Î¿Î³ÎÎ± Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -232,8 +232,8 @@ msgstr "Î”ÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Î·ÎºÎµ Î¿ Ï„ÏÏ€Î¿Ï‚ Ï„Î¿Ï… Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
@@ -253,140 +253,141 @@ msgstr "ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î±"
 msgid "Share"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿Î½ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒ"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿ ÏƒÏ„Î±Î¼Î¬Ï„Î·Î¼Î± Ï„Î¿Ï… Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Î»Î»Î±Î³Î® Ï„Ï‰Î½ Î´Î¹ÎºÎ±Î¹Ï‰Î¼Î¬Ï„Ï‰Î½"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Î¼Îµ ÏƒÎ±Ï‚ ÎºÎ±Î¹ Î¼Îµ Ï„Î·Î½ Î¿Î¼Î¬Î´Î± {group} Ï„Î¿Ï… {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Î¼Îµ ÏƒÎ±Ï‚ Î±Ï€ÏŒ Ï„Î¿Î½ {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î· Î”Î·Î¼ÏŒÏƒÎ¹Î± Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® ÏƒÏ…Î½Î´ÎÏƒÎ¼Î¿Ï… Î¼Îµ email "
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼ÎÏƒÏ‰ email:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Î¬Î½Î¸ÏÏ‰Ï€Î¿Ï‚"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ÎžÎ±Î½Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… {item} Î¼Îµ Ï„Î¿Î½ {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Î£Ï„Î±Î¼Î¬Ï„Î·Î¼Î± Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Î´Ï…Î½Î±Ï„ÏŒÏ„Î·Ï„Î± Î±Î»Î»Î±Î³Î®Ï‚"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ÎÎ»ÎµÎ³Ï‡Î¿Ï‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ·"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± Î¼Îµ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î·Ï‚ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿Î½ Î¿ÏÎ¹ÏƒÎ¼ÏŒ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Î¤Î¿ Email Î±Ï€ÎµÏƒÏ„Î¬Î»Î· "
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Î— ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Î®Ï„Î±Î½ Î±Î½ÎµÏ€Î¹Ï„Ï…Ï‡Î®Ï‚. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏƒÏ„ÎµÎ¯Î»Ï„Îµ Î±Î½Î±Ï†Î¿ÏÎ¬ ÏƒÏ„Î·Î½ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ÎºÎ¿Î¹Î½ÏŒÏ„Î·Ï„Î± ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Î— ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Î®Ï„Î±Î½ ÎµÏ€Î¹Ï„Ï…Ï‡Î®Ï‚. ÎœÎµÏ„Î¬Î²Î±ÏƒÎ· ÏƒÏ„Î¿ ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -407,7 +408,7 @@ msgstr "Î— Î±Î¯Ï„Î·ÏƒÎ· Î±Ï€ÎÏ„Ï…Ï‡Îµ! Î’ÎµÎ²Î±Î¹Ï‰Î¸Î·ÎºÎ±Ï„Îµ ÏŒÏ„Î¹ Ï„Î¿ ema
 msgid "You will receive a link to reset your password via Email."
 msgstr "Î˜Î± Î»Î¬Î²ÎµÏ„Îµ ÎÎ½Î± ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿ Î³Î¹Î± Î½Î± ÎµÏ€Î±Î½Î±Ï†ÎÏÎµÏ„Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ®Ï‚ ÏƒÎ±Ï‚ Î¼ÎÏƒÏ‰ Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï…."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·"
@@ -468,11 +469,11 @@ msgstr "Î’Î¿Î®Î¸ÎµÎ¹Î±"
 msgid "Access forbidden"
 msgstr "Î”ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î· Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Î½ÎÏ†Î¿Ï‚"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -501,8 +502,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Î— PHP ÎµÎ¹Î½Î±Î¹ ÎµÏ…Î±Î»Ï‰Ï„Î· ÏƒÏ„Î·Î½ NULL Byte ÎµÏ€Î¹Î¸ÎµÏƒÎ· (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· PHP ÏƒÎ±Ï‚ ÏŽÏƒÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î±ÏƒÏ†Î±Î»ÎÏƒÏ„ÎµÏÎ± Ï„Î¿ ownCloud."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î·Î½ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î·Ï‚ PHP ÏŽÏƒÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î¿ %s Î¼Îµ Î±ÏƒÏ†Î¬Î»ÎµÎ¹Î±."
 
 #: templates/installation.php:32
 msgid ""
@@ -522,68 +524,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ ÎºÎ±Î¹ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±Ï‚ ÎµÎ¯Î½Î±Î¹ Ï€Î¹Î¸Î±Î½ÏŒ Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î± Î±Ï€ÏŒ Ï„Î¿ internet Î³Î¹Î±Ï„Î¯ Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ .htaccess."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Î“Î¹Î± Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Ï„Î·Î½ ÏƒÏ‰ÏƒÏ„Î® ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚, Î´ÎµÎ¯Ï„Îµ ÏƒÏ„Î·Î½ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ï„ÎµÎºÎ¼Î·ÏÎ¯Ï‰ÏƒÎ·</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Î“Î¹Î± Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï€Ï‰Ï‚ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Î¿ÏÎ¸Î¬ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Î´ÎµÎ¯Ï„Îµ Ï„Î·Î½ <a href=\"%s\" target=\"_blank\">Ï„ÎµÎºÎ¼Î·ÏÎ¯Ï‰ÏƒÎ·</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÏ„Îµ ÎÎ½Î±Î½ <strong>Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Î“Î¹Î± Ï€ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿Ï…Ï‚"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸Î¿ÏÎ½"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Î§ÏÎ®ÏƒÏ„Î·Ï‚ Ï„Î·Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "ÎŒÎ½Î¿Î¼Î± Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "ÎšÎµÎ½Î¬ Î Î¹Î½Î¬ÎºÏ‰Î½ Î’Î¬ÏƒÎ·Ï‚ Î”ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ÎŸÎ»Î¿ÎºÎ»Î®ÏÏ‰ÏƒÎ· ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î·. Î”ÎµÎ¯Ï„Îµ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÏƒÏ„Î¿ Ï€ÏŽÏ‚ Î½Î± Î±Î½Î±Î²Î±Î¸Î¼Î¯ÏƒÎµÏ„Îµ."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ·"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Î‘Ï€Î¿ÏÏÎ¯Ï†Î¸Î·ÎºÎµ Î· Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î· ÏƒÏÎ½Î´ÎµÏƒÎ·!"
@@ -614,7 +620,7 @@ msgstr "Î•Î¯ÏƒÎ¿Î´Î¿Ï‚"
 msgid "Alternative Logins"
 msgstr "Î•Î½Î±Î»Î»Î±ÎºÏ„Î¹ÎºÎÏ‚ Î£Ï…Î½Î´ÎÏƒÎµÎ¹Ï‚"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/el/files.po b/l10n/el/files.po
index bb679adbb6b9bc0207e23a9235fdd7f5b43e1cbe..483abeaba5d687afbf450354e423a79e42c27249 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2013
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,11 +31,11 @@ msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î¼ÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Ï„Î¿Ï… %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î¿ÏÎ¹ÏƒÎ¼Î¿Ï ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ Token"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -121,7 +122,7 @@ msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 msgid "Delete permanently"
 msgstr "ÎœÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 
@@ -129,43 +130,45 @@ msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 msgid "Rename"
 msgstr "ÎœÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Î•ÎºÎºÏÎµÎ¼ÎµÎ¯"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î·"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Î±Î½Ï„Î¹ÎºÎ±Ï„ÎÏƒÏ„Î·ÏƒÎµ"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "ÏƒÏ…Î½Î¹ÏƒÏ„ÏŽÎ¼ÎµÎ½Î¿ ÏŒÎ½Î¿Î¼Î±"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Î±ÎºÏÏÏ‰ÏƒÎ·"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Î±Î½Ï„Î¹ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ Ï„Î¿ {new_name} Î¼Îµ {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Î±Î½Î±Î¯ÏÎµÏƒÎ·"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Ï„Î·Ï‚ Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î±Ï‚ Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 Î±ÏÏ‡ÎµÎ¯Î¿ Î±Î½ÎµÎ²Î±Î¯Î½ÎµÎ¹"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Î±ÏÏ‡ÎµÎ¯Î± Î±Î½ÎµÎ²Î±Î¯Î½Î¿Ï…Î½"
 
@@ -201,38 +204,34 @@ msgstr "Î— Î»Î®ÏˆÎ· Ï€ÏÎ¿ÎµÏ„Î¿Î¹Î¼Î¬Î¶ÎµÏ„Î±Î¹. Î‘Ï…Ï„ÏŒ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï†Î±ÎºÎÎ»Î¿Ï…. Î— Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… 'ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Ï‚' Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î±Ï€ÏŒ Î¿ Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "ÎœÎÎ³ÎµÎ¸Î¿Ï‚"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ï†Î¬ÎºÎµÎ»Î¿Ï‚"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ï†Î¬ÎºÎµÎ»Î¿Î¹"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Î±ÏÏ‡ÎµÎ¯Î¿"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Î±ÏÏ‡ÎµÎ¯Î±"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,61 +285,61 @@ msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚"
 msgid "From link"
 msgstr "Î‘Ï€ÏŒ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Î”Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î±"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ ÎµÎ´ÏŽ."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ. Î‘Î½ÎµÎ²Î¬ÏƒÏ„Îµ ÎºÎ¬Ï„Î¹!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Î›Î®ÏˆÎ·"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Î£Ï„Î±Î¼Î¬Ï„Î·Î¼Î± Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï€ÏÎ¿Ï‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€Î¿Ï… Ï€ÏÎ¿ÏƒÏ€Î±Î¸ÎµÎ¯Ï„Îµ Î½Î± Î±Î½ÎµÎ²Î¬ÏƒÎµÏ„Îµ Ï…Ï€ÎµÏÎ²Î±Î¯Î½Î¿Ï…Î½ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±ÏÏŽÎ½Î¿Î½Ï„Î±Î¹, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Î¤ÏÎÏ‡Î¿Ï…ÏƒÎ± Î±Î½Î¯Ï‡Î½ÎµÏ…ÏƒÎ·"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Î¹"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Î±ÏÏ‡ÎµÎ¯Î¿"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Î±ÏÏ‡ÎµÎ¯Î±"
 
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 684d9d810ea5b58ac3f9ccf68bb6b253854836cf..1cdfbf50fec95a698a736a7681bbdebf089eafe8 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -70,9 +70,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 3de82d16e6e7c40a8d72abc7d1225fc9c9bf64c8..fd0a919e9f3ef61cc4e0f3686f80f6115b9bdba5 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î´ÏŽÏƒÏ„Îµ ÎÎ³ÎºÏ…ÏÎ¿ ÎºÎ»ÎµÎ¹Î´Î¯ Dropbox ÎºÎ±
 msgid "Error configuring Google Drive storage"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏ…Î¸Î¼Î¯Î¶Ï‰Î½Ï„Î±Ï‚ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Google Drive "
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> ÎŸ \"smbclient\" Î´ÎµÎ½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ. Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Ï€ÏÎ¿ÏƒÎ¬ÏÏ„Î·ÏƒÎ· CIFS/SMB. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Ï„Î¿ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> Î— Ï…Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î· FTP ÏƒÏ„Î·Î½ PHP Î´ÎµÎ½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ Î® ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ. Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Ï€ÏÎ¿ÏƒÎ¬ÏÏ„Î·ÏƒÎ· FTP. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÏ„Îµ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Ï„Î¿ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index a06ace24b40392a4e76dc72a5c55edc6cef99bca..5fe608cdb4b219022d8fd3fc00170c8f5b7702b2 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Î•ÏƒÏ†Î±Î»Î¼ÎÎ½Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ. Î ÏÎ¿ÏƒÏ€Î±Î¸Î®ÏƒÏ„Îµ Î¾Î±Î½Î¬."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 msgid "Submit"
 msgstr "ÎšÎ±Ï„Î±Ï‡ÏŽÏÎ·ÏƒÎ·"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Î£Ï…Î³Î³Î½ÏŽÎ¼Î·, Î±Ï…Ï„ÏŒÏ‚ Î¿ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ Î¼Î¿Î¹Î¬Î¶ÎµÎ¹ Î½Î± Î¼Î·Î½ Î¹ÏƒÏ‡ÏÎµÎ¹ Ï€Î¹Î±."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "ÎŸÎ¹ Î»ÏŒÎ³Î¿Î¹ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Ï„Î¿ Î±Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Î±Ï€Î¿Î¼Î±ÎºÏÏÎ½Î¸Î·ÎºÎµ"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "Î¿ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ ÎÎ»Î·Î¾Îµ"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "Î¿ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Î“Î¹Î± Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏÏ‰Ï„Î®ÏƒÏ„Îµ Ï„Î¿ Î¬Ï„Î¿Î¼Î¿ Ï€Î¿Ï… ÏƒÎ±Ï‚ ÎÏƒÏ„ÎµÎ¹Î»Îµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Ï„Î¿Î½ Ï†Î¬ÎºÎµÎ»Î¿ %s Î¼Î±Î¶Î¯ ÏƒÎ±Ï‚"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s Î¼Î±Î¶Î¯ ÏƒÎ±Ï‚"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Î›Î®ÏˆÎ·"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ÎœÎµÏ„Î±Ï†ÏŒÏÏ„Ï‰ÏƒÎ·"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î· Ï€ÏÎ¿ÎµÏ€Î¹ÏƒÎºÏŒÏ€Î·ÏƒÎ· Î³Î¹Î±"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index ecfaa5c1f5563d0d3d232cce97d50c652f2a2cf2..9419e249a1fb5b6145bf3667cdbd4d3a3300965b 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î¼ÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î¿Ï… %s"
 msgid "Couldn't restore %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "Î¼ÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Î±ÏÏ‡ÎµÎ¯Î¿Ï…"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "ÎœÏŒÎ½Î¹Î¼Î· Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Î”Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ï†Î¬ÎºÎµÎ»Î¿Ï‚"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ï†Î¬ÎºÎµÎ»Î¿Î¹"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Î±ÏÏ‡ÎµÎ¯Î¿"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Î±ÏÏ‡ÎµÎ¯Î±"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "ÎÎ³Î¹Î½Îµ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index c0a78762a845887bf4584d3ae2993b9cca6fd2b3..69a93edf4e88af7293c1571ba8c1964367e636eb 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-06 07:40+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ Ï„Î¿Ï…: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s ÎµÏ€Î±Î½Î±Ï†ÎÏÎ¸Î·ÎºÎµ ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "Î±Ï€Î¿Ï„Ï…Ï‡Î¯Î±"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„ÏŒ Î½Î± ÎµÏ€Î±Î½Î±Ï†ÎµÏÎ¸ÎµÎ¯ ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "ÎœÎ· Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚ Ï€Î±Î»Î¹ÎÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ Ï„Î¿Ï… {file} ÏƒÏ„Î·Î½ Î±Î½Î±Î¸ÎµÏŽÏÎ·ÏƒÎ· {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Î”ÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Î·ÎºÎµ Î´Î¹Î±Î´ÏÎ¿Î¼Î®"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ Î¬Î»Î»ÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ ÎµÎ½ÏŒÏ‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÏƒÎµ Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î· ÎÎºÎ´Î¿ÏƒÎ· Ï€Î±Ï„ÏŽÎ½Ï„Î±Ï‚ ÏƒÏ„Î¿ ÎºÎ¿Ï…Î¼Ï€Î¯ ÎµÏ€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 9a83873120f045834a88131a983d1257c2fc7545..c98f621f36eac427b3420a6bf0ff7e2fd392964a 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·Ï‚ Ï„Î¿Ï… \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ï…Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚ Î´Î¹ÎºÏ„ÏÎ¿Ï… Ï…Ï€ÏŒ Ï„Î¿Î½ ÎÎ»ÎµÎ³Ï‡ÏŒ ÏƒÎ±Ï‚"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Î±Î´Ï…Î½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±Ï„Î¿Ï‚ \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Î— Î»Î®ÏˆÎ· ZIP Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î»Î·Ï†Î¸Î¿ÏÎ½ ÎÎ½Î±-ÎÎ½Î±."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Î Î¯ÏƒÏ‰ ÏƒÏ„Î± Î‘ÏÏ‡ÎµÎ¯Î±"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Î¤Î± ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± ÎµÎ¯Î½Î±Î¹ Î¼ÎµÎ³Î¬Î»Î± ÏŽÏƒÏ„Îµ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸ÎµÎ¯ Î±ÏÏ‡ÎµÎ¯Î¿ zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Î›Î®ÏˆÎ· Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎµ Î¼Î¹ÎºÏÏŒÏ„ÎµÏÎ± ÎºÎ¿Î¼Î¼Î¬Ï„Î¹Î±, Ï‡Ï‰ÏÎ¹ÏƒÏ„Î¬ Î® ÏÏ‰Ï„Î®ÏƒÏ„Îµ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÎ±Ï‚."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "Î´ÎµÎ½ Î¼Ï€Î¿ÏÎ¿ÏÏƒÎµ Î½Î± Ï€ÏÎ¿ÏƒÎ´Î¹Î¿ÏÎ¹ÏƒÎ¸ÎµÎ¯"
 
@@ -171,77 +183,77 @@ msgstr "Î— ÎµÎ½Ï„Î¿Î»Î· Ï€Î±ÏÎ±Î²Î±Ï„Î¹ÎºÎ¿Ï„Î·Ï„Î±Ï‚ Î·Ï„Î±Î½: \"%s\", Î¿Î½Î¿
 msgid "PostgreSQL username and/or password not valid"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÎºÎ±Î¹/Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Ï„Î·Ï‚ PostgreSQL"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Î•Î¹ÏƒÎ¬Î³ÎµÏ„Îµ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Î•Î¹ÏƒÎ¬Î³ÎµÏ„Îµ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ÏƒÎ±Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏÏ…Î¸Î¼Î¹ÏƒÏ„ÎµÎ¯ ÎºÎ±Ï„Î¬Î»Î»Î·Î»Î± ÏŽÏƒÏ„Îµ Î½Î± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î¿Î½ ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼ÏŒ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î³Î¹Î±Ï„Î¯ Î· Î´Î¹ÎµÏ€Î±Ï†Î® WebDAV Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„ÎµÏƒÏ„ÏÎ±Î¼Î¼ÎÎ½Î·."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Î•Î»ÎÎ³Î¾Ï„Îµ Î¾Î±Î½Î¬ Ï„Î¹Ï‚ <a href='%s'>Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d Î»ÎµÏ€Ï„Î¬ Ï€ÏÎ¹Î½"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 ÏŽÏÎ± Ï€ÏÎ¹Î½"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ÏŽÏÎµÏ‚ Ï€ÏÎ¹Î½"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ÏƒÎ®Î¼ÎµÏÎ±"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ï‡Ï„ÎµÏ‚"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Î ÏÎ¿ÎºÎ»Î®Î¸Î·ÎºÎµ Î±Ï€ÏŒ:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 1eb1f98e7ae4a3bf74e4a57b33563cbba9ba519c..80d72b31abdeaf9fd8359b53f4b464212a4e1c51 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -174,166 +175,173 @@ msgstr "Î ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î¿Î¸ÎµÎ¯ ÎÎ³ÎºÏ…ÏÎ¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 msgid "__language_name__"
 msgstr "__ÏŒÎ½Î¿Î¼Î±_Î³Î»ÏŽÏƒÏƒÎ±Ï‚__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î‘ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ data ÎºÎ±Î¹ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±Ï‚ Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î½Î± ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î± ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿. Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ .htaccess Ï€Î¿Ï… Ï€Î±ÏÎÏ‡ÎµÎ¹ Ï„Î¿ ownCloud Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹. Î£Î±Ï‚ Ï€ÏÎ¿Ï„ÎµÎ¯Î½Î¿Ï…Î¼Îµ Î±Î½ÎµÏ€Î¹Ï†ÏÎ»Î±ÎºÏ„Î± Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Ï„Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚ Î¼Îµ Ï„ÎÏ„Î¿Î¹Î¿ Ï„ÏÏŒÏ€Î¿ ÏŽÏƒÏ„Îµ Î¿ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ data Î½Î± Î¼Î·Î½ ÎµÎ¯Î½Î±Î¹ Ï€Î»ÎÎ¿Î½ Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î¿Ï‚ Î® Î½Î± Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÎµÏ„Îµ Ï„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ data ÎÎ¾Ï‰ Î±Ï€ÏŒ Ï„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ÏƒÎ±Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏÏ…Î¸Î¼Î¹ÏƒÏ„ÎµÎ¯ ÎºÎ±Ï„Î¬Î»Î»Î·Î»Î± ÏŽÏƒÏ„Îµ Î½Î± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î¿Î½ ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼ÏŒ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î³Î¹Î±Ï„Î¯ Î· Î´Î¹ÎµÏ€Î±Ï†Î® WebDAV Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„ÎµÏƒÏ„ÏÎ±Î¼Î¼ÎÎ½Î·."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Î•Î»ÎÎ³Î¾Ï„Îµ Î¾Î±Î½Î¬ Ï„Î¹Ï‚ <a href='%s'>Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Î— ÎµÎ½Î¿Ï„Î·Ï„Î± 'fileinfo' Î»ÎµÎ¹Ï€ÎµÎ¹"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Î— PHP ÎµÎ½Î¿Ï„Î·Ï„Î± 'fileinfo' Î»ÎµÎ¹Ï€ÎµÎ¹. Î£Î±Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¿ÏÎ¼Îµ Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ½ÏŒÏ„Î·Ï„Î± Î³Î¹Î± Î½Î± ÎÏ‡ÎµÏ„Îµ ÎºÎ±Î»ÏÏ„ÎµÏÎ± Î±Ï€Î¿Ï„ÎµÎ»ÎÏƒÎ¼Î±Ï„Î± Î¼Îµ Ï„Î¿Î½ ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼ÏŒ Ï„ÏÏ€Î¿Ï… MIME. "
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Î— Î¼ÎµÏ„Î¬Ï†ÏÎ±ÏƒÎ· Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Î‘Ï…Ï„ÏŒÏ‚ Î¿ ownCloud Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÎµÎ¹ Ï„Î¿ ÏƒÏÎ½Î¿Î»Î¿ Ï„Î¿Ï€Î¹ÎºÎ®Ï‚ Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿Î³Î®Ï‚ ÏƒÏ…ÏƒÏ„Î·Î¼Î¬Ï„Ï‰Î½ ÏƒÏ„Î¿ %s. Î‘Ï…Ï„ÏŒ ÏƒÎ·Î¼Î±Î¯Î½ÎµÎ¹ ÏŒÏ„Î¹ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï…Ï€Î¬ÏÎ¾Î¿Ï…Î½ Ï€ÏÎ¿Î²Î»Î®Î¼Î±Ï„Î± Î¼Îµ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ ÏƒÎµ Î¿Î½ÏŒÎ¼Î±Ï„Î± Î±ÏÏ‡ÎµÎ¯Ï‰Î½. Î£Î±Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¿ÏÎ¼Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Î±Ï€Î±ÏÎ±Î¯Ï„Î·Ï„ÎµÏ‚ ÏƒÏ…ÏƒÎºÎµÏ…Î±ÏƒÎ¯ÎµÏ‚ ÏƒÏ„Î¿ ÏƒÏÏƒÏ„Î·Î¼Î¬ ÏƒÎ±Ï‚ Î³Î¹Î± Î½Î± Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Ï‡Î¸ÎµÎ¹ Ï„Î¿ %s. "
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Î— ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿ Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Î‘Ï…Ï„ÏŒÏ‚ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ownCloud Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿. Î‘Ï…Ï„ÏŒ ÏƒÎ·Î¼Î±Î¯Î½ÎµÎ¹ ÏŒÏ„Î¹ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î± Î±Ï€ÏŒ Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Î³Î½Ï‰ÏÎ¯ÏƒÎ¼Î±Ï„Î± ÏŒÏ€Ï‰Ï‚ Î· Ï„Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· ÎµÎ¾Ï‰Ï„ÎµÏÎ¹ÎºÎ®Ï‚ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚, Î¿Î¹ ÎºÎ¿Î¹Î½Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Î±Î½Î±Î½ÎµÏ‰ÏƒÎµÎ¹Ï‚, Î® ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· 3Ï‰Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Î´ÎµÎ½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¿ÏÎ½.  Î— Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÎµ Î±ÏÏ‡ÎµÎ¯Î± ÎºÎ±Î¹ Î· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½ Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ ÎµÏ€Î¯ÏƒÎ·Ï‚ Î½Î± Î¼Î·Î½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³ÎµÎ¯. Î£Î±Ï‚ Ï€ÏÎ¿Ï„ÎµÎ¯Î½Î¿Ï…Î¼Îµ Î½Î± ÏƒÏÎ½Î´ÎµÎ¸ÎµÎ¹Ï„Îµ ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¹ÎºÏ„Ï…Î¿ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®, ÎµÎ¬Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± ÎÏ‡ÎµÏ„Îµ ÏŒÎ»Î± Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Ï„Î¿Ï… ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Î¼Î¹Î±Ï‚ Î´Î¹ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î¼Îµ ÎºÎ¬Î¸Îµ ÏƒÎµÎ»Î¯Î´Î± Ï€Î¿Ï… Ï†Î¿ÏÏ„ÏŽÎ½ÎµÏ„Î±Î¹"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "Î¤Î¿ cron.php ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿ ÏƒÏ„Î·Î½ Ï…Ï€Î·ÏÎµÏƒÎ¯Î± webcron. ÎÎ± ÎºÎ±Î»ÎµÎ¯Ï„Î±Î¹ Î¼Î¹Î± Ï†Î¿ÏÎ¬ Ï„Î¿ Î»ÎµÏ€Ï„ÏŒ Î· ÏƒÎµÎ»Î¯Î´Î± cron.php Î±Ï€ÏŒ Ï„Î¿Î½ root Ï„Î¿Ï… owncloud Î¼ÎÏƒÏ‰ http"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Î§ÏÎ®ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ cron. ÎÎ± ÎºÎ±Î»ÎµÎ¯Ï„Î±Î¹ Î¼Î¹Î± Ï†Î¿ÏÎ¬ Ï„Î¿ Î»ÎµÏ€Ï„ÏŒ, Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ cron.php Î±Ï€ÏŒ Ï„Î¿Î½ Ï†Î¬ÎºÎµÎ»Î¿ Ï„Î¿Ï… owncloud Î¼ÎÏƒÏ‰ Ï„Î¿Ï… cronjob Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· API Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¹Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î¿ÏÎ½ Ï„Î¿ API Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Î¹"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î½Î± Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬Î¶Î¿Ï…Î½ Î´Î·Î¼ÏŒÏƒÎ¹Î± Î¼Îµ ÏƒÏ…Î½Î´ÎÏƒÎ¼Î¿Ï…Ï‚"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î¿ ÎµÏ€Î±Î½Î±Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î½Î± Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬Î¶Î¿Ï…Î½ ÏŒÏ„Î¹ Ï„Î¿Ï…Ï‚ ÎÏ‡ÎµÎ¹ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÏ„ÎµÎ¯"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î¿ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ Î¿Ï€Î¿Î¹Î¿Î½Î´Î®Ï€Î¿Ï„Îµ"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î¿ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼ÏŒÎ½Î¿ Î¼Îµ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Ï„Î·Ï‚ Î¯Î´Î¹Î±Ï‚ Î¿Î¼Î¬Î´Î±Ï‚"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Î‘ÏƒÏ†Î¬Î»ÎµÎ¹Î±"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Î•Ï€Î¹Î²Î¿Î»Î® Ï‡ÏÎ®ÏƒÎ·Ï‚ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Î•Ï€Î¹Î²Î¿Î»Î® ÏƒÏ„Î¿Ï…Ï‚ Ï€ÎµÎ»Î¬Ï„ÎµÏ‚ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸Î¿ÏÎ½ ÏƒÏ„Î¿ ownCloud Î¼ÎÏƒÏ‰ Î¼Î¹Î±Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î·Ï‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î¼Îµ Ï„Î¿ ownCloud Î¼ÎÏƒÏ‰ HTTPS Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î® Î½Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÏ€Î¹Î²Î¿Î»Î® SSL. "
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "ÎšÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Î•Ï€Î¯Ï€ÎµÎ´Î¿ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Î›Î¹Î³ÏŒÏ„ÎµÏÎ±"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "ÎˆÎºÎ´Î¿ÏƒÎ·"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -391,77 +399,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Î•Î¼Ï€Î¿ÏÎ¹ÎºÎ® Î¥Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î·"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Î›Î®ÏˆÎ· Ï„Î·Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚ Î³Î¹Î± ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼ÏŒ Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎ±Ï‚"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î ÏÏŽÏ„Î·Ï‚ Î•ÎºÏ„ÎÎ»ÎµÏƒÎ·Ï‚ ÎŸÎ´Î·Î³Î¿Ï Ï€Î¬Î»Î¹"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎ±Ï„Îµ <strong>%s</strong> Î±Ï€ÏŒ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î± <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Î¤Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ±Ï‚ ÎÏ‡ÎµÎ¹ Î±Î»Î»Î¬Î¾ÎµÎ¹"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Î”ÎµÎ½ Î®Ï„Î±Î½ Î´Ï…Î½Î±Ï„Î® Î· Î±Î»Î»Î±Î³Î® Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Î¤ÏÎÏ‡Ï‰Î½ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÎÎÎ¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Î‘Î»Î»Î±Î³Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "ÎŒÎ½Î¿Î¼Î± ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Î—Î». Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï… ÏƒÎ±Ï‚"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Î£Ï…Î¼Ï€Î»Î·ÏÏŽÏƒÏ„Îµ Î¼Î¹Î± Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï… Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ Î· Î±Î½Î¬ÎºÏ„Î·ÏƒÎ· ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Î“Î»ÏŽÏƒÏƒÎ±"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Î’Î¿Î·Î¸Î®ÏƒÏ„Îµ ÏƒÏ„Î· Î¼ÎµÏ„Î¬Ï†ÏÎ±ÏƒÎ·"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Î§ÏÎ®ÏƒÎ· Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚ Î³Î¹Î± <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎ±Ï‚ Î¼ÎÏƒÏ‰ WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 2c3a6be413740710eb98d95b6bfd750ede27bb24..fbd59d1274997b24053a8e623b12235f4c203dc1 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ· Î”Î¹Î±Î³ÏÎ±Ï†Î®Ï‚"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> ÎŸÎ¹ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ user_ldap ÎºÎ±Î¹ user_webdavauth ÎµÎ¯Î½Î±Î¹ Î±ÏƒÏÎ¼Î²Î±Ï„ÎµÏ‚. ÎœÏ€Î¿ÏÎµÎ¯ Î½Î± Î±Î½Ï„Î¹Î¼ÎµÏ„Ï‰Ï€Î¯ÏƒÎµÏ„Îµ Î±Ï€ÏÏŒÎ²Î»ÎµÏ€Ï„Î· ÏƒÏ…Î¼Ï€ÎµÏÎ¹Ï†Î¿ÏÎ¬. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Î¶Î·Ï„Î®ÏƒÏ„Îµ Î±Ï€ÏŒ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ Î¼Î¯Î± Î±Ï€ÏŒ Î±Ï…Ï„ÎÏ‚."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,8 +221,8 @@ msgid "Disable Main Server"
 msgstr "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·ÏƒÎ· Ï„Î¿Ï… ÎºÎµÎ½Ï„ÏÎ¹ÎºÎ¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "ÎŒÏ„Î±Î½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯, Î¼Îµ Ï„Î¿ ownCloud Î¸Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î¼Îµ Ï„Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏÎµÏ€Î»Î¯ÎºÎ±."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎµÏ€Î¹ÎºÏÏÏ‰ÏƒÎ·Ï‚ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Î•Î¬Î½ Î· ÏƒÏÎ½Î´ÎµÏƒÎ· Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Î¼ÏŒÎ½Î¿ Î¼Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î®, ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Ï„Î¿ LDAP SSL Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÏ„Î¿Î½ ownCloud server ÏƒÎ±Ï‚."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "Î ÎµÎ´Î¯Î¿ ÎŸÎ½ÏŒÎ¼Î±Ï„Î¿Ï‚ Î§ÏÎ®ÏƒÏ„Î·"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Î— Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± LDAP Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î· Ï„Î¿Ï… ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Î— Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± LDAP Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î¿Î½ÏŒÎ¼Î±Ï„Î¿Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ Ï„Î¿Ï… ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index cd7f6d89f48834216d75d57f631c49770db2f1a3..85544e07257fafa0f3effbde00a98a6b24a50fe9 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -6,14 +6,15 @@
 # Dimitris M. <monopatis@gmail.com>, 2012
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2012
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2013
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012-2013
 # Konstantinos Tzanidis <tzanidis@gmail.com>, 2012
 # Marios Bekatoros <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-25 02:04+0200\n"
-"PO-Revision-Date: 2013-06-24 20:30+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-06 08:10+0000\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -27,12 +28,12 @@ msgid "WebDAV Authentication"
 msgstr "Î‘Ï…Î¸ÎµÎ½Ï„Î¹ÎºÎ¿Ï€Î¿Î¯Î·ÏƒÎ· Î¼ÎÏƒÏ‰ WebDAV "
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "Î¤Î¿ ownCloud Î¸Î± ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹ Ï„Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î±  Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ URL. Î‘Ï…Ï„ÏŒ Ï„Î¿ plugin ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· ÎºÎ±Î¹ Ï„Î·Î½ Î¼ÎµÏ„Î±Ï„ÏÎÏ€ÎµÎ¹ ÏƒÎµ HTTP ÎºÏ‰Î´Î¹ÎºÏŒ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ 401 ÎºÎ±Î¹ 403 Î³Î¹Î± Î¼Î· ÎÎ³ÎºÏ…ÏÎ±, ÏŒÎ»ÎµÏ‚ Î¿Î¹ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€ÎµÏ‚ Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎµÏ‚."
+msgstr "Î¤Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î± Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· Î¸Î± ÏƒÏ„Î±Î»Î¿ÏÎ½ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·. Î‘Ï…Ï„ÏŒ Ï„Î¿ Ï€ÏÏŒÏƒÎ¸ÎµÏ„Î¿ ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ Ï„Î·Î½ Î±Ï€ÏŒÎºÏÎ¹ÏƒÎ· ÎºÎ±Î¹ Î¸Î± ÎµÏÎ¼Î·Î½ÎµÏÏƒÎµÎ¹ Ï„Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ HTTP 401 ÎºÎ±Î¹ 402 Ï‰Ï‚ Î¼Î· ÎÎ³ÎºÏ…ÏÎ± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î± ÎºÎ±Î¹ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ Î¬Î»Î»ÎµÏ‚ Î±Ï€Î¿ÎºÏÎ¯ÏƒÎµÎ¹Ï‚ Ï‰Ï‚ ÎÎ³ÎºÏ…ÏÎ± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î±."
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 80b5bdf950a2b8a5330c1b7ce44c2c797decf4c3..f644607fac94a696068a62846f7afe14bfadc53b 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -247,139 +247,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Passcode"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -401,7 +402,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -462,11 +463,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,7 +496,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -608,7 +614,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 1734a0e504d6cbe6bc5cb8d30e20ee4af16864d2..49638f0cca28e9d389e5fdedc7ca10568b41181f 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index c0cec032f05b5f8bf1ba649fccd4aad4d049b39e..00358fec52b00d36c045d10fc348420482f1e6d0 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 6b61afeaf00549cd84157705bcf83bdacc29de14..94c722fa9a3481a9dfd1f913c373c4353d00f696 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "Secret Code"
 msgid "Submit"
 msgstr "Submit"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s shared the folder %s with you"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s shared the file %s with you"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "No preview available for"
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index 3ae46bccb49090d385f5bd9b8ccde433ad6dcf1f..c64e4f7a6a29c9033f674ed514bdbdf9be53542f 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/en@pirate/files_versions.po b/l10n/en@pirate/files_versions.po
index 2df316a89241f58dd0b18adfc52dece6ca7d7b06..e4461689d990e8b40d49b39b0ff66bcc91aa1296 100644
--- a/l10n/en@pirate/files_versions.po
+++ b/l10n/en@pirate/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index c41a936390908ca9e7a3476e42e4382ca24e5930..69cf917ce77afc2a87fafcd94f50ebe1441360d7 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-05 00:30+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 1b6740bec83bff6d7e69b1758a5ccb52139d5631..79163dfbd84b2ee79683ff7fae9a04f71596f269 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passcode"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index ac3ae9d2a52f2b264f404cd61d6d23655bdb82f0..3f36998584c3a21aae9fcbce82706dd1cc769fde 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-23 01:59+0200\n"
-"PO-Revision-Date: 2013-06-22 10:24+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/en@pirate/user_webdavauth.po b/l10n/en@pirate/user_webdavauth.po
index 22b86eac1980e0b5d36f867a9939249a8cbb0cfc..0af776aec9b1df5c8fe8cc902210e9978b157b37 100644
--- a/l10n/en@pirate/user_webdavauth.po
+++ b/l10n/en@pirate/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index e3a0933ccd7aafdcf6958729e46d33866108ef25..59d39a60fd0410035df996afd79a9ae9079a2309 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,59 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Decembro"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekundoj antaÅe"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "antaÅ 1 minuto"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "antaÅ {minutes} minutoj"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "antaÅ 1 horo"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "antaÅ {hours} horoj"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hodiaÅ"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "hieraÅ"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "antaÅ {days} tagoj"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "antaÅ {months} monatoj"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "monatoj antaÅe"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "jaroj antaÅe"
 
@@ -227,8 +227,8 @@ msgstr "Ne indikiÄis tipo de la objekto."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Eraro"
 
@@ -248,140 +248,141 @@ msgstr "Dividita"
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Eraro dum malkunhavigo"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Eraro dum ÅanÄo de permesoj"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Kunhavigita kun vi de {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Kunhavigi kun"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Kunhavigi per ligilo"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Pasvorto"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "RetpoÅti la ligilon al ulo"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Sendi"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Kunhavigi per retpoÅto:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ne troviÄis gento"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "Äisdatigi"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "La retpoÅtaÄµo sendiÄis"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "La Äisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La Äisdatigo estis sukcesa. Alidirektante nun al ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "La pasvorto de ownCloud restariÄis."
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +403,7 @@ msgstr "La peto malsukcesis!<br />Äˆu vi certiÄis, ke via retpoÅto/uzantonomo
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vi ricevos ligilon retpoÅte por rekomencigi vian pasvorton."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Uzantonomo"
@@ -463,11 +464,11 @@ msgstr "Helpo"
 msgid "Access forbidden"
 msgstr "Aliro estas malpermesata"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "La nubo ne estas trovita"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Bonvolu Äisdatigi vian instalon de PHP por uzi ownCloud-on sekure."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Progresinta"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "estos uzata"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Datumbaza tabelospaco"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s haveblas. Ekhavi pli da informo pri kiel Äisdatigi."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Elsaluti"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "La aÅtomata ensaluto malakceptiÄis!"
@@ -609,7 +615,7 @@ msgstr "Ensaluti"
 msgid "Alternative Logins"
 msgstr "Alternativaj ensalutoj"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index e96b5e25c300c1cb0649013f41b9f252d17add79..9e2617e412df600ef591d202939a0a4f8fb664c6 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgstr "Kunhavigi"
 msgid "Delete permanently"
 msgstr "Forigi por Ä‰iam"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Forigi"
 
@@ -129,43 +129,45 @@ msgstr "Forigi"
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "anstataÅigi"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataÅiÄis {new_name} per {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "plenumi forigan operacion"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 dosiero estas alÅutata"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "dosieroj estas alÅutataj"
 
@@ -201,33 +203,29 @@ msgstr "Via elÅuto pretiÄatas. Äˆi tio povas daÅri iom da tempo se la dosiero
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de â€œSharedâ€ rezervatas de Owncloud."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 dosierujo"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} dosierujoj"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 dosiero"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} dosierujoj"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +284,61 @@ msgstr "Dosierujo"
 msgid "From link"
 msgstr "El ligilo"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Forigitaj dosieroj"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Nuligi alÅuton"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Vi ne havas permeson skribi Ä‰i tie."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas Ä‰i tie. AlÅutu ion!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ElÅuti"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "AlÅuto tro larÄa"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosieroj, kiujn vi provas alÅuti, transpasas la maksimuman grandon por dosieralÅutoj en Ä‰i tiu servilo."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Nuna skano"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "dosiero"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "dosieroj"
 
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index c5864c36b149be2a84db74bc7ea4721a727b66c2..cce04b5e023fb5aae5270d42cc0d9e6b178d9778 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 4fd081aba3309740921284a635b8df6ec4d82886..a97c1db9c07030b1ca163600850f293cbc99e39a 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Bonvolu provizi Ålosilon de la aplikaÄµo Dropbox validan kaj sekretan."
 msgid "Error configuring Google Drive storage"
 msgstr "Eraro dum agordado de la memorservo Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 20c1f020a2297999d43ca6ee872f1f0290766f45..3a0a3dd55256bafd41f10d39c966eeb6353aaa51 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Pasvorto"
 msgid "Submit"
 msgstr "Sendi"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s kunhavigis la dosierujon %s kun vi"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s kunhavigis la dosieron %s kun vi"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ElÅuti"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "AlÅuti"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Nuligi alÅuton"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Ne haveblas antaÅvido por"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index 71946e65ffa01264649b3c1dfb20820404069216..def217fe084d861997ff1b75f22e3a6d92e24fff 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Eraro"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Forigi por Ä‰iam"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nomo"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 dosierujo"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} dosierujoj"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 dosiero"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} dosierujoj"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index afca16226f037b0adb951968fca38198b982ab66..1225699dbba72d9cb58a4bfd3eb95057870303ed 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Ne eblas malfari: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "sukceso"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Dosiero %s estis malfarita al versio %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "malsukceso"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Ne eblis malfari dosieron %s al versio %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versioj"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Neniu malnova versio disponeblas"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Neniu vojo estas specifita"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versioj"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Malfari dosieron al antaÅa versio per klako sur sia malfarad-butono"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "RestaÅri"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 8c1b22b779526b075cc9501223869e4b5dac45c4..8c48d709483f5cbb0f8a18f33a3b537240f38284 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Uzantoj"
 
 #: app.php:409
-msgid "Apps"
-msgstr "AplikaÄµoj"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administranto"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "TTT-servoj regataj de vi"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-elÅuto estas malkapabligita."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elÅutiÄi unuope."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -171,77 +183,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr "La uzantonomo de PostgreSQL aÅ la pasvorto ne validas"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Starigi administran uzantonomon."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Starigi administran pasvorton."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Via TTT-servilo ankoraÅ ne Äuste agordiÄis por permesi sinkronigi dosierojn Ä‰ar la WebDAV-interfaco Åajnas rompita."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekundoj antaÅe"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "antaÅ 1 minuto"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "antaÅ %d minutoj"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "antaÅ 1 horo"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "antaÅ %d horoj"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hodiaÅ"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "hieraÅ"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "antaÅ %d tagoj"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "lastamonate"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "antaÅ %d monatoj"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "lastajare"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "jaroj antaÅe"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index deb760d768ff47e9265a752117a8307d49fb7c53..be9963b2dd9c80d949d28b9fcf6b0d09591e7a0b 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "Esperanto"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Via TTT-servilo ankoraÅ ne Äuste agordiÄis por permesi sinkronigi dosierojn Ä‰ar la WebDAV-interfaco Åajnas rompita."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Kunhavigo"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Kapabligi API-on por Kunhavigo"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Kapabligi aplikaÄµojn uzi la API-on pri Kunhavigo"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Kapabligi ligilojn"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Kapabligi rekunhavigon"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Kapabligi uzantojn kunhavigi kun Ä‰iu ajn"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Registronivelo"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "Cimoraportejo"
 msgid "Commercial Support"
 msgstr "Komerca subteno"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Ekhavu la aplikaÄµojn por sinkronigi viajn dosierojn"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Via pasvorto ÅanÄiÄis"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ne eblis ÅanÄi vian pasvorton"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Nuna pasvorto"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ÅœanÄi la pasvorton"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "RetpoÅto"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Via retpoÅta adreso"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Enigu retpoÅtadreson por kapabligi pasvortan restaÅron"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 599994cc7df3b63628d28f2951a86efca5ad7f03..f91366c39c9e54f35710b649b5016da9a4ebd6c2 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Se la konekto nur funkcias kun Ä‰i tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "Kampo de vidignomo de uzanto"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "Kampo de vidignomo de grupo"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index c7675bf38739fdc6d03e8571689b95edf00c4d1e..1da9b2ef919d969a78eff4c94d5d617877f9bb41 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-aÅtentigo"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 8abc2766934840dce1fd41562963f91f57cead13..89a2465d445edac823ffdb54409f6cda4c617786 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,6 +6,7 @@
 # Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
+# pablomillaquen <pablomillaquen@gmail.com>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 # iGerli <stefano@aerosoles.net>, 2013
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -144,59 +145,59 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "hace {minutes} minutos"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Hace 1 hora"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "Hace {hours} horas"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "hace {days} dÃas"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "Hace {months} meses"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "el aÃ±o pasado"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "hace aÃ±os"
 
@@ -232,8 +233,8 @@ msgstr "El tipo de objeto no estÃ¡ especificado."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Error"
 
@@ -253,140 +254,141 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Error mientras comparte"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Error mientras se deja de compartir"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Error mientras se cambia permisos"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido contigo y el grupo {group} por {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Compartir con enlace"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ProtecciÃ³n con contraseÃ±a"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Permitir Subida PÃºblica"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Enviar enlace por correo electrÃ³nico a una persona"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Compartir por correo electrÃ³nico:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "No se encontrÃ³ gente"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protegido con contraseÃ±a"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Correo electrÃ³nico enviado"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "La actualizaciÃ³n ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualizaciÃ³n se ha realizado con Ã©xito. Redireccionando a ownCloud ahora."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Reseteo contraseÃ±a de ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -407,7 +409,7 @@ msgstr "La peticiÃ³n ha fallado! <br> Â¿EstÃ¡ seguro de que su direcciÃ³n de cor
 msgid "You will receive a link to reset your password via Email."
 msgstr "RecibirÃ¡ un enlace por correo electrÃ³nico para restablecer su contraseÃ±a"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -468,11 +470,11 @@ msgstr "Ayuda"
 msgid "Access forbidden"
 msgstr "Acceso prohibido"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "No se encuentra la nube"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -501,8 +503,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Su versiÃ³n de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Por favor, actualice su instalaciÃ³n de PHP para utilizar ownCloud de manera segura."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Por favor, actualice su instalaciÃ³n PHP para usar %s con seguridad."
 
 #: templates/installation.php:32
 msgid ""
@@ -522,68 +525,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Su directorio de datos y sus archivos probablemente sean accesibles a travÃ©s de internet ya que el archivo .htaccess no funciona."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Para informaciÃ³n sobre cÃ³mo configurar adecuadamente su servidor, por favor vea la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Para informaciÃ³n de cÃ³mo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentaciÃ³n</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Directorio de datos"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "se utilizarÃ¡n"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ContraseÃ±a de la base de datos"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Completar la instalaciÃ³n"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s esta disponible. Obtener mas informaciÃ³n de como actualizar."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Salir"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Â¡Inicio de sesiÃ³n automÃ¡tico rechazado!"
@@ -614,7 +621,7 @@ msgstr "Entrar"
 msgid "Alternative Logins"
 msgstr "Inicios de sesiÃ³n alternativos"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 743719a2dfc5a87460e26ca359c251fc67db2396..6dd3bd3f4addaac119f1ab725f6dc16901d5c1ef 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -6,14 +6,15 @@
 # Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
 # mikelanabitarte <mikelanabitarte@gmail.com>, 2013
+# qdneren <renanqd@yahoo.com.mx>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: mikelanabitarte <mikelanabitarte@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -124,7 +125,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -132,43 +133,45 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Realizar operaciÃ³n de borrado"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "subiendo 1 archivo"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "subiendo archivos"
 
@@ -204,33 +207,29 @@ msgstr "Su descarga estÃ¡ siendo preparada. Esto puede tardar algÃºn tiempo si l
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta no es vÃ¡lido. El uso de \"Shared\" estÃ¡ reservado por Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 carpeta"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} carpetas"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 archivo"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} archivos"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -289,61 +288,61 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "No tiene permisos de escritura aquÃ."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquÃ. Â¡Suba algo!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estÃ¡s intentando subir sobrepasan el tamaÃ±o mÃ¡ximo permitido en este servidor."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos estÃ¡n siendo escaneados,  por favor espere."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "carpeta"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "carpetas"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "archivo"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "archivos"
 
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index fbcbc4e2fe14e1fdd3331de0a4b13389c02375e4..1382a2304b683629a06f7d5f1c0398bee564766c 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-08 02:02+0200\n"
-"PO-Revision-Date: 2013-07-07 07:50+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,10 +74,14 @@ msgstr "Requisitos incompletos."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr "Por favor, asegÃºrese de que PHP 5.3.3 o posterior estÃ¡ instalado y que la extensiÃ³n OpenSSL de PHP estÃ¡ habilitada y configurada correctamente. Por el momento, la aplicaciÃ³n de cifrado ha sido deshabilitada."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index db79b82122c385076c22a5a43088e456e2465e28..6ffa1327ba1969bba43bb33067086ab0f156dc56 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Por favor, proporcione un una clave vÃ¡lida de la app Dropbox y una clav
 msgid "Error configuring Google Drive storage"
 msgstr "Error configurando el almacenamiento de Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 17a94b91648699965ea47065282cf27d11e076bd..302b80c747a25a494a878375d49a4be152605495 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
 # Korrosivo <yo@rubendelcampo.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +31,52 @@ msgstr "ContraseÃ±a"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Este enlace parece no funcionar mÃ¡s."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Las causas podrÃan ser:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "el elemento fue eliminado"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "el enlace expirÃ³"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "compartir estÃ¡ desactivado"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Para mayor informaciÃ³n, contacte a la persona que le enviÃ³ el enlace."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartiÃ³ la carpeta %s contigo"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartiÃ³ el fichero %s contigo"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "No hay vista previa disponible para"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 3473d1f258a9ce0b197ec177332545d41d68aadc..beb34a8115ec05a6a26c126fb9b2abb01638064d 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
 # Korrosivo <yo@rubendelcampo.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +29,45 @@ msgstr "No se puede eliminar %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "restaurar"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "eliminar archivo permanentemente"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 carpeta"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} carpetas"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 archivo"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} archivos"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "recuperado"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 1277356dd138de1ba45ed92e6f65a831f09e61fd..2c3194d68707062921fe825544b4522549527d8f 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Rodrigo RodrÃguez <roirobo@ubuntu.org.ni>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-08 02:02+0200\n"
-"PO-Revision-Date: 2013-07-07 07:42+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 05:50+0000\n"
+"Last-Translator: Rodrigo RodrÃguez <roirobo@ubuntu.org.ni>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "No se puede revertir: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "exitoso"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "El archivo %s fue revertido a la version %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "fallo"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "El archivo %s no puede ser revertido a la version %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Revisiones"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "No hay versiones antiguas disponibles"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "No se ha podido revertir {archivo} a revisiÃ³n {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ruta no especificada"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "MÃ¡s..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Revisiones"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "No hay otras versiones disponibles"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Revertir un archivo a una versiÃ³n anterior haciendo clic en el boton de revertir"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Recuperar"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 27d91bb3bb450c7ee0678f703db1ac667d33e344..209038f14eba2689576001ac1444c9bc122005c9 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pablomillaquen <pablomillaquen@gmail.com>, 2013
 # xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplicaciones"
-
-#: app.php:417
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "FallÃ³ la actualizaciÃ³n \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Servicios web bajo su control"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "No se puede abrir \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP estÃ¡ desactivada."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Descargue los archivos en trozos mÃ¡s pequeÃ±os, por separado o solicÃtelos amablemente su administrador."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "no pudo ser determinado"
 
@@ -171,77 +184,77 @@ msgstr "Comando infractor: \"%s\", nombre: %s, contraseÃ±a: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Usuario y/o contraseÃ±a de PostgreSQL no vÃ¡lidos"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Configurar un nombre de usuario del administrador"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Configurar la contraseÃ±a del administrador."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Su servidor web aÃºn no estÃ¡ configurado adecuadamente para permitir sincronizaciÃ³n de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guÃas de instalaciÃ³n</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "hace %d minutos"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Hace 1 hora"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Hace %d horas"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hoy"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ayer"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "hace %d dÃas"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "mes pasado"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Hace %d meses"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "aÃ±o pasado"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "hace aÃ±os"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Causado por:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index afd9ffcd97e813e7e0195c635bc25d1473b892e3..582d3720c7a9bedd65d35c185b5e33b1ca213e5c 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -5,15 +5,17 @@
 # Translators:
 # Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
+# pablomillaquen <pablomillaquen@gmail.com>, 2013
+# qdneren <renanqd@yahoo.com.mx>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 # scambra <sergio@programatica.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: pablomillaquen <pablomillaquen@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,166 +175,173 @@ msgstr "Se debe usar una contraseÃ±a valida"
 msgid "__language_name__"
 msgstr "Castellano"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no estÃ¡ funcionando. Le recomendamos encarecidamente que configure su servidor web de manera que el directorio de datos no estÃ© accesible, o mueva el directorio de datos fuera del documento raÃz de su servidor web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Su directorio de datos y sus archivos probablemente estÃ¡n accesibles desde Internet. El archivo .htaccess no estÃ¡ funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raÃz de documentos del servidor web."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Advertencia de configuraciÃ³n"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Su servidor web aÃºn no estÃ¡ configurado adecuadamente para permitir sincronizaciÃ³n de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guÃas de instalaciÃ³n</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modulo 'fileinfo' perdido"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este mÃ³dulo para obtener mejores resultados con la detecciÃ³n del mime-type"
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "La configuraciÃ³n regional no estÃ¡ funcionando"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Este servidor ownCloud no puede establecer la configuraciÃ³n regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar el %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "La configuraciÃ³n regional del sistema no se puede ajustar a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo. Le recomendamos instalar los paquetes necesarios en el sistema para soportar % s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "La conexion a internet no esta funcionando"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionarÃ¡n. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexiÃ³n a Internet para este servidor si quiere disfrutar de todas las caracterÃsticas de ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Este servidor no tiene una conexiÃ³n a Internet. Esto significa que algunas de las caracterÃsticas como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o instalaciÃ³n de aplicaciones de terceros no funcionan. PodrÃa no funcionar el acceso a los archivos de forma remota y el envÃo de correos electrÃ³nicos de notificaciÃ³n. Sugerimos habilitar la conexiÃ³n a Internet de este servidor, si quiere tener todas las funciones."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Ejecutar una tarea con cada pÃ¡gina cargada"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php es un sistema webcron registrado. Llama a la pÃ¡gina cron.php en la raÃz de owncloud una vez por minuto sobre http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php estÃ¡ registrado en un servicio WebCron para llamar cron.php una vez por minuto a travÃ©s de HTTP."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Utilizar el servicio cron del sistema. Llama al archivo cron.php en la carpeta de owncloud a travÃ©s de un cronjob del sistema una vez por minuto."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Usar el servicio cron del sistema para llamar al archivo cron.php una vez por minuto."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activar API de ComparticiÃ³n"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones utilizar la API de ComparticiÃ³n"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos al pÃºblico con enlaces"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Permitir subidas pÃºblicas"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas pÃºblicamente"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Permitir re-comparticiÃ³n"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con todo el mundo"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sÃ³lo con los usuarios en sus grupos"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Fuerza la conexiÃ³n de los clientes a ownCloud con una conexiÃ³n cifrada."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Forzar a los clientes a conectarse a %s por medio de una conexiÃ³n encriptada."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Por favor, conecte esta instancia de ownCloud vÃa HTTPS para activar o desactivar la aplicaciÃ³n de SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Por favor, conÃ©ctese a su %s a travÃ©s de HTTPS para habilitar o deshabilitar la aplicaciÃ³n SSL."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "MÃ¡s"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -390,77 +399,77 @@ msgstr "Rastreador de fallos"
 msgid "Commercial Support"
 msgstr "Soporte comercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Obtener las aplicaciones para sincronizar sus archivos"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Mostrar asistente para iniciar otra vez"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Su contraseÃ±a ha sido cambiada"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar su contraseÃ±a"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ContraseÃ±a actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nueva contraseÃ±a"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Cambiar contraseÃ±a"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Su direcciÃ³n de correo"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba una direcciÃ³n de correo electrÃ³nico para restablecer la contraseÃ±a"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "AyÃºdnos a traducir"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Utilice esta direcciÃ³n para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a travÃ©s de WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 31cef312559db808029f85374c423275a80839e1..edabac064f82ee4fd4435ce1c18b36b41d79d955 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -5,14 +5,15 @@
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # ordenet <roberto@ordenet.com>, 2013
+# Rodrigo RodrÃguez <roirobo@ubuntu.org.ni>, 2013
 # xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: xhiena <xhiena@gmail.com>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 06:00+0000\n"
+"Last-Translator: Rodrigo RodrÃguez <roirobo@ubuntu.org.ni>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgstr "No se pudo borrar la configuraciÃ³n del servidor"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr "La configuraciÃ³n es vÃ¡lida y la conexiÃ³n puede establecerse!"
+msgstr "Â¡La configuraciÃ³n es vÃ¡lida y la conexiÃ³n puede establecerse!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
@@ -54,7 +55,7 @@ msgstr "Â¿Asumir los ajustes actuales de la configuraciÃ³n del servidor?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr "Mantener la configuraciÃ³n?"
+msgstr "Â¿Mantener la configuraciÃ³n?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
@@ -91,9 +92,9 @@ msgstr "Confirmar eliminaciÃ³n"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -224,8 +225,8 @@ msgid "Disable Main Server"
 msgstr "Deshabilitar servidor principal"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Cuando se inicie, ownCloud unicamente conectarÃ¡ al servidor replica"
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -244,10 +245,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Apagar la validaciÃ³n por certificado SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Si la conexiÃ³n sÃ³lo funciona con esta opciÃ³n, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
+"certificate in your %s server."
+msgstr "Si la conexiÃ³n funciona sÃ³lo con esta opciÃ³n, importe el certificado SSL del servidor LDAP en su servidor %s."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -270,8 +272,8 @@ msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -294,8 +296,8 @@ msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -355,13 +357,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Por defecto el nombre de usuario interno serÃ¡ creado desde el atributo UUID. Esto asegura que el nombre de usuario es Ãºnico y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sÃ³lo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente quitados. En coincidencias un nÃºmero serÃ¡ aÃ±adido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es tambiÃ©n el nombre por defecto para la carpeta personal del usuario in ownCloud. TambiÃ©n es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuraciÃ³n el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. DÃ©jalo vacÃo para el comportamiento por defecto. Los cambios solo tendrÃ¡n efecto en los nuevos usuarios LDAP."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -373,14 +375,14 @@ msgstr "Sobrescribir la detecciÃ³n UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Por defecto, ownCloud autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. AdemÃ¡s, el nombre de usuario interno serÃ¡ creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuraciÃ³n y pasar un atributo de tu elecciÃ³n. Debes asegurarte de que el atributo de tu elecciÃ³n sea accesible por los usuarios y grupos y ser Ãºnico. DÃ©jalo en blanco para usar el comportamiento por defecto. Los cambios tendrÃ¡n efecto solo en los nuevos usuarios y grupos de LDAP."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -392,18 +394,17 @@ msgstr "AsignaciÃ³n del Nombre de usuario de un usuario LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud utiliza nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisiÃ³n y reconocer usuarios, cada usuario LDAP tendrÃ¡ un nombre de usuario interno. Esto requiere una asignaciÃ³n de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. AdemÃ¡s el DN se almacena en cachÃ© mÃ¡s bien para reducir la interacciÃ³n de LDAP, pero no se utiliza para la identificaciÃ³n. Si la DN cambia, los cambios serÃ¡n encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Eliminando las asignaciones tendrÃ¡ restos por todas partes. Eliminando las asignaciones no es sensible a la configuraciÃ³n, que afecta a todas las configuraciones de LDAP! No limpiar nunca las asignaciones en un entorno de producciÃ³n. SÃ³lo borrar asignaciones en una situaciÃ³n de prueba o experimental."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 38bc6e5bb761497d9769d8b6a8fb20add4b719db..b880f91c7a99d4de78296d5ccb11eddadcfeb56b 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -6,14 +6,15 @@
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # Art O. Pal <artopal@fastmail.fm>, 2012
 # pggx999 <pggx999@gmail.com>, 2012
+# Rodrigo RodrÃguez <roirobo@ubuntu.org.ni>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-08 02:02+0200\n"
-"PO-Revision-Date: 2013-07-07 08:08+0000\n"
-"Last-Translator: Korrosivo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 05:50+0000\n"
+"Last-Translator: Rodrigo RodrÃguez <roirobo@ubuntu.org.ni>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,12 +27,12 @@ msgid "WebDAV Authentication"
 msgstr "AutenticaciÃ³n de WevDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "DirecciÃ³n:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "onwCloud enviarÃ¡ las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
+msgstr "onwCloud enviarÃ¡ las credenciales de usuario a esta direcciÃ³n. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index e61e0cdd9703b3358367896924d2afc410a49c51..a64c557f8e75d627d55f210668ecf54f01fe2c40 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr "noviembre"
 msgid "December"
 msgstr "diciembre"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ConfiguraciÃ³n"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "hace {minutes} minutos"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 hora atrÃ¡s"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "hace {hours} horas"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "hace {days} dÃas"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} meses atrÃ¡s"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "el aÃ±o pasado"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "aÃ±os atrÃ¡s"
 
@@ -226,8 +226,8 @@ msgstr "El tipo de objeto no estÃ¡ especificado. "
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Error"
 
@@ -247,140 +247,141 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Error en al dejar de compartir"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vos y el grupo {group} por {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vos por {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Compartir con enlace"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Proteger con contraseÃ±a "
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Permitir Subida PÃºblica"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Enviar el enlace por e-mail."
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Mandar"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Compartir a travÃ©s de e-mail:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "podÃ©s editar"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protegido por contraseÃ±a"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Mandando..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "e-mail mandado"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "La actualizaciÃ³n no pudo ser completada. Por favor, reportÃ¡ el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualizaciÃ³n fue exitosa. EstÃ¡s siendo redirigido a ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Restablecer contraseÃ±a de ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +402,7 @@ msgstr "Â¡Error en el pedido! <br> Â¿EstÃ¡s seguro de que tu direcciÃ³n de corre
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseÃ±a."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -462,11 +463,11 @@ msgstr "Ayuda"
 msgid "Access forbidden"
 msgstr "Acceso prohibido"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "No se encontrÃ³ ownCloud"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "La versiÃ³n de PHP que tenÃ©s, es vulnerable al ataque de byte NULL (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ActualizÃ¡ tu instalaciÃ³n de PHP para usar ownCloud de manera segura."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Tu directorio de datos y tus archivos probablemente son accesibles a travÃ©s de internet, ya que el archivo .htaccess no estÃ¡ funcionando."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Para informaciÃ³n sobre cÃ³mo configurar adecuadamente tu servidor, por favor mirÃ¡ la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "se usarÃ¡n"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ContraseÃ±a de la base de datos"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "HuÃ©sped de la base de datos"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Completar la instalaciÃ³n"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s estÃ¡ disponible. ObtenÃ© mÃ¡s informaciÃ³n sobre cÃ³mo actualizar."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Cerrar la sesiÃ³n"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Â¡El inicio de sesiÃ³n automÃ¡tico fue rechazado!"
@@ -608,7 +614,7 @@ msgstr "Iniciar sesiÃ³n"
 msgid "Alternative Logins"
 msgstr "Nombre alternativos de usuarios"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 5eb13343dd5742ce500f9454c15e8605a3b5d57c..942c654beb62df9c488fb99bb8944b2a0e5b64e8 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +31,11 @@ msgstr "No se pudo mover %s "
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "No fue posible crear el directorio de subida."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "Token InvÃ¡lido"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -65,7 +66,7 @@ msgstr "No se subiÃ³ ningÃºn archivo "
 
 #: ajax/upload.php:72
 msgid "Missing a temporary folder"
-msgstr "Error en la carpera temporal"
+msgstr "Falta un directorio temporal"
 
 #: ajax/upload.php:73
 msgid "Failed to write to disk"
@@ -73,11 +74,11 @@ msgstr "Error al escribir en el disco"
 
 #: ajax/upload.php:91
 msgid "Not enough storage available"
-msgstr "No hay suficiente capacidad de almacenamiento"
+msgstr "No hay suficiente almacenamiento"
 
 #: ajax/upload.php:123
 msgid "Invalid directory."
-msgstr "Directorio invalido."
+msgstr "Directorio invÃ¡lido."
 
 #: appinfo/app.php:12
 msgid "Files"
@@ -106,7 +107,7 @@ msgstr "La URL no puede estar vacÃa"
 
 #: js/file-upload.js:238 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "Nombre de carpeta invÃ¡lido. El uso de \"Shared\" estÃ¡ reservado por ownCloud"
+msgstr "Nombre de directorio invÃ¡lido. El uso de \"Shared\" estÃ¡ reservado por ownCloud"
 
 #: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
 #: js/files.js:693 js/files.js:731
@@ -119,9 +120,9 @@ msgstr "Compartir"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr "Borrar de manera permanente"
+msgstr "Borrar permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Borrar"
 
@@ -129,43 +130,45 @@ msgstr "Borrar"
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Pendientes"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
-msgstr "reemplazado {new_name} con {old_name}"
+msgstr "se reemplazÃ³ {new_name} con {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
-msgstr "Eliminar"
+msgstr "Llevar a cabo borrado"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "Subiendo 1 archivo"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Subiendo archivos"
 
@@ -195,44 +198,40 @@ msgstr "El almacenamiento estÃ¡ casi lleno ({usedSpacePercent}%)"
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
+msgstr "Tu descarga se estÃ¡ preparando. Esto puede demorar si los archivos son muy grandes."
 
 #: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta invÃ¡lido. El uso de 'Shared' estÃ¡ reservado por ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 directorio"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} directorios"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 archivo"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} archivos"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "No se pudo renombrar %s"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -252,7 +251,7 @@ msgstr "mÃ¡x. posible:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Es necesario para descargas multi-archivo y de carpetas"
+msgstr "Es necesario para descargas multi-archivo y de directorios."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -286,61 +285,61 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
-msgstr "Archivos Borrados"
+msgstr "Archivos borrados"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "No tenÃ©s permisos de escritura acÃ¡."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. Â¡SubÃ contenido!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "El tamaÃ±o del archivo que querÃ©s subir es demasiado grande"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que intentÃ¡s subir sobrepasan el tamaÃ±o mÃ¡ximo "
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Se estÃ¡n escaneando los archivos, por favor esperÃ¡."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "directorio"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "directorios"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "archivo"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "archivos"
 
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index f52bef53bf0edc3cc18d57cd7dbbdab4d6980ead..0640a5045514ecdbccd77b2ef56b836578ac37cc 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgstr "ContraseÃ±a de clave privada actualizada con Ã©xito."
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr "No fue posible actualizar la contraseÃ±a de la clave privada. Tal vez la contraseÃ±a antigua no es correcta."
+msgstr "No fue posible actualizar la contraseÃ±a de clave privada. Tal vez la contraseÃ±a anterior no es correcta."
 
 #: files/error.php:7
 msgid ""
@@ -60,17 +60,21 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Â¡Tu clave privada no es vÃ¡lida! Tal vez tu contraseÃ±a fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). PodÃ©s actualizar tu clave privada en la secciÃ³n de \"configuraciÃ³n personal\", para recuperar el acceso a tus archivos."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Requisitos incompletos."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -98,7 +102,7 @@ msgstr "EncriptaciÃ³n"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr "Habilitar clave de recuperaciÃ³n (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseÃ±a):"
+msgstr "Habilitar clave de recuperaciÃ³n (te permite recuperar los archivos de usuario en el caso que pierdas la contraseÃ±a):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
@@ -130,11 +134,11 @@ msgstr "Cambiar contraseÃ±a"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr "Tu contraseÃ±a de recuperaciÃ³n de clave ya no coincide con la contraseÃ±a de ingreso:"
+msgstr "Tu contraseÃ±a de clave privada ya no coincide con la contraseÃ±a de ingreso:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr "UsÃ¡ tu contraseÃ±a de recuperaciÃ³n de clave antigua para tu contraseÃ±a de ingreso actual."
+msgstr "UsÃ¡ tu contraseÃ±a de clave privada antigua para tu contraseÃ±a de ingreso actual."
 
 #: templates/settings-personal.php:16
 msgid ""
@@ -156,13 +160,13 @@ msgstr "Actualizar contraseÃ±a de la clave privada"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr "Habilitar contraseÃ±a de recuperaciÃ³n:"
+msgstr "Habilitar recuperaciÃ³n de contraseÃ±a:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr "Habilitando esta opciÃ³n te va a permitir tener acceso a tus archivos encriptados incluso si perdÃ©s la contraseÃ±a"
+msgstr "Habilitando esta opciÃ³n, vas a tener acceso a tus archivos encriptados, incluso si perdÃ©s la contraseÃ±a"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index e96d01110b19e6aca24f8648c32345e2eb7acd52..91783cd3659edb305866506388f7d8c57a4508f5 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -38,25 +38,25 @@ msgstr "Por favor, proporcionÃ¡ un secreto y una contraseÃ±a vÃ¡lida para la apl
 msgid "Error configuring Google Drive storage"
 msgstr "Error al configurar el almacenamiento de Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
+msgstr "<b>Advertencia:</b> El cliente smb \"smbclient\" no estÃ¡ instalado. Montar archivos CIFS/SMB no es posible. Por favor, pedile al administrador de tu sistema que lo instale."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
+msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no estÃ¡ instalado. Montar archivos FTP no es posible. Por favor, pedile al administrador de tu sistema que lo instale."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr "<b>Advertencia:</b> El soporte de Curl de PHP no estÃ¡ activado ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no serÃ¡ posible. Pedile al administrador del sistema que lo instale."
+msgstr "<b>Advertencia:</b> El soporte de Curl de PHP no estÃ¡ activo ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no serÃ¡ posible. Pedile al administrador del sistema que lo instale."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 5c1ed88699ff876a7622c54a0de1864b61cc04b4..1af48d91541e5705d22351052a2fc0c5c45d633d 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "La contraseÃ±a no es correcta. ProbÃ¡ de nuevo."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "ContraseÃ±a"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartiÃ³ la carpeta %s con vos"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartiÃ³ el archivo %s con vos"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Subir"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "La vista preliminar no estÃ¡ disponible para"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 6c380e43d1e122b1f4492fce20db3226b6023cd4..bdec790f40d33688902c48111d45168bec0d14b6 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr "No fue posible borrar %s de manera permanente"
 msgid "Couldn't restore %s"
 msgstr "No se pudo restaurar %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "Borrar archivo de manera permanente"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Borrar de manera permanente"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Borrado"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 directorio"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} directorios"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 archivo"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} archivos"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 956dd59f216fabc314499840f2720389fcf049f9..47441f17a35d4c18c6b2d9e82edc363333ee955b 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "No se pudo revertir: %s "
 
-#: history.php:40
-msgid "success"
-msgstr "Ã‰xito"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "El archivo %s fue revertido a la versiÃ³n %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "error"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "El archivo %s no pudo ser revertido a la versiÃ³n %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versiones"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "No hay versiones antiguas disponibles"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ruta de acceso no especificada"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versiones"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "RevertÃ un archivo a una versiÃ³n anterior haciendo click en su botÃ³n de \"revertir\""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Recuperar"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 60b3946840514606050d3c9f280bcd1aa683204b..722cf0c4c60e70dcc226cdcdaf0d826922b3293a 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -35,36 +35,48 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplicaciones"
-
-#: app.php:417
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "No se pudo actualizar \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
-msgstr "servicios web que controlÃ¡s"
+msgstr "servicios web sobre los que tenÃ©s control"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "no se puede abrir \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP estÃ¡ desactivada."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
-msgstr "Volver a archivos"
+msgstr "Volver a Archivos"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "DescargÃ¡ los archivos en partes mÃ¡s chicas, de forma separada, o pedÃselos al administrador"
+
+#: helper.php:235
 msgid "couldn't be determined"
-msgstr "no pudo ser determinado"
+msgstr "no se pudo determinar"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -93,17 +105,17 @@ msgstr "ImÃ¡genes"
 #: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
-msgstr "%s Entre el Usuario de la Base de Datos"
+msgstr "%s EntrÃ¡ el usuario de la base de datos"
 
 #: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
-msgstr "%s Entre el Nombre de la Base de Datos"
+msgstr "%s EntrÃ¡ el nombre de la base de datos."
 
 #: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr "%s no puede usar puntos en el nombre de la Base de Datos"
+msgstr "%s no podÃ©s usar puntos en el nombre de la base de datos"
 
 #: setup/mssql.php:20
 #, php-format
@@ -113,7 +125,7 @@ msgstr "Nombre de usuario y contraseÃ±a de MS SQL no son vÃ¡lidas: %s"
 #: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
 #: setup/postgresql.php:24 setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
-msgstr "Debe ingresar una cuenta existente o el administrador"
+msgstr "TenÃ©s que ingresar una cuenta existente o el administrador."
 
 #: setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
@@ -139,7 +151,7 @@ msgstr "El comando no comprendido es: \"%s\""
 #: setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Usuario MySQL '%s'@'localhost' ya existente"
+msgstr "Usuario MySQL '%s'@'localhost' ya existe."
 
 #: setup/mysql.php:86
 msgid "Drop this user from MySQL"
@@ -148,7 +160,7 @@ msgstr "Borrar este usuario de MySQL"
 #: setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Usuario MySQL '%s'@'%%' ya existente"
+msgstr "Usuario MySQL '%s'@'%%' ya existe"
 
 #: setup/mysql.php:92
 msgid "Drop this user from MySQL."
@@ -160,7 +172,7 @@ msgstr "No fue posible establecer la conexiÃ³n a Oracle"
 
 #: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr "El nombre de usuario y contraseÃ±a no son vÃ¡lidos"
+msgstr "El nombre de usuario y/o contraseÃ±a no son vÃ¡lidos"
 
 #: setup/oci.php:173 setup/oci.php:205
 #, php-format
@@ -169,79 +181,79 @@ msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseÃ±a: \"%s\
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
-msgstr "Nombre de usuario o contraseÃ±a de PostgradeSQL no vÃ¡lido."
+msgstr "Nombre de usuario o contraseÃ±a PostgradeSQL invÃ¡lido."
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
-msgstr "Configurar un nombre de administrador"
+msgstr "Configurar un nombre de administrador."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
-msgstr "Configurar una palabra clave de administrador"
+msgstr "Configurar una contraseÃ±a de administrador."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tu servidor web no estÃ¡ configurado todavÃa para permitir sincronizaciÃ³n de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, comprobÃ¡ nuevamente la <a href='%s'>guÃa de instalaciÃ³n</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "hace %d minutos"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 hora atrÃ¡s"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d horas atrÃ¡s"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hoy"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ayer"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "hace %d dÃas"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "el mes pasado"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d meses atrÃ¡s"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "el aÃ±o pasado"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "aÃ±os atrÃ¡s"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Provocado por:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 172e6c3a9cc388f5813395065bbd7e3816342e5a..38ed5cca2a42872699bed5c22644b074d137c4d0 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -171,166 +171,173 @@ msgstr "Debe ingresar una contraseÃ±a vÃ¡lida"
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no estÃ¡ funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no estÃ© accesible, o que muevas el directorio de datos afuera del directorio raÃz de tu servidor web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Alerta de ConfiguraciÃ³n"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tu servidor web no estÃ¡ configurado todavÃa para permitir sincronizaciÃ³n de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Por favor, comprobÃ¡ nuevamente la <a href='%s'>guÃa de instalaciÃ³n</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "El mÃ³dulo 'fileinfo' no existe"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "El mÃ³dulo PHP 'fileinfo' no existe. Es recomendable que actives este mÃ³dulo para obtener mejores resultados con la detecciÃ³n mime-type"
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "\"Locale\" no estÃ¡ funcionando"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "El servidor ownCloud no puede asignar la localizaciÃ³n de sistema a %s. Esto puede provocar que existan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "La conexiÃ³n a Internet no esta funcionando. "
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Este servidor ownCloud no tiene una conexiÃ³n a internet que funcione. Esto significa que alguno de sus servicios, tales  como montar dispositivos externos, notificaciÃ³n de actualizaciones o instalar Apps de otros desarrolladores no funcionan. Puede ser que tampoco puedas acceder a archivos remotos y mandar e-mails. Te sugerimos que actives una conexiÃ³n a internet si querÃ©s estas caracterÃsticas en ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "EjecutÃ¡ una tarea con cada pagina cargada."
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php estÃ¡ registrado como un servicio webcron. Llamar la pÃ¡gina cron.php en la raÃz de ownCloud una vez al minuto sobre http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Usar el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a travÃ©s del sistema cronjob cada un minuto."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Habilitar Share API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones usar la Share API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir enlaces pÃºblicos"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Permitir subidas pÃºblicas"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios pÃºblicos compartidos"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Permitir Re-Compartir"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquiera."
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sÃ³lo con los de sus mismos grupos"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Forzar a los clientes conectar a ownCloud vÃa conexiÃ³n encriptada."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Por favor conectate a este ownCloud vÃa HTTPS para habilitar o deshabilitar el SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "MÃ¡s"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,77 +395,77 @@ msgstr "Informar errores"
 msgid "Commercial Support"
 msgstr "Soporte comercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ObtenÃ© Apps para sincronizar tus archivos"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Mostrar de nuevo el asistente de primera ejecuciÃ³n"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "UsÃ¡s <strong>%s</strong>  de los <strong>%s</strong> disponibles"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Tu contraseÃ±a fue cambiada"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "No fue posible cambiar tu contraseÃ±a"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ContraseÃ±a actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nueva contraseÃ±a:"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Cambiar contraseÃ±a"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "e-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Tu direcciÃ³n de e-mail"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "EscribÃ una direcciÃ³n de e-mail para restablecer la contraseÃ±a"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "UsÃ¡ esta direcciÃ³n para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a travÃ©s de WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 1eb14182b83f55a082ba8f1a46c3ba490e45eca8..21e09ca7c370722172947031440716e15e468eeb 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +89,9 @@ msgstr "Confirmar borrado"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "Deshabilitar el Servidor Principal"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Al comenzar, ownCloud se conectarÃ¡ Ãºnicamente al servidor rÃ©plica"
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Desactivar la validaciÃ³n por certificado SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Si la conexiÃ³n sÃ³lo funciona con esta opciÃ³n, importÃ¡ el certificado SSL del servidor LDAP en tu servidor ownCloud."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es Ãºnico y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sÃ³lo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un nÃºmero serÃ¡ aÃ±adido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es tambiÃ©n el nombre por defecto para el directorio personal del usuario in ownCloud. TambiÃ©n es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuraciÃ³n el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresÃ¡ el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacÃo para el comportamiento por defecto. Los cambios solo tendrÃ¡n efecto para los nuevos usuarios LDAP."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "Sobrescribir la detecciÃ³n UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Por defecto, ownCloud detecta automÃ¡ticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. AdemÃ¡s, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. PodÃ©s sobrescribir la configuraciÃ³n y pasar un atributo de tu elecciÃ³n. TenÃ©s que asegurarte de que el atributo de tu elecciÃ³n sea accesible por los usuarios y grupos y ser Ãºnico. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrÃ¡n efecto sÃ³lo en los nuevos usuarios y grupos de LDAP."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "AsignaciÃ³n del Nombre de usuario de un usuario LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisiÃ³n y reconocer usuarios, cada usuario LDAP tendrÃ¡ un nombre de usuario interno. Esto requiere una asignaciÃ³n de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. AdemÃ¡s el DN se almacena en cachÃ© principalmente para reducir la interacciÃ³n de LDAP, pero no se utiliza para la identificaciÃ³n. Si la DN cambia, los cambios serÃ¡n encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejarÃ¡ restos en distintos lugares. Borrar las asignaciones no depende de la configuraciÃ³n, Â¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producciÃ³n. SÃ³lo borrar asignaciones en una situaciÃ³n de prueba o experimental."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index aaa1cdcdb30f263af5b4339c3af9759d06ab271c..e40f809b1bfd1cf3cca2ea888ab743f73bca0bdc 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-25 02:04+0200\n"
-"PO-Revision-Date: 2013-06-24 13:50+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "AutenticaciÃ³n de WevDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "onwCloud enviarÃ¡ las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
+msgstr ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 30a31b65a0619967bf0c3892274e592b969c0963..089c7847e96ec97fdffb8f636ae8cb312b47d7dc 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,59 @@ msgstr "November"
 msgid "December"
 msgstr "Detsember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minut tagasi"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutit tagasi"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 tund tagasi"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} tundi tagasi"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "tÃ¤na"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} pÃ¤eva tagasi"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} kuud tagasi"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -227,8 +227,8 @@ msgstr "Objekti tÃ¼Ã¼p pole mÃ¤Ã¤ratletud."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Viga"
 
@@ -248,140 +248,141 @@ msgstr "Jagatud"
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Viga jagamise lÃµpetamisel"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Viga Ãµiguste muutmisel"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Sinuga jagas {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Jaga"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Jaga lingiga"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Parool"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Luba avalik Ã¼leslaadimine"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Saada link isikule e-postiga"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Saada"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "MÃ¤Ã¤ra aegumise kuupÃ¤ev"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Aegumise kuupÃ¤ev"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ãœhtegi inimest ei leitud"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Jagatud {item} kasutajaga {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "LÃµpeta jagamine"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ligipÃ¤Ã¤sukontroll"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupÃ¤eva eemaldamisel"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupÃ¤eva mÃ¤Ã¤ramisel"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Uuendus ebaÃµnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud parooli taastamine"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +403,7 @@ msgstr "PÃ¤ring ebaÃµnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on Ãµ
 msgid "You will receive a link to reset your password via Email."
 msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Kasutajanimi"
@@ -463,11 +464,11 @@ msgstr "Abiinfo"
 msgid "Access forbidden"
 msgstr "LigipÃ¤Ã¤s on keelatud"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Pilve ei leitud"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rÃ¼nnakuga."
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Palun uuenda oma paigaldatud PHP-d tagamaks ownCloudi turvalisus."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Su andmete kataloog ja failid on tÃµenÃ¤oliselt internetist vabalt saadaval kuna .htaccess fail ei toimi."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Serveri korrektseks seadistuseks tutvu palun <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "TÃ¤psem"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "kasutatakse"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Andmebaasi tabeliruum"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "LÃµpeta seadistamine"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saadaval. Vaata lÃ¤hemalt kuidas uuendada."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Logi vÃ¤lja"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Rohkem rakendusi"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automaatne sisselogimine lÃ¼kati tagasi!"
@@ -609,7 +615,7 @@ msgstr "Logi sisse"
 msgid "Alternative Logins"
 msgstr "Alternatiivsed sisselogimisviisid"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 21915a06344d6c5af1fe4096b1d83b939fe41e3f..2420df62528fec2299205333fe5469ccd4b824a5 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,7 @@ msgstr "Jaga"
 msgid "Delete permanently"
 msgstr "Kustuta jÃ¤Ã¤davalt"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -130,43 +130,45 @@ msgstr "Kustuta"
 msgid "Rename"
 msgstr "Nimeta Ã¼mber"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "teosta kustutamine"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fail Ã¼leslaadimisel"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "faili Ã¼leslaadimisel"
 
@@ -202,33 +204,29 @@ msgstr "Valmistatakse allalaadimist. See vÃµib vÃµtta veidi aega, kui on tegu su
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 kaust"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} kausta"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fail"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} faili"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -287,61 +285,61 @@ msgstr "Kaust"
 msgid "From link"
 msgstr "Allikast"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Kustutatud failid"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "TÃ¼hista Ã¼leslaadimine"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Siin puudvad sul kirjutamisÃµigused."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi Ã¼les!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "LÃµpeta jagamine"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ãœleslaadimine on liiga suur"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Failid, mida sa proovid Ã¼les laadida, Ã¼letab serveri poolt Ã¼leslaetavatele failidele mÃ¤Ã¤ratud maksimaalse suuruse."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "kaust"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "kaustad"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fail"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index b5851a1bb9d40cccf03de172dc2cc054dfd66f1c..f39cbd36408ca78c1d8c82c2e20cdffdebfca0f6 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 09:30+0000\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 11:10+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -69,10 +69,14 @@ msgstr "NÃµutavad on puudu."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr "Veendu, et kasutusel oleks PHP 5.3.3 vÃµi uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krÃ¼pteerimise rakenduse kasutamine peatatud."
+"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."
+msgstr "Palun veendu, et on paigaldatud PHP 5.3.3 vÃµi uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krÃ¼pteerimise rakendus on peatatud."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "JÃ¤rgmised kasutajad pole seadistatud krÃ¼pteeringuks:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index eb3443c929f2bc91ecf4f4d32868b6bdc7a7508c..b371afd1271de812052e1dd8d3d93f0f520feb0e 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Palun sisesta korrektne Dropboxi rakenduse vÃµti ja salasÃµna."
 msgid "Error configuring Google Drive storage"
 msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Hoiatus:</b> \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate Ã¼hendamine pole vÃµimalik. Palu oma sÃ¼steemihalduril paigaldata SAMBA tugi."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Hoiatus:</b> PHP-s puudub FTP tugi. Jagatud FTP hoidlate Ã¼hendamine pole vÃµimalik. Palu oma sÃ¼steemihalduril paigaldata FTP tugi."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index a5067f52ace81507d84ef9741985b36222a95b47..f45b12c52bbbf2bfed0acf3c8ba42006bfd7b8b5 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
 # Rivo ZÃ¤ngov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:50+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +31,52 @@ msgstr "Parool"
 msgid "Submit"
 msgstr "Saada"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Vabandust, see link ei tundu enam toimivat."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "PÃµhjused vÃµivad olla:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Ã¼ksus on eemaldatud"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "link on aegunud"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "jagamine on peatatud"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "TÃ¤psema info saamiseks palun pÃ¶Ã¶rdu lingi saatnud isiku poole."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jagas sinuga kausta %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jagas sinuga faili %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Lae Ã¼les"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "TÃ¼hista Ã¼leslaadimine"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Eelvaadet pole saadaval"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 12747f6425b2350942df38a18e057af3d16d7513..9e88ec56abd822c4c6ee9a8131b6929f29f4946c 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +28,45 @@ msgstr "%s jÃ¤Ã¤davalt kustutamine ebaÃµnnestus"
 msgid "Couldn't restore %s"
 msgstr "%s ei saa taastada"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "soorita taastamine"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Viga"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "kustuta fail jÃ¤Ã¤davalt"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Kustuta jÃ¤Ã¤davalt"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 kaust"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} kausta"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fail"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} faili"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "taastatud"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index 6be6fc45ff4528470a63258c450caefcfae208d4..cfb0bfca4a332d1a1cc6a8e6a8ae1b2d88437939 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
 # Rivo ZÃ¤ngov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:40+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,41 +19,27 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Ei suuda taastada faili: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "korras"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Fail %s taastati versioonile %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "ebaÃµnnestus"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Faili %s ei saa taastada versioonile %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versioonid"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Vanu versioone pole saadaval"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "EbaÃµnnestus faili {file} taastamine revisjonile {timestamp}"
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Asukohta pole mÃ¤Ã¤ratud"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Rohkem versioone..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versioonid"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Muid versioone pole saadaval"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Taasta"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index a6c9243ae86da6a60cd01e1f2ef20b9d68f2a55b..a0fadcd8feab9850b0ef9f654bad8d31bf453adf 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -36,34 +36,46 @@ msgid "Users"
 msgstr "Kasutajad"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Rakendused"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "EbaÃµnnestunud uuendus \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "veebitenused sinu kontrolli all"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "ei suuda avada \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on vÃ¤lja lÃ¼litatud."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida Ã¼kshaaval."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Laadi failid alla eraldi vÃ¤iksemate osadena vÃµi kÃ¼si nÃµu oma sÃ¼steemiadminstraatorilt."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ei suudetud tuvastada"
 
@@ -172,77 +184,77 @@ msgstr "TÃµrkuv kÃ¤sk oli: \"%s\", nimi: %s, parool: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL kasutajatunnus ja/vÃµi parool pole Ãµiged"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "MÃ¤Ã¤ra admin kasutajanimi."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "MÃ¤Ã¤ra admini parool."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud vÃµimaldamaks failide sÃ¼nkroniseerimist, kuna WebDAV liides nÃ¤ib olevat mittetoimiv."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minut tagasi"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutit tagasi"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 tund tagasi"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d tundi tagasi"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "tÃ¤na"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "eile"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d pÃ¤eva tagasi"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d kuud tagasi"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "aastat tagasi"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "PÃµhjustaja:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 2a8c7c35470a57dae895e83e1574f592b37155e1..4dc6df1749c33f403ae9d935dff962352dc420c7 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,166 +171,173 @@ msgstr "Sisesta nÃµuetele vastav parool"
 msgid "__language_name__"
 msgstr "Eesti"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Andmete kataloog ja failid on tÃµenÃ¤oliselt internetis avalikult saadaval. .htaccess fail, mida pakub ownCloud, ei toimi. Soovitame tungivalt veebiserveri seadistust selliselt, et andmete kataloog ei oleks enam vabalt saadaval vÃµi tÃµstaksid andmete kataloogi oma veebiserveri veebi-juurkataloogist mujale."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Andmete kataloog ja failid on tÃµenÃ¤oliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval vÃµi tÃµstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Paigalduse hoiatus"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud vÃµimaldamaks failide sÃ¼nkroniseerimist, kuna WebDAV liides nÃ¤ib olevat mittetoimiv."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Palun kontrolli uuesti <a href=\"%s\">paigaldusjuhendeid</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Moodul 'fileinfo' puudub"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitÃ¼Ã¼pide tuvastamisel."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Lokalisatsioon ei toimi"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "ownCloud server ei suuda seadistada sÃ¼steemi lokalisatsiooni %s. See tÃ¤hendab, et vÃµib esineda probleeme teatud tÃ¤hemÃ¤rkidega failide nimedes. Soovitame tungivalt paigaldada sÃ¼steemi vajalikud pakid toetamaks %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "SÃ¼steemi lokaliseeringut ei saa panna %s. See tÃ¤hendab, et vÃµib esineda probleeme teatud tÃ¤hemÃ¤rkidega failide nimedes. Soovitame tungivalt paigaldada sÃ¼steemi vajalikud pakid toetamaks %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "InternetiÃ¼hendus ei toimi"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "ownCloud serveril puudub toimiv internetiÃ¼hendus. See tÃ¤hendab, et mÃµned funktsionaalsused, nagu nÃ¤iteks vÃ¤liste andmehoidlate Ã¼hendamine, teavitused uuendustest vÃµi kolmandate osapoolte rakenduste paigaldamine ei tÃ¶Ã¶ta. Eemalt failidele ligipÃ¤Ã¤s ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid tÃ¤ielikku funktsionaalsust, siis soovitame serverile tagada ligipÃ¤Ã¤s internetti."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Serveril puudub toimiv internetiÃ¼hendus. See tÃ¤hendab, et mÃµned funktsionaalsused, nagu nÃ¤iteks vÃ¤liste andmehoidlate Ã¼hendamine, teavitused uuendustest vÃµi kolmandate osapoolte rakenduste paigaldamine ei tÃ¶Ã¶ta. Eemalt failidele ligipÃ¤Ã¤s ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid tÃ¤ielikku funktsionaalsust, siis soovitame serverile tagada ligipÃ¤Ã¤s internetti."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "KÃ¤ivita toiming lehe laadimisel"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php on registreeritud webcron teenusena. Lae cron.php lehte owncloud veebikataloogist iga minut Ã¼le http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php on registreeritud webcron teenusena laadimaks cron.php iga minut Ã¼le http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Kasuta sÃ¼steemi cron teenust. KÃ¤ivita cron.php fail owncloud veebikataloogist kasutades sÃ¼steemi crontab toimingut iga minut."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Kasuta sÃ¼steemi cron teenust kÃ¤ivitamaks faili cron.php kord minutis."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Luba Share API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Luba rakendustel kasutada Share API-t"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Luba lingid"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Luba avalikud Ã¼leslaadimised"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Luba kasutajatel Ã¼leslaadimine teiste poolt oma avalikult jagatud kataloogidesse "
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Luba edasijagamine"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Luba kasutajatel kÃµigiga jagada"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Sunnib kliente ownCloudiga Ã¼henduma krÃ¼pteeritult."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Sunnib kliente %s Ã¼henduma krÃ¼pteeritult."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Palun Ã¼hendu selle ownCloud instantsiga Ã¼le HTTPS vÃµi keela SSL kasutamine."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Palun Ã¼hendu oma %s Ã¼le HTTPS vÃµi keela SSL kasutamine."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "VÃ¤hem"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,77 +395,77 @@ msgstr "Vigade nimekiri"
 msgid "Commercial Support"
 msgstr "Tasuline kasutajatugi"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Hangi rakendusi failide sÃ¼nkroniseerimiseks"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "NÃ¤ita veelkord Esmase KÃ¤ivituse Juhendajat"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parool"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Sinu parooli on muudetud"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Sa ei saa oma parooli muuta"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Uus parool"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "NÃ¤idatav nimi"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parooli taastamise sisse lÃ¼litamiseks sisesta e-posti aadress"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Aita tÃµlkida"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipÃ¤Ã¤suks WebDAV kaudu</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 20b45f0f722b10f989f2c2c73512fd6ffde04d69..429359f138b7acd206abe68e7a63a8db1a105add 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:16+0000\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 11:00+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Kinnita kustutamine"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole Ã¼hilduvad. TÃ¶Ã¶s vÃµib esineda ootamatuid tÃµrkeid.\nPalu oma sÃ¼steemihalduril Ã¼ks neist rakendustest kasutusest eemaldada."
 
@@ -223,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "Ã„ra kasuta peaserverit"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "MÃ¤rgituna ownCloud Ã¼hendub ainult varuserverisse."
+msgid "Only connect to the replica server."
+msgstr "Ãœhendu ainult replitseeriva serveriga."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -243,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "LÃ¼lita SSL sertifikaadi kontrollimine vÃ¤lja."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Kui Ã¼hendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
+"certificate in your %s server."
+msgstr "Kui Ã¼hendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -269,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "Kasutaja nÃ¤idatava nime vÃ¤li"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -293,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "Grupi nÃ¤idatava nime vÃ¤li"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -354,13 +355,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sÃ¼mboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult jÃ¤rgmised sÃ¼mbolid: [ a-zA-Z0-9_.@- ]. Muud sÃ¼mbolid asendatakse nende ASCII vastega vÃµi lihtsalt hÃ¼ljatakse. TÃµrgete korral lisatakse number vÃµi suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ãœhtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, nÃ¤iteks kÃµikidel *DAV teenustel.Selle seadistusega saab tÃ¼histada vaikimisi kÃ¤itumise. Saavutamaks sarnast kÃ¤itumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut jÃ¤rgnevale vÃ¤ljale. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sÃ¼mboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult jÃ¤rgmised sÃ¼mbolid: [ a-zA-Z0-9_.@- ]. Muud sÃ¼mbolid asendatakse nende ASCII vastega vÃµi lihtsalt hÃ¼ljatakse. TÃµrgete korral lisatakse number vÃµi suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ãœhtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, nÃ¤iteks kÃµikidel *DAV teenustel. Selle seadistusega saab tÃ¼histada vaikimisi kÃ¤itumise. Saavutamaks sarnast kÃ¤itumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut jÃ¤rgnevale vÃ¤ljale. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -372,14 +373,14 @@ msgstr "TÃ¼hista UUID tuvastus"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole mÃ¤Ã¤ratud teisiti. Sa saad tÃ¼histada selle seadistuse ning mÃ¤Ã¤rata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+msgstr "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole mÃ¤Ã¤ratud teisiti. Sa saad tÃ¼histada selle seadistuse ning mÃ¤Ã¤rata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jÃ¤ta tÃ¼hjaks. Muudatused mÃµjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -391,18 +392,17 @@ msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et tÃ¤pselt tuvastada ja mÃ¤Ã¤ratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vÃ¤hendamaks LDAP pÃ¤ringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse Ã¼le kogu ownCloudi. Eemaldates vastenduse tekivad kÃµikjal andmejÃ¤Ã¤gid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mÃµjutab kÃµiki LDAP seadistusi! Ã„ra kunagi eemalda vastendusi produktsioonis! Seda vÃµid teha ainult testis vÃµi katsetuste masinas."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et tÃ¤pselt tuvastada ja mÃ¤Ã¤ratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vÃ¤hendamaks LDAP pÃ¤ringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse Ã¼le kogu ownCloudi. Eemaldates vastenduse tekivad kÃµikjal andmejÃ¤Ã¤gid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mÃµjutab kÃµiki LDAP seadistusi! Ã„ra kunagi eemalda vastendusi produktsioonis! Seda vÃµid teha ainult testis vÃµi katsetuste masinas."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index 3c9471a2734cea9cf2e414118206019bf1faa628..575c051d6aa67cd14e87661a0ae745e09e8a4f9d 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 09:20+0000\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:40+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV autentimine"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr "Aadress:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kÃµik teised vastused kui korrektsed kasutajatunnused."
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index e38745317b67d7a615421ba0397c2bc664ec8d02..b732596c727d438d5e42389bd236e649d6924ec5 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asieriko <asieriko@gmail.com>, 2013
+# Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr ""
+msgstr "%s-ek Â»%sÂ« zurekin partekatu du"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -137,59 +139,59 @@ msgstr "Azaroa"
 msgid "December"
 msgstr "Abendua"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "orain dela minutu 1"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "orain dela {minutes} minutu"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "orain dela ordu bat"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "orain dela {hours} ordu"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "orain dela {days} egun"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "orain dela {months} hilabete"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "urte"
 
@@ -203,7 +205,7 @@ msgstr "Ezeztatu"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -225,8 +227,8 @@ msgstr "Objetu mota ez dago zehaztuta."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Errorea"
 
@@ -246,140 +248,141 @@ msgstr "Elkarbanatuta"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Errore bat egon da elkarbanaketa desegitean"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Errore bat egon da baimenak aldatzean"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner}-k zurekin elkarbanatuta"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Elkarbanatu honekin"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Elkarbanatu lotura batekin"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Pasahitza"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Gaitu igotze publikoa"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Postaz bidali lotura "
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Bidali"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n elkarbanatuta"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-en pasahitza berrezarri"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -390,17 +393,17 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
 msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Erabiltzaile izena"
@@ -411,11 +414,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Bai, nire pasahitza orain berrabiarazi nahi dut"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -461,11 +464,11 @@ msgstr "Laguntza"
 msgid "Access forbidden"
 msgstr "Sarrera debekatuta"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Ez da hodeia aurkitu"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,7 +477,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\nOngi jarraitu!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -494,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake."
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Mesedez eguneratu zure PHP instalazioa ownCloud modu seguru batean erabiltzeko."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko"
 
 #: templates/installation.php:32
 msgid ""
@@ -515,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Zure zerbitzaria ongi konfiguratzeko informazioa eskuratzeko, begiratu  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentazioa</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "erabiliko da"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Datu basearen taula-lekua"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Saioa bukatu"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Saio hasiera automatikoa ez onartuta!"
@@ -607,12 +615,12 @@ msgstr "Hasi saioa"
 msgid "Alternative Logins"
 msgstr "Beste erabiltzaile izenak"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 1b54cf0e76588e5176c0056e58f80ab4bd59baa6..401167b0fc2ed5d2dbe6aad45c23f23b24b9589d 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +30,11 @@ msgstr "Ezin dira fitxategiak mugitu %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Ezin da igoera direktorioa ezarri."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "Lekuko baliogabea"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -105,7 +106,7 @@ msgstr "URLa ezin da hutsik egon."
 
 #: js/file-upload.js:238 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago."
 
 #: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
 #: js/files.js:693 js/files.js:731
@@ -120,7 +121,7 @@ msgstr "Elkarbanatu"
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -128,43 +129,45 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Ezabatu"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "fitxategi 1 igotzen"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "fitxategiak igotzen"
 
@@ -200,38 +203,34 @@ msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "karpeta bat"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} karpeta"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "fitxategi bat"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} fitxategi"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s ezin da berrizendatu"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -285,61 +284,61 @@ msgstr "Karpeta"
 msgid "From link"
 msgstr "Estekatik"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ezabatutako fitxategiak"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Ez duzu hemen idazteko baimenik."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Igoera handiegia da"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "direktorioa"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "direktorioak"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fitxategia"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fitxategiak"
 
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index cc5d993d62c10aebc4fd5505245a33876df4b086..a714d8fa8889369d1e2dcaa345af7d2d4500593c 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # asaez <asaez@asaez.eu>, 2013
+# asieriko <asieriko@gmail.com>, 2013
 # Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -61,17 +62,21 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza ownCloud sistematik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Eskakizun batzuk ez dira betetzen."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -82,11 +87,11 @@ msgstr "Gordetzen..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Zure gako pribatua ez da egokia! Agian zure pasahitza kanpotik aldatu da."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Zure gako pribatua desblokeatu dezakezu zure"
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
@@ -99,7 +104,7 @@ msgstr "Enkriptazioa"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
@@ -131,25 +136,25 @@ msgstr "Aldatu Pasahitza"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Zure gako pribatuaren pasahitza ez da dagoeneko zure sarrera pasahitza:"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Ezarri zure gako pribatu zaharraren pasahitza zure oraingo sarrerako psahitzara."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Sartzeko pasahitz zaharra"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Sartzeko oraingo pasahitza"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
@@ -163,7 +168,7 @@ msgstr "Gaitu pasahitz berreskuratzea:"
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 6ee480dc961cc1d65843a6c30016e77b8122eb9b..fbe14c6446f23379ff8f0a0dc8c492311c329d1e 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
 msgid "Error configuring Google Drive storage"
 msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 6d416d670b4769191f3521abbcac195db99c3a05..81b2f6c18a9c2ec695d2edf49f8daa4325116eb4 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asieriko <asieriko@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Pasahitza ez da egokia. Saiatu berriro."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Pasahitza"
 msgid "Submit"
 msgstr "Bidali"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sk zurekin %s karpeta elkarbanatu du"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sk zurekin %s fitxategia elkarbanatu du"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Igo"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Ez dago aurrebista eskuragarririk hauentzat "
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 42e00410ac68bfb24d4e3964313cc10814b06dae..ee2efd48c1bd5b151693f1471f48814be134dad7 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr "Ezin izan da %s betirako ezabatu"
 msgid "Couldn't restore %s"
 msgstr "Ezin izan da %s berreskuratu"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "berreskuratu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Errorea"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "ezabatu fitxategia betirako"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Izena"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "karpeta bat"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} karpeta"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "fitxategi bat"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} fitxategi"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 284ceaf733e1d97474d2650d119d6541189bd81b..6712907ef1368b1ca996450edd27c478820335f6 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asieriko <asieriko@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 07:30+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Ezin izan da leheneratu: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "arrakasta"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "%s fitxategia %s bertsiora leheneratu da"
-
-#: history.php:49
-msgid "failure"
-msgstr "errorea"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "%s fitxategia ezin da %s bertsiora leheneratu"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Bertsioak"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Ez dago bertsio zaharrik eskuragarri"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Errore bat izan da {fitxategia} {timestamp} bertsiora leheneratzean."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ez da bidea zehaztu"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Bertsio gehiago..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Bertsioak"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Ez dago bertsio gehiago eskuragarri"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Itzuli fitxategi bat aurreko bertsio batera leheneratu bere leheneratu botoia sakatuz"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Berrezarri"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 1e0c53f8fcaab036a645c427cc39204ea41fec1a..99b8dd00c28176e3e154f1a26cef5eb91ecf97e3 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asieriko <asieriko@gmail.com>, 2013
+# Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +36,46 @@ msgid "Users"
 msgstr "Erabiltzaileak"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplikazioak"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Ezin izan da \"%s\" eguneratu."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "ezin da \"%s\" ireki"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari"
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ezin izan da zehaztu"
 
@@ -155,7 +169,7 @@ msgstr "Ezabatu erabiltzaile hau MySQLtik."
 
 #: setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Ezin da Oracle konexioa sortu"
 
 #: setup/oci.php:41 setup/oci.php:113
 msgid "Oracle username and/or password not valid"
@@ -170,77 +184,77 @@ msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Ezarri administraziorako erabiltzaile izena."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Ezarri administraziorako pasahitza."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "segundu"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "orain dela minutu 1"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "orain dela %d minutu"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "orain dela ordu bat"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "orain dela %d ordu"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "gaur"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "atzo"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "orain dela %d egun"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "orain dela %d hilabete"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "joan den urtean"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "urte"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Honek eraginda:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index b30dc8e4d68314bcee5ec85f3c2b85ccab826bd7..561de1b7d88aa83ba4b230cbfb668c55f4fede63 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asieriko <asieriko@gmail.com>, 2013
 # Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,166 +171,173 @@ msgstr "Baliozko pasahitza eman behar da"
 msgid "__language_name__"
 msgstr "Euskera"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Konfiguratu Abisuak"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Mesedez birpasatu <a href=\"%s\">instalazio gidak</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "'fileinfo' Modulua falta da"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Lokala ez dabil"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "OwnClud zerbitzari honek ezin du sistemaren lokala %s-ra ezarri. Honek fitxategien izenetan karaktere batzuekin arazoak egon daitekeela esan nahi du. Aholkatzen dizugu zure sistema %s lokalea onartzeko beharrezkoak diren paketeak instalatzea."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Interneteko konexioak ez du funtzionatzen"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "ownCloud zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Exekutatu zeregin bat orri karga bakoitzean"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php webcron zerbitzu batean erregistratua dago cron.php  minuturo http bidez deitzeko."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Erabili sistemaren cron zerbitzua cron.php fitxategia minuturo deitzeko."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Gaitu Elkarbanatze APIa"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Baimendu loturak"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Baimendu igoera publikoak"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Baimendu birpartekatzea"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Bezeroak konexio enkriptatu baten bidez ownCloud-era konektatzera behartzen du."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Mesedez konektatu ownCloud honetara HTTPS bidez SSL-ren beharra gaitu edo ezgaitzeko"
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +395,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Babes komertziala"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Zere pasahitza aldatu da"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ezin izan da zure pasahitza aldatu"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Uneko pasahitza"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Bistaratze Izena"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 8c83257dc27c4ece6f272c2be5aa24133c4aff42..38995d2790876647ce82e3a6c717b741b29fe26e 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# asieriko <asieriko@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,9 +89,9 @@ msgstr "Baieztatu Ezabatzea"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "Desgaitu Zerbitzari Nagusia"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -241,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -342,7 +344,7 @@ msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Barneko erabiltzaile izena"
 
 #: templates/settings.php:102
 msgid ""
@@ -352,12 +354,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +372,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +391,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index 03f85ec7ec0c32eeb8f50c72b9b8bc42775e4156..e0b496113421cf05870f587a5694ba72116fd9a7 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 07:30+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Autentikazioa"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr ""
+msgid "Address: "
+msgstr "Helbidea:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloudek erabiltzailearen kredentzialak URL honetara bidaliko ditu. Plugin honek erantzuna aztertzen du eta HTTP 401 eta 403 egoera kodeak baliogabezko kredentzialtzat hartuko ditu, beste erantzunak kredentzial egokitzat hartuko dituelarik."
+msgstr "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 77bbb7b33d4fae92781f909e962e42d9ee3cd845..132453355403c43c384b7d616d02012005384f65 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -138,59 +138,55 @@ msgstr "Ù†ÙˆØ§Ù…Ø¨Ø±"
 msgid "December"
 msgstr "Ø¯Ø³Ø§Ù…Ø¨Ø±"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§} Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§ÛŒ Ù¾ÛŒØ´"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{Ø³Ø§Ø¹Øª Ù‡Ø§} Ø³Ø§Ø¹Øª Ù‡Ø§ Ù¾ÛŒØ´"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "Ø§Ù…Ø±ÙˆØ²"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ø¯ÛŒØ±ÙˆØ²"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{Ø±ÙˆØ²Ù‡Ø§} Ø±ÙˆØ²Ù‡Ø§ÛŒ Ù¾ÛŒØ´"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ù…Ø§Ù‡ Ù‚Ø¨Ù„"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{Ù…Ø§Ù‡ Ù‡Ø§} Ù…Ø§Ù‡ Ù‡Ø§ Ù¾ÛŒØ´"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ø³Ø§Ù„ Ù‚Ø¨Ù„"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
@@ -226,8 +222,8 @@ msgstr "Ù†ÙˆØ¹ Ø´ÛŒ ØªØ¹ÛŒÛŒÙ† Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
@@ -247,140 +243,141 @@ msgstr "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡"
 msgid "Share"
 msgstr "Ø§Ø´ØªØ±Ø§Ú©â€ŒÚ¯Ø°Ø§Ø±ÛŒ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ØØ§Ù„ ØªØºÛŒÛŒØ± Ù…Ø¬ÙˆØ²"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ Ùˆ Ú¯Ø±ÙˆÙ‡ {Ú¯Ø±ÙˆÙ‡} ØªÙˆØ³Ø· {Ø¯Ø§Ø±Ù†Ø¯Ù‡}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ ØªÙˆØ³Ø· { Ø¯Ø§Ø±Ù†Ø¯Ù‡}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§ Ù¾ÛŒÙˆÙ†Ø¯"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ú©Ø±Ø¯Ù† Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø¹Ù…ÙˆÙ…ÛŒ"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Ù¾ÛŒÙˆÙ†Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ø´Ø®Øµ."
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Ø§Ø±Ø³Ø§Ù„"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ø¨Ú¯Ø°Ø§Ø±ÛŒØ¯ :"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ú©Ø³ÛŒ ÛŒØ§ÙØª Ù†Ø´Ø¯"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯ Ù…Ø¬Ø§Ø² Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¯Ø± {Ø¨Ø®Ø´} Ø¨Ø§ {Ú©Ø§Ø±Ø¨Ø±}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ù…ÛŒ ØªÙˆØ§Ù† ÙˆÛŒØ±Ø§ÛŒØ´ Ú©Ø±Ø¯"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Ú©Ù†ØªØ±Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "Ø§ÛŒØ¬Ø§Ø¯"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "Ø¨Ù‡ Ø±ÙˆØ²"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ø§Ø² Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… Ù†Ú©Ø±Ø¯Ù† ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§ "
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Ø¯Ø±ØØ§Ù„ Ø§Ø±Ø³Ø§Ù„ ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Ø§ÛŒÙ…ÛŒÙ„ Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯. Ù„Ø·ÙØ§ Ø§ÛŒÙ† Ø®Ø·Ø§ Ø±Ø§ Ø¨Ù‡  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Ø¬Ø§Ù…Ø¹Ù‡ ÛŒ OwnCloud</a> Ú¯Ø²Ø§Ø±Ø´ Ù†Ù…Ø§ÛŒÛŒØ¯."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Ø¨Ù‡ Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù…ÙˆÙÙ‚ÛŒØª Ø¢Ù…ÛŒØ² Ø¨ÙˆØ¯. Ø¯Ø± ØØ§Ù„ Ø§Ù†ØªÙ‚Ø§Ù„ Ø´Ù…Ø§ Ø¨Ù‡ OwnCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ù¾Ø³ÙˆØ±Ø¯ Ø§Ø¨Ø±Ù‡Ø§ÛŒ Ø´Ù…Ø§ ØªØºÛŒÛŒØ±Ú©Ø±Ø¯"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +398,7 @@ msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø±Ø¯ Ø´Ø¯Ù‡ Ø§Ø³Øª !<br> Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù† Ù‡Ø³ØªÛŒØ¯ Ú©
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ø´Ù…Ø§ ÛŒÚ© Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ ØØ§ÙˆÛŒ ÛŒÚ© Ù„ÛŒÙ†Ú© Ø¬Ù‡Øª Ø¨Ø§Ø²Ø³Ø§Ø²ÛŒ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ø¯Ø±ÛŒØ§ÙØª Ø®ÙˆØ§Ù‡ÛŒØ¯ Ú©Ø±Ø¯."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ"
@@ -462,11 +459,11 @@ msgstr "Ø±Ø§Ù‡â€ŒÙ†Ù…Ø§"
 msgid "Access forbidden"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ù…Ù†Ø§Ø·Ù‚ Ù…Ù…Ù†ÙˆØ¹Ù‡ Ø±Ø§ Ù†Ø¯Ø§Ø±ÛŒØ¯"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +492,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Ù†Ø³Ø®Ù‡ ÛŒ PHP Ø´Ù…Ø§ Ø¯Ø± Ø¨Ø±Ø§Ø¨Ø± ØÙ…Ù„Ø§Øª NULL Byte Ø¢Ø³ÛŒØ¨ Ù¾Ø°ÛŒØ± Ø§Ø³Øª.(CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Ù„Ø·ÙØ§ Ø¨Ø±Ù†Ø§Ù…Ù‡ ÛŒ PHP Ø®ÙˆØ¯ØªØ§Ù† Ø±Ø§ Ø¨Ø±ÙˆØ² Ú©Ù†ÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØ¯ Ø§ÛŒÙ…Ù† ØªØ± Ø§Ø² ownCloud Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +514,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "ÙØ§ÛŒÙ„Ù‡Ø§ Ùˆ ÙÙ‡Ø±Ø³Øª Ù‡Ø§ÛŒ Ø¯Ø§Ø¯Ù‡ Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ù‚Ø§Ø¨Ù„ Ø§Ø² Ø§ÛŒÙ†ØªØ±Ù†Øª Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯ØŒ Ú†ÙˆÙ†Ú©Ù‡ ÙØ§ÛŒÙ„ htacces. Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Ø¨Ø±Ø§ÛŒ Ù…Ø·Ù„Ø¹ Ø´Ø¯Ù† Ø§Ø² Ú†Ú¯ÙˆÙ†Ú¯ÛŒ ØªÙ†Ø¸ÛŒÙ… Ø³Ø±ÙˆØ±ØªØ§Ù†ØŒÙ„Ø·ÙØ§ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ø§ÛŒÙ†</a> Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ù„Ø·ÙØ§ ÛŒÚ© <strong> Ø´Ù†Ø§Ø³Ù‡ Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ±</strong> Ø¨Ø³Ø§Ø²ÛŒØ¯"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ù¾ÛŒØ´Ø±ÙØªÙ‡"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Ù¾ÙˆØ´Ù‡ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø±ÛŒØ²ÛŒ Ø´Ø¯Ù†Ø¯"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Ø´Ù†Ø§Ø³Ù‡ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Ù¾Ø³ÙˆØ±Ø¯ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ù†Ø§Ù… Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Ø¬Ø¯ÙˆÙ„ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ù‡Ø§Ø³Øª Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ø§ØªÙ…Ø§Ù… Ù†ØµØ¨"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ø§Ø³Øª. Ø¨Ø±Ø§ÛŒ Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨ÛŒØ´ØªØ± Ø±Ø§ Ø¯Ø±ÛŒØ§ÙØª Ù†Ù…Ø§ÛŒÛŒØ¯."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ø®Ø±ÙˆØ¬"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ÙˆØ±ÙˆØ¯ Ø¨Ù‡ Ø³ÛŒØ³ØªÙ… Ø§ØªÙˆÙ…Ø§ØªÛŒÚ© Ø±Ø¯Ø´Ø¯!"
@@ -608,7 +610,7 @@ msgstr "ÙˆØ±ÙˆØ¯"
 msgid "Alternative Logins"
 msgstr "ÙˆØ±ÙˆØ¯ Ù…ØªÙ†Ø§ÙˆØ¨"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 38e8fc1d7ed21f7c0faf8be2de5aa8a62bbb12b4..8a93ed800180df8dc1cfa45b9e131a5f28b87b97 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,7 +121,7 @@ msgstr "Ø§Ø´ØªØ±Ø§Ú©â€ŒÚ¯Ø°Ø§Ø±ÛŒ"
 msgid "Delete permanently"
 msgstr "ØØ°Ù Ù‚Ø·Ø¹ÛŒ"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "ØØ°Ù"
 
@@ -129,43 +129,44 @@ msgstr "ØØ°Ù"
 msgid "Rename"
 msgstr "ØªØºÛŒÛŒØ±Ù†Ø§Ù…"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ø¯Ø± Ø§Ù†ØªØ¸Ø§Ø±"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{Ù†Ø§Ù… _Ø¬Ø¯ÛŒØ¯} Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯."
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ†"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù†Ø§Ù…"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Ù„ØºÙˆ"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{Ù†Ø§Ù…_Ø¬Ø¯ÛŒØ¯} Ø¨Ø§ { Ù†Ø§Ù…_Ù‚Ø¯ÛŒÙ…ÛŒ} Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø´Ø¯."
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Ø§Ù†Ø¬Ø§Ù… Ø¹Ù…Ù„ ØØ°Ù"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø´Ø¯."
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ÙØ§ÛŒÙ„ Ù‡Ø§"
 
@@ -201,33 +202,27 @@ msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø¢Ù…Ø§Ø¯Ù‡ Ø´Ø¯Ù† Ø§Ø³Øª. Ø¯Ø± ØµÙˆØ±Øª
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª. Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² \" Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ \" Ù…ØªØ¹Ù„Ù‚ Ø¨Ù‡ Ø³Ø§ÛŒØª Owncloud Ø§Ø³Øª."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ù†Ø§Ù…"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ø§Ù†Ø¯Ø§Ø²Ù‡"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ØªØ§Ø±ÛŒØ®"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ù¾ÙˆØ´Ù‡"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{ Ø´Ù…Ø§Ø±} Ù¾ÙˆØ´Ù‡ Ù‡Ø§"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +281,61 @@ msgstr "Ù¾ÙˆØ´Ù‡"
 msgid "From link"
 msgstr "Ø§Ø² Ù¾ÛŒÙˆÙ†Ø¯"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ ØØ°Ù Ø´Ø¯Ù‡"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ù…ØªÙˆÙ‚Ù Ú©Ø±Ø¯Ù† Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Ø´Ù…Ø§ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù†ÙˆØ´ØªÙ† Ø¯Ø± Ø§ÛŒÙ†Ø¬Ø§ Ø±Ø§ Ù†Ø¯Ø§Ø±ÛŒØ¯"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ø§ÛŒÙ†Ø¬Ø§ Ù‡ÛŒÚ† Ú†ÛŒØ² Ù†ÛŒØ³Øª."
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ø³Ø§ÛŒØ² ÙØ§ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ø¢Ù¾Ù„ÙˆØ¯ Ø²ÛŒØ§Ø¯ Ø§Ø³Øª(Ù….ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø¯Ø± php.ini)"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ÙØ§ÛŒÙ„Ù‡Ø§ Ø¨ÛŒØ´ Ø§Ø² ØØ¯ ØªØ¹ÛŒÛŒÙ† Ø´Ø¯Ù‡ Ø¯Ø± Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ù‡Ø³ØªÙ†Ø¯\nÙ…ØªØ±Ø¬Ù…:Ø¨Ø§ ØªØºÛŒÛŒØ± ÙØ§ÛŒÙ„ php,ini Ù…ÛŒØªÙˆØ§Ù† Ø§ÛŒÙ† Ù…ØØ¯ÙˆØ¯ÛŒØª Ø±Ø§ Ø¨Ø±Ø·Ø±Ù Ú©Ø±Ø¯"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§ Ø¯Ø± ØØ§Ù„ Ø¨Ø§Ø²Ø±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯ Ù„Ø·ÙØ§ ØµØ¨Ø± Ú©Ù†ÛŒØ¯"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Ø¨Ø§Ø²Ø±Ø³ÛŒ Ú©Ù†ÙˆÙ†ÛŒ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "Ù¾ÙˆØ´Ù‡"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "Ù¾ÙˆØ´Ù‡ Ù‡Ø§"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§"
 
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index 5435dd5782bb7918ba04309259612aac24a31d22..6dced246ec6203faff8502d75e1f042b7ed20561 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,39 +20,39 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ÙØ¹Ø§Ù„ Ø´ÙˆØ¯. Ù„Ø·ÙØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ù†Ù…Ø§ÛŒÛŒØ¯!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ØºÛŒØ± ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ØºÛŒØ±ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒØ¯. Ù„Ø·ÙØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ØªØºÛŒÛŒØ± ÛŒØ§ÙØª."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø±Ø§ Ù†Ù…ÛŒØªÙˆØ§Ù†Ø¯ ØªØºÛŒÛŒØ± Ø¯Ù‡Ø¯. Ø´Ø§ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±Ù‚Ø¯ÛŒÙ…ÛŒ ØµØÛŒØ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ù‡ Ø±ÙˆØ² Ø´Ø¯."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø¨Ù‡ Ø±ÙˆØ² Ú©Ù†Ø¯. Ø´Ø§ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ ØµØÛŒØ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯."
 
 #: files/error.php:7
 msgid ""
@@ -59,17 +60,21 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ù…Ø§ Ù…Ø¹ØªØ¨Ø± Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯!  Ø¸Ø§Ù‡Ø±Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø´Ù…Ø§ Ø¨ÛŒØ±ÙˆÙ† Ø§Ø² Ø³ÛŒØ³ØªÙ… ownCloud ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª( Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø«Ø§Ù„ Ù¾ÙˆØ´Ù‡ Ø³Ø§Ø²Ù…Ø§Ù† Ø´Ù…Ø§ ). Ø´Ù…Ø§ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø®ØµÛŒØªØ§Ù† Ø¨Ù‡ Ø±ÙˆØ² Ú©Ù†ÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØ¯ Ø¨Ù‡  ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡ Ø®ÙˆØ¯ Ø±Ø§ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ÛŒ Ù‡Ø§ÛŒ Ú¯Ù…Ø´Ø¯Ù‡"
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -80,15 +85,15 @@ msgstr "Ø¯Ø± ØØ§Ù„ Ø°Ø®ÛŒØ±Ù‡ Ø³Ø§Ø²ÛŒ..."
 msgid ""
 "Your private key is not valid! Maybe the your password was changed from "
 "outside."
-msgstr ""
+msgstr "Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ù…Ø§ Ù…Ø¹ØªØ¨Ø± Ù†ÛŒØ³Øª! Ø´Ø§ÛŒØ¯ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±Ø§Ø² Ø¨ÛŒØ±ÙˆÙ† ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª."
 
 #: templates/invalid_private_key.php:7
 msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Ø´Ù…Ø§ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø§Ø² Ù†Ù…Ø§ÛŒÛŒØ¯."
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø´Ø®ØµÛŒ"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -97,76 +102,76 @@ msgstr "Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ(Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯Ø± ØµÙˆØ±Øª Ø§Ø² Ø¯Ø³Øª Ø¯Ø§Ø¯Ù† Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "ØºÛŒØ±ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "ØªØºÛŒÛŒØ± Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ:"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ  Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ "
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¬Ø¯ÛŒØ¯ Ú©Ù„ÛŒØ¯ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "ØªØºÛŒÛŒØ± Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ù…Ø§ Ø¨Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø´Ù…Ø§ ÛŒÚ©Ø³Ø§Ù† Ù†ÛŒØ³Øª :"
 
 #: templates/settings-personal.php:14
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ  Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± ÙØ¹Ù„ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ù…Ø§ÛŒÛŒØ¯."
 
 #: templates/settings-personal.php:16
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Ø§Ú¯Ø± Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ Ø±Ø§ ÙØ±Ø§Ù…ÙˆØ´ Ú©Ø±Ø¯Ù‡ Ø§ÛŒØ¯ Ù…ÛŒØªÙˆØ§Ù†ÛŒØ¯ Ø§Ø² Ù…Ø¯ÛŒØ± Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒØªØ§Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù†Ù…Ø§ÛŒÛŒØ¯."
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù‚Ø¯ÛŒÙ…ÛŒ"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± ÙØ¹Ù„ÛŒ"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "ÙØ¹Ø§Ù„ Ø³Ø§Ø²ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø§ÛŒÙ† Ú¯Ø²ÛŒÙ†Ù‡ Ø¨Ù‡ Ø´Ù…Ø§ Ø§Ø¬Ø§Ø²Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø¯Ø§Ø¯ Ø¯Ø± ØµÙˆØ±Øª Ø§Ø² Ø¯Ø³Øª Ø¯Ø§Ø¯Ù† Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡ Ø®ÙˆØ¯ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯."
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ø¨Ù‡ Ø±ÙˆØ² Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø±ÙˆØ² Ø±Ø³Ø§Ù†ÛŒ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ ÙØ§ÛŒÙ„ Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø§Ù†Ø¬Ø§Ù… Ø¯Ù‡Ø¯."
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 9e94da858213f4ea2b2004841e430763cd6aa992..28f6d3cb82a8616d45f3c0af8f849bc32efc9c3e 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
+"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,43 +20,43 @@ msgstr ""
 
 #: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
 msgid "Access granted"
-msgstr ""
+msgstr "Ù…Ø¬ÙˆØ² Ø¯Ø³ØªØ±Ø³ÛŒ ØµØ§Ø¯Ø± Ø´Ø¯"
 
 #: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ØªÙ†Ø¸ÛŒÙ… ÙØ¶Ø§ÛŒ Ø¯Ø±Ø§Ù¾ Ø¨Ø§Ú©Ø³"
 
 #: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
-msgstr ""
+msgstr " Ù…Ø¬ÙˆØ² Ø§Ø¹Ø·Ø§ Ø¯Ø³ØªØ±Ø³ÛŒ"
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Ù„Ø·ÙØ§ ÛŒÚ© Ú©Ù„ÛŒØ¯ Ùˆ Ú©Ø¯ Ø§Ù…Ù†ÛŒØªÛŒ ØµØÛŒØ Ø¯Ø±Ø§Ù¾ Ø¨Ø§Ú©Ø³ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯."
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ØªÙ†Ø¸ÛŒÙ… ÙØ¶Ø§ÛŒ Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "Ø®Ø·Ø§: \"smbclient\" Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù†ØµØ¨ Ùˆ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø³Ù‡Ø§Ù…  CIFS/SMB Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†Ù…ÛŒØ¨Ø§Ø´Ø¯. Ù„Ø·ÙØ§ Ø§Ø² Ù…Ø¯ÛŒØ±ÛŒØª Ø³Ø§Ø²Ù…Ø§Ù† Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø¢Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù†Ù…Ø§ÛŒÛŒØ¯."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "Ø®Ø·Ø§: Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ FTP Ø¯Ø± PHP ÙØ¹Ø§Ù„ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯ ÛŒØ§ Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù†ØµØ¨ Ùˆ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø§Ø² Ø³Ù‡Ù… Ù‡Ø§ÛŒ FTP Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯. Ù„Ø·ÙØ§ Ø§Ø² Ù…Ø¯ÛŒØ± Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ Ø¢Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª\nÚ©Ù†ÛŒØ¯."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "Ø®Ø·Ø§: Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Curl  ÙØ¹Ø§Ù„ Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯ ÛŒØ§ Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª. Ù†ØµØ¨ Ùˆ Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ  ownCloud / WebDAV ÛŒØ§ GoogleDrive Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ù†ÛŒØ³Øª. Ù„Ø·ÙØ§ Ø§Ø² Ù…Ø¯ÛŒØ± Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ Ø¨Ø±Ø§ÛŒ Ù†ØµØ¨ Ø¢Ù† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ú©Ù†ÛŒØ¯."
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -63,11 +64,11 @@ msgstr "ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ"
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "ØØ§ÙØ¸Ù‡ Ø®Ø§Ø±Ø¬ÛŒ"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -83,7 +84,7 @@ msgstr "Ù‚Ø§Ø¨Ù„ Ø§Ø¬Ø±Ø§"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† ØØ§ÙØ¸Ù‡"
 
 #: templates/settings.php:90
 msgid "None set"
@@ -116,8 +117,8 @@ msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ú©Ø±Ø¯Ù† Ù…Ù†Ø§Ø¨Ø¹ Ø°
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Ú¯ÙˆØ§Ù‡ÛŒ Ù‡Ø§ÛŒ Ø§ØµÙ„ÛŒ SSL "
 
 #: templates/settings.php:159
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú¯ÙˆØ§Ù‡ÛŒ Ø§ØµÙ„ÛŒ"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 8024c77470e587bfacd153c98f786bdafa3f3b19..a39839bae3549f8a280a1da483d744ed2a4c7160 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +30,52 @@ msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 msgid "Submit"
 msgstr "Ø«Ø¨Øª"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sÙ¾ÙˆØ´Ù‡ %s Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´Øª"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sÙØ§ÛŒÙ„ %s Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´Øª"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ø¨Ø§Ø±Ú¯Ø²Ø§Ø±ÛŒ"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Ù…ØªÙˆÙ‚Ù Ú©Ø±Ø¯Ù† Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Ù‡ÛŒÚ†Ú¯ÙˆÙ†Ù‡ Ù¾ÛŒØ´ Ù†Ù…Ø§ÛŒØ´ÛŒ Ù…ÙˆØ¬ÙˆØ¯ Ù†ÛŒØ³Øª"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index 8800fe182e872ecc3952842ca4052c1836944dae..b7425ae04baa4d38799800679999bf5754f49bf7 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr "%s Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ø¨Ø±Ø§ÛŒ Ù‡Ù…ÛŒØ´Ù‡ ØØ°Ù Ú©Ø±Ø¯"
 msgid "Couldn't restore %s"
 msgstr "%s Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Ø§Ù†Ø¬Ø§Ù… Ø¹Ù…Ù„ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†Ø¯Ù†"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "ØØ°Ù ÙØ§ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ù‡Ù…ÛŒØ´Ù‡"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "ØØ°Ù Ù‚Ø·Ø¹ÛŒ"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ù†Ø§Ù…"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "ØØ°Ù Ø´Ø¯Ù‡"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ù¾ÙˆØ´Ù‡"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{ Ø´Ù…Ø§Ø±} Ù¾ÙˆØ´Ù‡ Ù‡Ø§"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index a288b3ab8a56ee34be4cba99d17d1a9b264fa06b..a524de5a0e396328a23538a4c5926eed82d06a69 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-08 02:02+0200\n"
-"PO-Revision-Date: 2013-07-07 12:50+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,41 +18,27 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ø§Ù…Ú©Ø§Ù† Ù†Ø§Ù¾Ø°ÛŒØ± Ø§Ø³Øª: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "Ù…ÙˆÙÙ‚ÛŒØª"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Ù†Ø³Ø®Ù‡ Ù‡Ø§"
 
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:49
-msgid "failure"
-msgstr "Ø´Ú©Ø³Øª"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Ù‡ÛŒÚ† Ù†Ø³Ø®Ù‡ Ù‚Ø¯ÛŒÙ…ÛŒ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª"
-
-#: history.php:74
-msgid "No path specified"
-msgstr "Ù‡ÛŒÚ† Ù…Ø³ÛŒØ±ÛŒ Ù…Ø´Ø®Øµ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
-
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Ù†Ø³Ø®Ù‡ Ù‡Ø§"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ ÛŒÚ© Ù¾Ø±ÙˆØ±Ù†Ø¯Ù‡ Ø¨Ù‡ Ù†Ø³Ø®Ù‡ Ù‚Ø¯ÛŒÙ…ÛŒ Ø§Ø´ Ø§Ø²  Ø·Ø±ÛŒÙ‚ Ø¯Ú©Ù…Ù‡ Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ø§Ù…Ú©Ø§Ù† Ù¾Ø°ÛŒØ± Ø§Ø³Øª"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 1b26545b0200b598968c6e52da8930719dd8f4b4..86524be032e13962d674094c0ee5e1ada54d8b4d 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Ú©Ø§Ø±Ø¨Ø±Ø§Ù†"
 
 #: app.php:409
-msgid "Apps"
-msgstr "  Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Ù…Ø¯ÛŒØ±"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ø³Ø±ÙˆÛŒØ³ Ù‡Ø§ÛŒ ØªØØª ÙˆØ¨ Ø¯Ø± Ú©Ù†ØªØ±Ù„ Ø´Ù…Ø§"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø¨Ù‡ ØµÙˆØ±Øª ÙØ´Ø±Ø¯Ù‡ ØºÛŒØ± ÙØ¹Ø§Ù„ Ø§Ø³Øª"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ÙØ§ÛŒÙ„ Ù‡Ø§ Ø¨Ø§ÛŒØ¯ Ø¨Ù‡ ØµÙˆØ±Øª ÛŒÚ©ÛŒ ÛŒÚ©ÛŒ Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø´ÙˆÙ†Ø¯"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡ Ø¨Ø²Ø±Ú¯ØªØ± Ø§Ø² Ø¢Ù† Ù‡Ø³ØªÙ†Ø¯ Ú©Ù‡ Ø¨ØªÙˆØ§Ù† ÛŒÚ© ÙØ§ÛŒÙ„ ÙØ´Ø±Ø¯Ù‡ ØªÙˆÙ„ÛŒØ¯ Ú©Ø±Ø¯"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "Ù†Ù…ÛŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ø®Øµ Ø´ÙˆØ¯"
 
@@ -134,7 +146,7 @@ msgstr "Ø®Ø·Ø§ÛŒ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡: \"%s\""
 #: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Ø¯Ø³ØªÙˆØ± Ù…ØªØ®Ù„Ù Ø¹Ø¨Ø§Ø±Øª Ø§Ø³Øª Ø§Ø²: \"%s\""
 
 #: setup/mysql.php:85
 #, php-format
@@ -165,83 +177,79 @@ msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ùˆ / ÛŒØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø§Ø±Ø§Ú©Ù„ Ù…Ø¹ØªØ¨Ø± Ù†ÛŒ
 #: setup/oci.php:173 setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Ø¯Ø³ØªÙˆØ± Ù…ØªØ®Ù„Ù Ø¹Ø¨Ø§Ø±Øª Ø§Ø³Øª Ø§Ø²: \"%s\"ØŒ Ù†Ø§Ù…: \"%s\"ØŒ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±:\"%s\""
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ùˆ / ÛŒØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù…Ø¹ØªØ¨Ø± Ù†ÛŒØ³Øª."
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "ÛŒÚ© Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ± ØªÙ†Ø¸ÛŒÙ… Ù†Ù…Ø§ÛŒÛŒØ¯."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "ÛŒÚ© Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ± ØªÙ†Ø¸ÛŒÙ… Ù†Ù…Ø§ÛŒÛŒØ¯."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù‡Ù…Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ Ø±Ø§ Ø¨Ø¯Ù‡Ø¯ Ø²ÛŒØ±Ø§ Ø¨Ù‡ Ù†Ø¸Ø± Ù…ÛŒØ±Ø³Ø¯ Ø±Ø§Ø¨Ø· WebDAV Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ù„Ø·ÙØ§Ù‹ Ø¯ÙˆØ¨Ø§Ø±Ù‡ <a href='%s'>Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒ Ù†ØµØ¨</a>Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d Ø³Ø§Ø¹Øª Ù¾ÛŒØ´"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "Ø§Ù…Ø±ÙˆØ²"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ø¯ÛŒØ±ÙˆØ²"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d Ø±ÙˆØ²  Ù¾ÛŒØ´"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ù…Ø§Ù‡ Ù‚Ø¨Ù„"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%dÙ…Ø§Ù‡ Ù¾ÛŒØ´"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ø³Ø§Ù„ Ù‚Ø¨Ù„"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 372e229d21dee7ad847db87c2d674d30e3ab3762..c30c709618f28e18bc133a4a558504ebb6994870 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± ØµØÛŒØ Ø¨Ø§ÛŒØ¯ ÙˆØ§Ø±Ø¯ Ø´ÙˆØ¯"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Ø§Ø®Ø·Ø§Ø± Ø§Ù…Ù†ÛŒØªÛŒ"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙÙ‡Ø±Ø³Øª Ùˆ ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ†ØªØ±Ù†Øª Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯. ÙØ§ÛŒÙ„ Ø¨Ø§ ÙØ±Ù…Øª .htaccess Ú©Ù‡ ownCloud Ø§Ø±Ø§Ø¯Ù‡ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯. Ù…Ø§ Ù‚ÙˆÛŒØ§Ù‹ ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ… Ú©Ù‡ Ø´Ù…Ø§ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø®ÙˆØ¯ØªØ§Ù† Ø±Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯ Ú©Ù‡ ÙÙ‡Ø±Ø³Øª Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø´Ù…Ø§ ØºÛŒØ± Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ø§Ø´Ù†Ø¯ ÛŒØ§ ÙÙ‡Ø±Ø³Øª Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø±Ø§ Ø¨Ù‡ Ø®Ø§Ø±Ø¬ Ø§Ø² Ø±ÛŒØ´Ù‡ ÛŒ Ø§ØµÙ„ÛŒ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø§Ù†ØªÙ‚Ø§Ù„ Ø¯Ù‡ÛŒØ¯."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Ù‡Ø´Ø¯Ø§Ø± Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù‡Ù…Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ Ø±Ø§ Ø¨Ø¯Ù‡Ø¯ Ø²ÛŒØ±Ø§ Ø¨Ù‡ Ù†Ø¸Ø± Ù…ÛŒØ±Ø³Ø¯ Ø±Ø§Ø¨Ø· WebDAV Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ù„Ø·ÙØ§Ù‹ Ø¯ÙˆØ¨Ø§Ø±Ù‡ <a href='%s'>Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒ Ù†ØµØ¨</a>Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Ù…Ø§Ú˜ÙˆÙ„ 'fileinfo' Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Ù…Ø§Ú˜ÙˆÙ„ 'fileinfo' PHP Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª.Ù…Ø§ Ø§Ú©ÛŒØ¯Ø§ ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ… Ú©Ù‡ Ø§ÛŒÙ† Ù…Ø§Ú˜ÙˆÙ„ Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯ ØªØ§ Ù†ØªØ§ÛŒØ¬ Ø¨Ù‡ØªØ±ÛŒ Ø¨Ù‡ ÙˆØ³ÛŒÙ„Ù‡ ÛŒ mime-type detection Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†ÛŒØ¯."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Ø²Ø¨Ø§Ù† Ù…ØÙ„ÛŒ Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯."
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Ø§ÛŒÙ† Ø³Ø±ÙˆØ± ownCloud Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø³ÛŒØ³ØªÙ… Ù…ØÙ„ÛŒ Ø±Ø§ Ø¨Ø± Ø±ÙˆÛŒ %s ØªÙ†Ø¸ÛŒÙ… Ú©Ù†Ø¯.Ø§ÛŒÙ† Ø¨Ù‡ Ø§ÛŒÙ† Ù…Ø¹Ù†ÛŒ Ø³Øª Ú©Ù‡ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø¨Ø§ Ú©Ø§Ø±Ø§Ú©ØªØ±Ù‡Ø§ÛŒ Ø®Ø§ØµÛŒ Ø¯Ø± Ù†Ø§Ù… ÙØ§ÛŒÙ„ Ù‡Ø§ Ù…Ø´Ú©Ù„ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯.Ù…Ø§ Ø§Ú©ÛŒØ¯Ø§Ù‹ Ù†ØµØ¨ Ú©Ø±Ø¯Ù† Ø¨Ø³ØªÙ‡ Ù‡Ø§ÛŒ Ù„Ø§Ø²Ù… Ø±Ø§ Ø¨Ø± Ø±ÙˆÛŒ Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ØªØ§Ù† Ø¨Ø±Ø§ÛŒ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ %s ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ…."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Ø§ØªØµØ§Ù„ Ø§ÛŒÙ†ØªØ±Ù†Øª Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Ø§ÛŒÙ† Ø³Ø±ÙˆØ± OwnCloud Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù†Ø¯Ø§Ø±Ø¯.Ø§ÛŒÙ† Ø¨Ø¯ÛŒÙ† Ù…Ø¹Ù†Ø§Ø³Øª Ú©Ù‡ Ø¨Ø¹Ø¶ÛŒ Ø§Ø² Ø®ØµÙˆØµÛŒØ§Øª Ù†Ø¸ÛŒØ± Ø®Ø§Ø±Ø¬ Ú©Ø±Ø¯Ù† Ù…Ù†Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒØŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¯Ø± Ù…ÙˆØ±Ø¯ Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù‡Ø§ ÛŒØ§ Ù†ØµØ¨ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§ÛŒ Ù†ÙˆØ¹ 3Ø§Ù… Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ù†Ø¯.Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§ Ø§Ø² Ø±Ø§Ù‡ Ø¯ÙˆØ± Ùˆ Ø§Ø±Ø³Ø§Ù„ Ø¢Ú¯Ø§Ù‡ Ø³Ø§Ø²ÛŒ Ø§ÛŒÙ…ÛŒÙ„ Ù‡Ø§ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù‡Ù…Ú†Ù†Ø§Ù† Ú©Ø§Ø± Ù†Ú©Ù†Ù†Ø¯.Ø§Ú¯Ø±Ø´Ù…Ø§ Ù‡Ù…Ù‡ ÛŒ Ø®ØµÙˆØµÛŒØ§Øª OwnCloud Ù…ÛŒ Ø®ÙˆØ§Ù‡ÛŒØ¯ Ù…Ø§ Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù…ÛŒ Ú©Ù†ÛŒÙ… ØªØ§ Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯."
-
-#: templates/admin.php:94
-msgid "Cron"
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:92
+msgid "Cron"
+msgstr "Ø²Ù…Ø§Ù†Ø¨Ù†Ø¯"
+
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Ø§Ø¬Ø±Ø§ÛŒ ÛŒÚ© ÙˆØ¸ÛŒÙÙ‡ Ø¨Ø§ Ù‡Ø± Ø¨Ø§Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ØµÙØÙ‡"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† API Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§ Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² API Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù„ÛŒÙ†Ú© Ù‡Ø§"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¯Ø§Ø¯Ù† Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ø¢ÛŒØªÙ… Ù‡Ø§ Ø¨Ø§ Ø¹Ù…ÙˆÙ… Ø§Ø² Ø·Ø±ÛŒÙ‚ Ù¾ÛŒÙˆÙ†Ø¯ Ù‡Ø§"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Ù…Ø¬ÙˆØ² Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ø§ Ø¢Ù†Ù‡Ø§"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ø§ Ù‡Ù…Ù‡"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ ØŒ ØªÙ†Ù‡Ø§ Ø¨Ø§ Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø¨Ø±Ø§Ù† Ú¯Ø±ÙˆÙ‡ Ø®ÙˆØ¯Ø´Ø§Ù†"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Ø§Ù…Ù†ÛŒØª"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ÙˆØ§Ø¯Ø§Ø± Ú©Ø±Ø¯Ù† HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "ÙˆØ§Ø¯Ø§Ø± Ú©Ø±Ø¯Ù† Ù…Ø´ØªØ±ÛŒØ§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ ownCloud Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø§Ø±ØªØ¨Ø§Ø·"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Ø§Ø² Ø·Ø±ÛŒÙ‚ HTTPS Ø¨Ù‡ Ø§ÛŒÙ† Ù†Ø³Ø®Ù‡ Ø§Ø² ownCloud Ù…ØªØµÙ„ Ø´ÙˆÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØ¯ SSL  Ø±Ø§ ÙØ¹Ø§Ù„ ÛŒØ§ ØºÛŒØ± ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒÛŒØ¯."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Ú©Ø§Ø±Ù†Ø§Ù…Ù‡"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Ø³Ø·Ø ÙˆØ±ÙˆØ¯"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Ø¨ÛŒØ´â€ŒØªØ±"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Ú©Ù…â€ŒØªØ±"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ù†Ø³Ø®Ù‡"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +394,77 @@ msgstr "Ø±Ø¯ÛŒØ§Ø¨ Ø¨Ø§Ú¯ "
 msgid "Commercial Support"
 msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ ØªØ¬Ø§Ø±ÛŒ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§ Ø±Ø§ Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†ÛŒØ¯ ØªØ§ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒØªØ§Ù† Ø±Ø§ Ù‡Ù…Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒØ¯"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Ø±Ø§Ù‡Ø¨Ø±ÛŒ Ú©Ù…Ú©ÛŒ Ø§Ø¬Ø±Ø§ÛŒ Ø§ÙˆÙ„ Ø±Ø§ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ù†Ù…Ø§ÛŒØ´ Ø¨Ø¯Ù‡"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ø´Ù…Ø§ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ø±Ø¯ÛŒØ¯ Ø§Ø² <strong>%s</strong> Ø§Ø² Ù…ÛŒØ²Ø§Ù† Ø¯Ø± Ø¯Ø³ØªØ±Ø³ <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± Ø´Ù…Ø§ ØªØºÛŒÛŒØ± ÛŒØ§ÙØª"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ù†Ø§ØªÙˆØ§Ù† Ø¯Ø± ØªØºÛŒÛŒØ± Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ú©Ù†ÙˆÙ†ÛŒ"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ø¬Ø¯ÛŒØ¯"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ØªØºÛŒÛŒØ± Ú¯Ø°Ø± ÙˆØ§Ú˜Ù‡"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Ù†Ø§Ù… Ù†Ù…Ø§ÛŒØ´ÛŒ"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Ø§ÛŒÙ…ÛŒÙ„"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ø´Ù…Ø§"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ø±Ø§ Ù¾Ø±Ú©Ù†ÛŒØ¯  ØªØ§ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ ÙØ¹Ø§Ù„ Ø´ÙˆØ¯"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Ø²Ø¨Ø§Ù†"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ø¨Ù‡ ØªØ±Ø¬Ù…Ù‡ Ø¢Ù† Ú©Ù…Ú© Ú©Ù†ÛŒØ¯"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø¨Ù† Ø¢Ø¯Ø±Ø³ <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªØ±Ø³ÛŒ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ø§Ø² Ø·Ø±ÛŒÙ‚ WebDAV </a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index d45be57fda70505be0bc08ee79be849f8e32e9a5..1a547f66dd78a245a822e82000539556e6c1bb9c 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Ø¹Ø¯Ù… Ù…ÙˆÙÙ‚ÛŒØª Ø¯Ø± Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ú¯Ø§Ø´Øª."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -33,7 +34,7 @@ msgstr "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª Ùˆ Ø§Ø±ØªØ¨Ø§Ø· Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø¨Ø±
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù…Ø¹ØªØ¨Ø±Ø§Ø³ØªØŒ Ø§Ù…Ø§ Ø§ØªØµØ§Ù„ Ø´Ú©Ø³Øª Ø®ÙˆØ±Ø¯. Ù„Ø·ÙØ§ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ùˆ Ø§Ø¹ØªØ¨Ø§Ø±Ù‡Ø§ÛŒ Ø³Ø±ÙˆØ± Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯."
 
 #: ajax/testConfiguration.php:43
 msgid ""
@@ -55,15 +56,15 @@ msgstr "Ø¢ÛŒØ§ ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø°Ø®ÛŒØ±Ù‡ Ø´ÙˆØ¯ ØŸ"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Ù†Ù…ÛŒ ØªÙˆØ§Ù† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ø³Ø±ÙˆØ± Ø±Ø§ Ø§Ø¶Ø§ÙÙ‡ Ù†Ù…ÙˆØ¯"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Ù†Ú¯Ø§Ø´Øª Ù¾Ø§Ú© Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
 #: js/settings.js:112
 msgid "Success"
-msgstr ""
+msgstr "Ù…ÙˆÙÙ‚ÛŒØª"
 
 #: js/settings.js:117
 msgid "Error"
@@ -88,7 +89,7 @@ msgstr "ØªØ§ÛŒÛŒØ¯ ØØ°Ù"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -117,19 +118,19 @@ msgstr ""
 
 #: templates/settings.php:40
 msgid "Base DN"
-msgstr ""
+msgstr "Ù¾Ø§ÛŒÙ‡ DN"
 
 #: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "ÛŒÚ© Ù¾Ø§ÛŒÙ‡ DN Ø¯Ø± Ù‡Ø± Ø®Ø·"
 
 #: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Ø´Ù…Ø§ Ù…ÛŒ ØªÙˆØ§Ù†ÛŒØ¯ Ù¾Ø§ÛŒÙ‡ DN Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ùˆ Ú¯Ø±ÙˆÙ‡ Ù‡Ø§ Ø¯Ø± Ø²Ø¨Ø§Ù†Ù‡ Advanced Ù…Ø´Ø®Øµ Ú©Ù†ÛŒØ¯."
 
 #: templates/settings.php:44
 msgid "User DN"
-msgstr ""
+msgstr "Ú©Ø§Ø±Ø¨Ø± DN"
 
 #: templates/settings.php:46
 msgid ""
@@ -144,11 +145,11 @@ msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
 #: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªØ±Ø³ÛŒ Ù†Ø§Ø´Ù†Ø§Ø³ØŒ DN Ø±Ø§ Ø±Ù‡Ø§ Ù†Ù…ÙˆØ¯Ù‡ Ùˆ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø±Ø§ Ø®Ø§Ù„ÛŒ Ø¨Ú¯Ø°Ø§Ø±ÛŒØ¯."
 
 #: templates/settings.php:51
 msgid "User Login Filter"
-msgstr ""
+msgstr "ÙÛŒÙ„ØªØ± ÙˆØ±ÙˆØ¯ÛŒ Ú©Ø§Ø±Ø¨Ø±"
 
 #: templates/settings.php:54
 #, php-format
@@ -184,19 +185,19 @@ msgstr ""
 
 #: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "Ø¨Ø¯ÙˆÙ† Ù‡ÛŒÚ† Ú¯ÙˆÙ†Ù‡ ØÙØ±Ù‡ ÛŒØ§ Ø³ÙˆØ±Ø§Ø®ØŒ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø«Ø§Ù„ØŒ \"objectClass = posixGroup\"."
 
 #: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ø§ØªØµØ§Ù„"
 
 #: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ ÙØ¹Ø§Ù„"
 
 #: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Ø²Ù…Ø§Ù†ÛŒÚ©Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ù†Ø´ÙˆØ¯ØŒ Ø§ÛŒÙ† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯."
 
 #: templates/settings.php:72
 msgid "Port"
@@ -204,7 +205,7 @@ msgstr "Ø¯Ø±Ú¯Ø§Ù‡"
 
 #: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù† Ú¯ÛŒØ±ÛŒ (Ø¨Ø¯Ù„) Ù…ÛŒØ²Ø¨Ø§Ù†"
 
 #: templates/settings.php:73
 msgid ""
@@ -214,41 +215,42 @@ msgstr ""
 
 #: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù† Ú¯ÛŒØ±ÛŒ (Ø¨Ø¯Ù„) Ù¾ÙˆØ±Øª"
 
 #: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "ØºÛŒØ± ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø³Ø±ÙˆØ± Ø§ØµÙ„ÛŒ"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø²TLS"
 
 #: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Ø¹Ù„Ø§ÙˆÙ‡ Ø¨Ø± Ø§ÛŒÙ† Ø¨Ø±Ø§ÛŒ Ø§ØªØµØ§Ù„Ø§Øª LDAPS  Ø§Ø² Ø¢Ù† Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù†Ú©Ù†ÛŒØ¯ØŒ Ø¨Ø§ Ø´Ú©Ø³Øª Ù…ÙˆØ§Ø¬Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯."
 
 #: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "ØºÛŒØ± ØØ³Ø§Ø³ Ø¨Ù‡ Ø¨Ø²Ø±Ú¯ÛŒ Ùˆ Ú©ÙˆÚ†Ú©ÛŒ ØØ±ÙˆÙ LDAP Ø³Ø±ÙˆØ± (ÙˆÛŒÙ†Ø¯ÙˆØ²)"
 
 #: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "ØºÛŒØ±ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø§Ø¹ØªØ¨Ø§Ø± Ú¯ÙˆØ§Ù‡ÛŒ Ù†Ø§Ù…Ù‡ SSL ."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "ØªÙˆØµÛŒÙ‡ Ù†Ù…ÛŒ Ø´ÙˆØ¯ØŒ ØªÙ†Ù‡Ø§ Ø¨Ø±Ø§ÛŒ Ø¢Ø²Ù…Ø§ÛŒØ´ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯."
 
 #: templates/settings.php:79
 msgid "Cache Time-To-Live"
@@ -260,67 +262,67 @@ msgstr ""
 
 #: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ù¾ÙˆØ´Ù‡"
 
 #: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr ""
+msgstr "ÙÛŒÙ„Ø¯ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
-msgstr ""
+msgstr "Ú©Ø§Ø±Ø¨Ø± Ø¯Ø±Ø®Øª Ù¾Ø§ÛŒÙ‡"
 
 #: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "ÛŒÚ© Ú©Ø§Ø±Ø¨Ø± Ù¾Ø§ÛŒÙ‡ DN Ø¯Ø± Ù‡Ø± Ø®Ø·"
 
 #: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "ÙˆÛŒÚ˜Ú¯ÛŒ Ù‡Ø§ÛŒ Ø¬Ø³ØªØ¬ÙˆÛŒ Ú©Ø§Ø±Ø¨Ø±"
 
 #: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Ø§Ø®ØªÛŒØ§Ø±ÛŒØ› ÛŒÚ© ÙˆÛŒÚ˜Ú¯ÛŒ Ø¯Ø± Ù‡Ø± Ø®Ø·"
 
 #: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "ÙÛŒÙ„Ø¯ Ù†Ø§Ù… Ú¯Ø±ÙˆÙ‡"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Ú¯Ø±ÙˆÙ‡ Ø¯Ø±Ø®Øª Ù¾Ø§ÛŒÙ‡ "
 
 #: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "ÛŒÚ© Ú¯Ø±ÙˆÙ‡ Ù¾Ø§ÛŒÙ‡ DN Ø¯Ø± Ù‡Ø± Ø®Ø·"
 
 #: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Ú¯Ø±ÙˆÙ‡ ØµÙØ§Øª Ø¬Ø³ØªØ¬Ùˆ"
 
 #: templates/settings.php:89
 msgid "Group-Member association"
-msgstr ""
+msgstr "Ø§Ù†Ø¬Ù…Ù† Ú¯Ø±ÙˆÙ‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù†"
 
 #: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "ÙˆÛŒÚ˜Ú¯ÛŒ Ù‡Ø§ÛŒ Ù…Ø®ØµÙˆØµ"
 
 #: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Ø³Ù‡Ù…ÛŒÙ‡ Ø¨Ù†Ø¯ÛŒ Ø§Ù†Ø¬Ø§Ù… Ù†Ø´Ø¯."
 
 #: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Ø³Ù‡Ù…ÛŒÙ‡ Ø¨Ù†Ø¯ÛŒ Ù¾ÛŒØ´ ÙØ±Ø¶"
 
 #: templates/settings.php:94
 msgid "in bytes"
@@ -328,21 +330,21 @@ msgstr "Ø¯Ø± Ø¨Ø§ÛŒØª"
 
 #: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Ø§ÛŒÙ…ÛŒÙ„ Ø§Ø±Ø³Ø§Ù„ Ù†Ø´Ø¯."
 
 #: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Ù‚Ø§Ù†ÙˆÙ† Ù†Ø§Ù…Ú¯Ø°Ø§Ø±ÛŒ Ù¾ÙˆØ´Ù‡ Ø®Ø§Ù†Ù‡ Ú©Ø§Ø±Ø¨Ø±"
 
 #: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Ø®Ø§Ù„ÛŒ Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ (Ù¾ÛŒØ´ ÙØ±Ø¶). Ø¯Ø± ØºÛŒØ± Ø§ÛŒÙ† ØµÙˆØ±ØªØŒ ØªØ¹ÛŒÛŒÙ† ÛŒÚ© ÙˆÛŒÚ˜Ú¯ÛŒ LDAP/AD."
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¯Ø§Ø®Ù„ÛŒ"
 
 #: templates/settings.php:102
 msgid ""
@@ -352,67 +354,66 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "ÙˆÛŒÚ˜Ú¯ÛŒ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¯Ø§Ø®Ù„ÛŒ:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ† ØªØ´Ø®ÛŒØµ UUID "
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "ØµÙØª UUID:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ - Ù†Ú¯Ø§Ø´Øª Ú©Ø§Ø±Ø¨Ø± LDAP "
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ- LDAP  Ù†Ú¯Ø§Ø´Øª Ú©Ø§Ø±Ø¨Ø± "
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ø§Ù… Ú¯Ø±ÙˆÙ‡ -LDAP Ú¯Ø±ÙˆÙ‡ Ù†Ù‚Ø´Ù‡ Ø¨Ø±Ø¯Ø§Ø±ÛŒ"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
-msgstr ""
+msgstr "Ø§Ù…ØªØØ§Ù† Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ"
 
 #: templates/settings.php:111
 msgid "Help"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index 1310a3b5e67ef063de596dde1590f9a83f98e0df..f73b8487597cbb43790538a3649550602d245770 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# miki_mika1362 <miki_mika1362@yahoo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "Ø§Ø¹ØªØ¨Ø§Ø± Ø³Ù†Ø¬ÛŒ WebDAV "
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 6d009462c0fb395197d38ad9503f77918ef72e06..c568ee695217a7c661e5237954139ad893d86449 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr "marraskuu"
 msgid "December"
 msgstr "joulukuu"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minuutti sitten"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuuttia sitten"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 tunti sitten"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} tuntia sitten"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "tÃ¤nÃ¤Ã¤n"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} pÃ¤ivÃ¤Ã¤ sitten"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} kuukautta sitten"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -226,8 +226,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Virhe"
 
@@ -247,140 +247,141 @@ msgstr "Jaettu"
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Virhe jakoa peruttaessa"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Virhe oikeuksia muuttaessa"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Jaettu sinun ja ryhmÃ¤n {group} kanssa kÃ¤yttÃ¤jÃ¤n {owner} toimesta"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Jaettu kanssasi kÃ¤yttÃ¤jÃ¤n {owner} toimesta"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Jaa"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Jaa linkillÃ¤"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Salasana"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Salli julkinen lÃ¤hetys"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "LÃ¤hetÃ¤ linkki sÃ¤hkÃ¶postitse"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "LÃ¤hetÃ¤"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Aseta pÃ¤Ã¤ttymispÃ¤ivÃ¤"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "PÃ¤Ã¤ttymispÃ¤ivÃ¤"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Jaa sÃ¤hkÃ¶postilla:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "HenkilÃ¶itÃ¤ ei lÃ¶ytynyt"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "PÃ¤Ã¤syn hallinta"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "pÃ¤ivitÃ¤"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa erÃ¤pÃ¤ivÃ¤Ã¤"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Virhe pÃ¤Ã¤ttymispÃ¤ivÃ¤Ã¤ asettaessa"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "LÃ¤hetetÃ¤Ã¤n..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "SÃ¤hkÃ¶posti lÃ¤hetetty"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "PÃ¤ivitys epÃ¤onnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisÃ¶lle</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "PÃ¤ivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-salasanan nollaus"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -391,7 +392,7 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Linkki salasanan nollaamiseen on lÃ¤hetetty sÃ¤hkÃ¶postiisi.<br>Jos et saa viestiÃ¤ pian, tarkista roskapostikansiosi.<br>Jos et lÃ¶ydÃ¤ viestiÃ¤ roskapostinkaan seasta, ota yhteys yllÃ¤pitÃ¤jÃ¤Ã¤n."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -401,7 +402,7 @@ msgstr "PyyntÃ¶ epÃ¤onnistui!<br>Olihan sÃ¤hkÃ¶postiosoitteesi/kÃ¤yttÃ¤jÃ¤tunnuk
 msgid "You will receive a link to reset your password via Email."
 msgstr "Saat sÃ¤hkÃ¶postitse linkin nollataksesi salasanan."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "KÃ¤yttÃ¤jÃ¤tunnus"
@@ -462,11 +463,11 @@ msgstr "Ohje"
 msgid "Access forbidden"
 msgstr "PÃ¤Ã¤sy estetty"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "PilveÃ¤ ei lÃ¶ydy"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "PHP-asennuksesi on haavoittuvainen NULL Byte -hyÃ¶kkÃ¤ykselle (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "PÃ¤ivitÃ¤ PHP-asennuksesi kÃ¤yttÃ¤Ã¤ksesi ownCloudia turvallisesti."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "PÃ¤ivitÃ¤ PHP-asennus varmistaaksesi, ettÃ¤ %s on turvallinen kÃ¤yttÃ¤Ã¤."
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Datakansiosi ja tiedostosi ovat mitÃ¤ luultavimmin muiden saavutettavissa internetistÃ¤, koska .htaccess-tiedosto ei toimi."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Katso palvelimen asetuksien mÃ¤Ã¤rittÃ¤miseen liittyvÃ¤t ohjeet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaatiosta</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "LisÃ¤tietoja palvelimen asetuksien mÃ¤Ã¤rittÃ¤misestÃ¤ on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>yllÃ¤pitÃ¤jÃ¤n tunnus</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "LisÃ¤asetukset"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "kÃ¤ytetÃ¤Ã¤n"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Tietokannan kÃ¤yttÃ¤jÃ¤"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tietokannan taulukkotila"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saatavilla. Lue lisÃ¤tietoja, miten pÃ¤ivitys asennetaan."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "LisÃ¤Ã¤ sovelluksia"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automaattinen sisÃ¤Ã¤nkirjautuminen hylÃ¤ttiin!"
@@ -608,7 +614,7 @@ msgstr "Kirjaudu sisÃ¤Ã¤n"
 msgid "Alternative Logins"
 msgstr "Vaihtoehtoiset kirjautumiset"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 0da220062d28d1fceb6789a2241d4b1ff761dc88..8ac0bd2bb30b2a412c1d3a03a70fb23d5df1d174 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +121,7 @@ msgstr "Jaa"
 msgid "Delete permanently"
 msgstr "Poista pysyvÃ¤sti"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Poista"
 
@@ -128,43 +129,45 @@ msgstr "Poista"
 msgid "Rename"
 msgstr "NimeÃ¤ uudelleen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "ehdota nimeÃ¤"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "suorita poistotoiminto"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +203,29 @@ msgstr "Lataustasi valmistellaan. TÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken, jos tiedostot
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 kansio"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} kansiota"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 tiedosto"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} tiedostoa"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +284,61 @@ msgstr "Kansio"
 msgid "From link"
 msgstr "LinkistÃ¤"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Poistetut tiedostot"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Peru lÃ¤hetys"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tÃ¤nne."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "TÃ¤Ã¤llÃ¤ ei ole mitÃ¤Ã¤n. LÃ¤hetÃ¤ tÃ¤nne jotakin!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "LÃ¤hetettÃ¤vÃ¤ tiedosto on liian suuri"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "LÃ¤hetettÃ¤vÃ¤ksi valitsemasi tiedostot ylittÃ¤vÃ¤t palvelimen salliman tiedostokoon rajan."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "TÃ¤mÃ¤nhetkinen tutkinta"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "kansio"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "kansiota"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "tiedosto"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "tiedostoa"
 
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 0f8f958a2d0ba78bf090352eaaf109988d0d5048..5aaf930afb3828f7758c93493eaa7a8b08b89fd9 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 79f7f2be116e74e4570e7fc94c20ffecaa32e410..cc90b8dc79b797678f6661629908c285d18cd8bf 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus."
 msgid "Error configuring Google Drive storage"
 msgstr "Virhe Google Drive levyn asetuksia tehtÃ¤essÃ¤"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Varoitus:</b> \"smbclient\" ei ole asennettuna. CIFS-/SMB-jakojen liittÃ¤minen ei ole mahdollista. PyydÃ¤ jÃ¤rjestelmÃ¤n yllÃ¤pitÃ¤jÃ¤Ã¤ asentamaan smbclient."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Varoitus:</b> PHP:n FTP-tuki ei ole kÃ¤ytÃ¶ssÃ¤ tai sitÃ¤ ei ole asennettu. FTP-jakojen liittÃ¤minen ei ole mahdollista. PyydÃ¤ jÃ¤rjestelmÃ¤n yllÃ¤pitÃ¤jÃ¤Ã¤ ottamaan FTP-tuki kÃ¤yttÃ¶Ã¶n."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index ed1e3beb08a650478a20c50bfac903617d3aff6f..6194c0899889d8bd950e8d9aa2a9ec1f28159ed1 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "VÃ¤Ã¤rÃ¤ salasana. YritÃ¤ uudelleen."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Salasana"
 msgid "Submit"
 msgstr "LÃ¤hetÃ¤"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Valitettavasti linkki ei vaikuta enÃ¤Ã¤ toimivan."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Mahdollisia syitÃ¤:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "kohde poistettiin"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "linkki vanheni"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "jakaminen on poistettu kÃ¤ytÃ¶stÃ¤"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Kysy lisÃ¤tietoja henkilÃ¶ltÃ¤, jolta sait linkin."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jakoi kansion %s kanssasi"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jakoi tiedoston %s kanssasi"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "LÃ¤hetÃ¤"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Peru lÃ¤hetys"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Ei esikatselua kohteelle"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index bee5803eade18884c97cd9ced7eca2107035637e..d49cd73b9085f376c07b6d07c42534fcbe57708c 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvÃ¤sti"
 msgid "Couldn't restore %s"
 msgstr "Kohteen %s palautus epÃ¤onnistui"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "suorita palautustoiminto"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Virhe"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "poista tiedosto pysyvÃ¤sti"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Poista pysyvÃ¤sti"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 kansio"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} kansiota"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 tiedosto"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} tiedostoa"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "palautettu"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index c93ead204dc95bb7344382ee8cd850002822ae38..1f30f6fe2a4ef1e97b28f75914cf3f69fd7cac9c 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:00+0000\n"
+"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Palautus epÃ¤onnistui: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "onnistui"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Tiedosto %s palautettiin versioon %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "epÃ¤onnistui"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Tiedoston %s palautus versioon %s epÃ¤onnistui"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versiot"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Vanhoja versioita ei ole saatavilla"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Tiedoston {file} palautus versioon {timestamp} epÃ¤onnistui."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Polkua ei ole mÃ¤Ã¤ritetty"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "LisÃ¤Ã¤ versioita..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versiot"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Ei muita versioita saatavilla"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Palauta tiedoston edellinen versio napsauttamalla palautuspainiketta"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Palauta"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index c56e359a841bd2b3a26ea638a305fea540406b44..04bbdf3a79780f45afde2eddbaed9f03ba437f8b 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "KÃ¤yttÃ¤jÃ¤t"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Sovellukset"
-
-#: app.php:417
 msgid "Admin"
 msgstr "YllÃ¤pitÃ¤jÃ¤"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu kÃ¤ytÃ¶stÃ¤."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittÃ¤in."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ei voitu mÃ¤Ã¤rittÃ¤Ã¤"
 
@@ -171,77 +183,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL:n kÃ¤yttÃ¤jÃ¤tunnus ja/tai salasana on vÃ¤Ã¤rin"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Aseta yllÃ¤pitÃ¤jÃ¤n kÃ¤yttÃ¤jÃ¤tunnus."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Aseta yllÃ¤pitÃ¤jÃ¤n salasana."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minuutti sitten"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuuttia sitten"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 tunti sitten"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d tuntia sitten"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "tÃ¤nÃ¤Ã¤n"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "eilen"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d pÃ¤ivÃ¤Ã¤ sitten"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "viime kuussa"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d kuukautta sitten"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "viime vuonna"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "vuotta sitten"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 6b0ec49e1bcd601ec225a31aea17a1cd16b92a2c..4281890e9da9f85ff433cb52b141a29b4f62e845 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr "lisÃ¤Ã¤ ryhmÃ¤"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Anna kelvollinen kÃ¤yttÃ¤jÃ¤tunnus"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
@@ -164,172 +164,179 @@ msgstr "Virhe kÃ¤yttÃ¤jÃ¤Ã¤ luotaessa"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Anna kelvollinen salasana"
 
 #: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Data-kansio ja tiedostot ovat ehkÃ¤ saavutettavissa InternetistÃ¤. .htaccess-tiedosto, jolla kontrolloidaan pÃ¤Ã¤syÃ¤, ei toimi. Suosittelemme, ettÃ¤ muutat web-palvelimesi asetukset niin ettei data-kansio ole enÃ¤Ã¤ pÃ¤Ã¤syÃ¤ tai siirrÃ¤t data-kansion pois web-palvelimen tiedostojen juuresta."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Moduuli 'fileinfo' puuttuu"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Internet-yhteys ei toimi"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "KÃ¤ytÃ¤ jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Salli sovellusten kÃ¤yttÃ¤Ã¤ jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Salli linkit"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Salli kÃ¤yttÃ¤jien jakaa kohteita kÃ¤yttÃ¤en linkkejÃ¤"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Salli uudelleenjakaminen"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Mahdollistaa kÃ¤yttÃ¤jien jakavan uudelleen heidÃ¤n kanssaan jaettuja kohteita"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Salli kÃ¤yttÃ¤jien jakaa kenen tahansa kanssa"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Salli jakaminen vain samoissa ryhmissÃ¤ olevien kÃ¤yttÃ¤jien kesken"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Pakottaa salaamaan ownCloudiin kohdistuvat yhteydet."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "EnemmÃ¤n"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "VÃ¤hemmÃ¤n"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +394,77 @@ msgstr "Ohjelmistovirheiden jÃ¤ljitys"
 msgid "Commercial Support"
 msgstr "Kaupallinen tuki"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Aseta sovellukset synkronoimaan tiedostosi"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "NÃ¤ytÃ¤ ensimmÃ¤isen kÃ¤yttÃ¶kerran avustaja uudelleen"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "KÃ¤ytÃ¶ssÃ¤si on <strong>%s</strong>/<strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Salasanasi vaihdettiin"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Salasanaasi ei voitu vaihtaa"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "NÃ¤yttÃ¶nimi"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "SÃ¤hkÃ¶postiosoite"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "SÃ¤hkÃ¶postiosoitteesi"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Anna sÃ¤hkÃ¶postiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Auta kÃ¤Ã¤ntÃ¤misessÃ¤"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "KÃ¤ytÃ¤ tÃ¤tÃ¤ osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pÃ¤Ã¤stÃ¤ksesi kÃ¤siksi tiedostoihisi WebDAVin kautta</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index ede652110572d4b89b4c39732603fa809c39e704..a935ca4f8278892ed47f108cc6a17bdf3a8f6c77 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "Vahvista poisto"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr "Poista pÃ¤Ã¤palvelin kÃ¤ytÃ¶stÃ¤"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Poista kÃ¤ytÃ¶stÃ¤ SSL-varmenteen vahvistus"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Jos yhteys toimii vain tÃ¤llÃ¤ valinnalla, siirrÃ¤ LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "KÃ¤yttÃ¤jÃ¤n nÃ¤ytettÃ¤vÃ¤n nimen kenttÃ¤"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP-attribuutti, jota kÃ¤ytetÃ¤Ã¤n kÃ¤yttÃ¤jÃ¤n ownCloud-kÃ¤yttÃ¤jÃ¤nimenÃ¤ "
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "RyhmÃ¤n \"nÃ¤ytettÃ¤vÃ¤ nimi\"-kenttÃ¤"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP-attribuutti, jota kÃ¤ytetÃ¤Ã¤n luomaan ryhmÃ¤n ownCloud-nimi"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index f38e5770f385e2b7a9f58b6baa13c60967e07a33..ca7c9cc8f3ba6e5cdcbe4225931450ba1f0fca61 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-05 07:52-0400\n"
+"PO-Revision-Date: 2013-08-05 11:20+0000\n"
+"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-todennus"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr ""
+msgid "Address: "
+msgstr "Osoite:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "KÃ¤yttÃ¤jÃ¤tiedot lÃ¤hetetÃ¤Ã¤n tÃ¤hÃ¤n osoitteeseen. LiitÃ¤nnÃ¤inen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vÃ¤Ã¤riksi kÃ¤yttÃ¤jÃ¤tiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi kÃ¤yttÃ¤jÃ¤tiedoiksi."
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 20ae6db0709ace63dad9a1f37ea3893e46093cae..8246c9644de68b043df143319e6de4bc7e33aaf5 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -142,59 +142,59 @@ msgstr "novembre"
 msgid "December"
 msgstr "dÃ©cembre"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ParamÃ¨tres"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "il y a une minute"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "il y a {minutes} minutes"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Il y a une heure"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "Il y a {hours} heures"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "il y a {days} jours"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "Il y a {months} mois"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "l'annÃ©e derniÃ¨re"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "il y a plusieurs annÃ©es"
 
@@ -230,8 +230,8 @@ msgstr "Le type d'objet n'est pas spÃ©cifiÃ©."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Erreur"
 
@@ -251,140 +251,141 @@ msgstr "PartagÃ©"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Erreur lors de l'annulation du partage"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Erreur lors du changement des permissions"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "PartagÃ© par {owner} avec vous et le groupe {group}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "PartagÃ© avec vous par {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Partager avec"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Partager via lien"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ProtÃ©ger par un mot de passe"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Mot de passe"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Autoriser l'upload par les utilisateurs non enregistrÃ©s"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Envoyez le lien par email"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Envoyer"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "SpÃ©cifier la date d'expiration"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Aucun utilisateur trouvÃ©"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisÃ©"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "PartagÃ© dans {item} avec {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ã©dition autorisÃ©e"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "contrÃ´le des accÃ¨s"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "crÃ©er"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "mettre Ã  jour"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "ProtÃ©gÃ© par un mot de passe"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spÃ©cification de la date d'expiration"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email envoyÃ©"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "La mise Ã  jour a Ã©chouÃ©. Veuillez signaler ce problÃ¨me Ã  la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communautÃ© ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La mise Ã  jour a rÃ©ussi. Vous Ãªtes redirigÃ© maintenant vers ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "RÃ©initialisation de votre mot de passe Owncloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -405,7 +406,7 @@ msgstr "RequÃªte en Ã©chec!<br>Avez-vous vÃ©rifiÃ© vos courriel/nom d'utilisateu
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vous allez recevoir un e-mail contenant un lien pour rÃ©initialiser votre mot de passe."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nom d'utilisateur"
@@ -466,11 +467,11 @@ msgstr "Aide"
 msgid "Access forbidden"
 msgstr "AccÃ¨s interdit"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Introuvable"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -499,8 +500,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Votre version de PHP est vulnÃ©rable Ã  l'attaque par caractÃ¨re NULL (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Veuillez mettre Ã  jour votre installation PHP pour utiliser ownCloud de faÃ§on sÃ©curisÃ©e."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -520,68 +522,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Votre rÃ©pertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner"
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "CrÃ©er un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "AvancÃ©"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "RÃ©pertoire des donnÃ©es"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configurer la base de donnÃ©es"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "sera utilisÃ©"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Utilisateur pour la base de donnÃ©es"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Mot de passe de la base de donnÃ©es"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nom de la base de donnÃ©es"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tablespaces de la base de donnÃ©es"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Serveur de la base de donnÃ©es"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s est disponible. Obtenez plus d'informations sur la faÃ§on de mettre Ã  jour."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Se dÃ©connecter"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Connexion automatique rejetÃ©e !"
@@ -612,7 +618,7 @@ msgstr "Connexion"
 msgid "Alternative Logins"
 msgstr "Logins alternatifs"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 437d3e668b50b58f0a56209aa9445cd7bd1c9c35..e1bb8333cb3ec9c7253b57e0ac8779351736d645 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -123,7 +123,7 @@ msgstr "Partager"
 msgid "Delete permanently"
 msgstr "Supprimer de faÃ§on dÃ©finitive"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -131,43 +131,45 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} existe dÃ©jÃ "
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "SuggÃ©rer un nom"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a Ã©tÃ© remplacÃ© par {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "effectuer l'opÃ©ration de suppression"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fichier en cours d'envoi"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "fichiers en cours d'envoi"
 
@@ -203,33 +205,29 @@ msgstr "Votre tÃ©lÃ©chargement est cours de prÃ©paration. Ceci peut nÃ©cessiter
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est rÃ©servÃ©e Ã  Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ModifiÃ©"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 dossier"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} dossiers"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fichier"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} fichiers"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -288,61 +286,61 @@ msgstr "Dossier"
 msgid "From link"
 msgstr "Depuis le lien"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Fichiers supprimÃ©s"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Vous n'avez pas le droit d'Ã©criture ici."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "TÃ©lÃ©charger"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "TÃ©lÃ©versement trop volumineux"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Les fichiers que vous essayez d'envoyer dÃ©passent la taille maximale permise par ce serveur."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "dossier"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "dossiers"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fichier"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fichiers"
 
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index a7a5e7a6fe44b134413f76eb95266d299e411f34..a3cea1154a6d4372a008301a946eea8dfbd0fae0 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -67,13 +67,17 @@ msgstr "Votre clÃ© de sÃ©curitÃ© privÃ©e n'est pas valide! Il est probable que v
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "SystÃ¨me minimum requis non respectÃ©."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index ebb335e5e93891f3bea1d14b09e438af1fc93f25..c1e69f0c90269814a2f35068493e53c28a14bbab 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Veuillez fournir une clÃ© d'application (app key) ainsi qu'un mot de pas
 msgid "Error configuring Google Drive storage"
 msgstr "Erreur lors de la configuration du support de stockage Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Attention : </b> \"smbclient\" n'est pas installÃ©. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur systÃ¨me pour l'installer."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activÃ© ou installÃ©. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur systÃ¨me pour l'installer."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 2fefa32c5522e28c75fe19487e5242556d82997c..67c79c9ec353f04422cfcdad76ca48e0fab4b9f5 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# square <benben390-390@yahoo.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Le mot de passe est incorrect. Veuillez rÃ©essayer."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Mot de passe"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partagÃ© le rÃ©pertoire %s avec vous"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partagÃ© le fichier %s avec vous"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "TÃ©lÃ©charger"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Envoyer"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Pas d'aperÃ§u disponible pour"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index d2d604b4e098fbf94de5e9e287180c724d697349..464c518b8a506ee4312ee18675d0f142b3d14b44 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr "Impossible d'effacer %s de faÃ§on permanente"
 msgid "Couldn't restore %s"
 msgstr "Impossible de restaurer %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "effectuer l'opÃ©ration de restauration"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Erreur"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "effacer dÃ©finitivement le fichier"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Supprimer de faÃ§on dÃ©finitive"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "EffacÃ©"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 dossier"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} dossiers"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fichier"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} fichiers"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index dd91318cfb4c79af70b3dc306e50f1edfb1f1c46..79799c762b91f912fa86c48cf9700a9040e8e91f 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Impossible de restaurer %s"
 
-#: history.php:40
-msgid "success"
-msgstr "succÃ¨s"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Le fichier %s a Ã©tÃ© restaurÃ© dans sa version %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "Ã©chec"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Le fichier %s ne peut Ãªtre restaurÃ© dans sa version %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versions"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Aucune ancienne version n'est disponible"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Aucun chemin spÃ©cifiÃ©"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Restaurez un fichier dans une version antÃ©rieure en cliquant sur son bouton de restauration"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Restaurer"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index b0a7c07763d5de2fb486600cda7b647e921cb1fb..0658f16d4351897b8af07671039112a175f38b3a 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Applications"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administration"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "services web sous votre contrÃ´le"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "TÃ©lÃ©chargement ZIP dÃ©sactivÃ©."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Les fichiers nÃ©cessitent d'Ãªtre tÃ©lÃ©chargÃ©s un par un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sÃ©lectionnÃ©s sont trop volumineux pour Ãªtre compressÃ©s."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "impossible Ã  dÃ©terminer"
 
@@ -171,77 +183,77 @@ msgstr "La requÃªte en cause est : \"%s\", nom : %s, mot de passe : %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "SpÃ©cifiez un nom d'utilisateur pour l'administrateur."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "SpÃ©cifiez un mot de passe administrateur."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Votre serveur web, n'est pas correctement configurÃ© pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Veuillez vous rÃ©fÃ©rer au <a href='%s'>guide d'installation</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "il y a une minute"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "il y a %d minutes"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Il y a une heure"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Il y a %d heures"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "aujourd'hui"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "hier"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "il y a %d jours"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "le mois dernier"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Il y a %d mois"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "l'annÃ©e derniÃ¨re"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "il y a plusieurs annÃ©es"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 6fa011502995374144c8730aff6a76f24dd951b5..168a33c9ec9fe6f46202209d375239f952c1a93b 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013
 # lyly95, 2013
 # red0ne <red-0ne@smarty-concept.com>, 2013
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -172,166 +173,173 @@ msgstr "Un mot de passe valide doit Ãªtre saisi"
 msgid "__language_name__"
 msgstr "FranÃ§ais"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Avertissement de sÃ©curitÃ©"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de maniÃ¨re Ã  ce que le dossier data ne soit plus accessible ou bien de dÃ©placer le dossier data en dehors du dossier racine des documents du serveur web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Avertissement, problÃ¨me de configuration"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Votre serveur web, n'est pas correctement configurÃ© pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Veuillez vous rÃ©fÃ©rer au <a href='%s'>guide d'installation</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' manquant"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Le module PHP 'fileinfo' est manquant. Il est vivement recommandÃ© de l'activer afin d'obtenir de meilleurs rÃ©sultats pour la dÃ©tection des types de fichiers."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Localisation non fonctionnelle"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Ce serveur ownCloud ne peut pas ajuster la localisation du systÃ¨me en %s. Cela signifie qu'il pourra y avoir des problÃ¨mes avec certains caractÃ¨res dans les noms de fichiers. Il est vivement recommandÃ© d'installer les paquets requis pour le support de %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "La connexion internet ne fonctionne pas"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Ce serveur ownCloud ne peut pas se connecter Ã  internet. Cela signifie que certaines fonctionnalitÃ©s, telles que l'utilisation de supports de stockage distants, les notifications de mises Ã  jour, ou l'installation d'applications tierces ne fonctionneront pas. L'accÃ¨s aux fichiers Ã  distance, ainsi que les notifications par mails ne marcheront pas non plus. Il est recommandÃ© d'activer la connexion internet pour ce serveur si vous souhaitez utiliser toutes les fonctionnalitÃ©s offertes par ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "ExÃ©cute une tÃ¢che Ã  chaque chargement de page"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php est enregistrÃ© en tant que service webcron. Veuillez appeler la page cron.php situÃ©e Ã  la racine du serveur ownCoud via http toute les minutes."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Utilise le service cron du systÃ¨me. Appelle le fichier cron.php du rÃ©pertoire owncloud toutes les minutes grÃ¢ce Ã  une tÃ¢che cron du systÃ¨me."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Partage"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activer l'API de partage"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Autoriser les applications Ã  utiliser l'API de partage"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Autoriser les liens"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Autoriser les utilisateurs Ã  partager des Ã©lÃ©ments publiquement Ã  l'aide de liens"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Autoriser le repartage"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Autoriser les utilisateurs Ã  partager des Ã©lÃ©ments qui ont Ã©tÃ© partagÃ©s avec eux"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Autoriser les utilisateurs Ã  partager avec tout le monde"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Autoriser les utilisateurs Ã  partager avec des utilisateurs de leur groupe uniquement"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "SÃ©curitÃ©"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Forcer HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Forcer les clients Ã  se connecter Ã  Owncloud via une connexion chiffrÃ©e."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Merci de vous connecter Ã  cette instance Owncloud en HTTPS pour activer ou dÃ©sactiver SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,77 +397,77 @@ msgstr "Suivi de bugs"
 msgid "Commercial Support"
 msgstr "Support commercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Obtenez les applications de synchronisation de vos fichiers"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Revoir le premier lancement de l'installeur"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vous avez utilisÃ© <strong>%s</strong> des <strong>%s<strong> disponibles"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Votre mot de passe a Ã©tÃ© changÃ©"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Impossible de changer votre mot de passe"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nom affichÃ©"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Adresse mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Entrez votre adresse e-mail pour permettre la rÃ©initialisation du mot de passe"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Aidez Ã  traduire"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accÃ©der Ã  vos fichiers via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index bd5fabd5ec832d04389d48d412be891cf78e040f..39d520c2b30dac1190b1fa5ef8831cc824f89d14 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: plachance <patlachance@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +89,9 @@ msgstr "Confirmer la suppression"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur systÃ¨me pour qu'il dÃ©sactive l'une d'elles."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "DÃ©sactiver le serveur principal"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Lorsqu'activÃ©, ownCloud ne se connectera qu'au serveur rÃ©pliquÃ©."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "DÃ©sactiver la validation du certificat SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "L'attribut LDAP utilisÃ© pour gÃ©nÃ©rer les noms d'utilisateurs d'ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "L'attribut LDAP utilisÃ© pour gÃ©nÃ©rer les noms de groupes d'ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Par dÃ©faut le nom d'utilisateur interne sera crÃ©Ã© Ã  partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractÃ¨res ne nÃ©cessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractÃ¨res suivants: [ a-zA-Z0-9_.@- ]. Les autres caractÃ¨res sont remplacÃ©s par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrÃ©mentÃ©/dÃ©crÃ©mentÃ©. Le nom d'utilisateur interne est utilisÃ© pour identifier l'utilisateur au sein du systÃ¨me. C'est aussi le nom par dÃ©faut du rÃ©pertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par dÃ©faut peut Ãªtre modifiÃ© Ã  l'aide de ce paramÃ¨tre. Pour obtenir un comportement similaire aux versions prÃ©cÃ©dentes Ã  ownCloud 5, saisir le nom d'utilisateur Ã  afficher dans le champ suivant. Laissez Ã  blanc pour le comportement par dÃ©faut. Les modifications prendront effet seulement pour les nouveaux (ajoutÃ©s) utilisateurs LDAP."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "Surcharger la dÃ©tection d'UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Par dÃ©faut, ownCloud dÃ©tecte automatiquement l'attribut UUID. L'attribut UUID est utilisÃ© pour identifier les utilisateurs et groupes de faÃ§on prÃ©dictive. De plus, le nom d'utilisateur interne sera crÃ©Ã© basÃ© sur l'UUID s'il n'est pas explicitÃ© ci-dessus. Vous pouvez modifier ce comportement et dÃ©finir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut Ãªtre rÃ©cupÃ©rÃ© pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser Ã  blanc pour le comportement par dÃ©faut. Les modifications seront effectives uniquement pour les nouveaux (ajoutÃ©s) utilisateurs et groupes LDAP."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre prÃ©cisÃ©ment les utilisateurs, chaque utilisateur aura un nom interne spÃ©cifique. Cela requiert l'association d'un nom d'utilisateur ownCloud Ã  un nom d'utilisateur LDAP. Le nom d'utilisateur crÃ©Ã© est associÃ© Ã  l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mÃ©morisÃ© en cache pour limiter les interactions LDAP mais il n'est pas utilisÃ© pour l'identification. ownCloud dÃ©tectera le changement de DN, le cas Ã©chÃ©ant. Seul le nom interne Ã  ownCloud est utilisÃ© au sein du produit. Supprimer les associations crÃ©era des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expÃ©rimentation."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index 592ae748bc3cfc8ea400457e0a11fbb693f3b12c..c4a85dce02d633c714b9b663aba6abcf42838438 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-17 02:02+0200\n"
-"PO-Revision-Date: 2013-06-16 18:40+0000\n"
-"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,12 +28,12 @@ msgid "WebDAV Authentication"
 msgstr "Authentification WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud enverra les informations de connexion Ã  cette adresse. Ce module complÃ©mentaire analyse le code rÃ©ponse HTTP et considÃ¨re tout code diffÃ©rent des codes 401 et 403 comme associÃ© Ã  une authentification correcte."
+msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 195292276a479933ce4f601cdd99a6e62959eebd..c7eccad163fb601051a6ce9dfbd27cf365141671 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -138,59 +138,59 @@ msgstr "novembro"
 msgid "December"
 msgstr "decembro"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "hai 1 minuto"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "hai {minutes} minutos"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Vai 1 hora"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "hai {hours} horas"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "hai {days} dÃas"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ãºltimo mes"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "hai {months} meses"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
@@ -226,8 +226,8 @@ msgstr "Non se especificou o tipo de obxecto."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Erro"
 
@@ -247,140 +247,141 @@ msgstr "Compartir"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Produciuse un erro ao deixar de compartir"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Produciuse un erro ao cambiar os permisos"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vostede e co grupo {group} por {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vostede por {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Compartir coa ligazÃ³n"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Contrasinal"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Permitir o envÃo pÃºblico"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Enviar ligazÃ³n por correo"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Compartir por correo:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Non se permite volver a compartir"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Correo enviado"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "A actualizaciÃ³n non foi satisfactoria, informe deste problema Ã¡  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualizaciÃ³n realizouse correctamente. RedirixÃndoo agora Ã¡ ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Restabelecer o contrasinal de ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +402,7 @@ msgstr "Non foi posÃbel facer a peticiÃ³n!<br>AsegÃºrese de que o seu enderezo
 msgid "You will receive a link to reset your password via Email."
 msgstr "RecibirÃ¡ unha ligazÃ³n por correo para restabelecer o contrasinal"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nome de usuario"
@@ -462,11 +463,11 @@ msgstr "Axuda"
 msgid "Access forbidden"
 msgstr "Acceso denegado"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Nube non atopada"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "A sÃºa versiÃ³n de PHP Ã© vulnerÃ¡bel a un ataque de byte nulo (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Actualice a instalaciÃ³n de PHP para empregar ownCloud de xeito seguro."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Actualice a instalaciÃ³n de PHP para empregar %s de xeito seguro."
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "O seu directorio de datos e os ficheiros probabelmente sexan accesÃbeis desde a Internet xa que o ficheiro .htaccess non estÃ¡ a traballar."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Para obter informaciÃ³n sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaciÃ³n</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Para obter informaciÃ³n sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentaciÃ³n</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "vai ser utilizado"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "TÃ¡boa de espazos da base de datos"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Rematar a configuraciÃ³n"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s estÃ¡ dispoÃ±Ãbel. ObteÃ±a mÃ¡is informaciÃ³n sobre como actualizar."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Desconectar"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "MÃ¡is aplicativos"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Rexeitouse a entrada automÃ¡tica"
@@ -608,7 +614,7 @@ msgstr "Conectar"
 msgid "Alternative Logins"
 msgstr "Accesos alternativos"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 01e6429ebcad8d49266dc2941f970669310651d1..7d01856d0831b7d39c0080cb19caaa790dfe04ce 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,7 +121,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -129,43 +129,45 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substituÃr"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituÃr {new_name} por {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "realizar a operaciÃ³n de eliminaciÃ³n"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "EnviÃ¡ndose 1 ficheiro"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "ficheiros enviÃ¡ndose"
 
@@ -201,33 +203,29 @@ msgstr "EstÃ¡ a prepararse a sÃºa descarga. Isto pode levar bastante tempo se os
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol incorrecto. O uso de Â«SharedÂ» estÃ¡ reservado por Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 cartafol"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} cartafoles"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 ficheiro"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +284,61 @@ msgstr "Cartafol"
 msgid "From link"
 msgstr "Desde a ligazÃ³n"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar o envÃo"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Non ten permisos para escribir aquÃ."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "AquÃ non hai nada. EnvÃe algo."
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "EnvÃo demasiado grande"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiros que tenta enviar exceden do tamaÃ±o mÃ¡ximo permitido neste servidor"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "AnÃ¡lise actual"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "directorio"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "directorios"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ficheiro"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index a8f83b07bb48338b344bd883f7e905e3d32538a4..1395e13a4f35065d7e9d2d92e7e7d42c1b067851 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-07 01:58+0200\n"
-"PO-Revision-Date: 2013-07-06 09:11+0000\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-09 18:50+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -70,10 +70,14 @@ msgstr "Non se cumpren os requisitos."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr "AsegÃºrese de que estÃ¡ instalado o  PHP 5.3.3 ou posterior e de que a extensiÃ³n OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
+"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."
+msgstr "AsegÃºrese de que estÃ¡ instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensiÃ³n PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "Os seguintes usuarios non teÃ±en configuraciÃ³n para o cifrado:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index ceb54f1e4a72dd63d5baf2651a4163509eed3ccd..c6a78af76d2ee8e4dcd87418f7dcc89297e9322a 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Forneza unha chave correcta e segreda do Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> Â«smbclientÂ» non estÃ¡ instalado. Non Ã© posibel a montaxe de comparticiÃ³ns CIFS/SMB. Consulte co administrador do sistema para instalalo."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Aviso:</b> A compatibilidade de FTP en PHP non estÃ¡ activada ou instalada. Non Ã© posibel a montaxe de comparticiÃ³ns FTP. Consulte co administrador do sistema para instalalo."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 972d4e51847703993c70c9a7f0d554589cd8d5fa..13e9cefab473dd2d6893272f1514b32987cf39f7 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "Contrasinal"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Semella que esta ligazÃ³n non funciona."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "As razÃ³ns poderÃan ser:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "o elemento foi retirado"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "a ligazÃ³n caducou"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "foi desactivada a comparticiÃ³n"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Para obter mÃ¡is informaciÃ³n, pregÃºntelle Ã¡ persoa que lle enviou a ligazÃ³n."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartiu o cartafol %s con vostede"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartiu o ficheiro %s con vostede"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Enviar"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Cancelar o envÃo"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Sen vista previa dispoÃ±Ãbel para"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 223933f91a637978220ee71a5ece6e1ec3f76d60..2a1193ea633bf2d15edf01c3637a8222b197dc7b 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "Non foi posÃbel eliminar %s permanente"
 msgid "Couldn't restore %s"
 msgstr "Non foi posÃbel restaurar %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "realizar a operaciÃ³n de restauraciÃ³n"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Erro"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "eliminar o ficheiro permanentemente"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 cartafol"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} cartafoles"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 ficheiro"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "restaurado"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index be763534a5e07997e2f4ee918adbb45ac550c79f..567f404673988027f0e2df838d4fe46d72574cad 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 10:20+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Non foi posÃbel reverter: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "feito"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "O ficheiro %s foi revertido Ã¡ versiÃ³n %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "produciuse un fallo"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Non foi posÃbel reverter o ficheiro %s Ã¡ versiÃ³n %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "VersiÃ³ns"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Non hai versiÃ³ns antigas dispoÃ±Ãbeis"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Non foi posÃbel reverter {file} Ã¡ revisiÃ³n {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Non foi indicada a ruta"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "MÃ¡is versiÃ³ns..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "VersiÃ³ns"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Non hai outras versiÃ³ns dispoÃ±Ãbeis"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Reverta un ficheiro a unha versiÃ³n anterior premendo no botÃ³n reversiÃ³n"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Restablecer"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index d042ddf5271762f27a6e2a890139912083bef172..0ed2450f99348dd61599062d5f8cc7133aebe545 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplicativos"
-
-#: app.php:417
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Non foi posÃbel anovar Â«%sÂ»."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "non foi posÃbel abrir Â«%sÂ»"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP estÃ¡n desactivadas."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Descargue os ficheiros en cachos mÃ¡is pequenos e por separado, ou pÃdallos amabelmente ao seu administrador."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "non foi posÃbel determinalo"
 
@@ -171,77 +183,77 @@ msgstr "A orde ofensiva foi: Â«%sÂ», nome: %s, contrasinal: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Estabeleza un nome de usuario administrador"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Estabeleza un contrasinal de administrador"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web non estÃ¡ aÃnda configurado adecuadamente para permitir a sincronizaciÃ³n de ficheiros xa que semella que a interface WebDAV non estÃ¡ a funcionar."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Volva comprobar as <a href='%s'>guÃas de instalaciÃ³n</a>"
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "hai 1 minuto"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "hai %d minutos"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Vai 1 hora"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Vai %d horas"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hoxe"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "onte"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "hai %d dÃas"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ãºltimo mes"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Vai %d meses"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Causado por:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 856c7126ac0ff34db47fb8fd3e3de0be53aa8fd6..35d5432fae3777f0d2da05aaeb57f2c8f47f613c 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,166 +170,173 @@ msgstr "Debe fornecer un contrasinal"
 msgid "__language_name__"
 msgstr "Galego"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Aviso de seguranza"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesÃbeis a travÃ©s da Internet. O ficheiro .htaccess que fornece ownCloud non estÃ¡ a empregarse. SuxerÃmoslle que configure o seu servidor web de tal xeito que o cartafol de datos non estea accesÃbel ou mova o cartafol de datos fora do directorio raÃz de datos do servidor web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesÃbeis a travÃ©s de internet. O ficheiro .htaccess non estÃ¡ a traballar. SuxerÃmoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesÃbel ou que mova o o directorio de datos fÃ³ra da raÃz de documentos do servidor web."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Configurar os avisos"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web non estÃ¡ aÃnda configurado adecuadamente para permitir a sincronizaciÃ³n de ficheiros xa que semella que a interface WebDAV non estÃ¡ a funcionar."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Volva comprobar as <a href='%s'>guÃas de instalaciÃ³n</a>"
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Volva comprobar as <a href=\"%s\">guÃas de instalaciÃ³n</a>"
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Non se atopou o mÃ³dulo Â«fileinfoÂ»"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Non se atopou o mÃ³dulo de PHP Â«fileinfoÂ». Ã‰ recomendÃ¡bel activar este mÃ³dulo para obter os mellores resultados coa detecciÃ³n do tipo MIME."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "A configuraciÃ³n rexional non funciona"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Este servidor ownCloud non pode estabelecer a configuraciÃ³n rexional do sistema a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. RecomendÃ¡moslle que inste os paquetes necesarios no sistema para aceptar o %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "A configuraciÃ³n rexional do sistema non pode estabelecerse a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. RecomendÃ¡moslle que instale os paquetes necesarios no sistema para aceptar o %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "A conexiÃ³n Ã¡ Internet non funciona"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Este servidor ownCloud non ten conexiÃ³n a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificaciÃ³ns sobre actualizaciÃ³ns ou instalaciÃ³n de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envÃo de mensaxes de notificaciÃ³n poderÃan non funcionar. SuxerÃmoslle que active a conexiÃ³n a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Este servidor non ten conexiÃ³n a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificaciÃ³ns sobre actualizaciÃ³ns ou instalaciÃ³n de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envÃo de mensaxes de notificaciÃ³n poderÃan non funcionar. SuxerÃmoslle que active a conexiÃ³n a Internet deste servidor se quere dispor de todas as funcionalidades."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Executar unha tarefa con cada pÃ¡xina cargada"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php estÃ¡ rexistrado nun servizo de WebCron. Chame Ã¡ pÃ¡gina cron.php na raÃz ownCloud unha vez por minuto a travÃ©s de HTTP."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php estÃ¡ rexistrado nun servizo de WebCron para chamar a cron.php unha vez por minuto a travÃ©s de HTTP."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no cartafol owncloud a travÃ©s dun sistema de cronjob unha vez por minuto."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Use o servizo de sistema cron para chamar ao ficheiro cron.php unha vez por minuto."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartindo"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activar o API para compartir"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os aplicativos empreguen o API para compartir"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir ligazÃ³ns"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os usuarios compartan elementos ao pÃºblico con ligazÃ³ns"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Permitir os envÃos pÃºblicos"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Permitir compartir"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os usuarios compartan con calquera"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os usuarios compartan sÃ³ cos usuarios dos seus grupos"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Forzar que os clientes se conecten a ownCloud empregando unha conexiÃ³n cifrada"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Forzar que os clientes se conecten a %s empregando unha conexiÃ³n cifrada."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Conectese a esta instancia ownCloud empregando HTTPS para activar ou desactivar o forzado de SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "ConÃ©ctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "MÃ¡is"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +394,77 @@ msgstr "Seguemento de fallos"
 msgid "Commercial Support"
 msgstr "Asistencia comercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ObteÃ±a os aplicativos para sincronizar os seus ficheiros"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Amosar o axudante da primeira execuciÃ³n outra vez"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ten en uso <strong>%s</strong> do total dispoÃ±Ãbel de <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "O seu contrasinal foi cambiado"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Non Ã© posÃbel cambiar o seu contrasinal"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Amosar o nome"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperaciÃ³n"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Axude na traduciÃ³n"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Empregue esta ligazÃ³n <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 47fd8a3c4052b8e66b67722f7ec0eb4e7f54a84d..0202018f3d451091234148d2bbcdb54c32188f24 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Confirmar a eliminaciÃ³n"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatÃbeis. Pode acontecer un comportamento estraÃ±o. Consulte co administrador do sistema para desactivar un deles."
 
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "Desactivar o servidor principal"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Cando estÃ¡ activado, ownCloud sÃ³ se conectarÃ¡ ao servidor de rÃ©plica."
+msgid "Only connect to the replica server."
+msgstr "Conectar sÃ³ co servidor de rÃ©plica."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Desactiva a validaciÃ³n do certificado SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Se a conexiÃ³n sÃ³ funciona con esta opciÃ³n importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
+"certificate in your %s server."
+msgstr "Se a conexiÃ³n sÃ³ funciona con esta opciÃ³n importa o certificado SSL do servidor LDAP no teu servidor %s."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Campo de mostra do nome de usuario"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "O atributo LDAP a empregar para xerar o nome de usuario para amosar."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Campo de mostra do nome de grupo"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "O atributo LDAP Ãºsase para xerar os nomes dos grupos de ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "O atributo LDAP Ãºsase para xerar os nomes dos grupos que amosar."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario Ã© Ãºnico e de non ter que converter os caracteres. O nome de usuario interno ten a limitaciÃ³n de que sÃ³ estÃ¡n permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitÃºense pola sÃºa correspondencia ASCII ou simplemente omÃtense. Nas colisiÃ³ns engadirase/incrementarase un nÃºmero. O nome de usuario interno utilizase para identificar a un usuario interno. Ã‰ tamÃ©n o nome predeterminado do cartafol persoal do usuario en ownCloud. TamÃ©n Ã© un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario Ã© Ãºnico e de non ter que converter os caracteres. O nome de usuario interno ten a limitaciÃ³n de que sÃ³ estÃ¡n permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitÃºense pola sÃºa correspondencia ASCII ou simplemente omÃtense. Nas colisiÃ³ns engadirase/incrementarase un nÃºmero. O nome de usuario interno utilizase para identificar a un usuario interno. Ã‰ tamÃ©n o nome predeterminado do cartafol persoal do usuario. TamÃ©n Ã© parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "Ignorar a detecciÃ³n do UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dÃºbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuraciÃ³n e pasar un atributo da sÃºa escolla. Vostede debe asegurarse de que o atributo da sÃºa escolla pode ser recuperado polos usuarios e grupos e de que Ã© Ãºnico. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP."
+msgstr "De xeito predeterminado, o atributo UUID Ã© detectado automaticamente. O atributo UUID utilizase para identificar, sen dÃºbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuraciÃ³n e pasar un atributo da sÃºa escolla. Vostede debe asegurarse de que o atributo da sÃºa escolla pode ser recuperado polos usuarios e grupos e de que Ã© Ãºnico. DÃ©ixeo baleiro para o comportamento predeterminado. Os cambios terÃ¡n efecto sÃ³ nas novas asignaciÃ³ns (engadidos) de usuarios de LDAP."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "AsignaciÃ³n do usuario ao Â«nome de usuario LDAPÂ»"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisiÃ³n e recoÃ±ecer aos usuarios, cada usuario LDAP terÃ¡ un nome de usuario interno. Isto require unha asignaciÃ³n de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na cachÃ©, para asÃ reducir a interacciÃ³n do LDAP, mais non se utiliza para a identificaciÃ³n. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignaciÃ³ns deixarÃ¡ rastros en todas partes. A limpeza das asignaciÃ³ns non Ã© sensÃbel Ã¡ configuraciÃ³n, afecta a todas as configuraciÃ³ns de LDAP! Non limpar nunca as asignaciÃ³ns nun entorno de produciÃ³n. Limpar as asignaciÃ³ns sÃ³ en fases de proba ou experimentais."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisiÃ³n e recoÃ±ecer aos usuarios, cada usuario LDAP terÃ¡ un nome de usuario interno. Isto require unha asignaciÃ³n de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na cachÃ©, para asÃ reducir a interacciÃ³n do LDAP, mais non se utiliza para a identificaciÃ³n. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignaciÃ³ns deixarÃ¡ rastros en todas partes. A limpeza das asignaciÃ³ns non Ã© sensÃbel Ã¡ configuraciÃ³n, afecta a todas as configuraciÃ³ns de LDAP! Non limpar nunca as asignaciÃ³ns nun entorno de produciÃ³n. Limpar as asignaciÃ³ns sÃ³ en fases de proba ou experimentais."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index d92c173664b45293059c360edf976dd593539322..1619f5c3fbc266ce123c6d5272a9bdd5f5f0e883 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 09:10+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 10:20+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +26,12 @@ msgid "WebDAV Authentication"
 msgstr "AutenticaciÃ³n WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr "Enderezo:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud enviarÃ¡ as credenciais do usuario a este URL. Este engadido comproba a resposta e interpretarÃ¡ os cÃ³digos de estado HTTP 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
+msgstr "As credenciais do usuario serÃ¡n enviadas a este enderezo. Este engadido comproba a resposta e interpretarÃ¡ os cÃ³digos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 2777a76d4daa067449c8a0029473e363a0e94e11..44845c5b9e7206ffd761b7174f0e7cc1ed2298eb 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr "× ×•×‘×ž×‘×¨"
 msgid "December"
 msgstr "×“×¦×ž×‘×¨"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "×”×’×“×¨×•×ª"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "×©× ×™×•×ª"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "×œ×¤× ×™ ×“×§×” ××—×ª"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "×œ×¤× ×™ {minutes} ×“×§×•×ª"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "×œ×¤× ×™ ×©×¢×”"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "×œ×¤× ×™ {hours} ×©×¢×•×ª"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "×”×™×•×"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "××ª×ž×•×œ"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "×œ×¤× ×™ {days} ×™×ž×™×"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "×—×•×“×© ×©×¢×‘×¨"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "×œ×¤× ×™ {months} ×—×•×“×©×™×"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "×—×•×“×©×™×"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "×©× ×” ×©×¢×‘×¨×”"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "×©× ×™×"
 
@@ -226,8 +226,8 @@ msgstr "×¡×•×’ ×”×¤×¨×™×˜ ×œ× ×¦×•×™×Ÿ."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "×©×’×™××”"
 
@@ -247,140 +247,141 @@ msgstr "×©×•×ª×£"
 msgid "Share"
 msgstr "×©×ª×£"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×”×©×™×ª×•×£"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×‘×™×˜×•×œ ×”×©×™×ª×•×£"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×©×™× ×•×™ ×”×”×’×“×¨×•×ª"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "×©×•×ª×£ ××ª×š ×•×¢× ×”×§×‘×•×¦×” {group} ×©×‘×‘×¢×œ×•×ª {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "×©×•×ª×£ ××ª×š ×¢×œ ×™×“×™ {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "×©×™×ª×•×£ ×¢×"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "×©×™×ª×•×£ ×¢× ×§×™×©×•×¨"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "×”×’× ×” ×‘×¡×¡×ž×”"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "×¡×™×¡×ž×"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "×©×œ×™×—×ª ×§×™×©×•×¨ ×‘×“×•××´×œ ×œ×ž×©×ª×ž×©"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "×©×œ×™×—×”"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "×”×’×“×¨×ª ×ª××¨×™×š ×ª×¤×•×’×”"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "×©×™×ª×•×£ ×‘××ž×¦×¢×•×ª ×“×•××´×œ:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "×œ× × ×ž×¦××• ×× ×©×™×"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "××¡×•×¨ ×œ×¢×©×•×ª ×©×™×ª×•×£ ×ž×—×“×©"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "×©×•×ª×£ ×ª×—×ª {item} ×¢× {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "×”×¡×¨ ×©×™×ª×•×£"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "× ×™×ª×Ÿ ×œ×¢×¨×•×š"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "×‘×§×¨×ª ×’×™×©×”"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "×™×¦×™×¨×”"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "×¢×“×›×•×Ÿ"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "×ž×—×™×§×”"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "×©×™×ª×•×£"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "×ž×•×’×Ÿ ×‘×¡×¡×ž×”"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×‘×™×˜×•×œ ×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×¢×ª ×”×’×“×¨×ª ×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "×ž×ª×‘×¦×¢×ª ×©×œ×™×—×” ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "×”×•×“×¢×ª ×”×“×•××´×œ × ×©×œ×—×”"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "×ª×”×œ×™×š ×”×¢×“×›×•×Ÿ ×œ× ×”×•×©×œ× ×‘×”×¦×œ×—×”. × × ×“×•×•×— ××ª ×”×‘×¢×™×” ×‘<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">×§×”×™×œ×ª ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "×ª×”×œ×™×š ×”×¢×“×›×•×Ÿ ×”×¡×ª×™×™× ×‘×”×¦×œ×—×”. ×¢×›×©×™×• ×ž× ×ª×‘ ××•×ª×š ××œ ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "××™×¤×•×¡ ×”×¡×¡×ž×” ×©×œ ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +402,7 @@ msgstr "×”×‘×§×©×” × ×›×©×œ×”!<br>×”×× ×›×ª×•×‘×ª ×”×“×•××´×œ/×©× ×”×ž×©×ª×ž
 msgid "You will receive a link to reset your password via Email."
 msgstr "×™×™×©×œ×— ×œ×ª×™×‘×ª ×”×“×•××´×œ ×©×œ×š ×§×™×©×•×¨ ×œ××™×¤×•×¡ ×”×¡×¡×ž×”."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "×©× ×ž×©×ª×ž×©"
@@ -462,11 +463,11 @@ msgstr "×¢×–×¨×”"
 msgid "Access forbidden"
 msgstr "×”×’×™×©×” × ×—×¡×ž×”"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "×¢× ×Ÿ ×œ× × ×ž×¦×"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "×’×¨×¡×ª ×”Ö¾PHP ×¤×’×™×¢×” ×‘×¤× ×™ ×”×ª×§×¤×ª ×‘×™×ª NULL/×¨×™×§ (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "× × ×œ×¢×“×›×Ÿ ××ª ×”×ª×§× ×ª ×”Ö¾PHP ×©×œ×š ×›×“×™ ×œ×”×©×ª×ž×© ×‘Ö¾PHP ×‘×‘×˜×—×”."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "×ª×™×§×™×™×ª ×•×§×‘×¦×™ ×”×ž×™×“×¢ ×©×œ×š ×›× ×¨××” × ×’×™×©×™× ×ž×”××™× ×˜×¨× ×˜ ×ž×›×™×•×•×Ÿ ×©×§×•×‘×¥ ×”.htaccess ×œ× ×¢×•×‘×“."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "×œ×§×‘×œ×ª ×ž×™×“×¢ ×œ×”×’×“×¨×” × ×›×•× ×” ×©×œ ×”×©×¨×ª ×©×œ×š, ×¨××” ××ª ×”<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">×ª×™×¢×•×“</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "×™×¦×™×¨×ª <strong>×—×©×‘×•×Ÿ ×ž× ×”×œ</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "×ž×ª×§×“×"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "×ª×™×§×™×™×ª × ×ª×•× ×™×"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "×”×’×“×¨×ª ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "×™× ×•×¦×œ×•"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "×©× ×ž×©×ª×ž×© ×‘×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "×¡×¡×ž×ª ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "×©× ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "×ž×¨×—×‘ ×”×›×ª×•×‘×•×ª ×©×œ ×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "×©×¨×ª ×‘×¡×™×¡ × ×ª×•× ×™×"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "×¡×™×•× ×”×ª×§× ×”"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ×–×ž×™× ×” ×œ×”×•×¨×“×”. × ×™×ª×Ÿ ×œ×œ×—×•×¥ ×›×“×™ ×œ×§×‘×œ ×ž×™×“×¢ × ×•×¡×£ ×›×™×¦×“ ×œ×¢×“×›×Ÿ."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "×”×ª× ×ª×§×•×ª"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "×‘×§×©×ª ×”×›× ×™×¡×” ×”××•×˜×•×ž×˜×™×ª × ×“×—×ª×”!"
@@ -608,7 +614,7 @@ msgstr "×›× ×™×¡×”"
 msgid "Alternative Logins"
 msgstr "×›× ×™×¡×•×ª ××œ×˜×¨× ×˜×™×‘×™×•×ª"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/he/files.po b/l10n/he/files.po
index eba383d04f1ee50cba45169f45f68b23a3cb9cec..90b64157ff9b814162b0398fa35912e22ebbf910 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgstr "×©×ª×£"
 msgid "Delete permanently"
 msgstr "×ž×—×§ ×œ×¦×ž×™×ª×•×ª"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "×ž×—×™×§×”"
 
@@ -129,43 +129,45 @@ msgstr "×ž×—×™×§×”"
 msgid "Rename"
 msgstr "×©×™× ×•×™ ×©×"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "×ž×ž×ª×™×Ÿ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ×›×‘×¨ ×§×™×™×"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "×”×—×œ×¤×”"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "×”×¦×¢×ª ×©×"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ×”×•×—×œ×£ ×‘Ö¾{old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "×‘×™×¦×•×¢ ×¤×¢×•×œ×ª ×ž×—×™×§×”"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "×§×•×‘×¥ ××—×“ × ×©×œ×—"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "×§×‘×¦×™× ×‘×”×¢×œ××”"
 
@@ -201,33 +203,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "×©×"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "×’×•×“×œ"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "×–×ž×Ÿ ×©×™× ×•×™"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "×ª×™×§×™×™×” ××—×ª"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} ×ª×™×§×™×•×ª"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "×§×•×‘×¥ ××—×“"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} ×§×‘×¦×™×"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +284,61 @@ msgstr "×ª×™×§×™×™×”"
 msgid "From link"
 msgstr "×ž×§×™×©×•×¨"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "×‘×™×˜×•×œ ×”×”×¢×œ××”"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "××™×Ÿ ×›××Ÿ ×©×•× ×“×‘×¨. ××•×œ×™ ×‘×¨×¦×•× ×š ×œ×”×¢×œ×•×ª ×ž×©×”×•?"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "×”×•×¨×“×”"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "×”×¡×¨ ×©×™×ª×•×£"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "×”×¢×œ××” ×’×“×•×œ×” ×ž×™×“×™"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "×”×§×‘×¦×™× ×©× ×™×¡×™×ª ×œ×”×¢×œ×•×ª ×—×¨×’×• ×ž×”×’×•×“×œ ×”×ž×§×¡×™×ž×œ×™ ×œ×”×¢×œ××ª ×§×‘×¦×™× ×¢×œ ×©×¨×ª ×–×”."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "×”×¡×¨×™×§×” ×”× ×•×›×—×™×ª"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "×§×•×‘×¥"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "×§×‘×¦×™×"
 
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 8b805ef221a9969f9dbec9f6736279a3a7c9a7cf..5e2a2f39dbbd758bf00b1c51c89c05574fd1f1de 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index fb8baaf307f53524c62fb4db6884dcec755ee4ce..42013789e83c6e5b16cf04d965d5497bdf1bc70e 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "× × ×œ×¡×¤×§ ×§×•×“ ×™×™×©×•× ×•×¡×•×“ ×ª×§× ×™×™× ×©×œ Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×¢×ª ×”×’×“×¨×ª ××—×¡×•×Ÿ ×‘Ö¾Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 104831e6fbb69e8eb36cb90afeec4c04bc0f6f09..9ce5f7cc91e8ed070bb68c79e7ace7e3c0dae263 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "×¡×™×¡×ž×"
 msgid "Submit"
 msgstr "×©×œ×™×—×”"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ×©×™×ª×£ ×¢×ž×š ××ª ×”×ª×™×§×™×™×” %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ×©×™×ª×£ ×¢×ž×š ××ª ×”×§×•×‘×¥ %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "×”×•×¨×“×”"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "×”×¢×œ××”"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "×‘×™×˜×•×œ ×”×”×¢×œ××”"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "××™×Ÿ ×ª×¦×•×’×” ×ž×§×“×™×ž×” ×–×ž×™× ×” ×¢×‘×•×¨"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index cb91cbb9ec781dbefa4fd2c44221b78718eb8850..b938a87bca02c54801355c4f4de3a67af0211061 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +28,45 @@ msgstr "×œ× × ×™×ª×Ÿ ×œ×ž×—×•×§ ××ª %s ×œ×¦×ž×™×ª×•×ª"
 msgid "Couldn't restore %s"
 msgstr "×œ× × ×™×ª×Ÿ ×œ×©×—×–×¨ ××ª %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "×‘×™×¦×•×¢ ×¤×¢×•×œ×ª ×©×—×–×•×¨"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "×©×’×™××”"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "×ž×—×™×§×ª ×§×•×‘×¥ ×œ×¦×ž×™×ª×•×ª"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "×ž×—×™×§×” ×œ×¦×ž×™×ª×•×ª"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "×©×"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "× ×ž×—×§"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "×ª×™×§×™×™×” ××—×ª"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} ×ª×™×§×™×•×ª"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "×§×•×‘×¥ ××—×“"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} ×§×‘×¦×™×"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index fbb47670af4d69754bd60b42ff5884f84c4e267e..61c81ff7b83d7d2f1f0b1111727ec18f0bddc25e 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,41 +18,27 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "×œ× × ×™×ª×Ÿ ×œ×”×—×–×™×¨: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "×”×•×©×œ×"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "×”×§×•×‘×¥ %s ×”×•×—×–×¨ ×œ×’×¨×¡×” %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "× ×›×©×œ"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "×œ× × ×™×ª×Ÿ ×œ×”×—×–×™×¨ ××ª ×”×§×•×‘×¥ %s ×œ×’×¨×¡×” %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "×’×¨×¡××•×ª"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "××™×Ÿ ×’×¨×¡××•×ª ×™×©× ×•×ª ×–×ž×™× ×•×ª"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "×œ× ×¦×•×™×Ÿ × ×ª×™×‘"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "×’×¨×¡××•×ª"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "× ×™×ª×Ÿ ×œ×”×—×–×™×¨ ×§×•×‘×¥ ×œ×’×¨×¡×” ×§×•×“×ž×ª ×¢×œ ×™×“×™ ×œ×—×™×¦×” ×¢×œ ×œ×—×¦×Ÿ ×”×”×—×–×¨×” ×©×œ×•"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "×©×—×–×•×¨"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 4142c6d74d81e82861a19f510e0c39863020bb92..a52972724304660ed1c83d3e249d726471c9be3d 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "×ž×©×ª×ž×©×™×"
 
 #: app.php:409
-msgid "Apps"
-msgstr "×™×™×©×•×ž×™×"
-
-#: app.php:417
 msgid "Admin"
 msgstr "×ž× ×”×œ"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "×©×™×¨×•×ª×™ ×¨×©×ª ×ª×—×ª ×”×©×œ×™×˜×” ×©×œ×š"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "×”×•×¨×“×ª ZIP ×›×‘×•×™×”"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "×™×© ×œ×”×•×¨×™×“ ××ª ×”×§×‘×¦×™× ××—×“ ××—×¨×™ ×”×©× ×™."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "×—×–×¨×” ×œ×§×‘×¦×™×"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "×”×§×‘×¦×™× ×”× ×‘×—×¨×™× ×’×“×•×œ×™× ×ž×™×“×™ ×œ×™×¦×™×¨×ª ×§×•×‘×¥ zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "×©×¨×ª ×”××™× ×˜×¨× ×˜ ×©×œ×š ××™× ×• ×ž×•×’×“×¨ ×œ×¦×•×¨×›×™ ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ ×›×™×•×•×Ÿ ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• ×ª×§×™×Ÿ."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "× × ×œ×¢×™×™×Ÿ ×©×•×‘ ×‘<a href='%s'>×ž×“×¨×™×›×™ ×”×”×ª×§× ×”</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "×©× ×™×•×ª"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "×œ×¤× ×™ ×“×§×” ××—×ª"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "×œ×¤× ×™ %d ×“×§×•×ª"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "×œ×¤× ×™ ×©×¢×”"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "×œ×¤× ×™ %d ×©×¢×•×ª"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "×”×™×•×"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "××ª×ž×•×œ"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "×œ×¤× ×™ %d ×™×ž×™×"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "×—×•×“×© ×©×¢×‘×¨"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "×œ×¤× ×™ %d ×—×•×“×©×™×"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "×©× ×” ×©×¢×‘×¨×”"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "×©× ×™×"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index fc2bc16aabad809de754e1fc12435a8be6407ce0..e4eee2b12b4cc82006d62971696d89d1c1b47fa1 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr "×™×© ×œ×¡×¤×§ ×¡×¡×ž×” ×ª×§× ×™×ª"
 msgid "__language_name__"
 msgstr "×¢×‘×¨×™×ª"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "××–×”×¨×ª ××‘×˜×—×”"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "×™×ª×›×Ÿ ×©×ª×™×§×™×™×ª ×”× ×ª×•× ×™× ×•×”×§×‘×¦×™× ×©×œ×š × ×’×™×©×™× ×“×¨×š ×”××™× ×˜×¨× ×˜. ×§×•×‘×¥ ×”Ö¾â€Ž.htaccess ×©×ž×¡×•×¤×§ ×¢×œ ×™×“×™ ownCloud ×›× ×¨××” ××™× ×• ×¢×•×‘×“. ×× ×• ×ž×ž×œ×™×¦×™× ×‘×—×•× ×œ×”×’×“×™×¨ ××ª ×©×¨×ª ×”××™× ×˜×¨× ×˜ ×©×œ×š ×‘×“×¨×š ×©×‘×” ×ª×™×§×™×™×ª ×”× ×ª×•× ×™× ×œ× ×ª×”×™×” ×–×ž×™× ×” ×¢×•×“ ××• ×œ×”×¢×‘×™×¨ ××ª ×ª×™×§×™×™×ª ×”× ×ª×•× ×™× ×ž×—×•×¥ ×œ×¡×¤×¨×™×™×ª ×”×¢×œ ×©×œ ×©×¨×ª ×”××™× ×˜×¨× ×˜."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "×©×’×™××ª ×”×’×“×¨×”"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "×©×¨×ª ×”××™× ×˜×¨× ×˜ ×©×œ×š ××™× ×• ×ž×•×’×“×¨ ×œ×¦×•×¨×›×™ ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ ×›×™×•×•×Ÿ ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• ×ª×§×™×Ÿ."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "× × ×œ×¢×™×™×Ÿ ×©×•×‘ ×‘<a href='%s'>×ž×“×¨×™×›×™ ×”×”×ª×§× ×”</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "×”×ž×•×“×•×œ â€žfileinfoâ€œ ×—×¡×¨"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "×”×—×™×‘×•×¨ ×œ××™× ×˜×¨× ×˜ ××™× ×• ×¤×¢×™×œ"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "×™×© ×œ×”×¤×¢×™×œ ×ž×©×™×ž×” ××—×ª ×¢× ×›×œ ×¢×ž×•×“ ×©× ×˜×¢×Ÿ"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "×©×™×ª×•×£"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "×”×¤×¢×œ×ª API ×”×©×™×ª×•×£"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "×œ××¤×©×¨ ×œ×™×™×©×•× ×œ×”×©×ª×ž×© ×‘Ö¾API ×”×©×™×ª×•×£"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "×œ××¤×©×¨ ×§×™×©×•×¨×™×"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "×œ××¤×©×¨ ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¤×¨×™×˜×™× "
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "×œ××¤×©×¨ ×©×™×ª×•×£ ×ž×—×“×©"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "×œ××¤×©×¨ ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×”×œ××” ×¤×¨×™×˜×™× ×©×©×•×ª×¤×• ××ª×"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "×œ××¤×©×¨ ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×›×œ ××—×“"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "×œ××¤×©×¨ ×œ×ž×©×ª×ž×©×™× ×œ×©×ª×£ ×¢× ×ž×©×ª×ž×©×™× ×‘×§×‘×•×¦×•×ª ×©×œ×”× ×‘×œ×‘×“"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "××‘×˜×—×”"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "×œ××œ×¥ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "×™×•×ž×Ÿ"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "×¨×ž×ª ×”×“×™×•×•×—"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "×™×•×ª×¨"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "×¤×—×•×ª"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "×’×¨×¡×"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,72 +394,72 @@ msgstr "×¢×•×§×‘ ×ª×§×œ×•×ª"
 msgid "Commercial Support"
 msgstr "×ª×ž×™×›×” ×‘×ª×©×œ×•×"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "×”×©×’ ××ª ×”××¤×œ×™×§×¦×™×•×ª ×¢×œ ×ž× ×ª ×œ×¡× ×›×¨×Ÿ ××ª ×”×§×‘×¦×™× ×©×œ×š"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "×”×¦×’×ª ××©×£ ×”×”×¤×¢×œ×” ×”×¨××©×•× ×™×ª ×©×•×‘"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "×”×©×ª×ž×©×ª ×‘Ö¾<strong>%s</strong> ×ž×ª×•×š <strong>%s</strong> ×”×–×ž×™× ×™× ×œ×š"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "×¡×™×¡×ž×"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "×”×¡×¡×ž×” ×©×œ×š ×”×•×—×œ×¤×”"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "×œ× × ×™×ª×Ÿ ×œ×©× ×•×ª ××ª ×”×¡×¡×ž×” ×©×œ×š"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "×¡×¡×ž×” × ×•×›×—×™×ª"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "×¡×¡×ž×” ×—×“×©×”"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "×©×™× ×•×™ ×¡×¡×ž×”"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "×©× ×ª×¦×•×’×”"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "×“×•××¨ ××œ×§×˜×¨×•× ×™"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "×›×ª×•×‘×ª ×”×“×•××´×œ ×©×œ×š"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "× × ×œ×ž×œ× ××ª ×›×ª×•×‘×ª ×”×“×•××´×œ ×©×œ×š ×›×“×™ ×œ××¤×©×¨ ×©×—×–×•×¨ ×¡×¡×ž×”"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "×¤×”"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "×¢×–×¨×” ×‘×ª×¨×’×•×"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 312edf31835a2c0f82f421ec56fb6bfd61077ded..8f989bc1faec0e6a5c8755ba9e1dff08eda7305b 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "××™×©×•×¨ ×”×ž×—×™×§×”"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -222,7 +222,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -242,9 +242,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -268,7 +269,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -292,7 +293,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -353,12 +354,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -371,12 +372,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -390,17 +391,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index ac898b74676bc1bea2dabe95cd87d724a6d22ae0..08c9dc6a5515a5bf793f62d16198b3839efa5575 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "×”×–×“×”×•×ª ×ž×•×œ WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "×ž×¢×¨×›×ª ownCloud ×ª×©×œ×— ××ª ×¤×¨×˜×™ ×”×ž×©×ª×ž×© ×œ×›×ª×•×‘×ª ×–×•. ×”×ª×•×¡×£ ×™×‘×“×•×§ ××ª ×”×ª×’×•×‘×” ×•×™×ª×¨×’× ××ª ×”×§×•×“×™× 401 ×•Ö¾403 ×›×ª×’×•×‘×” ×œ×¦×™×•×Ÿ ×¤×¨×˜×™ ×’×™×©×” ×©×’×•×™×™× ×•××ª ×›×œ ×©××¨ ×”×ª×’×•×‘×•×ª ×›×¤×¨×˜×™ ×’×™×©×” × ×›×•× ×™×."
+msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index e1119d622f305174398eea785bdf5b9c1cbf13a0..b9bb38c3e73a6c203e8c744700d8593d12f66e1b 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr "à¤¨à¤µà¤‚à¤¬à¤°"
 msgid "December"
 msgstr "à¤¦à¤¿à¤¸à¤®à¥à¤¬à¤°"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤¸"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "à¤¤à¥à¤°à¥à¤Ÿà¤¿"
 
@@ -247,139 +247,140 @@ msgstr ""
 msgid "Share"
 msgstr "à¤¸à¤¾à¤à¤¾ à¤•à¤°à¥‡à¤‚"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "à¤•à¥‡ à¤¸à¤¾à¤¥ à¤¸à¤¾à¤à¤¾"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -401,7 +402,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤¬à¤¦à¤²à¤¨à¥‡ à¤•à¤¿ à¤²à¤¿à¤‚à¤• à¤†à¤ªà¤•à¥‹ à¤ˆ-à¤®à¥‡à¤² à¤¦à¥à¤µà¤¾à¤°à¤¾ à¤à¥‡à¤œà¥€ à¤œà¤¾à¤¯à¥‡à¤—à¥€|"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "à¤ªà¥à¤°à¤¯à¥‹à¤•à¥à¤¤à¤¾ à¤•à¤¾ à¤¨à¤¾à¤®"
@@ -462,11 +463,11 @@ msgstr "à¤¸à¤¹à¤¯à¥‹à¤—"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "à¤•à¥à¤²à¥Œà¤¡ à¤¨à¤¹à¥€à¤‚ à¤®à¤¿à¤²à¤¾ "
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,7 +496,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "à¤µà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• à¤–à¤¾à¤¤à¤¾ à¤¬à¤¨à¤¾à¤à¤"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "à¤‰à¤¨à¥à¤¨à¤¤"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "à¤¡à¤¾à¤Ÿà¤¾ à¤«à¥‹à¤²à¥à¤¡à¤°"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤•à¥‰à¤¨à¥à¤«à¤¼à¤¿à¤—à¤° à¤•à¤°à¥‡à¤‚ "
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "à¤‰à¤ªà¤¯à¥‹à¤— à¤¹à¥‹à¤—à¤¾"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "à¤¡à¥‡à¤Ÿà¤¾à¤¬à¥‡à¤¸ à¤•à¤¾ à¤¨à¤¾à¤®"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "à¤¸à¥‡à¤Ÿà¤…à¤ª à¤¸à¤®à¤¾à¤ªà¥à¤¤ à¤•à¤°à¥‡"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "à¤²à¥‹à¤—  à¤†à¤‰à¤Ÿ"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -608,7 +614,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 6d1af6100af4adc095a4b15e2c0cc35ca5c8196e..0afb104096a3250e601f6267fdd26438d501b3cf 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "à¤¸à¤¾à¤à¤¾ à¤•à¤°à¥‡à¤‚"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 94ad25dcd1a5f9069ed8784f20e33a2cb4785c80..ac181cbae061eefad2de88e33b107dfc76ba03a2 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 374cd748474bdf1652e2d58689715adf016585ea..1b0fd22ba82c2f86e728ac94180966b0c029dd25 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index 120e43b4de85de553d5bff0b8e723d53feffeabc..6ebcc054149ac9df3e65dc0e0001972438d4ec09 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "à¤¤à¥à¤°à¥à¤Ÿà¤¿"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index e3697cd4513dd004f6dc0db1f76dbddbcb41030e..6c3aaf87350b7b41710cf5f12994f234e225fe69 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 723d8f82929fc8bbad81d7d716e1ed827010aa1e..d2b0c7fad22321712d4b2030256678ab07091bda 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 01cffe3e4dc98726a67b95e4e457d7eba0e14e1d..66da608edd3edecdd54e04a62dd367b76bfb4080 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "à¤¨à¤¯à¤¾ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 6eb6c3787358cc2a3b2cc6d879be2af730feed5c..69b89ecdf7d746f48d67be41e5ef86faf010695c 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index 25d78227a57887b6d7252d7a85cf48d9ae7b4969..5d9c8b1fdca0aaedce9b0c9ede421c55cb8dc459 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 9d944b3e315c0e917c22b18b8b48c1851bbbeeab..521c5d603475f5b2b6e67df700a69447c3093591 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr "Studeni"
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "juÄer"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "proÅ¡li mjesec"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "proÅ¡lu godinu"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "godina"
 
@@ -225,8 +229,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "GreÅ¡ka"
 
@@ -246,140 +250,141 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "GreÅ¡ka prilikom djeljenja"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "GreÅ¡ka prilikom iskljuÄivanja djeljenja"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "GreÅ¡ka prilikom promjena prava"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Djeli sa"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Djeli preko link-a"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ZaÅ¡titi lozinkom"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Osobe nisu pronaÄ‘ene"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopuÅ¡teno"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "moÅ¾e mjenjat"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "aÅ¾uriraj"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "izbriÅ¡i"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "ZaÅ¡tita lozinkom"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "GreÅ¡ka prilikom brisanja datuma isteka"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "GreÅ¡ka prilikom postavljanja datuma isteka"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud resetiranje lozinke"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +405,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Primit Ä‡ete link kako biste poniÅ¡tili zaporku putem e-maila."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "KorisniÄko ime"
@@ -461,11 +466,11 @@ msgstr "PomoÄ‡"
 msgid "Access forbidden"
 msgstr "Pristup zabranjen"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud nije pronaÄ‘en"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +499,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski raÄun</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ä‡e se koristiti"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "PosluÅ¾itelj baze podataka"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ZavrÅ¡i postavljanje"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Odjava"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +617,7 @@ msgstr "Prijava"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index de0067bce1007ed0d0a069926f0230b2cc11b976..44cc369c33d444de4f7ae3c7541efb2c4e16bfa0 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Podijeli"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "ObriÅ¡i"
 
@@ -128,43 +128,46 @@ msgstr "ObriÅ¡i"
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "predloÅ¾i ime"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 datoteka se uÄitava"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "datoteke se uÄitavaju"
 
@@ -200,33 +203,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "VeliÄina"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +286,61 @@ msgstr "mapa"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke koje pokuÅ¡avate prenijeti prelaze maksimalnu veliÄinu za prijenos datoteka na ovom posluÅ¾itelju."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo priÄekajte."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "datoteka"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index 41ffd91c1b83014d5913da58275da1dda201f31b..db272d0927c3c2203a2b8ad3572624f48c0c0199 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index ae41114dae1477cd2f104e0e89a706bcfb36bb21..a7a8e13f531b5981c57087fabb8f2fc82ba7e5da 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 8abf69f394596cf01b97f06fc69481fccb18f09a..74836110cc89ec03f9a7a0ee408407163fc7bab6 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Lozinka"
 msgid "Submit"
 msgstr "PoÅ¡alji"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "UÄitaj"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index ecec9498bb30ad955d188a6ad8003791bcc82ce9..76a24e0c67e9b7d70bc6ea1c8db6a2021f5da3a3 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,46 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "GreÅ¡ka"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:198
-msgid "{count} files"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 4a55674bbd9ead0a18689f4335a0c1497a627fd7..d6b43eb495d0eedce5675f5e8c5b5dc098cb2064 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: hr\n"
 "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;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 1818bc1bfe097c7efc7935082e89a7682902112e..c9c913ffa16e68ceb6c2d89a0fec38f16e763587 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Korisnici"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplikacije"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administrator"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "web usluge pod vaÅ¡om kontrolom"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,81 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "danas"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "juÄer"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "proÅ¡li mjesec"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "proÅ¡lu godinu"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "godina"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 9378c8afa7dc58de9b26bbe9a9d5e44d0ee40ab3..e8be72648d0e2312ad5f3b04df0742c9585e0226 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "viÅ¡e"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "NemoguÄ‡e promijeniti lozinku"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "e-mail adresa"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "VaÅ¡a e-mail adresa"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ispunite vase e-mail adresa kako bi se omoguÄ‡ilo oporavak lozinke"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "PomoÄ‡ prevesti"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 15b9581afaf7e3bf0e27419ce60210b6f6fb08b7..28599c68dc6ef39fcd968b7a3bc625cd798a1e87 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index b0b3a830c3a16a2ffe4348a905ab1d3412cb663a..8eeb9864f5679460724916b39c35d6974b371e44 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index ca2616666a253634238ad8c5a7e9d888bad53d44..5348acb3a5d12a3e9877676c7ddc4df93a1a9166 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ebela <bela@dandre.hu>, 2013
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +139,59 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "BeÃ¡llÃtÃ¡sok"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "pÃ¡r mÃ¡sodperce"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 perce"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} perce"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 Ã³rÃ¡ja"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} Ã³rÃ¡ja"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} napja"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "mÃºlt hÃ³napban"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} hÃ³napja"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "tÃ¶bb hÃ³napja"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "tÃ¶bb Ã©ve"
 
@@ -226,8 +227,8 @@ msgstr "Az objektum tÃpusa nincs megadva."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Hiba"
 
@@ -247,140 +248,141 @@ msgstr "Megosztott"
 msgid "Share"
 msgstr "MegosztÃ¡s"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Nem sikerÃ¼lt lÃ©trehozni a megosztÃ¡st"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Nem sikerÃ¼lt visszavonni a megosztÃ¡st"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Nem sikerÃ¼lt mÃ³dosÃtani a jogosultsÃ¡gokat"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Megosztotta Ã–nnel Ã©s a(z) {group} csoporttal: {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Megosztotta Ã–nnel: {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Kivel osztom meg"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Link megadÃ¡sÃ¡val osztom meg"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "JelszÃ³val is vÃ©dem"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "JelszÃ³"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "FeltÃ¶ltÃ©st is engedÃ©lyezek"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Email cÃmre kÃ¼ldjÃ¼k el"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "KÃ¼ldjÃ¼k el"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Legyen lejÃ¡rati idÅ‘"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "A lejÃ¡rati idÅ‘"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "MegosztÃ¡s emaillel:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Nincs talÃ¡lat"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Ezt az Ã¡llomÃ¡nyt csak a tulajdonosa oszthatja meg mÃ¡sokkal"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Megosztva {item}-ben {user}-rel"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "A megosztÃ¡s visszavonÃ¡sa"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "mÃ³dosÃthat"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "jogosultsÃ¡g"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "lÃ©trehoz"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "szerkeszt"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "tÃ¶rÃ¶l"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "JelszÃ³val van vÃ©dve"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerÃ¼lt a lejÃ¡rati idÅ‘t tÃ¶rÃ¶lni"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Nem sikerÃ¼lt a lejÃ¡rati idÅ‘t beÃ¡llÃtani"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "KÃ¼ldÃ©s ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Az emailt elkÃ¼ldtÃ¼k"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "A frissÃtÃ©s nem sikerÃ¼lt. KÃ©rem Ã©rtesÃtse errÅ‘l a problÃ©mÃ¡rÃ³l az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kÃ¶zÃ¶ssÃ©get</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A frissÃtÃ©s sikeres volt. VisszairÃ¡nyÃtjuk az ownCloud szolgÃ¡ltatÃ¡shoz."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud jelszÃ³-visszaÃ¡llÃtÃ¡s"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +403,7 @@ msgstr "A kÃ©rÃ©st nem sikerÃ¼lt teljesÃteni! <br>Biztos, hogy jÃ³ emailcÃmet/
 msgid "You will receive a link to reset your password via Email."
 msgstr "Egy emailben fog Ã©rtesÃtÃ©st kapni a jelszÃ³beÃ¡llÃtÃ¡s mÃ³djÃ¡rÃ³l."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "FelhasznÃ¡lÃ³nÃ©v"
@@ -412,7 +414,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Az Ã–n Ã¡llomÃ¡nyai titkosÃtva vannak. Ha nem engedÃ©lyezte korÃ¡bban az adatok visszanyerÃ©sÃ©hez szÃ¼ksÃ©ges kulcs hasznÃ¡latÃ¡t, akkor a jelszÃ³ megvÃ¡ltoztatÃ¡sÃ¡t kÃ¶vetÅ‘en nem fog hozzÃ¡fÃ©rni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kÃ©rdezze meg a rendszergazdÃ¡t, mielÅ‘tt tovÃ¡bbmenne. Biztos, hogy folytatni kÃvÃ¡nja?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
@@ -462,11 +464,11 @@ msgstr "SÃºgÃ³"
 msgid "Access forbidden"
 msgstr "A hozzÃ¡fÃ©rÃ©s nem engedÃ©lyezett"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "A felhÅ‘ nem talÃ¡lhatÃ³"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Az Ã–n PHP verziÃ³ja sebezhetÅ‘ a NULL bÃ¡jtos tÃ¡madÃ¡ssal szemben (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "KÃ©rjÃ¼k frissÃtse a telepÃtett PHP csomagjait, hogy biztonsÃ¡gos legyen az ownCloud szolgÃ¡ltatÃ¡sa."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "KÃ©rjÃ¼k frissÃtse a telepÃtett PHP csomagjait, hogy biztonsÃ¡gos legyen az %s szolgÃ¡ltatÃ¡sa."
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Az adatkÃ¶nyvtÃ¡r Ã©s a benne levÅ‘ Ã¡llomÃ¡nyok valÃ³szÃnÅ±leg kÃ¶zvetlenÃ¼l is elÃ©rhetÅ‘k az internetrÅ‘l, mert a .htaccess Ã¡llomÃ¡ny nem Ã©rvÃ©nyesÃ¼l."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "A kiszolgÃ¡lÃ³ megfelelÅ‘ beÃ¡llÃtÃ¡sÃ¡hoz kÃ©rjÃ¼k olvassa el a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÃ¡ciÃ³t</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "A kiszolgÃ¡lÃ³ megfelelÅ‘ beÃ¡llÃtÃ¡sÃ¡hoz kÃ©rjÃ¼k olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentÃ¡ciÃ³t</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdai belÃ©pÃ©s</strong> lÃ©trehozÃ¡sa"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "HaladÃ³"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "AdatkÃ¶nyvtÃ¡r"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "AdatbÃ¡zis konfigurÃ¡lÃ¡sa"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "adatbÃ¡zist fogunk hasznÃ¡lni"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "AdatbÃ¡zis felhasznÃ¡lÃ³nÃ©v"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "AdatbÃ¡zis jelszÃ³"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Az adatbÃ¡zis neve"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Az adatbÃ¡zis tÃ¡blÃ¡zattÃ©r (tablespace)"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "AdatbÃ¡zis szerver"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "A beÃ¡llÃtÃ¡sok befejezÃ©se"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s rendelkezÃ©sre Ã¡ll. TovÃ¡bbi informÃ¡ciÃ³ a frissÃtÃ©shez."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "KilÃ©pÃ©s"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Az automatikus bejelentkezÃ©s sikertelen!"
@@ -608,7 +615,7 @@ msgstr "BejelentkezÃ©s"
 msgid "Alternative Logins"
 msgstr "AlternatÃv bejelentkezÃ©s"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 126360641e2cae5839736d3fdcaa9796dfa3fdc1..241024a5af179180964e203e488aa5149dd0a337 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +30,11 @@ msgstr "Nem sikerÃ¼lt %s Ã¡thelyezÃ©se"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nem talÃ¡lhatÃ³ a mappa, ahova feltÃ¶lteni szeretne."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "HibÃ¡s mappacÃm"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -121,7 +121,7 @@ msgstr "MegosztÃ¡s"
 msgid "Delete permanently"
 msgstr "VÃ©gleges tÃ¶rlÃ©s"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "TÃ¶rlÃ©s"
 
@@ -129,43 +129,45 @@ msgstr "TÃ¶rlÃ©s"
 msgid "Rename"
 msgstr "ÃtnevezÃ©s"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} mÃ¡r lÃ©tezik"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ãrjuk fÃ¶lÃ¼l"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "legyen mÃ¡s neve"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "mÃ©gse"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} fÃ¡jlt kicserÃ©ltÃ¼k ezzel:  {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "visszavonÃ¡s"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "a tÃ¶rlÃ©s vÃ©grehajtÃ¡sa"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l"
 
@@ -201,38 +203,34 @@ msgstr "KÃ©szÃ¼l a letÃ¶ltendÅ‘ Ã¡llomÃ¡ny. Ez eltarthat egy ideig, ha nagyok a
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ã‰rvÃ©nytelen mappanÃ©v. A nÃ©v hasznÃ¡lata csak a Owncloud szÃ¡mÃ¡ra lehetsÃ©ges."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "NÃ©v"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "MÃ©ret"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "MÃ³dosÃtva"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mappa"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mappa"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fÃ¡jl"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} fÃ¡jl"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s Ã¡tnevezÃ©se nem sikerÃ¼lt"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,61 +284,61 @@ msgstr "Mappa"
 msgid "From link"
 msgstr "FeltÃ¶ltÃ©s linkrÅ‘l"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "TÃ¶rÃ¶lt fÃ¡jlok"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "A feltÃ¶ltÃ©s megszakÃtÃ¡sa"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Itt nincs ÃrÃ¡sjoga."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. TÃ¶ltsÃ¶n fel valamit!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "LetÃ¶ltÃ©s"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "A megosztÃ¡s visszavonÃ¡sa"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "A feltÃ¶ltÃ©s tÃºl nagy"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltÃ¶ltendÅ‘ Ã¡llomÃ¡nyok mÃ©rete meghaladja a kiszolgÃ¡lÃ³n megengedett maximÃ¡lis mÃ©retet."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "A fÃ¡jllista ellenÅ‘rzÃ©se zajlik, kis tÃ¼relmet!"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "EllenÅ‘rzÃ©s alatt"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "mappa"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "mappa"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fÃ¡jl"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fÃ¡jlok"
 
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index cac07fdabb5a5b75d8f2fe014ac4e750185001a4..c50896b0590e1efc4d7cbaca7430659303a725e0 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 39b19b34ae61d19212034998cfae7d1392349b67..9a1567b54e25da82031faeabb9b2851c0be1179d 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Adjon meg egy Ã©rvÃ©nyes Dropbox app key-t Ã©s secretet!"
 msgid "Error configuring Google Drive storage"
 msgstr "A Google Drive tÃ¡rolÃ³t nem sikerÃ¼lt beÃ¡llÃtani"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Figyelem:</b> az \"smbclient\" nincs telepÃtve a kiszolgÃ¡lÃ³n. Emiatt nem lehet CIFS/SMB megosztÃ¡sokat fÃ¶lcsatolni. KÃ©rje meg a rendszergazdÃ¡t, hogy telepÃtse a szÃ¼ksÃ©ges programot."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Figyelem:</b> a PHP FTP tÃ¡mogatÃ¡sa vagy nincs telepÃtve, vagy nincs engedÃ©lyezve a kiszolgÃ¡lÃ³n. Emiatt nem lehetsÃ©ges FTP-tÃ¡rolÃ³kat fÃ¶lcsatolni. KÃ©rje meg a rendszergazdÃ¡t, hogy telepÃtse a szÃ¼ksÃ©ges programot."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 78ac45c275b6d0192dbc436c248f2f0a52d46d43..ea31ac3f6fc5b0f92b16158d1aa6d72d4fb148d6 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:50+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "A megadott jelszÃ³ nem megfelelÅ‘. PrÃ³bÃ¡lja Ãºjra!"
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "JelszÃ³"
 msgid "Submit"
 msgstr "ElkÃ¼ld"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Sajnos Ãºgy tÅ±nik, ez a link mÃ¡r nem mÅ±kÃ¶dik."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Ennek az oka a kÃ¶vetkezÅ‘ lehet:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "az Ã¡llomÃ¡nyt idÅ‘kÃ¶zben eltÃ¡volÃtottÃ¡k"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "lejÃ¡rt a link Ã©rvÃ©nyessÃ©gi ideje"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "letiltÃ¡sra kerÃ¼lt a megosztÃ¡s"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "TovÃ¡bbi informÃ¡ciÃ³Ã©rt forduljon ahhoz, aki ezt a linket kÃ¼ldte Ã–nnek!"
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s megosztotta Ã–nnel ezt a mappÃ¡t: %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s megosztotta Ã–nnel ezt az Ã¡llomÃ¡nyt: %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "LetÃ¶ltÃ©s"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "FeltÃ¶ltÃ©s"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "A feltÃ¶ltÃ©s megszakÃtÃ¡sa"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Nem Ã¡ll rendelkezÃ©sre elÅ‘nÃ©zet ehhez: "
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index abfd3a43feb1370bb0b2625196f0b02e8c3a388d..4e5d7207c9f4bb4bedb0aa36e22c49f68a51a26e 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "Nem sikerÃ¼lt %s vÃ©gleges tÃ¶rlÃ©se"
 msgid "Couldn't restore %s"
 msgstr "Nem sikerÃ¼lt %s visszaÃ¡llÃtÃ¡sa"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "a visszaÃ¡llÃtÃ¡s vÃ©grehajtÃ¡sa"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Hiba"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "az Ã¡llomÃ¡ny vÃ©gleges tÃ¶rlÃ©se"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "VÃ©gleges tÃ¶rlÃ©s"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "NÃ©v"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "TÃ¶rÃ¶lve"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mappa"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mappa"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fÃ¡jl"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} fÃ¡jl"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "visszaÃ¡llÃtva"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index 39f58c0a5db318e40a101cdbac1166893fd5bb7c..5fabacbc2ffb14668f467166c220b426f6c8c1a1 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:40+0000\n"
+"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Nem sikerÃ¼lt Ã¡tÃ¡llni a vÃ¡ltozatra: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "sikerÃ¼lt"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "%s Ã¡llomÃ¡nyt Ã¡tÃ¡llÃtottuk erre a vÃ¡ltozatra: %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "nem sikerÃ¼lt"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "%s Ã¡llomÃ¡nyt nem sikerÃ¼lt Ã¡tÃ¡llÃtani erre a vÃ¡ltozatra: %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Az Ã¡llomÃ¡nyok korÃ¡bbi vÃ¡ltozatai"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Nincs rÃ©gebbi vÃ¡ltozat"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Nem sikerÃ¼lt a(z) {file} Ã¡llomÃ¡nyt erre visszaÃ¡llÃtani: {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nincs megadva az Ãºtvonal"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "TovÃ¡bbi vÃ¡ltozatok..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Az Ã¡llomÃ¡nyok korÃ¡bbi vÃ¡ltozatai"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Az Ã¡llomÃ¡nynak nincs tÃ¶bb vÃ¡ltozata"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Az Ã¡llomÃ¡ny Ã¡tÃ¡llÃthatÃ³ egy rÃ©gebbi vÃ¡ltozatra, ha a gombra kattint"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "VisszaÃ¡llÃtÃ¡s"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index b3df8cfd1813ba1b86559477118e73b997830ca2..d517cddd328b61589af6b08b1520982b8df2f473 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ebela <bela@dandre.hu>, 2013
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "FelhasznÃ¡lÃ³k"
 
 #: app.php:409
-msgid "Apps"
-msgstr "AlkalmazÃ¡sok"
-
-#: app.php:417
 msgid "Admin"
 msgstr "AdminsztrÃ¡ciÃ³"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Sikertelen FrissÃtÃ©s \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "webszolgÃ¡ltatÃ¡sok sajÃ¡t kÃ©zben"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "nem sikerÃ¼lt megnyitni \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "A ZIP-letÃ¶ltÃ©s nincs engedÃ©lyezve."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "A fÃ¡jlokat egyenkÃ©nt kell letÃ¶lteni."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Vissza a FÃ¡jlokhoz"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "A kivÃ¡lasztott fÃ¡jlok tÃºl nagyok a zip tÃ¶mÃ¶rÃtÃ©shez."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "TÃ¶lts le a fileokat kisebb chunkokban, kÃ¶lÃ¼n vagy kÃ©rj segitsÃ©get a rendszergazdÃ¡dtÃ³l."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nem hatÃ¡rozhatÃ³ meg"
 
@@ -171,77 +184,77 @@ msgstr "A hibÃ¡t okozÃ³ parancs ez volt: \"%s\", login nÃ©v: %s, jelszÃ³: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "A PostgreSQL felhasznÃ¡lÃ³i nÃ©v Ã©s/vagy jelszÃ³ Ã©rvÃ©nytelen"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "ÃllÃtson be egy felhasznÃ¡lÃ³i nevet az adminisztrÃ¡ciÃ³hoz."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "ÃllÃtson be egy jelszÃ³t az adminisztrÃ¡ciÃ³hoz."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Az Ã–n webkiszolgÃ¡lÃ³ja nincs megfelelÅ‘en beÃ¡llÃtva az Ã¡llomÃ¡nyok szinkronizÃ¡lÃ¡sÃ¡hoz, mert a WebDAV-elÃ©rÃ©s Ãºgy tÅ±nik, nem mÅ±kÃ¶dik."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "KÃ©rjÃ¼k tÃ¼zetesen tanulmÃ¡nyozza Ã¡t a <a href='%s'>telepÃtÃ©si ÃºtmutatÃ³t</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "pÃ¡r mÃ¡sodperce"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 perce"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d perce"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 Ã³rÃ¡ja"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d Ã³rÃ¡ja"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ma"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "tegnap"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d napja"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "mÃºlt hÃ³napban"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d hÃ³napja"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "tavaly"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "tÃ¶bb Ã©ve"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Okozta:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 15894eb9f92a325731e62fe23a32a35639f98c06..e9f13f44d647e8878b101743af7f12e66004a4b6 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Adam Toth <adazlord@gmail.com>, 2013
+# ebela <bela@dandre.hu>, 2013
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: ebela <bela@dandre.hu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,166 +172,173 @@ msgstr "Ã‰rvÃ©nyes jelszÃ³t kell megadnia"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "BiztonsÃ¡gi figyelmeztetÃ©s"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Az adatkÃ¶nytÃ¡ra Ã©s az itt levÅ‘ fÃ¡jlok valÃ³szÃnÅ±leg elÃ©rhetÅ‘k az internetrÅ‘l. Az ownCloud Ã¡ltal beillesztett .htaccess fÃ¡jl nem mÅ±kÃ¶dik. Nagyon fontos, hogy a webszervert Ãºgy konfigurÃ¡lja, hogy az adatkÃ¶nyvtÃ¡r ne legyen kÃ¶zvetlenÃ¼l kÃvÃ¼lrÅ‘l elÃ©rhetÅ‘, vagy az adatkÃ¶nyvtÃ¡rt tegye a webszerver dokumentumfÃ¡jÃ¡n kÃvÃ¼lre."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Az adatkÃ¶nytÃ¡ra Ã©s az itt levÅ‘ fÃ¡jlok valÃ³szÃnÅ±leg elÃ©rhetÅ‘k az internetrÅ‘l. Az ownCloud Ã¡ltal beillesztett .htaccess fÃ¡jl nem mÅ±kÃ¶dik. Nagyon erÅ‘sen ajÃ¡nlott, hogy a webszervert Ãºgy konfigurÃ¡lja, hogy az adatkÃ¶nyvtÃ¡r ne legyen kÃ¶zvetlenÃ¼l kÃvÃ¼lrÅ‘l elÃ©rhetÅ‘, vagy az adatkÃ¶nyvtÃ¡rt tegye a webszerver dokumentumfÃ¡jÃ¡n kÃvÃ¼lre."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "A beÃ¡llÃtÃ¡ssal kapcsolatos figyelmeztetÃ©s"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Az Ã–n webkiszolgÃ¡lÃ³ja nincs megfelelÅ‘en beÃ¡llÃtva az Ã¡llomÃ¡nyok szinkronizÃ¡lÃ¡sÃ¡hoz, mert a WebDAV-elÃ©rÃ©s Ãºgy tÅ±nik, nem mÅ±kÃ¶dik."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "KÃ©rjÃ¼k tÃ¼zetesen tanulmÃ¡nyozza Ã¡t a <a href='%s'>telepÃtÃ©si ÃºtmutatÃ³t</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "A 'fileinfo' modul hiÃ¡nyzik"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "A 'fileinfo' PHP modul hiÃ¡nyzik. ErÅ‘sen javasolt ennek a modulnak a telepÃtÃ©se a MIME-tÃpusok felismerÃ©sÃ©nek eredmÃ©nyessÃ© tÃ©telÃ©hez."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "A nyelvi lokalizÃ¡ciÃ³ nem mÅ±kÃ¶dik"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr "Ezen az ownCloud kiszolgÃ¡lÃ³n nem hasznÃ¡lhatÃ³ a %s nyelvi beÃ¡llÃtÃ¡s. Ez azt jelenti, hogy a fÃ¡jlnevekben gond lehet bizonyos karakterekkel. NyomatÃ©kosan ajÃ¡nlott, hogy telepÃtse a szÃ¼ksÃ©ges csomagokat annak Ã©rdekÃ©ben, hogy a rendszer tÃ¡mogassa a %s beÃ¡llÃtÃ¡st."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Az internet kapcsolat nem mÅ±kÃ¶dik"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Az ownCloud kiszolgÃ¡lÃ³nak nincs internet kapcsolata. Ez azt jelenti, hogy bizonyos dolgok nem fognak mÅ±kÃ¶dni, pl. kÃ¼lsÅ‘ tÃ¡rolÃ³k csatolÃ¡sa, programfrissÃtÃ©sekrÅ‘l valÃ³ Ã©rtesÃtÃ©sek, vagy kÃ¼lsÅ‘ fejlesztÅ‘i modulok telepÃtÃ©se. Lehet, hogy az Ã¡llomÃ¡nyok tÃ¡volrÃ³l tÃ¶rtÃ©nÅ‘ elÃ©rÃ©se, ill. az email Ã©rtesÃtÃ©sek sem fog mÅ±kÃ¶dni. Javasoljuk, hogy engedÃ©lyezze az internet kapcsolatot a kiszolgÃ¡lÃ³ szÃ¡mÃ¡ra, ha az ownCloud Ã¶sszes szolgÃ¡ltatÃ¡sÃ¡t szeretnÃ© hasznÃ¡lni."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "A kiszolgÃ¡lÃ³nak nincs mÃ¼kÃ¶dÅ‘ internet kapcsolata. Ez azt jelenti, hogy nÃ©hÃ¡ny kÃ©pessÃ©gÃ©t a kiszolgÃ¡lÃ³nak mint pÃ©ldÃ¡ul becsatolni egy kÃ¼lsÅ‘ tÃ¡rolÃ³t, Ã©rtesÃtÃ©sek kÃ¼lsÅ‘ gyÃ¡rtÃ³k programjÃ¡nak frissÃtÃ©sÃ©rÅ‘l nem fog mÃ¼kÃ¶dni. A tÃ¡volrÃ³l valÃ³ elÃ©rÃ©se a fileoknak Ã©s email Ã©rtesÃtÃ©sek kÃ¼ldÃ©se szintÃ©n nem fog mÃ¼kÃ¶dni. Ha hasznÃ¡lni szeretnÃ©d mindezeket a kÃ©pessÃ©geit a szervernek, ahoz javasoljuk, hogy engedÃ©lyezzed az internet elÃ©rÃ©sÃ©t a szervernek."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Ãœtemezett feladatok"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Egy-egy feladat vÃ©grehajtÃ¡sa minden alkalommal, amikor egy weboldalt letÃ¶ltenek"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "A cron.php webcron szolgÃ¡ltatÃ¡skÃ©nt van regisztrÃ¡lva. HÃvja meg az owncloud kÃ¶nyvtÃ¡rban levÅ‘ cron.php Ã¡llomÃ¡nyt http-n keresztÃ¼l percenkÃ©nt egyszer."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "A cron.php webcron szolgÃ¡ltatÃ¡skÃ©nt van regisztrÃ¡lva. HÃvja meg a cron.php Ã¡llomÃ¡nyt http-n keresztÃ¼l percenkÃ©nt egyszer."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "A rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak hasznÃ¡lata. HÃvja meg az owncloud kÃ¶nyvtÃ¡rban levÅ‘  cron.php Ã¡llomÃ¡nyt percenkÃ©nt egyszer a rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak segÃtsÃ©gÃ©vel."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "A rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak hasznÃ¡lata. HÃvja meg a cron.php Ã¡llomÃ¡nyt percenkÃ©nt egyszer a rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak segÃtsÃ©gÃ©vel."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "MegosztÃ¡s"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "A megosztÃ¡s API-jÃ¡nak engedÃ©lyezÃ©se"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "LehetÅ‘vÃ© teszi, hogy a programmodulok is hasznÃ¡lhassÃ¡k a megosztÃ¡st"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Linkek engedÃ©lyezÃ©se"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "LehetÅ‘vÃ© teszi, hogy a felhasznÃ¡lÃ³k linkek segÃtsÃ©gÃ©vel kÃ¼lsÅ‘sÃ¶kkel is megoszthassÃ¡k az adataikat"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "FeltÃ¶ltÃ©st engedÃ©lyezÃ©se mindenki szÃ¡mÃ¡ra"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "EngedÃ©lyezni a felhasznÃ¡lÃ³knak, hogy beÃ¡llÃithassÃ¡k, hogy mÃ¡sok feltÃ¶lthetnek a nyilvÃ¡nosan megosztott mappÃ¡kba."
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "A tovÃ¡bbosztÃ¡s engedÃ©lyezÃ©se"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "LehetÅ‘vÃ© teszi, hogy a felhasznÃ¡lÃ³k a velÃ¼k megosztott Ã¡llomÃ¡nyokat megosszÃ¡k egy tovÃ¡bbi, harmadik fÃ©llel"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "A felhasznÃ¡lÃ³k bÃ¡rkivel megoszthatjÃ¡k Ã¡llomÃ¡nyaikat"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "A felhasznÃ¡lÃ³k csak olyanokkal oszthatjÃ¡k meg Ã¡llomÃ¡nyaikat, akikkel kÃ¶zÃ¶s csoportban vannak"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "BiztonsÃ¡g"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "KÃ¶telezÅ‘ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "KÃ¶telezÅ‘vÃ© teszi, hogy a bÃ¶ngÃ©szÅ‘programok titkosÃtott csatornÃ¡n kapcsolÃ³djanak az ownCloud szolgÃ¡ltatÃ¡shoz."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "KÃ¶telezÅ‘vÃ© teszi, hogy a bÃ¶ngÃ©szÅ‘programok titkosÃtott csatornÃ¡n kapcsolÃ³djanak a %s szolgÃ¡ltatÃ¡shoz."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "KÃ©rjÃ¼k, hogy HTTPS protokollt hasznÃ¡ljon, ha be vagy ki  akarja kapcsolni a kÃ¶telezÅ‘ SSL beÃ¡llÃtÃ¡st."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "KÃ©rjÃ¼k kapcsolodjon a %s rendszerhez HTTPS protokollon keresztÃ¼l, hogy be vagy ki kapcsoljaa kÃ¶telezÅ‘ SSL beÃ¡llÃtÃ¡st."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "NaplÃ³zÃ¡s"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "NaplÃ³zÃ¡si szint"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "TÃ¶bb"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "VerziÃ³"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,77 +396,77 @@ msgstr "HibabejelentÃ©sek"
 msgid "Commercial Support"
 msgstr "MegvÃ¡sÃ¡rolhatÃ³ tÃ¡mogatÃ¡s"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "TÃ¶ltse le az Ã¡llomÃ¡nyok szinkronizÃ¡ciÃ³jÃ¡hoz szÃ¼ksÃ©ges programokat"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "NÃ©zzÃ¼k meg Ãºjra az elsÅ‘ bejelentkezÃ©skori segÃtsÃ©get!"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Az Ã–n tÃ¡rterÃ¼let-felhasznÃ¡lÃ¡sa jelenleg: <strong>%s</strong>. MaximÃ¡lisan ennyi Ã¡ll rendelkezÃ©sÃ©re: <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "JelszÃ³"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "A jelszava megvÃ¡ltozott"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "A jelszÃ³ nem vÃ¡ltoztathatÃ³ meg"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "A jelenlegi jelszÃ³"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Az Ãºj jelszÃ³"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "A jelszÃ³ megvÃ¡ltoztatÃ¡sa"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "A megjelenÃtett nÃ©v"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Az Ã–n email cÃme"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Adja meg az email cÃmÃ©t, hogy jelszÃ³-emlÃ©keztetÅ‘t kÃ©rhessen, ha elfelejtette a jelszavÃ¡t!"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "SegÃtsen a fordÃtÃ¡sban!"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Ezt a cÃmet hasznÃ¡lja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztÃ¼l szeretnÃ© elÃ©rni az Ã¡llomÃ¡nyait</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 8b529aae498671add4b19a5689079c1994819648..0d0100a200ec52b73f44e2d499b95cbd41e0eae4 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ebela <bela@dandre.hu>, 2013
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +90,9 @@ msgstr "A tÃ¶rlÃ©s megerÅ‘sÃtÃ©se"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Figyelem:</b> a user_ldap Ã©s user_webdavauth alkalmazÃ¡sok nem kompatibilisek. EgyÃ¼ttes hasznÃ¡latuk vÃ¡ratlan eredmÃ©nyekhez vezethet. KÃ©rje meg a rendszergazdÃ¡t, hogy a kettÅ‘ kÃ¶zÃ¼l kapcsolja ki az egyiket."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "A fÅ‘ szerver kihagyÃ¡sa"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Ha ezt bekapcsoljuk, akkor az ownCloud csak a mÃ¡sodszerverekhez kapcsolÃ³dik."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Ne ellenÅ‘rizzÃ¼k az SSL-tanÃºsÃtvÃ¡ny Ã©rvÃ©nyessÃ©gÃ©t"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Ha a kapcsolat csak ezzel a beÃ¡llÃtÃ¡ssal mÅ±kÃ¶dik, akkor importÃ¡lja az LDAP-kiszolgÃ¡lÃ³ SSL tanÃºsÃtvÃ¡nyÃ¡t az ownCloud kiszolgÃ¡lÃ³ra!"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "A felhasznÃ¡lÃ³nÃ©v mezÅ‘je"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "EbbÅ‘l az LDAP attribÃºtumbÃ³l kÃ©pzÅ‘dik a felhasznÃ¡lÃ³ elnevezÃ©se, ami megjelenik az ownCloudban."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "A csoport nevÃ©nek mezÅ‘je"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "EbbÅ‘l az LDAP attribÃºtumbÃ³l kÃ©pzÅ‘dik a csoport elnevezÃ©se, ami megjelenik az ownCloudban."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,12 +355,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -371,12 +373,12 @@ msgstr "Az UUID-felismerÃ©s felÃ¼lbÃrÃ¡lÃ¡sa"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -390,17 +392,16 @@ msgstr "FelhasznÃ¡lÃ³ - LDAP felhasznÃ¡lÃ³ hozzÃ¡rendelÃ©s"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index 1d74be6d3f91bdf5d668b9e7247ac2d97cda7094..fd49829f9c598ac1c8caced3085c68eb23c32d69 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # akoscomp <nagy.akos@libreoffice.ro>, 2013
+# ebela <bela@dandre.hu>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV hitelesÃtÃ©s"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "Az ownCloud elkÃ¼ldi a felhasznÃ¡lÃ³i fiÃ³k adatai a kÃ¶vetkezÅ‘ URL-re. Ez a bÅ‘vÃtÅ‘modul leellenÅ‘rzi a vÃ¡laszt Ã©s ha a HTTP hibakÃ³d nem 401 vagy 403 azaz Ã©rvÃ©nytelen hitelesÃtÅ‘, akkor minden mÃ¡s vÃ¡lasz Ã©rvÃ©nyes lesz."
+msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 2238a3574fdcb5390ad3e366aec2db3988fa05c7..0b7d7fdbaaca52d79773d78e0e49a36983ba0889 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€"
 msgid "December"
 msgstr "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +462,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 2e8c540852b3ae21e6a6d468c5c7f3c8f7430136..2849dd25426fbc125baea3b61b4de15e544f48b2 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 
@@ -128,43 +128,45 @@ msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index aac4b4707b6b617dce68db1ba7020aea78b7c1cf..e9b9f2afbe858d683cddd076784dbdb7306f2387 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index ff790318abfc2362b454358dc1bd0d3b6e750851..ac97dda5449ba513cd9ec171b7416541405a6056 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
 "PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 16e21a4ee0d9949bc9265e320e6104b899139fd6..59d5e3109f5ee53edf83fab11b796999524cec34 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index 085ecfefb3a4a5b3cf1c413cb37579beaa3479e6..b1c3d308429ecf7a8f6366c1052348046bb84f42 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
index 7e959a096a38c80a81b2db21cd4890ab1fbac83d..e4b69d908c12a1b4593b46cceab5079653de6c25 100644
--- a/l10n/hy/files_versions.po
+++ b/l10n/hy/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 07d46915210e7d2f1550f9069197d373272cd36a..a5d0fdb5e62091ae159209474e0738bba3b4b22e 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 1bf0f6e996388676565b82f40635c07e70b83c55..0cb76a2fd2f99c63cc6e90a9846d5970e6509617 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index b85c44b15c33bbbef6e7cee629bd2a9a3b960ad7..40ead5a3d60b012717953c56cfcb030a57005634 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/hy/user_webdavauth.po b/l10n/hy/user_webdavauth.po
index 497f2fbc293d94276d8288006accb52a877d6954..9481cb0fb51630197247c0cba7bd52b269605c3d 100644
--- a/l10n/hy/user_webdavauth.po
+++ b/l10n/hy/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 09cdb4777a2891b4d2aeea7b741a1cf3023c6851..cb317dbb059ec7dcff5b69bd194caa8e56d7b24e 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Error"
 
@@ -246,140 +246,141 @@ msgstr ""
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Contrasigno"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Reinitialisation del contrasigno de ownCLoud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nomine de usator"
@@ -461,11 +462,11 @@ msgstr "Adjuta"
 msgid "Access forbidden"
 msgstr "Accesso prohibite"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Nube non trovate"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "essera usate"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Clauder le session"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr "Aperir session"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 770a496485a574e50601059024c1f9279ed75b7f..1d30b72298d2328d8ca5e010d71cbed286ed99cd 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Compartir"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Deler"
 
@@ -128,43 +128,45 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "Dossier"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 3dc0de995061f54eecf6c3039447655d09306e3b..04eb7d8960c2d62f902e4c80562b55e8a7b0031d 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index e2bb7b43a75bbf96a1e08b89a4a7b03e0c49d2e5..37018f946045a2a28f3537687204775c630dcaae 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index e81e7156c4ca778c549def7453d78d3d22f38f04..ac0a658eb5e4877860c226503cd205bf1fe97e20 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Contrasigno"
 msgid "Submit"
 msgstr "Submitter"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Incargar"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index d29a1c4ea29500064ccd8f91cfbcb76c9ab137ca..0ac362ef502a3ab5825d941d3d861bf98f0471f4 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nomine"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 0e666b6dc57525ae7e5c92f376f35aa799229dda..d08de20a52d8edb451f608797e5ab671795bbac9 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 23a4b16c4a2c58ed85a7947d78b38d7203fd2737..c60af2f1aa1e18ec8b43f9c1af2a4bc7c5a5044b 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Usatores"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Applicationes"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administration"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 23e599e7e35e4e71da61d3e84ed0fa8cbac89c7c..be9966dae6cc6fba76001e1609a16095d9139073 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "Interlingua"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Non pote cambiar tu contrasigno"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Contrasigno currente"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Linguage"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index d321b10f1eca56fb7be099cec8e34f9fdb57e180..31b0570076c4252b4dca78da677ceba87353ee67 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index e9996727a39ebf62a82ab1be0bb58b0f7f196ec7..c0aede82878ee1d1cd5f62260ac82c53c80f49cf 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 4eeb151b76c8aabb44196a623350d370ac87ad92..b3db7059779e53102b8d4c8306163f224198e1aa 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 menit yang lalu"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} menit yang lalu"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 jam yang lalu"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} jam yang lalu"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} hari yang lalu"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} bulan yang lalu"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -225,8 +221,8 @@ msgstr "Tipe objek tidak ditentukan."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Galat"
 
@@ -246,140 +242,141 @@ msgstr "Dibagikan"
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Galat ketika membagikan"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Galat ketika membatalkan pembagian"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Galat ketika mengubah izin"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Dibagikan dengan Anda dan grup {group} oleh {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Dibagikan dengan Anda oleh {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Bagikan dengan"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Bagikan lewat tautan"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Lindungi dengan sandi"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Sandi"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Emailkan tautan ini ke orang"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Kirim"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Setel tanggal kedaluwarsa"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Tanggal kedaluwarsa"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Bagian lewat email:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Tidak ada orang ditemukan"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Berbagi ulang tidak diizinkan"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "dapat mengedit"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "buat"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "perbarui"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Dilindungi sandi"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Galat ketika menyetel tanggal kedaluwarsa"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email terkirim"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Setel ulang sandi ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nama pengguna"
@@ -461,11 +458,11 @@ msgstr "Bantuan"
 msgid "Access forbidden"
 msgstr "Akses ditolak"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud tidak ditemukan"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,8 +491,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Silakan perbarui instalasi PHP untuk dapat menggunakan ownCloud secara aman."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Untuk informasi lebih lanjut tentang pengaturan server yang benar, silakan lihat <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasi</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Lanjutan"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfigurasikan basis data"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Pengguna basis data"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Sandi basis data"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nama basis data"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tablespace basis data"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Host basis data"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Keluar"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Masuk otomatis ditolak!"
@@ -607,7 +609,7 @@ msgstr "Masuk"
 msgid "Alternative Logins"
 msgstr "Cara Alternatif untuk Masuk"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 570551442f4baf328fc4573fad42a6bd478bab7c..9960e7da9b4838e3c7560515bd92a5a551c4de1a 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Bagikan"
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Hapus"
 
@@ -128,43 +128,44 @@ msgstr "Hapus"
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sarankan nama"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Lakukan operasi penghapusan"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 berkas diunggah"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "berkas diunggah"
 
@@ -200,33 +201,27 @@ msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jik
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 folder"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} folder"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 berkas"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} berkas"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr "Folder"
 msgid "From link"
 msgstr "Dari tautan"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Berkas yang dihapus"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Anda tidak memiliki izin menulis di sini."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "berkas"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "berkas-berkas"
 
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 754fd8ebf9a5e534f74cdf0164b797292ec6bc4e..fe3eba2a20dd80ca15349105f9217028a0df07ce 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 8de48cd0573deb47e589ec824a9489ddcdb47b38..fc20f2c014066834d6c596cee7474e4f39cd9314 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar."
 msgid "Error configuring Google Drive storage"
 msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index b5a7a63216bbde67d067e53ff177d473db9edcf5..79f5f77df1039802364e267ecde1cf5533e4dcfd 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Sandi"
 msgid "Submit"
 msgstr "Kirim"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s membagikan folder %s dengan Anda"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s membagikan file %s dengan Anda"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Unggah"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Tidak ada pratinjau tersedia untuk"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 04e76e42597b472117f10e125b9f375b36adff0b..5f5941b22adf3abf286c9d75c67ce0b49cf55914 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr "Tidak dapat menghapus permanen %s"
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "jalankan operasi pemulihan"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Galat"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "hapus berkas secara permanen"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nama"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Dihapus"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 folder"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} folder"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 berkas"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} berkas"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index a22d263e44e0887dedf0002a2ccda7c9b901d75b..7cc75c5495f3ddae570291dd4f373da3183f4c9f 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Tidak dapat mengembalikan: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "sukses"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Berkas %s telah dikembalikan ke versi %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "gagal"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Berkas %s gagal dikembalikan ke versi %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versi"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Versi lama tidak tersedia"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Lokasi tidak ditentukan"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versi"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Kembalikan berkas ke versi sebelumnya dengan mengeklik tombol kembalikan"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Pulihkan"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index df11b2b5318c5f066482e7191a6417f65b60e11b..e1a8dc80a69e4e170a5bf2df0d07b08def7ecfb9 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Pengguna"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplikasi"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "layanan web dalam kontrol Anda"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Pengunduhan ZIP dimatikan."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Berkas harus diunduh satu persatu."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Kembali ke Daftar Berkas"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "tidak dapat ditentukan"
 
@@ -170,77 +182,73 @@ msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Setel nama pengguna admin."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Setel sandi admin."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 menit yang lalu"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d menit yang lalu"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 jam yang lalu"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d jam yang lalu"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hari ini"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "kemarin"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d hari yang lalu"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d bulan yang lalu"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 2c475c8a383065dc7e0f98a0c1a2dd31d7841bc5..12086b8b8a3fc8edfdc49f7afa8c728846833add 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr "Tuliskan sandi yang valid"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Peringatan Keamanan"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Mungkin direktori data dan berkas Anda dapat diakses dari internet. Berkas .htaccess yang disediakan oleh ownCloud tidak berfungsi. Kami sangat menyarankan Anda untuk mengonfigurasi webserver Anda agar direktori data tidak lagi dapat diakses atau pindahkan direktori data ke luar akar dokumen webserver."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Peringatan Persiapan"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' tidak ada"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Kode pelokalan tidak berfungsi"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Server ownCloud ini tidak dapat menyetel kode pelokalan sistem ke nilai %s. Ini berarti mungkin akan terjadi masalah pada karakter tertentu pada nama berkas. Kami sarankan untuk menginstal paket yang dibutuhkan pada sistem Anda untuk mendukung %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Koneksi internet tidak berfungsi"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Server ownCloud ini tidak memiliki koneksi internet yang berfungsi. Artinya, beberapa fitur misalnya mengaitkan penyimpanan eksternal, notifikasi tentang pembaruan, atau instalasi aplikasi dari pihak ketiga tidak akan dapat berfungsi. Pengaksesan berkas secara online dan pengiriman email notifikasi mungkin juga tidak dapat berfungsi. Kami sarankan untuk mengaktifkan koneksi internet server ini agar mendapatkan semua fitur ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Jalankan tugas setiap kali halaman dimuat"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php telah terdaftar sebagai layanan webcron. Panggil halaman cron.php pada akar direktori ownCloud tiap menit lewat http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Gunakan layanan cron sistem. Panggil berkas cron.php pada folder ownCloud lewat cronjob sistem tiap menit."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Berbagi"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Aktifkan API Pembagian"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Izinkan tautan"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Izinkan pembagian ulang"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Keamanan"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Selalu Gunakan HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Paksa klien untuk tersambung ke ownCloud lewat koneksi yang dienkripsi."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Silakan sambungkan ke instalasi ownCloud lewat HTTPS untuk mengaktifkan atau menonaktifkan fitur SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Catat"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Dukungan Komersial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Tampilkan Penuntun Konfigurasi Awal"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Sandi Anda telah diubah"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Gagal mengubah sandi Anda"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Sandi saat ini"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Sandi baru"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ubah sandi"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Alamat email Anda"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index a8c3d2319e9316dbf9a3bb8c4f2fcc65bf47713e..f2e6d29fccec46f3793d9d77bde5fe3024e076d8 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "Konfirmasi Penghapusan"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,8 +221,8 @@ msgid "Disable Main Server"
 msgstr "Nonaktifkan Server Utama"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "matikan validasi sertivikat SSL"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "Bidang Tampilan Nama Pengguna"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "Bidang Tampilan Nama Grup"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index b411106f5f664f161a5387adc0e5a001676424fd..1c607bd00f8660f0faee1cafcd8c0180692d3e09 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "Otentikasi WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud akan mengirimkan informasi pengguna ke URL ini. Pengaya akan mengecek respon dan menginterpretasikan kode status HTTP 401 serta 403 sebagai informasi yang keliru, sedangkan respon lainnya dianggap benar."
+msgstr ""
diff --git a/l10n/is/core.po b/l10n/is/core.po
index a70c5e5c0713663718f79989c87c35a728b2d8ab..478150b094bbb0b18a67bccfc96b6b26cb856359 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr "NÃ³vember"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "Fyrir 1 mÃnÃºtu"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} min sÃÃ°an"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Fyrir 1 klst."
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "fyrir {hours} klst."
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "Ã dag"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ã gÃ¦r"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dagar sÃÃ°an"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "sÃÃ°asta mÃ¡nuÃ°i"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "fyrir {months} mÃ¡nuÃ°um"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mÃ¡nuÃ°ir sÃÃ°an"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "sÃÃ°asta Ã¡ri"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "einhverjum Ã¡rum"
 
@@ -226,8 +226,8 @@ msgstr "Tegund ekki tilgreind"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Villa"
 
@@ -247,140 +247,141 @@ msgstr "Deilt"
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Villa viÃ° deilingu"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Villa viÃ° aÃ° hÃ¦tta deilingu"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Villa viÃ° aÃ° breyta aÃ°gangsheimildum"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Deilt meÃ° Ã¾Ã©r og hÃ³pnum {group} af {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Deilt meÃ° Ã¾Ã©r af {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Deila meÃ°"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Deila meÃ° veftengli"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Verja meÃ° lykilorÃ°i"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "LykilorÃ°"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Senda vefhlekk Ã tÃ¶lvupÃ³stu til notenda"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Senda"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Setja gildistÃma"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Gildir til"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Deila meÃ° tÃ¶lvupÃ³sti:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Engir notendur fundust"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Endurdeiling er ekki leyfÃ°"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Deilt meÃ° {item} Ã¡samt {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "HÃ¦tta deilingu"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "getur breytt"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "aÃ°gangsstÃ½ring"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "mynda"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "uppfÃ¦ra"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "eyÃ°a"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Verja meÃ° lykilorÃ°i"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Villa viÃ° aÃ° aftengja gildistÃma"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Villa viÃ° aÃ° setja gildistÃma"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "TÃ¶lvupÃ³stur sendur"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "UppfÃ¦rslan heppnaÃ°ist. Beini Ã¾Ã©r til ownCloud nÃº."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "endursetja ownCloud lykilorÃ°"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +402,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "ÃžÃº munt fÃ¡ veftengil Ã tÃ¶lvupÃ³sti til aÃ° endursetja lykilorÃ°iÃ°."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Notendanafn"
@@ -462,11 +463,11 @@ msgstr "HjÃ¡lp"
 msgid "Access forbidden"
 msgstr "AÃ°gangur bannaÃ°ur"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "SkÃ½ finnst ekki"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,7 +496,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "ÃštbÃºa <strong>vefstjÃ³ra aÃ°gang</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ãtarlegt"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Gagnamappa"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Stilla gagnagrunn"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "verÃ°ur notaÃ°"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Gagnagrunns notandi"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Gagnagrunns lykilorÃ°"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nafn gagnagrunns"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "TÃ¶flusvÃ¦Ã°i gagnagrunns"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "NetÃ¾jÃ³nn gagnagrunns"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er til boÃ°a. FÃ¡Ã°u meiri upplÃ½singar um hvernig Ã¾Ãº uppfÃ¦rir."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ÃštskrÃ¡"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "SjÃ¡lfvirkri innskrÃ¡ningu hafnaÃ°!"
@@ -608,7 +614,7 @@ msgstr "<strong>SkrÃ¡ inn</strong>"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/is/files.po b/l10n/is/files.po
index bbcdb7e3a3a4192668601429c355bbf8903ddf57..41f6c945b1b846f37ea47674078c213a83a0212b 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Deila"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "EyÃ°a"
 
@@ -128,43 +128,45 @@ msgstr "EyÃ°a"
 msgid "Rename"
 msgstr "EndurskÃ½ra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "BÃÃ°ur"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} er Ã¾egar til"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "stinga upp Ã¡ nafni"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "hÃ¦tta viÃ°"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaÃ°i {new_name} meÃ° {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 skrÃ¡ innsend"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ã“leyfilegt nafn Ã¡ mÃ¶ppu. NafniÃ° 'Shared' er frÃ¡tekiÃ° fyrir Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "StÃ¦rÃ°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mappa"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mÃ¶ppur"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 skrÃ¡"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} skrÃ¡r"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "Mappa"
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "HÃ¦tta viÃ° innsendingu"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hÃ©r. Settu eitthvaÃ° inn!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "NiÃ°urhal"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "HÃ¦tta deilingu"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Innsend skrÃ¡ er of stÃ³r"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "SkrÃ¡rnar sem Ã¾Ãº ert aÃ° senda inn eru stÃ¦rri en hÃ¡marks innsendingarstÃ¦rÃ° Ã¡ Ã¾essum netÃ¾jÃ³ni."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "VeriÃ° er aÃ° skima skrÃ¡r, vinsamlegast hinkraÃ°u."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Er aÃ° skima"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 4cc867c7a62feba3930a80fedc1d00ba2982d979..2dfaa11e21d32126d60afd2ffe0d657463ed1756 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 218701b1563ee2f07ec7cdf2cef79ef7dd75f546..2d436f7d7ef7f04701e50bebbbf0b5f1042202e9 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "GefÃ°u upp virkan Dropbox lykil og leynikÃ³Ã°a"
 msgid "Error configuring Google Drive storage"
 msgstr "Villa kom upp viÃ° aÃ° setja upp Google Drive gagnasvÃ¦Ã°i"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>AÃ°vÃ¶run:</b> \"smbclient\" er ekki uppsettur. Uppsetning Ã¡ CIFS/SMB gagnasvÃ¦Ã°um er ekki mÃ¶guleg. HafÃ°u samband viÃ° kerfisstjÃ³ra til aÃ° fÃ¡ hann uppsettan."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>AÃ°vÃ¶run:</b> FTP stuÃ°ningur Ã PHP er ekki virkur. Uppsetning Ã¡ FTP gagnasvÃ¦Ã°um er ekki mÃ¶guleg. HafÃ°u samband viÃ° kerfisstjÃ³ra til aÃ° fÃ¡ hann uppsettan."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index 06c1326f7013e22c8b13045ea490a34377df5904..e4966a548d850baaa5863aca694f83773fcbb1cf 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "LykilorÃ°"
 msgid "Submit"
 msgstr "Senda"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deildi mÃ¶ppunni %s meÃ° Ã¾Ã©r"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deildi skrÃ¡nni %s meÃ° Ã¾Ã©r"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "NiÃ°urhal"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Senda inn"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "HÃ¦tta viÃ° innsendingu"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Yfirlit ekki Ã boÃ°i fyrir"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 1422133c9d5c32799f626be01e29f52231d17076..c28f1236b660d0816eec1803ed866b70fec35c79 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Villa"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nafn"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mappa"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mÃ¶ppur"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 skrÃ¡"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} skrÃ¡r"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index ad7f909d9f4a9682fb5aeca5794c3014d3827775..622809a774f419d8a3f6ebf17517563d49b3e032 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ÃštgÃ¡fur"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ÃštgÃ¡fur"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index cbe8b84e91cd389dcb3198d3fb0d2382486e3611..5926c37fa9f2a6808d633940e50b22f0f17e4c2c 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Notendur"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Forrit"
-
-#: app.php:417
 msgid "Admin"
 msgstr "StjÃ³rnun"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "vefÃ¾jÃ³nusta undir Ã¾inni stjÃ³rn"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "SlÃ¶kkt Ã¡ ZIP niÃ°urhali."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "SkrÃ¡rnar verÃ°ur aÃ° sÃ¦kja eina og eina"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Aftur Ã skrÃ¡r"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Valdar skrÃ¡r eru of stÃ³rar til aÃ° bÃºa til ZIP skrÃ¡."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sek."
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "Fyrir 1 mÃnÃºtu"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "fyrir %d mÃnÃºtum"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Fyrir 1 klst."
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "fyrir %d klst."
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "Ã dag"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ã gÃ¦r"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "fyrir %d dÃ¶gum"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "sÃÃ°asta mÃ¡nuÃ°i"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "fyrir %d mÃ¡nuÃ°um"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "sÃÃ°asta Ã¡ri"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "einhverjum Ã¡rum"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index a1a366b9954e547dadff9ed10fd034c99e23f447..6e26f787fdf2f9aa4aeaed1771afb57bb89b17eb 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__nafn_tungumÃ¡ls__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Ã–ryggis aÃ°vÃ¶run"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Gagnamappan Ã¾Ãn er aÃ° Ã¶llum lÃkindum aÃ°gengileg frÃ¡ internetinu. SkrÃ¡in .htaccess sem fylgir meÃ° ownCloud er ekki aÃ° virka. ViÃ° mÃ¦lum eindregiÃ° meÃ° Ã¾vÃ aÃ° Ã¾Ãº stillir vefÃ¾jÃ³ninn Ã¾annig aÃ° gagnamappan verÃ°i ekki aÃ°gengileg frÃ¡ internetinu eÃ°a fÃ¦rir hana Ãºt fyrir vefrÃ³tina."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "ÃštgÃ¡fa"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,72 +394,72 @@ msgstr "VillubÃ³khald"
 msgid "Commercial Support"
 msgstr "BorgaÃ°ur stuÃ°ningur"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "ÃžÃº hefur notaÃ° <strong>%s</strong> af tiltÃ¦ku <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "LykilorÃ°"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "LykilorÃ°i Ã¾Ãnu hefur veriÃ° breytt"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ekki tÃ³kst aÃ° breyta lykilorÃ°inu Ã¾Ãnu"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "NÃºverandi lykilorÃ°"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "NÃ½tt lykilorÃ°"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Breyta lykilorÃ°i"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "VÃsa nafn"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Netfang"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "NetfangiÃ° Ã¾itt"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "SlÃ¡Ã°u inn netfangiÃ° Ã¾itt til aÃ° virkja endurheimt Ã¡ lykilorÃ°i"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "TungumÃ¡l"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "HjÃ¡lpa viÃ° Ã¾Ã½Ã°ingu"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 14ce31926ff8775a9f7f659d75dd84064b9460c5..344e82af5255f200439d82cc096ec2d054ebf282 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +89,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -222,7 +222,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -242,9 +242,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -268,7 +269,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -292,7 +293,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -353,12 +354,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -371,12 +372,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -390,17 +391,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index d6a3dc156d8c334f081d6cc5d934ea022f7426af..69fdb0b0114b1028c9d7642f88d8d707542d1d78 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV AuÃ°kenni"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 59033c1190bc1b94571cc6132a52244f1b44305d..84687acd093bedddcea3f551af2737db21a60399 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr "%s ha condiviso Â»%sÂ« con te"
+msgstr "%s ha condiviso Â«%sÂ» con te"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -140,59 +140,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Dicembre"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "Un minuto fa"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuti fa"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 ora fa"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} ore fa"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} giorni fa"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} mesi fa"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "anni fa"
 
@@ -228,8 +228,8 @@ msgstr "Il tipo di oggetto non Ã¨ specificato."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Errore"
 
@@ -249,140 +249,141 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Errore durante la rimozione della condivisione"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Errore durante la modifica dei permessi"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Condiviso con te e con il gruppo {group} da {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Condiviso con te da {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Condividi con"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Condividi con collegamento"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Consenti caricamento pubblico"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Invia collegamento via email"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non Ã¨ consentita"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "puÃ² modificare"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "condividi"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "L'aggiornamento non Ã¨ riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitÃ  di ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'aggiornamento Ã¨ stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ripristino password di ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -403,7 +404,7 @@ msgstr "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome uten
 msgid "You will receive a link to reset your password via Email."
 msgstr "Riceverai un collegamento per ripristinare la tua password via email"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nome utente"
@@ -464,11 +465,11 @@ msgstr "Aiuto"
 msgid "Access forbidden"
 msgstr "Accesso negato"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Nuvola non trovata"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -497,8 +498,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "La tua versione di PHP Ã¨ vulnerabile all'attacco NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Aggiorna la tua installazione di PHP per utilizzare ownCloud in modo sicuro."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza."
 
 #: templates/installation.php:32
 msgid ""
@@ -518,68 +520,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "La cartella dei dati e i file sono probabilmente accessibili da Internet poichÃ© il file .htaccess non funziona."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Per informazioni su come configurare correttamente il server, vedi la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentazione</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avanzat"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "sarÃ  utilizzato"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Spazio delle tabelle del database"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s Ã¨ disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Esci"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Accesso automatico rifiutato."
@@ -610,12 +616,12 @@ msgstr "Accedi"
 msgid "Alternative Logins"
 msgstr "Accessi alternativi"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr "EhilÃ ,<br><br>volevo solamente farti sapere che %s ha condiviso Â»%sÂ« con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!"
+msgstr "EhilÃ ,<br><br>volevo solamente farti sapere che %s ha condiviso Â«%sÂ» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 25e7109e0550f99a4126b397d24b1a7557bc5bb4..b68d3239db7ba6a8d601bda3ade4c0e67e19edd4 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,7 @@ msgstr "Condividi"
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Elimina"
 
@@ -130,43 +130,45 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste giÃ "
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "esegui l'operazione di eliminazione"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 file in fase di caricamento"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "caricamento file"
 
@@ -202,33 +204,29 @@ msgstr "Il tuo scaricamento Ã¨ in fase di preparazione. CiÃ² potrebbe richiedere
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome della cartella non valido. L'uso di 'Shared' Ã¨ riservato da ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 cartella"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} cartelle"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 file"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} file"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -287,61 +285,61 @@ msgstr "Cartella"
 msgid "From link"
 msgstr "Da collegamento"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "File eliminati"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Qui non hai i permessi di scrittura."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'Ã¨ niente qui. Carica qualcosa!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Caricamento troppo grande"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "cartella"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "cartelle"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "file"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "file"
 
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 9e43d8c52dd0ffb86400685dd0639ec96f080969..390dd69d83cacfb5a60d5145786a36ff57654b6e 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 13:30+0000\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-11 07:20+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -70,11 +70,15 @@ msgstr "Requisiti mancanti."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
 msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura Ã¨ disabilitata."
 
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "I seguenti utenti non sono configurati per la cifratura:"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 58ec5ead832c114f9107b1c330fc1cd108a3ecc2..0e408fb028c05391a41ee583a1bdf77ef06c7845 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
 msgid "Error configuring Google Drive storage"
 msgstr "Errore durante la configurazione dell'archivio Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Avviso:</b> \"smbclient\" non Ã¨ installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Avviso:</b> il supporto FTP di PHP non Ã¨ abilitato o non Ã¨ installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index ecd1db16664bba9f993e90d5f86f27167a80e539..b2ebeff44036f9eea407cdcbabe68a2515cc70ac 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -31,28 +31,52 @@ msgstr "Password"
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Spiacenti, questo collegamento sembra non essere piÃ¹ attivo."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "I motivi potrebbero essere:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "l'elemento Ã¨ stato rimosso"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "il collegamento Ã¨ scaduto"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "la condivisione Ã¨ disabilitata"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha condiviso la cartella %s con te"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha condiviso il file %s con te"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Carica"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Annulla il caricamento"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Nessuna anteprima disponibile per"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index b35bafeab336469f1eb33e5694caf3d4c3f54951..188d8e7e9c0562781d3c5ef67379abe120313859 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +28,45 @@ msgstr "Impossibile eliminare %s definitivamente"
 msgid "Couldn't restore %s"
 msgstr "Impossibile ripristinare %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "esegui operazione di ripristino"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Errore"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "elimina il file definitivamente"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminati"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 cartella"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} cartelle"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 file"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} file"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "ripristinati"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index eecb2f8f5e5f4da18151c63ad2a434d46c01b8e1..aea7bf52384b96a81f630f1808e084487f315f46 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:30+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
-msgstr "Impossibild ripristinare: %s"
+msgstr "Impossibile ripristinare: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "completata"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Il file %s Ã¨ stato ripristinato alla versione %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "non riuscita"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Il file %s non puÃ² essere ripristinato alla versione %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versioni"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Non sono disponibili versioni precedenti"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Ripristino di {file} alla revisione {timestamp} non riuscito."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nessun percorso specificato"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Altre versioni..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versioni"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Non sono disponibili altre versioni"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Ripristina un file a una versione precedente facendo clic sul rispettivo pulsante di ripristino"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ripristina"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index a6ac442a81e3cc18d90f1ba1b40288de41cbfda5..506821d1d770e4b54550ed640e26cd6afd501828 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Francesco Capuano <francesco@capu.it>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "Utenti"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Applicazioni"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Aggiornamento non riuscito \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "impossibile aprire \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP Ã¨ stato disabilitato."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Scarica i file in blocchi piÃ¹ piccoli, separatamente o chiedi al tuo amministratore."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "non puÃ² essere determinato"
 
@@ -171,77 +184,77 @@ msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome utente e/o password di PostgreSQL non validi"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Imposta un nome utente di amministrazione."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Imposta una password di amministrazione."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Il tuo server web non Ã¨ configurato correttamente per consentire la sincronizzazione dei file poichÃ© l'interfaccia WebDAV sembra essere danneggiata."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "Un minuto fa"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuti fa"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 ora fa"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ore fa"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "oggi"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ieri"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d giorni fa"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "mese scorso"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d mesi fa"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "anno scorso"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "anni fa"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Causato da:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index d5e55f3217222dce6bd5dff161fe654bda662bf2..0f2c1b0c371fb39565bfb00c15fae80833a02108 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Francesco Apruzzese <cescoap@gmail.com>, 2013
+# idetao <marcxosm@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,166 +172,173 @@ msgstr "Deve essere fornita una password valida"
 msgid "__language_name__"
 msgstr "Italiano"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet. Il file .htaccess fornito da ownCloud non funziona. Ti suggeriamo vivamente di configurare il server web in modo che la cartella dei dati non sia piÃ¹ accessibile o sposta tale cartella fuori dalla radice del sito."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia piÃ¹ accessibile o spostare la cartella fuori dalla radice del server web."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Avviso di configurazione"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Il tuo server web non Ã¨ configurato correttamente per consentire la sincronizzazione dei file poichÃ© l'interfaccia WebDAV sembra essere danneggiata."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modulo 'fileinfo' mancante"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Il modulo PHP 'fileinfo' non Ã¨ presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Locale non funzionante"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Questo server ownCloud non puÃ² impostare la localizzazione a %s. CiÃ² significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti richiesti sul sistema per supportare %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "La localizzazione di sistema Ã¨ impostata a %s. CiÃ² significa che potrebbero verificarsi dei problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti necessari a supportare %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Concessione Internet non funzionante"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. CiÃ² significa che alcune delle funzionalitÃ  come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. Anche l'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalitÃ  di ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. CiÃ² significa che alcune delle funzionalitÃ  come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalitÃ ."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Esegui un'operazione con ogni pagina caricata"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php Ã¨ registrato su un sevizio webcron. Invoca la pagina cron.php nella radice di ownCloud ogni minuto, tramite http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php Ã¨ registrato su un servizio webcron per invocare la pagina cron.php ogni minuto su http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Utilizza il servizio cron di sistema. Invoca il file cron.php nella cartella di ownCloud tramite un job ogni minuto."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Usa il servizio cron di sistema per invocare il file cron.php ogni minuto."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Condivisione"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Abilita API di condivisione"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Consenti caricamenti pubblici"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Obbliga i client a connettersi a ownCloud tramite una confessione cifrata."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Forza i client a connettersi a %s tramite una connessione cifrata."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Altro"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,77 +396,77 @@ msgstr "Sistema di tracciamento bug"
 msgid "Commercial Support"
 msgstr "Supporto commerciale"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Mostra nuovamente la procedura di primo avvio"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "La tua password Ã¨ cambiata"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Modifica password non riuscita"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Password attuale"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Posta elettronica"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 1463ced964e132fb871427d2ff992c891a366aee..833085b49f36cce22f121f9134dd87e2d68261c7 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -89,9 +89,9 @@ msgstr "Conferma l'eliminazione"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno."
+msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una."
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "Disabilita server principale"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Se abilitata, ownCloud si collegherÃ  solo al server di replica."
+msgid "Only connect to the replica server."
+msgstr "Collegati solo al server di replica."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Disattiva il controllo del certificato SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
+"certificate in your %s server."
+msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server %s."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Campo per la visualizzazione del nome utente"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "L'attributo LDAP da usare per generare il nome visualizzato dell'utente."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Campo per la visualizzazione del nome del gruppo"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "L'attributo LDAP da usare per generare il nome visualizzato del gruppo."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "In modo predefinito, il nome utente interno sarÃ  creato dall'attributo UUID. CiÃ² assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarÃ  incrementato/decrementato un numero. Il nome utente interno Ã¨ utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito puÃ² essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "In modo predefinito, il nome utente interno sarÃ  creato dall'attributo UUID. CiÃ² assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarÃ  aggiunto/incrementato un numero. Il nome utente interno Ã¨ utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito puÃ² essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "Ignora rilevamento UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID Ã¨ utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarÃ  creato sulla base dell'UUID, se non Ã¨ specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
+msgstr "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID Ã¨ utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarÃ  creato sulla base dell'UUID, se non Ã¨ specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "Associazione Nome utente-Utente LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrÃ  un nome utente interno. CiÃ² richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non Ã¨ utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud Ã¨ utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerÃ  tracce residue ovunque e interesserÃ  esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrÃ  un nome utente interno. CiÃ² richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non Ã¨ utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno Ã¨ utilizzato dappertutto. La cancellazione delle associazioni lascerÃ  tracce residue ovunque e interesserÃ  esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index 78c08a701504baa68ccfc1d9ff06ea5b97f63f37..edef529b95eb1503e22aac93aba9cc13633c6568 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-20 02:37+0200\n"
-"PO-Revision-Date: 2013-06-19 06:39+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "Autenticazione WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "Indirizzo:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud invierÃ  le credenziali dell'utente a questo URL. Questa estensione controlla la risposta e interpreta i codici di stato 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
+msgstr "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterÃ  i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 5253ea2cabc7916a5c8009b293bbd439eb065c74..07c9dd2169d0e2059b498badb271631c6009bb26 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -5,12 +5,13 @@
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 # plazmism <gomidori@live.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +140,55 @@ msgstr "11æœˆ"
 msgid "December"
 msgstr "12æœˆ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "æ•°ç§’å‰"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 åˆ†å‰"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} åˆ†å‰"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 æ™‚é–“å‰"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} æ™‚é–“å‰"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ä»Šæ—¥"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "æ˜¨æ—¥"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} æ—¥å‰"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "ä¸€æœˆå‰"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} æœˆå‰"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "ä¸€å¹´å‰"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "å¹´å‰"
 
@@ -227,8 +224,8 @@ msgstr "ã‚ªãƒ–ã‚¸ã‚§ã‚¯ã‚¿ã‚¤ãƒ—ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "ã‚¨ãƒ©ãƒ¼"
 
@@ -248,140 +245,141 @@ msgstr "å…±æœ‰ä¸"
 msgid "Share"
 msgstr "å…±æœ‰"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "å…±æœ‰ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "å…±æœ‰è§£é™¤ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "æ¨©é™å¤‰æ›´ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ã‚ãªãŸã¨ {owner} ã®ã‚°ãƒ«ãƒ¼ãƒ— {group} ã§å…±æœ‰ä¸"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} ã¨å…±æœ‰ä¸"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "å…±æœ‰è€…"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "URLãƒªãƒ³ã‚¯ã§å…±æœ‰"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ä¿è·"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr "ãƒ‘ãƒ–ãƒªãƒƒã‚¯ãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’è¨±å¯"
+msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’è¨±å¯"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "ãƒ¡ãƒ¼ãƒ«ãƒªãƒ³ã‚¯"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "é€ä¿¡"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã‚’è¨å®š"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "æœ‰åŠ¹æœŸé™"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "ãƒ¡ãƒ¼ãƒ«çµŒç”±ã§å…±æœ‰:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "å†å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "{item} å†…ã§ {user} ã¨å…±æœ‰ä¸"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "å…±æœ‰è§£é™¤"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "ç·¨é›†å¯èƒ½"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ã‚¢ã‚¯ã‚»ã‚¹æ¨©é™"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "ä½œæˆ"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "å‰Šé™¤"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "å…±æœ‰"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ä¿è·"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã®æœªè¨å®šã‚¨ãƒ©ãƒ¼"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã®è¨å®šã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "é€ä¿¡ä¸..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã—ãŸ"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸã€‚ã“ã®å•é¡Œã‚’ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> ã«ãƒ¬ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚"
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸã€‚ä»Šã™ãownCloudã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚"
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloudã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã—ã¾ã™"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +400,7 @@ msgstr "ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸï¼<br>ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ï¼ãƒ¦
 msgid "You will receive a link to reset your password via Email."
 msgstr "ãƒ¡ãƒ¼ãƒ«ã§ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã™ã‚‹ãƒªãƒ³ã‚¯ãŒå±Šãã¾ã™ã€‚"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼å"
@@ -463,11 +461,11 @@ msgstr "ãƒ˜ãƒ«ãƒ—"
 msgid "Access forbidden"
 msgstr "ã‚¢ã‚¯ã‚»ã‚¹ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +494,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "ã‚ãªãŸã®PHPã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã¯ã€Null Byteæ”»æ’ƒ(CVE-2006-7243)ã¨ã„ã†è„†å¼±æ€§ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ownCloud ã‚’å®‰å…¨ã«åˆ©ç”¨ã™ã‚‹ã«ã€PHPã®æ›´æ–°ã‚’è¡Œãªã£ã¦ãã ã•ã„ã€‚"
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "%s ã‚’å®‰å…¨ã«åˆ©ç”¨ã™ã‚‹ç‚ºã« ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹PHPã‚’ã‚¢ãƒƒãƒ—ãƒ‡ãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚"
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +516,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ".htaccess ãƒ•ã‚¡ã‚¤ãƒ«ãŒå‹•ä½œã—ã¦ã„ãªã„ãŸã‚ã€ãŠãã‚‰ãã‚ãªãŸã®ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚ã—ãã¯ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ã§ã™ã€‚"
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "ã‚ãªãŸã®ã‚µãƒ¼ãƒã®é©åˆ‡ãªè¨å®šã«é–¢ã™ã‚‹æƒ…å ±ã¨ã—ã¦ã€<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆ</a>ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„ã€‚"
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "ã‚µãƒ¼ãƒãƒ¼ã‚’é©æ£ã«è¨å®šã™ã‚‹æƒ…å ±ã¯ã€ã“ã¡ã‚‰ã®<a href=\"%s\" target=\"_blank\">ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆ</a>ã‚’å‚ç…§ã—ã¦ãã ã•ã„ã€‚"
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>ç®¡ç†è€…ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ</strong>ã‚’ä½œæˆã—ã¦ãã ã•ã„"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "è©³ç´°è¨å®š"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚©ãƒ«ãƒ€"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’è¨å®šã—ã¦ãã ã•ã„"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "ãŒä½¿ç”¨ã•ã‚Œã¾ã™"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ¦ãƒ¼ã‚¶å"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®è¡¨é ˜åŸŸ"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ›ã‚¹ãƒˆå"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’å®Œäº†ã—ã¾ã™"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚æ›´æ–°æ–¹æ³•ã«é–¢ã—ã¦ã•ã‚‰ã«æƒ…å ±ã‚’å–å¾—ã—ã¦ä¸‹ã•ã„ã€‚"
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ãƒã‚°ã‚¢ã‚¦ãƒˆ"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "ä»–ã®ã‚¢ãƒ—ãƒª"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "è‡ªå‹•ãƒã‚°ã‚¤ãƒ³ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼"
@@ -609,7 +612,7 @@ msgstr "ãƒã‚°ã‚¤ãƒ³"
 msgid "Alternative Logins"
 msgstr "ä»£æ›¿ãƒã‚°ã‚¤ãƒ³"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 33ae72393ac97f1ace114a4cd8ea9fa9d097488e..428cfbd6c099a45b04c87a2a7e0b63a09c202c37 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -5,14 +5,15 @@
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 # plazmism <gomidori@live.jp>, 2013
+# pabook <pabook.32@gmail.com>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +124,7 @@ msgstr "å…±æœ‰"
 msgid "Delete permanently"
 msgstr "å®Œå…¨ã«å‰Šé™¤ã™ã‚‹"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "å‰Šé™¤"
 
@@ -131,43 +132,44 @@ msgstr "å‰Šé™¤"
 msgid "Rename"
 msgstr "åå‰ã®å¤‰æ›´"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ä¸æ–"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ã¯ã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ç½®ãæ›ãˆ"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "æŽ¨å¥¨åç§°"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ã‚’ {new_name} ã«ç½®æ›"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "å…ƒã«æˆ»ã™"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "å‰Šé™¤ã‚’å®Ÿè¡Œ"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’1ã¤ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸"
 
@@ -203,33 +205,27 @@ msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®æº–å‚™ä¸ã§ã™ã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒå¤§ãã„
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ç„¡åŠ¹ãªãƒ•ã‚©ãƒ«ãƒ€åã§ã™ã€‚'Shared' ã®åˆ©ç”¨ã¯ ownCloud ãŒäºˆç´„æ¸ˆã¿ã§ã™ã€‚"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "åå‰"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "ã‚µã‚¤ã‚º"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "å¤‰æ›´"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 ãƒ•ã‚©ãƒ«ãƒ€"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} ãƒ•ã‚©ãƒ«ãƒ€"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 ãƒ•ã‚¡ã‚¤ãƒ«"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} ãƒ•ã‚¡ã‚¤ãƒ«"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -288,61 +284,61 @@ msgstr "ãƒ•ã‚©ãƒ«ãƒ€"
 msgid "From link"
 msgstr "ãƒªãƒ³ã‚¯"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "å‰Šé™¤ãƒ•ã‚¡ã‚¤ãƒ«"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "ã‚ãªãŸã«ã¯æ›¸ãè¾¼ã¿æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“ã€‚"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ä½•ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„ã€‚"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "å…±æœ‰è§£é™¤"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ã‚µãƒ¼ãƒã§è¦å®šã•ã‚ŒãŸæœ€å¤§ã‚µã‚¤ã‚ºã‚’è¶…ãˆã¦ã„ã¾ã™ã€‚"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¹ã‚ãƒ£ãƒ³ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€‚"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "ã‚¹ã‚ãƒ£ãƒ³ä¸"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«"
 
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 1697707c7feeff73bcb5242c054797021e1f37cc..669ed7fa419ad21bb940c02e23d72de5fca719e7 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-07 01:58+0200\n"
-"PO-Revision-Date: 2013-07-06 01:30+0000\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-10 01:40+0000\n"
 "Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -70,10 +70,14 @@ msgstr "å¿…è¦è¦ä»¶ãŒæº€ãŸã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr "å¿…ãšã€PHP 5.3.3ä»¥ä¸Šã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã€OpenSSLã®PHPæ‹¡å¼µã‚’æœ‰åŠ¹ã«ã—ã¦é©åˆ‡ã«è¨å®šã—ã¦ãã ã•ã„ã€‚ç¾æ™‚ç‚¹ã§ã¯æš—å·åŒ–ã‚¢ãƒ—ãƒªã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚"
+"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."
+msgstr "å¿…ãšã€PHP 5.3.3ã‚‚ã—ãã¯ãã‚Œä»¥ä¸Šã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã€åŒæ™‚ã«OpenSSLã®PHPæ‹¡å¼µã‚’æœ‰åŠ¹ã«ã—ãŸä¸Šã§OpenSSLã‚‚åŒæ§˜ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€é©åˆ‡ã«è¨å®šã—ã¦ãã ã•ã„ã€‚ç¾æ™‚ç‚¹ã§ã¯æš—å·åŒ–ã‚¢ãƒ—ãƒªã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚"
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "ä»¥ä¸‹ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯ã€æš—å·åŒ–è¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼š"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index f520cc1c7501410661aeedbfc425966fb3f432fa..63c2ad22a060940de71dc6d1534f6f600347038f 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "æœ‰åŠ¹ãªDropboxã‚¢ãƒ—ãƒªã®ã‚ãƒ¼ã¨ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã—ã¦ä¸‹
 msgid "Error configuring Google Drive storage"
 msgstr "Googleãƒ‰ãƒ©ã‚¤ãƒ–ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã®è¨å®šã‚¨ãƒ©ãƒ¼"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>è¦å‘Š:</b> \"smbclient\" ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚CIFS/SMB å…±æœ‰ã®ãƒžã‚¦ãƒ³ãƒˆã¯ã§ãã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ä¸‹ã•ã„ã€‚"
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>è¦å‘Š:</b> PHPã®FTPã‚µãƒãƒ¼ãƒˆã¯ç„¡åŠ¹ã‚‚ã—ãã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚FTPå…±æœ‰ã®ãƒžã‚¦ãƒ³ãƒˆã¯ã§ãã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ãŠé¡˜ã„ã—ã¦ä¸‹ã•ã„ã€‚"
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index f7054b22ef00cad8484dbbad5db7d19442940706..305eb2256c21747aa5dc338347aba52106cde551 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 09:37+0000\n"
 "Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 msgid "Submit"
 msgstr "é€ä¿¡"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "ç”³ã—è¨³ã”ã–ã„ã¾ã›ã‚“ã€‚ã“ã®ãƒªãƒ³ã‚¯ã¯ã‚‚ã†åˆ©ç”¨ã§ãã¾ã›ã‚“ã€‚"
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "ç†ç”±ã¯ä»¥ä¸‹ã®é€šã‚Šã¨è€ƒãˆã‚‰ã‚Œã¾ã™ï¼š"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "ã‚¢ã‚¤ãƒ†ãƒ ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "ãƒªãƒ³ã‚¯ã®æœŸé™ãŒåˆ‡ã‚Œã¦ã„ã¾ã™"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "å…±æœ‰ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "ä¸æ˜Žãªç‚¹ã¯ã€ã“ã¡ã‚‰ã®ãƒªãƒ³ã‚¯ã®æä¾›è€…ã«ç¢ºèªã‚’ãŠé¡˜ã„ã—ã¾ã™ã€‚"
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ã¯ãƒ•ã‚©ãƒ«ãƒ€ãƒ¼ %s ã‚’ã‚ãªãŸã¨å…±æœ‰ä¸ã§ã™"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ã¯ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’ã‚ãªãŸã¨å…±æœ‰ä¸ã§ã™"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ãƒ—ãƒ¬ãƒ“ãƒ¥ãƒ¼ã¯ã‚ã‚Šã¾ã›ã‚“"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index 176a5d24c7db451481788393954c8b89e0fe3631..ca33f87628927d2b772b361748dfdc3c7b07d80a 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,43 @@ msgstr "%s ã‚’å®Œå…¨ã«å‰Šé™¤å‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ"
 msgid "Couldn't restore %s"
 msgstr "%s ã‚’å¾©å…ƒå‡ºæ¥ã¾ã›ã‚“ã§ã—ãŸ"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "å¾©å…ƒæ“ä½œã‚’å®Ÿè¡Œã™ã‚‹"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "ã‚¨ãƒ©ãƒ¼"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å®Œå…¨ã«å‰Šé™¤ã™ã‚‹"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "å®Œå…¨ã«å‰Šé™¤ã™ã‚‹"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "åå‰"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "å‰Šé™¤æ¸ˆã¿"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 ãƒ•ã‚©ãƒ«ãƒ€"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} ãƒ•ã‚©ãƒ«ãƒ€"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 ãƒ•ã‚¡ã‚¤ãƒ«"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} ãƒ•ã‚¡ã‚¤ãƒ«"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "å¾©å…ƒæ¸ˆ"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 2b62bba4cc1517b7bd944c70aedd5c18285aa855..a160c897a2a5fbe1e571ecf7c1eb194e3639d977 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 01:10+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "å…ƒã«æˆ»ã›ã¾ã›ã‚“ã§ã—ãŸ: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "æˆåŠŸ"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æˆ»ã—ã¾ã—ãŸ"
-
-#: history.php:49
-msgid "failure"
-msgstr "å¤±æ•—"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æˆ»ã›ã¾ã›ã‚“ã§ã—ãŸ"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "åˆ©ç”¨å¯èƒ½ãªå¤ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚ã‚Šã¾ã›ã‚“"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "{file} ã‚’ {timestamp} ã®ãƒªãƒ´ã‚£ã‚¸ãƒ§ãƒ³ã«æˆ»ã™ã“ã¨ãŒã§ãã¾ã›ã‚“ã€‚"
 
-#: history.php:74
-msgid "No path specified"
-msgstr "ãƒ‘ã‚¹ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "ã‚‚ã£ã¨ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "åˆ©ç”¨å¯èƒ½ãªä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ã‚ã‚Šã¾ã›ã‚“"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "ã‚‚ã¨ã«æˆ»ã™ãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã¨ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’éŽåŽ»ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«æˆ»ã—ã¾ã™"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "å¾©å…ƒ"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 283f668f7cc135f438b7f3f9e406eee9ff7e786f..b037427159730fcc9c40237884244e86db7fef37 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "ãƒ¦ãƒ¼ã‚¶"
 
 #: app.php:409
-msgid "Apps"
-msgstr "ã‚¢ãƒ—ãƒª"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "\"%s\" ã¸ã®ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "ç®¡ç†ä¸‹ã®ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "\"%s\" ãŒé–‹ã‘ã¾ã›ã‚“"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIPãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã«æˆ»ã‚‹"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ZIPãƒ•ã‚¡ã‚¤ãƒ«ã®ç”Ÿæˆã«ã¯å¤§ãã™ãŽã¾ã™ã€‚"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€å°ã•ã„ãƒ•ã‚¡ã‚¤ãƒ«ã«åˆ†å‰²ã•ã‚Œã¦ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã™ã€‚ã‚‚ã—ãã¯ã€ç®¡ç†è€…ã«ãŠå°‹ããã ã•ã„ã€‚"
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "æ¸¬å®šã§ãã¾ã›ã‚“ã§ã—ãŸ"
 
@@ -171,77 +183,73 @@ msgstr "é•åã‚³ãƒžãƒ³ãƒ‰: \"%s\"ã€åå‰: %sã€ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQLã®ãƒ¦ãƒ¼ã‚¶åã‚‚ã—ãã¯ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¯æœ‰åŠ¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "ç®¡ç†è€…ã®ãƒ¦ãƒ¼ã‚¶åã‚’è¨å®šã€‚"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "ç®¡ç†è€…ã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’è¨å®šã€‚"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAVã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBã‚µãƒ¼ãƒã¯ã¾ã ãƒ•ã‚¡ã‚¤ãƒ«ã®åŒæœŸã‚’è¨±å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¬ã‚¤ãƒ‰</a>ã‚’ã‚ˆãç¢ºèªã—ã¦ãã ã•ã„ã€‚"
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "æ•°ç§’å‰"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 åˆ†å‰"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d åˆ†å‰"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 æ™‚é–“å‰"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d æ™‚é–“å‰"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ä»Šæ—¥"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "æ˜¨æ—¥"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d æ—¥å‰"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "ä¸€æœˆå‰"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d åˆ†å‰"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "ä¸€å¹´å‰"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "å¹´å‰"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "åŽŸå› ã¯ä»¥ä¸‹:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 00e70353771f33fd444a85235a270facf9c5b0b2..b9a7baa144bed3b36f76a15e7e49521c17da6b8d 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -172,166 +172,173 @@ msgstr "æœ‰åŠ¹ãªãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
 msgid "__language_name__"
 msgstr "Japanese (æ—¥æœ¬èªž)"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£è¦å‘Š"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒæã‚‰ãã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã§ãã‚‹ã‚ˆã†ã«ãªã£ã¦ã„ã¾ã™ã€‚ownCloudãŒæä¾›ã™ã‚‹ .htaccessãƒ•ã‚¡ã‚¤ãƒ«ãŒæ©Ÿèƒ½ã—ã¦ã„ã¾ã›ã‚“ã€‚ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å…¨ãã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„ã‚ˆã†ã«ã™ã‚‹ã‹ã€ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãƒ«ãƒ¼ãƒˆã®å¤–ã«ç½®ãã‚ˆã†ã«ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒã‚’è¨å®šã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚ "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ã«ãªã£ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚.htaccessãƒ•ã‚¡ã‚¤ãƒ«ãŒæ©Ÿèƒ½ã—ã¦ã„ã¾ã›ã‚“ã€‚ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œãªã„ã‚ˆã†ã«ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒãƒ¼ã‚’è¨å®šã™ã‚‹ã‹ã€ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒãƒ¼ã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãƒ«ãƒ¼ãƒˆã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ç§»å‹•ã™ã‚‹ã‚ˆã†ã«å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚"
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—è¦å‘Š"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAVã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBã‚µãƒ¼ãƒã¯ã¾ã ãƒ•ã‚¡ã‚¤ãƒ«ã®åŒæœŸã‚’è¨±å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "<a href='%s'>ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¬ã‚¤ãƒ‰</a>ã‚’ã‚ˆãç¢ºèªã—ã¦ãã ã•ã„ã€‚"
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "<a href=\"%s\">installation guides</a>ã‚’ã‚‚ã†ä¸€åº¦ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«ãŠé¡˜ã„ã„ãŸã—ã¾ã™ã€‚"
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« 'fileinfo' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« 'fileinfo' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã€‚mimeã‚¿ã‚¤ãƒ—ã®æ¤œå‡ºã‚’ç²¾åº¦è‰¯ãè¡Œã†ãŸã‚ã«ã€ã“ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚"
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "ãƒã‚±ãƒ¼ãƒ«ãŒå‹•ä½œã—ã¦ã„ã¾ã›ã‚“"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "ã“ã® ownCloud ã‚µãƒ¼ãƒã¯ã€ã‚·ã‚¹ãƒ†ãƒ ãƒã‚±ãƒ¼ãƒ«ã‚’ %s ã«è¨å®šã§ãã¾ã›ã‚“ã€‚ã“ã‚Œã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«åã®ç‰¹å®šã®æ–‡å—ã§å•é¡ŒãŒç™ºç”Ÿã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚‹ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚%s ã‚’ã‚µãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã«ã€ã‚·ã‚¹ãƒ†ãƒ ã«å¿…è¦ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã“ã¨ã‚’å¼·ãæŽ¨å¥¨ã—ã¾ã™ã€‚"
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "ã‚·ã‚¹ãƒ†ãƒ ãƒã‚±ãƒ¼ãƒ«ãŒ %s ã«è¨å®šå‡ºæ¥ã¾ã›ã‚“ã€‚ã“ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«åã«ãã®ãƒã‚±ãƒ¼ãƒ«ã®æ–‡å—ãŒå…¥ã£ã¦ã„ãŸã¨ãã«å•é¡Œã«ãªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚å¿…è¦ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚·ã‚¹ãƒ†ãƒ ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã€%s ã‚’ã‚µãƒãƒ¼ãƒˆã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚"
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šãŒå‹•ä½œã—ã¦ã„ã¾ã›ã‚“"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "ã“ã® ownCloud ã‚µãƒ¼ãƒã«ã¯æœ‰åŠ¹ãªã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šãŒã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã‚Œã¯ã€å¤–éƒ¨ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã®ãƒžã‚¦ãƒ³ãƒˆã€æ›´æ–°ã®é€šçŸ¥ã€ã‚µãƒ¼ãƒ‰ãƒ‘ãƒ¼ãƒ†ã‚£è£½ã‚¢ãƒ—ãƒªã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€ã®ã‚ˆã†ãªã„ãã¤ã‹ã®æ©Ÿèƒ½ãŒå‹•ä½œã—ãªã„ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚ãƒªãƒ¢ãƒ¼ãƒˆã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸã‚Šã€é€šçŸ¥ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ãŸã‚Šã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã›ã‚“ã€‚å…¨ã¦ã®æ©Ÿèƒ½ã‚’åˆ©ç”¨ã™ã‚‹ãŸã‚ã«ã¯ã€ã“ã®ã‚µãƒ¼ãƒã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã‚’æœ‰åŠ¹ã«ã™ã‚‹ã“ã¨ã‚’æŽ¨å¥¨ã—ã¾ã™ã€‚"
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“ã€‚ã“ã®å ´åˆã€å¤–éƒ¨ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã®ãƒžã‚¦ãƒ³ãƒˆã€æ›´æ–°ã®é€šçŸ¥ã‚„ã‚µãƒ¼ãƒ‰ãƒ‘ãƒ¼ãƒ†ã‚£ã‚¢ãƒ—ãƒªã¨ã„ã£ãŸã„ãã¤ã‹ã®æ©Ÿèƒ½ãŒä½¿ãˆã¾ã›ã‚“ã€‚ã¾ãŸã€ãƒªãƒ¢ãƒ¼ãƒˆæŽ¥ç¶šã§ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚¢ã‚¯ã‚»ã‚¹ã€é€šçŸ¥ãƒ¡ãƒ¼ãƒ«ã®é€ä¿¡ã¨è¨€ã£ãŸæ©Ÿèƒ½ã‚‚åˆ©ç”¨ã§ããªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚å…¨ã¦ã®æ©Ÿèƒ½ã‚’åˆ©ç”¨ã—ãŸã„ã®ã§ã‚ã‚Œã°ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«æŽ¥ç¶šã§ãã‚‹ã‚ˆã†ã«ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "å„ãƒšãƒ¼ã‚¸ã®èªã¿è¾¼ã¿æ™‚ã«ã‚¿ã‚¹ã‚¯ã‚’å®Ÿè¡Œã™ã‚‹"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php ã¯ webcron ã‚µãƒ¼ãƒ“ã‚¹ã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã™ã€‚owncloud ã®ãƒ«ãƒ¼ãƒˆã«ã‚ã‚‹ cron.php ã®ãƒšãƒ¼ã‚¸ã‚’ http çµŒç”±ã§1åˆ†ã«1å›žå‘¼ã³å‡ºã—ã¦ä¸‹ã•ã„ã€‚"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "httpçµŒç”±ã§1åˆ†é–“ã«1å›žcron.phpã‚’å‘¼ã³å‡ºã™ã‚ˆã†ã« cron.phpãŒwebcron ã‚µãƒ¼ãƒ“ã‚¹ã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã™ã€‚"
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "ã‚·ã‚¹ãƒ†ãƒ ã® cron ã‚µãƒ¼ãƒ“ã‚¹ã‚’åˆ©ç”¨ã™ã‚‹ã€‚ã‚·ã‚¹ãƒ†ãƒ ã® cronjob ã‚’é€šã—ã¦1åˆ†ã«1å›ž owncloud å†…ã® cron.php ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‘¼ã³å‡ºã—ã¦ä¸‹ã•ã„ã€‚"
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "cron.phpãƒ•ã‚¡ã‚¤ãƒ«ã‚’1åˆ†é–“ã«1å›žå®Ÿè¡Œã™ã‚‹ç‚ºã«ã‚µãƒ¼ãƒãƒ¼ã®cronã‚µãƒ¼ãƒ“ã‚¹ã‚’åˆ©ç”¨ã™ã‚‹ã€‚"
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "å…±æœ‰"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "å…±æœ‰APIã‚’æœ‰åŠ¹ã«ã™ã‚‹"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "ã‚¢ãƒ—ãƒªã‹ã‚‰ã®å…±æœ‰APIã®åˆ©ç”¨ã‚’è¨±å¯ã™ã‚‹"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "ãƒªãƒ³ã‚¯ã‚’è¨±å¯ã™ã‚‹"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "ãƒªãƒ³ã‚¯ã«ã‚ˆã‚Šã‚¢ã‚¤ãƒ†ãƒ ã‚’å…¬é–‹ã™ã‚‹ã“ã¨ã‚’è¨±å¯ã™ã‚‹"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "ãƒ‘ãƒ–ãƒªãƒƒã‚¯ãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’è¨±å¯"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "å…¬é–‹ã—ã¦ã„ã‚‹å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ã¸ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’å…±æœ‰ã—ã¦ã„ã‚‹ãƒ¡ãƒ³ãƒãƒ¼ã«ã‚‚è¨±å¯"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "å†å…±æœ‰ã‚’è¨±å¯ã™ã‚‹"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãŒå…±æœ‰ã—ã¦ã„ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®å†å…±æœ‰ã‚’è¨±å¯ã™ã‚‹"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãŒèª°ã¨ã§ã‚‚å…±æœ‰ã™ã‚‹ã“ã¨ã‚’è¨±å¯ã™ã‚‹"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "ãƒ¦ãƒ¼ã‚¶ã«ã‚°ãƒ«ãƒ¼ãƒ—å†…ã®ãƒ¦ãƒ¼ã‚¶ã¨ã®ã¿å…±æœ‰ã‚’è¨±å¯ã™ã‚‹"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "å¸¸ã«HTTPSã‚’ä½¿ç”¨ã™ã‚‹"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ownCloudã¸ã®æŽ¥ç¶šã‚’å¸¸ã«æš—å·åŒ–ã™ã‚‹"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ %sã¸ã®æŽ¥ç¶šã‚’å¸¸ã«æš—å·åŒ–ã™ã‚‹ã€‚"
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "å¸¸ã«SSLæŽ¥ç¶šã‚’æœ‰åŠ¹ï¼ç„¡åŠ¹ã«ã™ã‚‹ãŸã‚ã«ã€HTTPSçµŒç”±ã§ã“ã® ownCloud ã«æŽ¥ç¶šã—ã¦ä¸‹ã•ã„ã€‚"
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "å¼·åˆ¶çš„ãªSSLæŽ¥ç¶šã‚’æœ‰åŠ¹ï¼ç„¡åŠ¹ã«ã™ã‚‹ãŸã‚ã«ã€HTTPSçµŒç”±ã§ %s ã¸æŽ¥ç¶šã—ã¦ãã ã•ã„ã€‚"
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "ãƒã‚°"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "ãƒã‚°ãƒ¬ãƒ™ãƒ«"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "ã‚‚ã£ã¨è¦‹ã‚‹"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "é–‰ã˜ã‚‹"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,77 +396,77 @@ msgstr "ãƒã‚°ãƒˆãƒ©ãƒƒã‚«ãƒ¼"
 msgid "Commercial Support"
 msgstr "ã‚³ãƒžãƒ¼ã‚·ãƒ£ãƒ«ã‚µãƒãƒ¼ãƒˆ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’åŒæœŸã™ã‚‹ãŸã‚ã®ã‚¢ãƒ—ãƒªã‚’å–å¾—"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "åˆå›žã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’å†è¡¨ç¤ºã™ã‚‹"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "ç¾åœ¨ã€<strong>%s</strong> / <strong>%s</strong> ã‚’åˆ©ç”¨ã—ã¦ã„ã¾ã™"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å¤‰æ›´ã—ã¾ã—ãŸ"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å¤‰æ›´ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Current password"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "æ–°ã—ã„ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å…¥åŠ›"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å¤‰æ›´"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "è¡¨ç¤ºå"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "ãƒ¡ãƒ¼ãƒ«"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "ã‚ãªãŸã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "â€»ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰å›žå¾©ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®å…¥åŠ›ãŒå¿…è¦ã§ã™"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "è¨€èªž"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "ç¿»è¨³ã«å”åŠ›ã™ã‚‹"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAVçµŒç”±ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a>ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’åˆ©ç”¨ã—ã¦ãã ã•ã„"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 43627085a557055eed46fcdeb5536dcd84e39a49..294bcdd8cc20234c5b04e633906fb907d38c3e0a 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 04:30+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -89,9 +90,9 @@ msgstr "å‰Šé™¤ã®ç¢ºèª"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>è¦å‘Š:</b> user_ldap ã¨ user_webdavauth ã®ã‚¢ãƒ—ãƒªã«ã¯äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“ã€‚äºˆæœŸã›ã¬å‹•ä½œã‚’ã™ã‚‹å¯èƒ½å§“ãŒã‚ã‚Šã¾ã™ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã©ã¡ã‚‰ã‹ã‚’ç„¡åŠ¹ã«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚"
+msgstr "<b>è¦å‘Š:</b> user_ldap ã¨ user_webdavauth ã®ã‚¢ãƒ—ãƒªã«ã¯äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“ã€‚äºˆæœŸã›ã¬å‹•ä½œã‚’ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã©ã¡ã‚‰ã‹ã‚’ç„¡åŠ¹ã«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚"
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "ãƒ¡ã‚¤ãƒ³ã‚µãƒ¼ãƒã‚’ç„¡åŠ¹ã«ã™ã‚‹"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "æœ‰åŠ¹ã«ã™ã‚‹ã¨ã€ownCloudã¯ãƒ¬ãƒ—ãƒªã‚«ã‚µãƒ¼ãƒã«ã®ã¿æŽ¥ç¶šã—ã¾ã™ã€‚"
+msgid "Only connect to the replica server."
+msgstr "ãƒ¬ãƒ—ãƒªã‚«ã‚µãƒ¼ãƒãƒ¼ã«ã®ã¿æŽ¥ç¶šã—ã¾ã™ã€‚"
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "SSLè¨¼æ˜Žæ›¸ã®ç¢ºèªã‚’ç„¡åŠ¹ã«ã™ã‚‹ã€‚"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "æŽ¥ç¶šãŒã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã®ã¿å‹•ä½œã™ã‚‹å ´åˆã¯ã€LDAPã‚µãƒ¼ãƒã®SSLè¨¼æ˜Žæ›¸ã‚’ownCloudã‚µãƒ¼ãƒã«ã‚¤ãƒ³ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚"
+"certificate in your %s server."
+msgstr "æŽ¥ç¶šãŒã“ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã®ã¿å‹•ä½œã™ã‚‹å ´åˆã¯ã€LDAPã‚µãƒ¼ãƒã®SSLè¨¼æ˜Žæ›¸ã‚’ %s ã‚µãƒ¼ãƒã«ã‚¤ãƒ³ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚"
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ãƒ¦ãƒ¼ã‚¶ã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§ã€‚"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "ãƒ¦ãƒ¼ã‚¶ã®è¡¨ç¤ºåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§"
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "ã‚°ãƒ«ãƒ¼ãƒ—è¡¨ç¤ºåã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ã‚°ãƒ«ãƒ¼ãƒ—ã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§ã€‚"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "ãƒ¦ãƒ¼ã‚¶ã®ã‚°ãƒ«ãƒ¼ãƒ—è¡¨ç¤ºåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAPå±žæ€§"
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +355,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDå±žæ€§ã‹ã‚‰ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶åãŒãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚Šã€ã‹ã¤æ–‡å—ã®å¤‰æ›ãŒå¿…è¦ãªã„ã“ã¨ã‚’ä¿è¨¼ã—ã¾ã™ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã«ã¯ã€[ a-zA-Z0-9_.@- ] ã®æ–‡å—ã®ã¿ãŒæœ‰åŠ¹ã§ã‚ã‚‹ã¨ã„ã†åˆ¶é™ãŒã‚ã‚Šã€ãã®ä»–ã®æ–‡å—ã¯å¯¾å¿œã™ã‚‹ ASCII ã‚³ãƒ¼ãƒ‰ã«å¤‰æ›ã•ã‚Œã‚‹ã‹å˜ã«ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ãã®ãŸã‚ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶åã¨ã®è¡çªã®å›žæ•°ãŒå¢—åŠ ã™ã‚‹ã§ã—ã‚‡ã†ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯ã€å†…éƒ¨çš„ã«ãƒ¦ãƒ¼ã‚¶ã‚’è˜åˆ¥ã™ã‚‹ãŸã‚ã«ç”¨ã„ã‚‰ã‚Œã€ã¾ãŸã€ownCloudã«ãŠã‘ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ›ãƒ¼ãƒ ãƒ•ã‚©ãƒ«ãƒ€åã¨ã—ã¦ã‚‚ç”¨ã„ã‚‰ã‚Œã¾ã™ã€‚ä¾‹ãˆã°*DAVã‚µãƒ¼ãƒ“ã‚¹ã®ã‚ˆã†ã«ã€ãƒªãƒ¢ãƒ¼ãƒˆURLã®ãƒãƒ¼ãƒˆã§ã‚‚ã‚ã‚Šã¾ã™ã€‚ã“ã®è¨å®šã«ã‚ˆã‚Šã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã‚’å†å®šç¾©ã—ã¾ã™ã€‚ownCloud 5 ä»¥å‰ã¨åŒã˜ã‚ˆã†ãªæŒ¯ã‚‹èˆžã„ã«ã™ã‚‹ãŸã‚ã«ã¯ã€ä»¥ä¸‹ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®å±žæ€§ã‚’å…¥åŠ›ã—ã¾ã™ã€‚ç©ºã«ã™ã‚‹ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã«ãŠã„ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚"
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDå±žæ€§ã‹ã‚‰ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã‚Œã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶åãŒãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚Šã€ã‹ã¤æ–‡å—ã®å¤‰æ›ãŒä¸è¦ã§ã‚ã‚‹ã“ã¨ã‚’ä¿è¨¼ã—ã¾ã™ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã«ã¯ã€[ a-zA-Z0-9_.@- ] ã®æ–‡å—ã®ã¿ãŒæœ‰åŠ¹ã§ã‚ã‚‹ã¨ã„ã†åˆ¶é™ãŒã‚ã‚Šã€ãã®ä»–ã®æ–‡å—ã¯å¯¾å¿œã™ã‚‹ ASCII ã‚³ãƒ¼ãƒ‰ã«å¤‰æ›ã•ã‚Œã‚‹ã‹å˜ã«ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ãã®ãŸã‚ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶åã¨ã®è¡çªã®å›žæ•°ãŒå¢—åŠ ã™ã‚‹ã§ã—ã‚‡ã†ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯ã€å†…éƒ¨çš„ã«ãƒ¦ãƒ¼ã‚¶ã‚’è˜åˆ¥ã™ã‚‹ãŸã‚ã«ç”¨ã„ã‚‰ã‚Œã€ã¾ãŸã€ownCloudã«ãŠã‘ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ›ãƒ¼ãƒ ãƒ•ã‚©ãƒ«ãƒ€åã¨ã—ã¦ã‚‚ç”¨ã„ã‚‰ã‚Œã¾ã™ã€‚ä¾‹ãˆã°*DAVã‚µãƒ¼ãƒ“ã‚¹ã®ã‚ˆã†ã«ã€ãƒªãƒ¢ãƒ¼ãƒˆURLã®ä¸€éƒ¨ã§ã‚‚ã‚ã‚Šã¾ã™ã€‚ã“ã®è¨å®šã«ã‚ˆã‚Šã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã‚’å†å®šç¾©ã—ã¾ã™ã€‚ownCloud 5 ä»¥å‰ã¨åŒã˜ã‚ˆã†ãªæŒ¯ã‚‹èˆžã„ã«ã™ã‚‹ãŸã‚ã«ã¯ã€ä»¥ä¸‹ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãƒ¦ãƒ¼ã‚¶è¡¨ç¤ºåã®å±žæ€§ã‚’å…¥åŠ›ã—ã¾ã™ã€‚ç©ºã«ã™ã‚‹ã¨ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã«ãŠã„ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚"
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +373,14 @@ msgstr "UUIDæ¤œå‡ºã‚’å†å®šç¾©ã™ã‚‹"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€ownCloud ã¯ UUID å±žæ€§ã‚’è‡ªå‹•çš„ã«æ¤œå‡ºã—ã¾ã™ã€‚UUIDå±žæ€§ã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã‚’é–“é•ã„ãªãè˜åˆ¥ã™ã‚‹ãŸã‚ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€ã‚‚ã—ã“ã‚Œã‚’æŒ‡å®šã—ãªã„å ´åˆã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDã«åŸºã¥ã„ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã®è¨å®šã¯å†å®šç¾©ã™ã‚‹ã“ã¨ãŒã§ãã€ã‚ãªãŸã®é¸æŠžã—ãŸå±žæ€§ã‚’ç”¨ã„ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚é¸æŠžã—ãŸå±žæ€§ãŒãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸¡æ–¹ã«å¯¾ã—ã¦é©ç”¨ã§ãã€ã‹ã¤ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚‹ã“ã¨ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚ç©ºã§ã‚ã‚Œã°ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯ã€æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚"
+msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã¯ã€UUID å±žæ€§ã¯è‡ªå‹•çš„ã«æ¤œå‡ºã•ã‚Œã¾ã™ã€‚UUIDå±žæ€§ã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã‚’é–“é•ã„ãªãè˜åˆ¥ã™ã‚‹ãŸã‚ã«åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€ã‚‚ã—ã“ã‚Œã‚’æŒ‡å®šã—ãªã„å ´åˆã¯ã€å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯UUIDã«åŸºã¥ã„ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ã“ã®è¨å®šã¯å†å®šç¾©ã™ã‚‹ã“ã¨ãŒã§ãã€ã‚ãªãŸã®é¸æŠžã—ãŸå±žæ€§ã‚’ç”¨ã„ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚é¸æŠžã—ãŸå±žæ€§ãŒãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸¡æ–¹ã«å¯¾ã—ã¦é©ç”¨ã§ãã€ã‹ã¤ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã‚ã‚‹ã“ã¨ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚ç©ºã§ã‚ã‚Œã°ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®æŒ¯ã‚‹èˆžã„ã¨ãªã‚Šã¾ã™ã€‚å¤‰æ›´ã¯ã€æ–°ã—ããƒžãƒƒãƒ”ãƒ³ã‚°ï¼ˆè¿½åŠ ï¼‰ã•ã‚ŒãŸLDAPãƒ¦ãƒ¼ã‚¶ã¨LDAPã‚°ãƒ«ãƒ¼ãƒ—ã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã¨ãªã‚Šã¾ã™ã€‚"
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +392,17 @@ msgstr "ãƒ¦ãƒ¼ã‚¶åã¨LDAPãƒ¦ãƒ¼ã‚¶ã®ãƒžãƒƒãƒ”ãƒ³ã‚°"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloudã¯ï¼ˆãƒ¡ã‚¿ï¼‰ ãƒ‡ãƒ¼ã‚¿ã®ä¿å˜ã¨å‰²ã‚Šå½“ã¦ã«ãƒ¦ãƒ¼ã‚¶åã‚’ä½¿ç”¨ã—ã¾ã™ã€‚ãƒ¦ãƒ¼ã‚¶ã‚’æ£ç¢ºã«è˜åˆ¥ã—ã¦èªè˜ã™ã‚‹ãŸã‚ã«ã€å€‹ã€…ã®LDAPãƒ¦ãƒ¼ã‚¶ã¯å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã‚’æŒã£ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€ownCloudãƒ¦ãƒ¼ã‚¶åã¨LDAPãƒ¦ãƒ¼ã‚¶åã®é–“ã®ãƒžãƒƒãƒ”ãƒ³ã‚°ãŒå¿…è¦ã§ã‚ã‚‹ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚ç”Ÿæˆã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶åã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã®UUIDã¨ãƒžãƒƒãƒ”ãƒ³ã‚°ã•ã‚Œã¾ã™ã€‚åŠ ãˆã¦ã€DNãŒLDAPã¨ã®ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ã‚·ãƒ§ãƒ³ã‚’å‰Šæ¸›ã™ã‚‹ãŸã‚ã«ã‚ãƒ£ãƒƒã‚·ãƒ¥ã•ã‚Œã¾ã™ãŒã€è˜åˆ¥ã«ã¯åˆ©ç”¨ã•ã‚Œã¾ã›ã‚“ã€‚DNãŒå¤‰ã‚ã£ãŸå ´åˆã¯ã€å¤‰æ›´ã‚’ownCloudãŒè¦‹ã¤ã‘ã¾ã™ã€‚å†…éƒ¨ã®ownCloudåã¯ownCloudå…¨ä½“ã«äº˜ã£ã¦åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹ã¨ã€ã„ãŸã‚‹ã¨ã“ã‚ã«ä½¿ã‚ã‚Œãªã„ã¾ã¾ã®ç‰©ãŒæ®‹ã‚‹ã§ã—ã‚‡ã†ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã¯è¨å®šã«æ•æ„Ÿã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å…¨ã¦ã®LDAPã®è¨å®šã«å½±éŸ¿ã‚’ä¸Žãˆã¾ã™ï¼æœ¬ç•ªã®ç’°å¢ƒã§ã¯æ±ºã—ã¦ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã—ãªã„ã§ãã ã•ã„ã€‚ãƒ†ã‚¹ãƒˆã‚‚ã—ãã¯å®Ÿé¨“ã®æ®µéšŽã§ã®ã¿ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã‚’è¡Œãªã£ã¦ãã ã•ã„ã€‚"
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "ãƒ¦ãƒ¼ã‚¶åã¯ï¼ˆãƒ¡ã‚¿ï¼‰ãƒ‡ãƒ¼ã‚¿ã®ä¿å˜ã¨å‰²ã‚Šå½“ã¦ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ãƒ¦ãƒ¼ã‚¶ã‚’æ£ç¢ºã«è˜åˆ¥ã—ã¦èªè˜ã™ã‚‹ãŸã‚ã«ã€å€‹ã€…ã®LDAPãƒ¦ãƒ¼ã‚¶ã¯å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã‚’æŒã£ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯ã€ãƒ¦ãƒ¼ã‚¶åã‹ã‚‰LDAPãƒ¦ãƒ¼ã‚¶ã¸ã®ãƒžãƒƒãƒ”ãƒ³ã‚°ãŒå¿…è¦ã§ã‚ã‚‹ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚ã“ã®ç”Ÿæˆã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶åã¯ã€LDAPãƒ¦ãƒ¼ã‚¶ã®UUIDã«ãƒžãƒƒãƒ”ãƒ³ã‚°ã•ã‚Œã¾ã™ã€‚åŠ ãˆã¦ã€DNãŒLDAPã¨ã®ã‚¤ãƒ³ã‚¿ãƒ©ã‚¯ã‚·ãƒ§ãƒ³ã‚’å‰Šæ¸›ã™ã‚‹ãŸã‚ã«ã‚ãƒ£ãƒƒã‚·ãƒ¥ã•ã‚Œã¾ã™ãŒã€è˜åˆ¥ã«ã¯åˆ©ç”¨ã•ã‚Œã¾ã›ã‚“ã€‚DNãŒå¤‰ã‚ã£ãŸå ´åˆã¯ã€å¤‰æ›´ãŒæ¤œå‡ºã•ã‚Œã¾ã™ã€‚å†…éƒ¨ãƒ¦ãƒ¼ã‚¶åã¯å…¨ä½“ã«äº˜ã£ã¦åˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã™ã‚‹ã¨ã€ã„ãŸã‚‹ã¨ã“ã‚ã«ä½¿ã‚ã‚Œãªã„ã¾ã¾ã®ç‰©ãŒæ®‹ã‚‹ã§ã—ã‚‡ã†ã€‚ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã¯è¨å®šã«æ•æ„Ÿã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€å…¨ã¦ã®LDAPã®è¨å®šã«å½±éŸ¿ã‚’ä¸Žãˆã¾ã™ï¼æœ¬ç•ªã®ç’°å¢ƒã§ã¯æ±ºã—ã¦ãƒžãƒƒãƒ”ãƒ³ã‚°ã‚’ã‚¯ãƒªã‚¢ã—ãªã„ã§ãã ã•ã„ã€‚ãƒ†ã‚¹ãƒˆã‚‚ã—ãã¯å®Ÿé¨“ã®æ®µéšŽã§ã®ã¿ãƒžãƒƒãƒ”ãƒ³ã‚°ã®ã‚¯ãƒªã‚¢ã‚’è¡Œãªã£ã¦ãã ã•ã„ã€‚"
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index a72b73812449fc87fdda1fb308c2c57f20281e88..c24eb2a95de1bc65caeba853dee89bc6d810954e 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -6,13 +6,14 @@
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013
 # plazmism <gomidori@live.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 05:30+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 01:10+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +26,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV èªè¨¼"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr "ã‚¢ãƒ‰ãƒ¬ã‚¹:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloudã¯ã“ã®URLã«ãƒ¦ãƒ¼ã‚¶è³‡æ ¼æƒ…å ±ã‚’é€ä¿¡ã—ã¾ã™ã€‚ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯å¿œç”ã‚’ãƒã‚§ãƒƒã‚¯ã—ã€HTTPçŠ¶æ…‹ã‚³ãƒ¼ãƒ‰ãŒ 401 ã¨ 403 ã®å ´åˆã¯ç„¡åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã€ä»–ã®å¿œç”ã¯ã™ã¹ã¦æœ‰åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã¦å‡¦ç†ã—ã¾ã™ã€‚"
+msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®æ¨©é™æƒ…å ±ã‚’ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ä¿¡ã—ã¾ã™ã€‚ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯å¿œç”ã‚’ãƒã‚§ãƒƒã‚¯ã—ã€HTTPçŠ¶æ…‹ã‚³ãƒ¼ãƒ‰ãŒ 401 ã¨ 403 ã®å ´åˆã¯ç„¡åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã€ä»–ã®å¿œç”ã¯ã™ã¹ã¦æœ‰åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã¦å‡¦ç†ã—ã¾ã™ã€‚"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index 5dea5056dfe9a9a1fc7c88a58a8cb9a0340150e9..a553cde32b67899101e1f2a550bf3afd61edb94b 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +221,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +242,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +458,11 @@ msgstr "áƒ¨áƒ•áƒ”áƒšáƒ"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +491,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +609,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 39e524171f43c81128238f916a2556185f87dcb9..dc14167acc55d0a3545cefe892240f1ccf8d9df4 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,44 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +201,27 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 30ae56a19d1cafeb6b574c886edc83eaca6c6171..581f6b03001215e57a8a4b00d14e7ad1b1a59857 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index f77b135a3db1e21c25353a3e30a1caa70147aa03..5bc5f41fc523477b280b14d1f0af39183a68dae7 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index f40050033f21b02d8952425bc2d366be01322489..36d83d1478b5c917f08b8a02700f76f2a31983a2 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,42 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/ka/files_versions.po b/l10n/ka/files_versions.po
index c36ba25f09d4a8577b31ba931bb5a8884905cd75..25d30a66dbeb075428d6972d5bb4f11f696228d8 100644
--- a/l10n/ka/files_versions.po
+++ b/l10n/ka/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 4fa2845d636b6955712978c523920de0d5077e31..32eb5dd2cd06220eafe1891b3f74461279a6687e 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜"
 
 #: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
 msgid "Admin"
 msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index 59b8b61428f6479e0594969922b181eb2522b948..82c0600bc845305ed0adacdc86bfb1e34b7f93e7 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index 43c61e51c4cbc8e7a55a2543c9934934d770c7af..2ed240f9a6ffcd0bc0350fb71de7c382dd826be8 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-23 01:59+0200\n"
-"PO-Revision-Date: 2013-06-22 10:24+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ka/user_webdavauth.po b/l10n/ka/user_webdavauth.po
index 35f97470b15bc713387b23d6d5380f79036d46ab..255fb668e75b0a34fdd2d1819bef4aa31ff3b068 100644
--- a/l10n/ka/user_webdavauth.po
+++ b/l10n/ka/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index c14d673567d179da8fb876c8adb16ca5fe8baf9e..1da987a21edd9e074d484c520a7ba6c47da0a176 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "áƒœáƒáƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
 msgid "December"
 msgstr "áƒ“áƒ”áƒ™áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
@@ -225,8 +221,8 @@ msgstr "áƒáƒ‘áƒ˜áƒ”áƒ¥áƒ¢áƒ˜áƒ¡ áƒ¢áƒ˜áƒžáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ"
 
@@ -246,140 +242,141 @@ msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ£áƒšáƒ˜"
 msgid "Share"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ—áƒ•áƒ˜áƒ¡ áƒ“áƒ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ {group}, {owner}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ—áƒ•áƒ˜áƒ¡ {owner}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜áƒ—:"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ” áƒšáƒ˜áƒœáƒ™áƒ˜áƒ—"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ— áƒ“áƒáƒªáƒ•áƒ"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "áƒšáƒ˜áƒœáƒ™áƒ˜áƒ¡ áƒžáƒ˜áƒ áƒáƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ–áƒ” áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ” áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” áƒ›áƒ”áƒ˜áƒšáƒ–áƒ”"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒœáƒáƒžáƒáƒ•áƒœáƒ˜"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "áƒ›áƒ”áƒáƒ áƒ”áƒ¯áƒ”áƒ  áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ {item}â€“áƒ¨áƒ˜  {user}â€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒáƒ“áƒ˜"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒ áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ˜"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ— áƒ“áƒáƒªáƒ£áƒšáƒ˜"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ ...."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ˜ áƒ’áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒ"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒ’áƒ•áƒáƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒáƒ— áƒáƒ› áƒžáƒ áƒáƒ‘áƒšáƒ”áƒ›áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘ áƒáƒ¥: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ’áƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”áƒšáƒ“áƒ. áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ ownCloudâ€“áƒ–áƒ”."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒáƒ’áƒ˜áƒ•áƒáƒ— áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒªáƒ•áƒšáƒ”áƒšáƒ˜ áƒšáƒ˜áƒœáƒ™áƒ˜ áƒ›áƒ”áƒ˜áƒšáƒ–áƒ”"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
@@ -461,11 +458,11 @@ msgstr "áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ"
 msgid "Access forbidden"
 msgstr "áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒáƒ™áƒ áƒ«áƒáƒšáƒ£áƒšáƒ˜áƒ"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "áƒ¦áƒ áƒ£áƒ‘áƒ”áƒšáƒ˜ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,8 +491,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ PHP áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ áƒ¨áƒ”áƒ˜áƒªáƒáƒ•áƒ¡ áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒ”áƒ¡  NULL Byte áƒ¨áƒ”áƒ¢áƒ”áƒ•áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ— ownCloud áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ“, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜  PHP áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ¨áƒ˜ áƒ áƒáƒ“áƒ’áƒáƒœ  .htaccess áƒ¤áƒáƒ˜áƒšáƒ˜ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ™áƒáƒ áƒ”áƒ¥áƒ¢áƒ£áƒšáƒáƒ“ áƒ“áƒáƒ¡áƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒšáƒáƒ“, áƒœáƒáƒ®áƒ”áƒ— áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">áƒ“áƒáƒ™áƒ£áƒ›áƒ”áƒœáƒ¢áƒáƒªáƒ˜áƒ</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "áƒ¨áƒ”áƒ¥áƒ›áƒ”áƒœáƒ˜ <strong>áƒáƒ“áƒ›áƒ˜áƒœ áƒ”áƒ¥áƒáƒ£áƒœáƒ¢áƒ˜</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ—áƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒªáƒ®áƒ áƒ˜áƒšáƒ˜áƒ¡ áƒ–áƒáƒ›áƒ"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ°áƒáƒ¡áƒ¢áƒ˜"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "áƒ’áƒáƒ›áƒáƒ¡áƒ•áƒšáƒ"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜ áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ˜áƒšáƒ˜áƒ!"
@@ -607,7 +609,7 @@ msgstr "áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ"
 msgid "Alternative Logins"
 msgstr "áƒáƒšáƒ¢áƒ”áƒ áƒœáƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ Loginâ€“áƒ˜"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 85120e0c0b9e4945800109e6bb296def728c0d62..f9ce44f87b2a14bbe33790bd7a172ec80b600f7e 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ"
 msgid "Delete permanently"
 msgstr "áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 
@@ -128,43 +128,44 @@ msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 msgid "Rename"
 msgstr "áƒ’áƒáƒ“áƒáƒ áƒ¥áƒ›áƒ”áƒ•áƒ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "áƒ›áƒáƒªáƒ“áƒ˜áƒ¡ áƒ áƒ”áƒŸáƒ˜áƒ›áƒ¨áƒ˜"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ›áƒáƒ—áƒáƒ•áƒáƒ–áƒ”áƒ‘áƒ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ {old_name}â€“áƒ˜áƒ—"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ˜áƒ¡ áƒáƒžáƒ”áƒ áƒáƒªáƒ˜áƒ"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ"
 
@@ -200,33 +201,27 @@ msgstr "áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ áƒ›áƒ£áƒ¨áƒáƒ•
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜.  'Shared'â€“áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ Owncloudâ€“áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ "
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "áƒ–áƒáƒ›áƒ"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 áƒ¤áƒáƒ˜áƒšáƒ˜"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} áƒ¤áƒáƒ˜áƒšáƒ˜"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr "áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 msgid "From link"
 msgstr "áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜áƒ“áƒáƒœ"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœ áƒáƒ  áƒ’áƒáƒ¥áƒ•áƒ— áƒ©áƒáƒ¬áƒ”áƒ áƒ˜áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒáƒ¥."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡. áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ” áƒ áƒáƒ›áƒ”!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "áƒ©áƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒáƒ“áƒ˜"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ«áƒáƒšáƒ˜áƒáƒœ áƒ“áƒ˜áƒ“áƒ˜áƒ"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ–áƒáƒ›áƒ áƒ áƒáƒ›áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒáƒ¡áƒáƒª áƒ—áƒ¥áƒ•áƒ”áƒœ áƒáƒžáƒ˜áƒ áƒ”áƒ‘áƒ—, áƒáƒáƒáƒ áƒ‘áƒ”áƒ‘áƒ¡ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ–áƒ” áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ£áƒš áƒ›áƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ›áƒ¡."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ”áƒšáƒáƒ“áƒáƒ—."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 39799227c61dcc3bbc842e4bbf2f8662ecbe9da4..4c7dd5a4457c0ea3c72b0283ff5142e436902dfb 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 13566f3543cbb3a5b850b961246f657df9e15076..e5d0ff158b9bc84e4fcc1cdfb34e36d78097be6c 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒáƒ— Dropbox áƒáƒžáƒšáƒ˜áƒ™áƒ
 msgid "Error configuring Google Drive storage"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ Google Drive áƒ¡áƒáƒªáƒáƒ•áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ:</b> \"smbclient\" áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜. CIFS/SMB áƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ—áƒ®áƒáƒ•áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ”áƒ‘áƒ¡ áƒ“áƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ áƒ˜áƒ¡."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ:</b>  FTP áƒ›áƒ®áƒáƒ áƒ“áƒáƒáƒ”áƒ áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ˜ áƒáƒœ áƒ“áƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜. FTP áƒ–áƒ˜áƒáƒ áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ—áƒ®áƒáƒ•áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ”áƒ‘áƒ¡ áƒ“áƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ áƒ˜áƒ¡."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index e95ab44eee8f685cdac4826c261ea70bb65b9ef4..31c89e7e6cde606a7b7fd1c864617ecdac079086 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 msgid "Submit"
 msgstr "áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒ"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sâ€“áƒ›áƒ áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜ %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sâ€“áƒ›áƒ áƒ’áƒáƒ’áƒ˜áƒ–áƒ˜áƒáƒ áƒáƒ— áƒ¤áƒáƒ˜áƒšáƒ˜ %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "áƒ©áƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "áƒ¬áƒ˜áƒœáƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒ“áƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒ”áƒ‘áƒ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜áƒ"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 566e13bb927515ed9da7fc453dc3d80c4b86273f..b41813f0a6def834101fb993ae95d3dd5d2b48fd 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +27,43 @@ msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜ %sâ€“áƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ áƒ•áƒ”áƒ 
 msgid "Couldn't restore %s"
 msgstr "%sâ€“áƒ˜áƒ¡ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒáƒžáƒ”áƒ áƒáƒªáƒ˜áƒ"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒ¬áƒáƒ¨áƒšáƒ"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 áƒ¤áƒáƒ˜áƒšáƒ˜"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} áƒ¤áƒáƒ˜áƒšáƒ˜"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 35af4eeea3b2a1f7c82d1b6f53d721ddcc8b23d2..9d61326140d99d1bc28d1db4a3a443cf35b01808 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ áƒ£áƒ™áƒáƒœ áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜ %s áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ“áƒ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ %s áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ %s áƒ•áƒ”áƒ áƒ¡áƒ˜áƒáƒ–áƒ” áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "áƒ«áƒ•áƒ”áƒšáƒ˜ áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "áƒ’áƒ–áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "áƒ“áƒáƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ— áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ¬áƒ˜áƒœáƒ áƒžáƒáƒ–áƒ˜áƒªáƒ˜áƒáƒ–áƒ” revert áƒ¦áƒ˜áƒšáƒáƒ™áƒ–áƒ” áƒ“áƒáƒáƒ”áƒ áƒ˜áƒ—"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 7e83bca98dd54212e48af1dd14aa44e203e6abb1..9546faa3400b771978f07ee73f36f79cf9f4169f 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜"
 
 #: app.php:409
-msgid "Apps"
-msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜"
-
-#: app.php:417
 msgid "Admin"
 msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP downloadâ€“áƒ˜ áƒ’áƒáƒ—áƒ˜áƒ¨áƒ£áƒšáƒ˜áƒ"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ£áƒœáƒ“áƒ áƒ’áƒáƒ“áƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒáƒ¡ áƒ¡áƒáƒ—áƒ˜áƒ—áƒáƒáƒ“."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "áƒ£áƒ™áƒáƒœ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ¨áƒ˜"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "áƒáƒ áƒ©áƒ”áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒ«áƒáƒšáƒ˜áƒáƒœ áƒ“áƒ˜áƒ“áƒ˜áƒ zip áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "áƒ•áƒ”áƒ  áƒ’áƒáƒœáƒ˜áƒ¡áƒáƒ–áƒ¦áƒ•áƒ áƒ"
 
@@ -170,77 +182,73 @@ msgstr "Offending áƒ‘áƒ áƒ«áƒáƒœáƒ”áƒ‘áƒ áƒ˜áƒ§áƒ: \"%s\", áƒ¡áƒáƒ®áƒ”áƒšáƒ˜
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL áƒ˜áƒ£áƒ–áƒ”áƒ áƒœáƒ”áƒ˜áƒ›áƒ˜ áƒ“áƒ/áƒáƒœ áƒžáƒáƒ áƒáƒšáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ¡áƒ¬áƒáƒ áƒ˜"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "áƒ“áƒáƒáƒ§áƒ”áƒœáƒ”áƒ— áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "áƒ“áƒáƒáƒ§áƒ”áƒœáƒ”áƒ— áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒšáƒ˜."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ web áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒš áƒ¡áƒ˜áƒœáƒ¥áƒ áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ áƒáƒ“áƒ’áƒáƒœ WebDAV áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒ’áƒáƒ¢áƒ”áƒ®áƒ˜áƒšáƒ˜."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒ“áƒáƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒáƒ— <a href='%s'>áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒ–áƒáƒ›áƒ™áƒ•áƒšáƒ”áƒ•áƒ˜</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d  áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 8abc0bed40dfa503ceb272a5e511b62bd230f9bf..c24e0dc72065caaed5c1331886b73532902533c5 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr "áƒ£áƒœáƒ“áƒ áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒáƒ— áƒáƒ áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒžáƒáƒ 
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ˜áƒ“áƒáƒœ. .htaccess áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ¡áƒáƒª ownCloud áƒ’áƒ•áƒ—áƒáƒ•áƒáƒ–áƒáƒ‘áƒ¡ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ“áƒáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒáƒ— áƒ˜áƒ¡áƒ” áƒ áƒáƒ› data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒáƒ  áƒ˜áƒ§áƒáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜, áƒáƒœ áƒ’áƒáƒ˜áƒ¢áƒáƒœáƒáƒ— data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ document root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ—."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ áƒ“áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ˜áƒ¡áƒáƒ¡"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ web áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒš áƒ¡áƒ˜áƒœáƒ¥áƒ áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ áƒáƒ“áƒ’áƒáƒœ WebDAV áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒ’áƒáƒ¢áƒ”áƒ®áƒ˜áƒšáƒ˜."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒ“áƒáƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒáƒ— <a href='%s'>áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒ–áƒáƒ›áƒ™áƒ•áƒšáƒ”áƒ•áƒ˜</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "áƒ›áƒáƒ“áƒ£áƒšáƒ˜ 'fileinfo'  áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP áƒ›áƒáƒ“áƒ£áƒšáƒ˜ 'fileinfo' áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒáƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒšáƒáƒ“ áƒ©áƒáƒ áƒ—áƒáƒ— áƒ”áƒ¡ áƒ›áƒáƒ“áƒ£áƒšáƒ˜, áƒ áƒáƒ› áƒ›áƒ˜áƒ˜áƒ¦áƒáƒ— áƒ™áƒáƒ áƒ’áƒ˜ áƒ¨áƒ”áƒ“áƒ”áƒ’áƒ”áƒ‘áƒ˜ mime-typeâ€“áƒ¡ áƒáƒ¦áƒ›áƒáƒ©áƒ”áƒœáƒ˜áƒ¡áƒáƒ¡."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "áƒšáƒáƒ™áƒáƒšáƒ˜áƒ–áƒáƒªáƒ˜áƒ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ•áƒ”áƒ  áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ¡ %s áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  áƒ”áƒœáƒáƒ¡. áƒ”áƒ¡ áƒ’áƒ£áƒšáƒ˜áƒ¡áƒ®áƒ›áƒáƒ‘áƒ¡ áƒ˜áƒ›áƒáƒ¡ áƒ áƒáƒ› áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒáƒ¡ áƒžáƒ áƒáƒ‘áƒšáƒ”áƒ›áƒ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒš áƒ¡áƒ˜áƒ›áƒ‘áƒáƒšáƒáƒ”áƒ‘áƒ–áƒ” áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ”áƒ‘áƒ¨áƒ˜. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ“áƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ— áƒ¡áƒáƒáƒ˜áƒ áƒ áƒžáƒáƒ™áƒ”áƒ¢áƒ”áƒ‘áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒáƒ–áƒ” áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ˜áƒ§áƒáƒ¡ %s â€“áƒ˜áƒ¡ áƒ›áƒ®áƒáƒ áƒ“áƒáƒáƒ”áƒ áƒ."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ¡ áƒáƒ  áƒ’áƒáƒáƒ©áƒœáƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ—áƒáƒœ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜. áƒ”áƒ¡ áƒœáƒ˜áƒ¨áƒœáƒáƒ•áƒ¡ áƒ˜áƒ›áƒáƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒšáƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜ áƒ áƒáƒ’áƒáƒ áƒ˜áƒªáƒáƒ áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ, áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘ áƒáƒœ áƒ¡áƒ®áƒ•áƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ 3rd áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ—áƒáƒœ áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ’áƒáƒ áƒ” áƒ¡áƒáƒ›áƒ§áƒáƒ áƒáƒ“áƒáƒœ áƒ“áƒ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒª áƒáƒ’áƒ áƒ”áƒ—áƒ•áƒ” áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ©áƒáƒ áƒ—áƒáƒ— áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒáƒ› áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒ¥áƒáƒœáƒ“áƒ”áƒ— ownCloudâ€“áƒ˜áƒ¡ áƒ§áƒ•áƒ”áƒšáƒ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ áƒ’áƒáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cronâ€“áƒ˜"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "áƒ’áƒáƒ£áƒ¨áƒ•áƒ˜ áƒ—áƒ˜áƒ—áƒ áƒ›áƒáƒ¥áƒ›áƒ”áƒ“áƒ”áƒ‘áƒ áƒ§áƒ•áƒ”áƒšáƒ áƒ©áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ£áƒš áƒ’áƒ•áƒ”áƒ áƒ“áƒ–áƒ”"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ webcron áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒáƒ“. áƒ’áƒáƒ£áƒ¨áƒ•áƒ˜áƒ— cron.php áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ›áƒáƒ—áƒáƒ•áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ owncloud root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒáƒ¨áƒ˜, áƒ¬áƒ£áƒ—áƒ¨áƒ˜ áƒ”áƒ áƒ—áƒ®áƒ”áƒš  httpâ€“áƒ˜áƒ—."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ” áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ áƒ˜ cron áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒ˜. áƒ’áƒáƒ£áƒ¨áƒ•áƒ˜áƒ— cron.php áƒ¤áƒáƒ˜áƒšáƒ˜ owncloud áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜áƒ“áƒáƒœ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  cronjobâ€“áƒ¨áƒ˜ áƒ¬áƒ£áƒ—áƒ¨áƒ˜ áƒ”áƒ áƒ—áƒ®áƒ”áƒš."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Share APIâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "áƒ“áƒáƒ£áƒ¨áƒ•áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ  Share API â€“áƒ–áƒ”"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "áƒšáƒ˜áƒœáƒ™áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ”áƒšáƒ”áƒ›áƒ”áƒœáƒ¢áƒ”áƒ‘áƒ˜ áƒ¡áƒáƒ¯áƒáƒ áƒáƒ“ áƒšáƒ˜áƒœáƒ™áƒ”áƒ‘áƒ˜áƒ—"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "áƒ’áƒáƒ“áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ›áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ£áƒšáƒ˜"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ§áƒ•áƒ”áƒšáƒáƒ¡áƒ—áƒ•áƒ˜áƒ¡"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ—áƒáƒ•áƒ˜áƒáƒœáƒ—áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "HTTPSâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "áƒ•áƒáƒ˜áƒ«áƒ£áƒšáƒáƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜ áƒ áƒáƒ› áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒœáƒ”áƒœ ownCloud áƒ“áƒáƒªáƒ£áƒšáƒ˜ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ— (https)."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ— ownCloudâ€“áƒ¡  HTTPSâ€“áƒ˜áƒ— áƒ áƒáƒ› áƒ¨áƒ”áƒ«áƒšáƒáƒ— SSLâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ•áƒ."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "áƒšáƒáƒ’áƒ˜"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "áƒšáƒáƒ’áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒœáƒ”"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "áƒ£áƒ¤áƒ áƒ áƒ›áƒ”áƒ¢áƒ˜"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "áƒ£áƒ¤áƒ áƒ áƒœáƒáƒ™áƒšáƒ”áƒ‘áƒ˜"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,72 +394,72 @@ msgstr "áƒ‘áƒáƒ’áƒ—áƒ áƒ”áƒ¥áƒ”áƒ áƒ˜"
 msgid "Commercial Support"
 msgstr "áƒ™áƒáƒ›áƒ”áƒ áƒªáƒ˜áƒ£áƒšáƒ˜ áƒ›áƒ®áƒáƒ áƒ“áƒáƒáƒ”áƒ áƒ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒœáƒ¥áƒ áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "áƒ›áƒáƒ©áƒ•áƒ”áƒœáƒ” áƒ—áƒáƒ•áƒ˜áƒ“áƒáƒœ áƒ’áƒáƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ•áƒ˜áƒ–áƒáƒ áƒ“áƒ˜"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ’áƒáƒ¥áƒ•áƒ— <strong>%s</strong> â€“áƒ˜ â€“<strong>%s<strong>â€“áƒ“áƒáƒœ"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜ áƒ¨áƒ”áƒ˜áƒªáƒ•áƒáƒšáƒ"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜ áƒáƒ  áƒ¨áƒ”áƒ˜áƒªáƒ•áƒáƒšáƒ"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "áƒ“áƒ˜áƒ¡áƒžáƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ˜"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ˜áƒ›áƒ”áƒ˜áƒš áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "áƒ¨áƒ”áƒáƒ•áƒ¡áƒ”áƒ— áƒ˜áƒ›áƒ”áƒ˜áƒš áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜áƒ¡ áƒ•áƒ”áƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒáƒ¦áƒ¡áƒáƒ“áƒ’áƒ”áƒœáƒáƒ“"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "áƒ”áƒœáƒ"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "áƒ—áƒáƒ áƒ’áƒ›áƒœáƒ˜áƒ¡ áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index de1bc9bad986717668ce9be72bf09ec4aa947be9..a2f98736a227afa1ff2bedc39ba54c73a283b5a5 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒ¡ áƒ“áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ‘áƒ"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ:</b>  áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ user_ldap áƒ“áƒ user_webdavauth áƒáƒ áƒáƒ—áƒáƒ•áƒ¡áƒ”áƒ‘áƒáƒ“áƒ˜áƒ. áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ¨áƒ”áƒ”áƒ©áƒ”áƒ®áƒáƒ— áƒ›áƒáƒ£áƒšáƒáƒ“áƒœáƒ”áƒš áƒ¨áƒ¨áƒ”áƒ“áƒ”áƒ’áƒ”áƒ‘áƒ¡. áƒ—áƒ®áƒáƒ•áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ¡ áƒ©áƒáƒ—áƒ˜áƒ¨áƒáƒ¡ áƒ”áƒ áƒ—áƒ”áƒ áƒ—áƒ˜."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,8 +221,8 @@ msgid "Disable Main Server"
 msgstr "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ”áƒ— áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“áƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "áƒ áƒáƒªáƒ áƒ›áƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜áƒ, ownCloud áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ‘áƒ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ áƒ”áƒžáƒšáƒ˜áƒ™áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ¡."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "áƒ’áƒáƒ›áƒáƒ áƒ—áƒ”áƒ— SSL áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜áƒ¡ áƒ•áƒáƒšáƒ˜áƒ“áƒáƒªáƒ˜áƒ."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "áƒ˜áƒ› áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒáƒ¨áƒ˜ áƒ—áƒ£ áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ”áƒ¡ áƒáƒ¤áƒªáƒ˜áƒ, áƒ“áƒáƒáƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ”áƒ— LDAP áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ SSL áƒ¡áƒ”áƒ áƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ–áƒ”."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ“áƒ˜"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡  ownCloud áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ“áƒ˜"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP áƒáƒ¢áƒ áƒ˜áƒ‘áƒ£áƒ¢áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡  ownCloud áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index 88af8f6bf4194e7ba66f266556ebb1194bf4b704..58a30e6736df5bd41d01e3586c0fbb36179250b1 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV áƒáƒ£áƒ—áƒ”áƒœáƒ—áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloudâ€“áƒ˜ áƒ’áƒáƒ›áƒáƒ’áƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒ˜áƒ— áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ¡ áƒáƒ› URLâ€“áƒ–áƒ”. áƒ”áƒ¡ áƒžáƒšáƒáƒ’áƒ˜áƒœáƒ˜ áƒ¨áƒ”áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ¡ áƒžáƒáƒ¡áƒ£áƒ®áƒ¡ áƒ“áƒ áƒ›áƒáƒáƒ®áƒ“áƒ”áƒœáƒ¡ áƒ›áƒ˜áƒ¡ áƒ˜áƒœáƒ¢áƒ”áƒ áƒžáƒ áƒ”áƒ¢áƒáƒªáƒ˜áƒáƒ¡ HTTP áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ™áƒáƒ“áƒ”áƒ‘áƒ¨áƒ˜ 401 áƒ“áƒ 403 áƒ“áƒáƒ£áƒ¨áƒ•áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ®áƒáƒšáƒ áƒ¡áƒ®áƒ•áƒ áƒ“áƒáƒœáƒáƒ áƒ©áƒ”áƒœáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡."
+msgstr ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index aef3d399ed344f0cee7ae2f3bb003ebf7e75ce60..a6e47dc7eddb056da553fdfba0c3bca127772f6e 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +221,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +242,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +458,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +491,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +609,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 1b7d00ff32dcc2bde760c400730bac6a3c5dca46..f0bd3f4a11124a5624a348bfac5efdb30bd0639a 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-04 09:30+0200\n"
-"PO-Revision-Date: 2013-07-04 07:31+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -27,54 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:39
+#: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:22
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:55
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:62
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:63
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:65
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:66
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:68
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:87
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:119
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,44 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +201,27 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 227f1e73e33ce344b874bcec0bafd9f4d871a6b4..be1a9ea38cd55dfd2ff3bf4160103ed635ce7522 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index 2d27aa7fc366313df61ece51aa10ac7d16b263af..b4ca53433143dd6e89165aab87c585009c5777e3 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 28bf4f67f97f354da1cd42c3be0695a8c9e8be88..4a8a4c3ae7630c84283190b2b60bd19ca2b9be1d 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,42 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/kn/files_versions.po b/l10n/kn/files_versions.po
index c61eacfeba8e482b655777cd8adbf41858c15ed2..2292632cf6ad897c13d66b319ea72644bd82f474 100644
--- a/l10n/kn/files_versions.po
+++ b/l10n/kn/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 308114917bc48c6407f97ee063aa870a7498ea84..6e1f85cdd109057ee09a6d7f91b92e67577829d4 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 9c122a4cda76e6bfb3e4d55919c68bf538f0e8a2..224c7063ecdd7b1de37f7efd5236c66c7af44fa8 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 782e792ba8bca208e74dfc91a16c3629c2d33d1a..e24987ef4dd8c0b82fc09044a48089815a103ab8 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/kn/user_webdavauth.po b/l10n/kn/user_webdavauth.po
index 535cabb87b6e000d58ff08597fcca286f935ccb6..f9c9c99d4f2ba31cf453f3a4892c02dfdb249359 100644
--- a/l10n/kn/user_webdavauth.po
+++ b/l10n/kn/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 81e4d7e762e02ff3b40bb1125e91275d42e7a855..f8be8d34af65d646446e4a20500c92a416359c55 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Shinjo Park <kde@peremen.name>, 2013
+# smallsnail <bjh13579@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +139,55 @@ msgstr "11ì›”"
 msgid "December"
 msgstr "12ì›”"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ì„¤ì •"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1ë¶„ ì „"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes}ë¶„ ì „"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1ì‹œê°„ ì „"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours}ì‹œê°„ ì „"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ì˜¤ëŠ˜"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ì–´ì œ"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days}ì¼ ì „"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "ì§€ë‚œ ë‹¬"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months}ê°œì›” ì „"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "ê°œì›” ì „"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "ë…„ ì „"
 
@@ -226,8 +223,8 @@ msgstr "ê°ì²´ ìœ í˜•ì´ ì§€ì •ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "ì˜¤ë¥˜"
 
@@ -247,140 +244,141 @@ msgstr "ê³µìœ ë¨"
 msgid "Share"
 msgstr "ê³µìœ "
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "ê³µìœ í•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "ê³µìœ  í•´ì œí•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "ê¶Œí•œ ë³€ê²½í•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} ë‹˜ì´ ì—¬ëŸ¬ë¶„ ë° ê·¸ë£¹ {group}ì™€(ê³¼) ê³µìœ  ì¤‘"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} ë‹˜ì´ ê³µìœ  ì¤‘"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "ë‹¤ìŒìœ¼ë¡œ ê³µìœ "
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "URL ë§í¬ë¡œ ê³µìœ "
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ì•”í˜¸ ë³´í˜¸"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ì•”í˜¸"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "í¼ë¸”ë¦ ì—…ë¡œë“œ í—ˆìš©"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "ì´ë©”ì¼ ì£¼ì†Œ"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "ì „ì†¡"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ ì„¤ì •"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "ì´ë©”ì¼ë¡œ ê³µìœ :"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "ë°œê²¬ëœ ì‚¬ëžŒ ì—†ìŒ"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ë‹¤ì‹œ ê³µìœ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "{user} ë‹˜ê³¼ {item}ì—ì„œ ê³µìœ  ì¤‘"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "ê³µìœ  í•´ì œ"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "íŽ¸ì§‘ ê°€ëŠ¥"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ì ‘ê·¼ ì œì–´"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "ìƒì„±"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "ì—…ë°ì´íŠ¸"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "ì‚ì œ"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "ê³µìœ "
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "ì•”í˜¸ë¡œ ë³´í˜¸ë¨"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ í•´ì œ ì˜¤ë¥˜"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ ì„¤ì • ì˜¤ë¥˜"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "ì „ì†¡ ì¤‘..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "ì´ë©”ì¼ ë°œì†¡ë¨"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "ì—…ë°ì´íŠ¸ê°€ ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤. ì´ ë¬¸ì œë¥¼ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ì»¤ë®¤ë‹ˆí‹°</a>ì— ë³´ê³ í•´ ì£¼ì‹ì‹œì˜¤."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "ì—…ë°ì´íŠ¸ê°€ ì„±ê³µí•˜ì˜€ìŠµë‹ˆë‹¤. ownCloudë¡œ ëŒì•„ê°‘ë‹ˆë‹¤."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud ì•”í˜¸ ìž¬ì„¤ì •"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -395,13 +393,13 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "ìš”ì²ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤!<br>email ì£¼ì†Œì™€ ì‚¬ìš©ìž ëª…ì„ ì •í™•í•˜ê²Œ ë„£ìœ¼ì…¨ë‚˜ìš”?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
 msgstr "ì´ë©”ì¼ë¡œ ì•”í˜¸ ìž¬ì„¤ì • ë§í¬ë¥¼ ë³´ëƒˆìŠµë‹ˆë‹¤."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ì‚¬ìš©ìž ì´ë¦„"
@@ -416,7 +414,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "ë„¤, ì „ ì œ ë¹„ë°€ë²ˆí˜¸ë¥¼ ë¦¬ì…‹í•˜ê¸¸ ì›í•©ë‹ˆë‹¤"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -462,11 +460,11 @@ msgstr "ë„ì›€ë§"
 msgid "Access forbidden"
 msgstr "ì ‘ê·¼ ê¸ˆì§€ë¨"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "í´ë¼ìš°ë“œë¥¼ ì°¾ì„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +493,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "ì‚¬ìš© ì¤‘ì¸ PHP ë²„ì „ì´ NULL ë°”ì´íŠ¸ ê³µê²©ì— ì·¨ì•½í•©ë‹ˆë‹¤ (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ownCloudì˜ ë³´ì•ˆì„ ìœ„í•˜ì—¬ PHP ë²„ì „ì„ ì—…ë°ì´íŠ¸í•˜ì‹ì‹œì˜¤."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +515,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ".htaccess íŒŒì¼ì´ ì²˜ë¦¬ë˜ì§€ ì•Šì•„ì„œ ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ íŒŒì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í•  ìˆ˜ ì—†ì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "ì„œë²„ë¥¼ ì˜¬ë°”ë¥´ê²Œ ì„¤ì •í•˜ëŠ” ë°©ë²•ì„ ì•Œì•„ë³´ë ¤ë©´ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ë¬¸ì„œ</a>ë¥¼ ì°¸ê³ í•˜ì‹ì‹œì˜¤.."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>ê´€ë¦¬ìž ê³„ì •</strong> ë§Œë“¤ê¸°"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "ê³ ê¸‰"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "ë°ì´í„° í´ë”"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì„¤ì •"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "ì‚¬ìš©ë  ì˜ˆì •"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì‚¬ìš©ìž"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì•”í˜¸"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì´ë¦„"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ í…Œì´ë¸” ê³µê°„"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "ë°ì´í„°ë² ì´ìŠ¤ í˜¸ìŠ¤íŠ¸"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ì„¤ì¹˜ ì™„ë£Œ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ë¡œê·¸ì•„ì›ƒ"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ìžë™ ë¡œê·¸ì¸ì´ ê±°ë¶€ë˜ì—ˆìŠµë‹ˆë‹¤!"
@@ -608,7 +611,7 @@ msgstr "ë¡œê·¸ì¸"
 msgid "Alternative Logins"
 msgstr "ëŒ€ì²´ "
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index d07d3f865e923547d5674b018b42147edb8489dc..a5f246cc2e23a6d7c9da12ad88703331c05e8a4f 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,7 @@ msgstr "ê³µìœ "
 msgid "Delete permanently"
 msgstr "ì˜ì›ížˆ ì‚ì œ"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "ì‚ì œ"
 
@@ -130,43 +130,44 @@ msgstr "ì‚ì œ"
 msgid "Rename"
 msgstr "ì´ë¦„ ë°”ê¾¸ê¸°"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ëŒ€ê¸° ì¤‘"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name}ì´(ê°€) ì´ë¯¸ ì¡´ìž¬í•¨"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ë°”ê¾¸ê¸°"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "ì´ë¦„ ì œì•ˆ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ì·¨ì†Œ"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}ì´(ê°€) {new_name}(ìœ¼)ë¡œ ëŒ€ì²´ë¨"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "ë˜ëŒë¦¬ê¸°"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "ì‚ì œ ìž‘ì—…ì¤‘"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "íŒŒì¼ 1ê°œ ì—…ë¡œë“œ ì¤‘"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "íŒŒì¼ ì—…ë¡œë“œì¤‘"
 
@@ -202,33 +203,27 @@ msgstr "ë‹¤ìš´ë¡œë“œê°€ ì¤€ë¹„ ì¤‘ìž…ë‹ˆë‹¤. íŒŒì¼ í¬ê¸°ê°€ í¬ë‹¤ë©´ ì‹œê°„
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "í´ë” ì´ë¦„ì´ ìœ íš¨í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. "
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "ì´ë¦„"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "í¬ê¸°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ìˆ˜ì •ë¨"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "í´ë” 1ê°œ"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "í´ë” {count}ê°œ"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "íŒŒì¼ 1ê°œ"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "íŒŒì¼ {count}ê°œ"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -287,61 +282,61 @@ msgstr "í´ë”"
 msgid "From link"
 msgstr "ë§í¬ì—ì„œ"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "íŒŒì¼ ì‚ì œë¨"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ì—…ë¡œë“œ ì·¨ì†Œ"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "ë‹¹ì‹ ì€ ì—¬ê¸°ì— ì“°ê¸°ë¥¼ í•  ìˆ˜ ìžˆëŠ” ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ë‹¤ìš´ë¡œë“œ"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "ê³µìœ  í•´ì œ"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "ì—…ë¡œë“œí•œ íŒŒì¼ì´ ë„ˆë¬´ í¼"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ì´ íŒŒì¼ì´ ì„œë²„ì—ì„œ í—ˆìš©í•˜ëŠ” ìµœëŒ€ ì—…ë¡œë“œ ê°€ëŠ¥ ìš©ëŸ‰ë³´ë‹¤ í½ë‹ˆë‹¤."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "íŒŒì¼ì„ ê²€ìƒ‰í•˜ê³  ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ ì£¼ì‹ì‹œì˜¤."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "í˜„ìž¬ ê²€ìƒ‰"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "íŒŒì¼"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "íŒŒì¼"
 
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 8fe2f1bc3b32efc7c1c9fffffeb8bb68f4cf8e9b..e3428a601e89c4db73261109cf285f39abfbdee0 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# smallsnail <bjh13579@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -37,15 +38,15 @@ msgstr ""
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "ì•”í˜¸ê°€ ì„±ê³µì ìœ¼ë¡œ ë³€ê²½ë˜ì—ˆìŠµë‹ˆë‹¤"
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "ì•”í˜¸ë¥¼ ë³€ê²½í• ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì•„ë§ˆë„ ì˜ˆì „ ì•”í˜¸ê°€ ì •í™•í•˜ì§€ ì•Šì€ê²ƒ ê°™ìŠµë‹ˆë‹¤."
 
 #: ajax/updatePrivateKeyPassword.php:51
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "ê°œì¸í‚¤ ì•”í˜¸ê°€ ì„±ê³µì ìœ¼ë¡œ ì—…ë°ì´íŠ¸ ë¨."
 
 #: ajax/updatePrivateKeyPassword.php:53
 msgid ""
@@ -67,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -88,7 +93,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "ê°œì¸ ì„¤ì •"
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -101,7 +106,7 @@ msgstr ""
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "í‚¤ ë¹„ë°€ë²ˆí˜¸ ë³µêµ¬"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -113,19 +118,19 @@ msgstr ""
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "ë³µêµ¬ í‚¤ ë¹„ë°€ë²ˆí˜¸ ë³€ê²½"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "ì˜ˆì „ ë³µêµ¬ í‚¤ ë¹„ë°€ë²ˆí˜¸"
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "ìƒˆ ë³µêµ¬ í‚¤ ë¹„ë°€ë²ˆí˜¸"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
-msgstr ""
+msgstr "ì•”í˜¸ ë³€ê²½"
 
 #: templates/settings-personal.php:11
 msgid "Your private key password no longer match your log-in password:"
@@ -143,15 +148,15 @@ msgstr ""
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "ì˜ˆì „ ë¡œê·¸ì¸ ì•”í˜¸"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "í˜„ìž¬ ë¡œê·¸ì¸ ì•”í˜¸"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "ê°œì¸ í‚¤ ì•”í˜¸ ì—…ë°ì´íŠ¸"
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
@@ -165,8 +170,8 @@ msgstr ""
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "íŒŒì¼ ë³µêµ¬ ì„¤ì • ì—…ë°ì´íŠ¸ë¨"
 
 #: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "íŒŒì¼ ë³µêµ¬ë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 5d11d6e87d16983ca2214efbb4e3a7360499b585..54e54ee8daf4664f3c91b3f437d6bee46325f5f5 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "ì˜¬ë°”ë¥¸ Dropbox ì•± í‚¤ì™€ ì•”í˜¸ë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤."
 msgid "Error configuring Google Drive storage"
 msgstr "Google ë“œë¼ì´ë¸Œ ì €ìž¥ì†Œ ì„¤ì • ì˜¤ë¥˜"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>ê²½ê³ :</b> \"smbclient\"ê°€ ì„¤ì¹˜ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. CIFS/SMB ê³µìœ  ìžì›ì— ì—°ê²°í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì‹œìŠ¤í…œ ê´€ë¦¬ìžì—ê²Œ ì„¤ì¹˜ë¥¼ ìš”ì²í•˜ì‹ì‹œì˜¤."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>ê²½ê³ :</b> PHP FTP ì§€ì›ì´ ë¹„í™œì„±í™”ë˜ì–´ ìžˆê±°ë‚˜ ì„¤ì¹˜ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. FTP ê³µìœ ë¥¼ ë§ˆìš´íŠ¸í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì‹œìŠ¤í…œ ê´€ë¦¬ìžì—ê²Œ ì„¤ì¹˜ë¥¼ ìš”ì²í•˜ì‹ì‹œì˜¤."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index d71e79df276d6775f47a585b0fbbee7d0b9a4be3..f3be635c899724b86bafbdcc6a8b8091915a6e12 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "ì•”í˜¸"
 msgid "Submit"
 msgstr "ì œì¶œ"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ë‹˜ì´ í´ë” %sì„(ë¥¼) ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ë‹˜ì´ íŒŒì¼ %sì„(ë¥¼) ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ë‹¤ìš´ë¡œë“œ"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ì—…ë¡œë“œ"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ì—…ë¡œë“œ ì·¨ì†Œ"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ë‹¤ìŒ í•ëª©ì„ ë¯¸ë¦¬ ë³¼ ìˆ˜ ì—†ìŒ:"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index b51c713a59aaef75c3541b0d5dd1a9772cf95432..3e48f534a18e85e32eea1c454e0f115b58a6bf52 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "ì˜¤ë¥˜"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "ì˜ì›ížˆ ì‚ì œ"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "ì´ë¦„"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "í´ë” 1ê°œ"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "í´ë” {count}ê°œ"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "íŒŒì¼ 1ê°œ"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "íŒŒì¼ {count}ê°œ"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index f92a63026989a27f73dff720be0a0e33a409319b..19ec188ee6c09997312cec52b88b40ba8f6485ca 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-20 02:37+0200\n"
-"PO-Revision-Date: 2013-06-19 08:50+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,41 +18,27 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "ë˜ëŒë¦´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "ì„±ê³µ"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "íŒŒì¼ %sì„(ë¥¼) ë²„ì „ %s(ìœ¼)ë¡œ ë˜ëŒë¦¼"
-
-#: history.php:49
-msgid "failure"
-msgstr "ì‹¤íŒ¨"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "íŒŒì¼ %sì„(ë¥¼) ë²„ì „ %s(ìœ¼)ë¡œ ë˜ëŒë¦¬ì§€ ëª»í–ˆìŒ"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ë²„ì „"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "ì˜¤ëž˜ëœ ë²„ì „ì„ ì‚¬ìš©í•  ìˆ˜ ì—†ìŒ"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "ê²½ë¡œê°€ ì§€ì •ë˜ì§€ ì•Šì•˜ìŒ"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ë²„ì „"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "ë³€ê²½ ë‹¨ì¶”ë¥¼ ëˆŒëŸ¬ ì´ì „ ë²„ì „ì˜ íŒŒì¼ë¡œ ë˜ëŒë¦´ ìˆ˜ ìžˆìŠµë‹ˆë‹¤"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "ë³µì›"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 782c6bd128409c81603200576d655085407f27b3..7b58ff4c090dc5228fd7e54129b2efa50d0f64a1 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# smallsnail <bjh13579@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +35,46 @@ msgid "Users"
 msgstr "ì‚¬ìš©ìž"
 
 #: app.php:409
-msgid "Apps"
-msgstr "ì•±"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ê´€ë¦¬ìž"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "ë‚´ê°€ ê´€ë¦¬í•˜ëŠ” ì›¹ ì„œë¹„ìŠ¤"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP ë‹¤ìš´ë¡œë“œê°€ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "íŒŒì¼ì„ ê°œë³„ì ìœ¼ë¡œ ë‹¤ìš´ë¡œë“œí•´ì•¼ í•©ë‹ˆë‹¤."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "íŒŒì¼ë¡œ ëŒì•„ê°€ê¸°"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "ì„ íƒí•œ íŒŒì¼ë“¤ì€ ZIP íŒŒì¼ì„ ìƒì„±í•˜ê¸°ì— ë„ˆë¬´ í½ë‹ˆë‹¤."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ê²°ì •í•  ìˆ˜ ì—†ìŒ"
 
@@ -92,17 +105,17 @@ msgstr "ê·¸ë¦¼"
 #: setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "ë°ì´í„°ë² ì´ìŠ¤ ì‚¬ìš©ìž ëª…ì„ %s ì— ìž…ë ¥í•´ì£¼ì‹ì‹œì˜¤"
 
 #: setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "ë°ì´í„°ë² ì´ìŠ¤ ëª…ì„ %s ì— ìž…ë ¥í•´ì£¼ì‹ì‹œì˜¤"
 
 #: setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s ì— ì ìœ¼ì‹  ë°ì´í„°ë² ì´ìŠ¤ ì´ë¦„ì—ëŠ” ì ì„ ì‚¬ìš©í• ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
 #: setup/mssql.php:20
 #, php-format
@@ -125,7 +138,7 @@ msgstr ""
 #: setup/postgresql.php:125 setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB ì˜¤ë¥˜: \"%s\""
 
 #: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
 #: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
@@ -168,79 +181,75 @@ msgstr ""
 
 #: setup/postgresql.php:23 setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQLì˜ ì‚¬ìš©ìž ëª… í˜¹ì€ ë¹„ë°€ë²ˆí˜¸ê°€ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
-msgstr ""
+msgstr "ê´€ë¦¬ìž ì´ë¦„ ì„¤ì •"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
-msgstr ""
+msgstr "ê´€ë¦¬ìž ë¹„ë°€ë²ˆí˜¸ ì„¤ì •"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAV ì¸í„°íŽ˜ì´ìŠ¤ê°€ ì œëŒ€ë¡œ ìž‘ë™í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì›¹ ì„œë²„ì—ì„œ íŒŒì¼ ë™ê¸°í™”ë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆë„ë¡ ì„¤ì •ì´ ì œëŒ€ë¡œ ë˜ì§€ ì•Šì€ ê²ƒ ê°™ìŠµë‹ˆë‹¤."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>ì„¤ì¹˜ ê°€ì´ë“œ</a>ë¥¼ ë‹¤ì‹œ í•œ ë²ˆ í™•ì¸í•˜ì‹ì‹œì˜¤."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1ë¶„ ì „"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%dë¶„ ì „"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1ì‹œê°„ ì „"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%dì‹œê°„ ì „"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ì˜¤ëŠ˜"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ì–´ì œ"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%dì¼ ì „"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "ì§€ë‚œ ë‹¬"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%dê°œì›” ì „"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "ë…„ ì „"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index b0f5886d1420ab49b734b5b56927bd9584ce676c..72c04c28e109c9070f261258202f0403e4bcd65e 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr "ì˜¬ë°”ë¥¸ ì•”í˜¸ë¥¼ ìž…ë ¥í•´ì•¼ í•¨"
 msgid "__language_name__"
 msgstr "í•œêµì–´"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "ë³´ì•ˆ ê²½ê³ "
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ íŒŒì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í•  ìˆ˜ ìžˆëŠ” ê²ƒ ê°™ìŠµë‹ˆë‹¤. ownCloudì—ì„œ ì œê³µí•œ .htaccess íŒŒì¼ì´ ìž‘ë™í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì›¹ ì„œë²„ë¥¼ ë‹¤ì‹œ ì„¤ì •í•˜ì—¬ ë°ì´í„° ë””ë ‰í„°ë¦¬ì— ì ‘ê·¼í•  ìˆ˜ ì—†ë„ë¡ í•˜ê±°ë‚˜ ë¬¸ì„œ ë£¨íŠ¸ ë°”ê¹¥ìª½ìœ¼ë¡œ ì˜®ê¸°ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "ì„¤ì • ê²½ê³ "
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAV ì¸í„°íŽ˜ì´ìŠ¤ê°€ ì œëŒ€ë¡œ ìž‘ë™í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì›¹ ì„œë²„ì—ì„œ íŒŒì¼ ë™ê¸°í™”ë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆë„ë¡ ì„¤ì •ì´ ì œëŒ€ë¡œ ë˜ì§€ ì•Šì€ ê²ƒ ê°™ìŠµë‹ˆë‹¤."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "<a href='%s'>ì„¤ì¹˜ ê°€ì´ë“œ</a>ë¥¼ ë‹¤ì‹œ í•œ ë²ˆ í™•ì¸í•˜ì‹ì‹œì˜¤."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "ëª¨ë“ˆ 'fileinfo'ê°€ ì—†ìŒ"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP ëª¨ë“ˆ 'fileinfo'ê°€ ì¡´ìž¬í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. MIME í˜•ì‹ ê°ì§€ ê²°ê³¼ë¥¼ í–¥ìƒì‹œí‚¤ê¸° ìœ„í•˜ì—¬ ì´ ëª¨ë“ˆì„ í™œì„±í™”í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "ë¡œìº˜ì´ ìž‘ë™í•˜ì§€ ì•ŠìŒ"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "ownCloud ì„œë²„ì˜ ì‹œìŠ¤í…œ ë¡œìº˜ì„ %s(ìœ¼)ë¡œ ì„¤ì •í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. íŒŒì¼ ì´ë¦„ì— íŠ¹ì •í•œ ê¸€ìžê°€ ë“¤ì–´ê°€ ìžˆëŠ” ê²½ìš° ë¬¸ì œê°€ ë°œìƒí•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. %sì„(ë¥¼) ì§€ì›í•˜ê¸° ìœ„í•´ì„œ ì‹œìŠ¤í…œì— í•„ìš”í•œ íŒ¨í‚¤ì§€ë¥¼ ì„¤ì¹˜í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "ì¸í„°ë„·ì— ì—°ê²°í•  ìˆ˜ ì—†ìŒ"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "ownCloud ì„œë²„ì—ì„œ ì¸í„°ë„·ì— ì—°ê²°í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì™¸ë¶€ ì €ìž¥ì†Œ ë§ˆìš´íŠ¸, ì—…ë°ì´íŠ¸ ì•Œë¦¼, ì™¸ë¶€ ì•± ì„¤ì¹˜ ë“±ì´ ìž‘ë™í•˜ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤. ì™¸ë¶€ì—ì„œ íŒŒì¼ì— ì ‘ê·¼í•˜ê±°ë‚˜, ì•Œë¦¼ ì´ë©”ì¼ì„ ë³´ë‚´ì§€ ëª»í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. ownCloudì˜ ëª¨ë“  ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ ì„œë²„ë¥¼ ì¸í„°ë„·ì— ì—°ê²°í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "í¬ë¡ "
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "ê°œë³„ íŽ˜ì´ì§€ë¥¼ ë¶ˆëŸ¬ì˜¬ ë•Œë§ˆë‹¤ ì‹¤í–‰"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.phpê°€ webcron ì„œë¹„ìŠ¤ì— ë“±ë¡ë˜ì–´ ìžˆìŠµë‹ˆë‹¤. HTTPë¥¼ í†µí•˜ì—¬ 1ë¶„ë§ˆë‹¤ ownCloud ë£¨íŠ¸ì—ì„œ cron.php íŽ˜ì´ì§€ë¥¼ ë¶ˆëŸ¬ì˜µë‹ˆë‹¤."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "ì‹œìŠ¤í…œ cron ì„œë¹„ìŠ¤ë¥¼ ì‚¬ìš©í•©ë‹ˆë‹¤. ì‹œìŠ¤í…œ cronjobì„ ì‚¬ìš©í•˜ì—¬ ownCloud í´ë”ì˜ cron.php íŒŒì¼ì„ 1ë¶„ë§ˆë‹¤ ë¶ˆëŸ¬ì˜µë‹ˆë‹¤."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "ê³µìœ "
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "ê³µìœ  API ì‚¬ìš©í•˜ê¸°"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "ì•±ì—ì„œ ê³µìœ  APIë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆë„ë¡ í—ˆìš©"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "ë§í¬ í—ˆìš©"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "ì‚¬ìš©ìžê°€ ê°œë³„ í•ëª©ì˜ ë§í¬ë¥¼ ê³µìœ í•  ìˆ˜ ìžˆë„ë¡ í—ˆìš©"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "ìž¬ê³µìœ  í—ˆìš©"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "ì‚¬ìš©ìžì—ê²Œ ê³µìœ ëœ í•ëª©ì„ ë‹¤ì‹œ ê³µìœ í•  ìˆ˜ ìžˆë„ë¡ í—ˆìš©"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "ëˆ„êµ¬ë‚˜ì™€ ê³µìœ í•  ìˆ˜ ìžˆë„ë¡ í—ˆìš©"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "ì‚¬ìš©ìžê°€ ì†í•´ ìžˆëŠ” ê·¸ë£¹ì˜ ì‚¬ìš©ìžì™€ë§Œ ê³µìœ í•  ìˆ˜ ìžˆë„ë¡ í—ˆìš©"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "ë³´ì•ˆ"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "HTTPS ê°•ì œ ì‚¬ìš©"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "í´ë¼ì´ì–¸íŠ¸ê°€ ownCloudì— í•ìƒ ì•”í˜¸í™”ëœ ì—°ê²°ë¡œ ì—°ê²°í•˜ë„ë¡ ê°•ì œí•©ë‹ˆë‹¤."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "SSL ê°•ì œ ì‚¬ìš© ì„¤ì •ì„ ë³€ê²½í•˜ë ¤ë©´ ownCloud ì¸ìŠ¤í„´ìŠ¤ì— HTTPSë¡œ ì—°ê²°í•˜ì‹ì‹œì˜¤."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "ë¡œê·¸"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "ë¡œê·¸ ë‹¨ê³„"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "ë” ì¤‘ìš”í•¨"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "ëœ ì¤‘ìš”í•¨"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "ë²„ì „"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,72 +394,72 @@ msgstr "ë²„ê·¸ íŠ¸ëž˜ì»¤"
 msgid "Commercial Support"
 msgstr "ìƒì—…ìš© ì§€ì›"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "íŒŒì¼ ë™ê¸°í™” ì•± ê°€ì ¸ì˜¤ê¸°"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "ì²« ì‹¤í–‰ ë§ˆë²•ì‚¬ ë‹¤ì‹œ ë³´ì´ê¸°"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "í˜„ìž¬ ê³µê°„ ì¤‘ <strong>%s</strong>/<strong>%s</strong>ì„(ë¥¼) ì‚¬ìš© ì¤‘ìž…ë‹ˆë‹¤"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ì•”í˜¸"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "ì•”í˜¸ê°€ ë³€ê²½ë˜ì—ˆìŠµë‹ˆë‹¤"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ì•”í˜¸ë¥¼ ë³€ê²½í•  ìˆ˜ ì—†ìŒ"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "í˜„ìž¬ ì•”í˜¸"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ìƒˆ ì•”í˜¸"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ì•”í˜¸ ë³€ê²½"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "í‘œì‹œ ì´ë¦„"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "ì´ë©”ì¼"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "ì´ë©”ì¼ ì£¼ì†Œ"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "ì•”í˜¸ ì°¾ê¸° ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "ì–¸ì–´"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "ë²ˆì— ë•ê¸°"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 656f21ec51b357f7b9c5ae34d515ec25e25b225e..f583c109bdf328510e54052a91cbdfbb1adc70e1 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>ê²½ê³ :</b> user_ldap ì•±ê³¼ user_webdavauth ì•±ì€ í˜¸í™˜ë˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì˜¤ë™ìž‘ì„ ì¼ìœ¼í‚¬ ìˆ˜ ìžˆìœ¼ë¯€ë¡œ, ì‹œìŠ¤í…œ ê´€ë¦¬ìžì—ê²Œ ìš”ì²í•˜ì—¬ ë‘˜ ì¤‘ í•˜ë‚˜ë§Œ ì‚¬ìš©í•˜ë„ë¡ í•˜ì‹ì‹œì˜¤."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr "ì£¼ ì„œë²„ ë¹„í™œì„±í™”"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "SSL ì¸ì¦ì„œ ìœ íš¨ì„± ê²€ì‚¬ë¥¼ í•´ì œí•©ë‹ˆë‹¤."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "ì´ ì˜µì…˜ì„ ì‚¬ìš©í•´ì•¼ ì—°ê²°í•  ìˆ˜ ìžˆëŠ” ê²½ìš°ì—ëŠ” LDAP ì„œë²„ì˜ SSL ì¸ì¦ì„œë¥¼ ownCloudë¡œ ê°€ì ¸ì˜¬ ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "ì‚¬ìš©ìžì˜ í‘œì‹œ ì´ë¦„ í•„ë“œ"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP ì†ì„±ì€ ì‚¬ìš©ìžì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° ìœ„í•´ ì‚¬ìš©í•©ë‹ˆë‹¤."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "ê·¸ë£¹ì˜ í‘œì‹œ ì´ë¦„ í•„ë“œ"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP ì†ì„±ì€ ê·¸ë£¹ì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° ìœ„í•´ ì‚¬ìš©í•©ë‹ˆë‹¤."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 73deb90e44b9249c5c9a44ee759942845c0bec5f..fbf66dad31d079094ec96d2920ccd2fe071fcaab 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -28,12 +28,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV ì¸ì¦"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloudì—ì„œ ì´ URLë¡œ ì‚¬ìš©ìž ì¸ì¦ ì •ë³´ë¥¼ ë³´ëƒ…ë‹ˆë‹¤. ì´ í”ŒëŸ¬ê·¸ì¸ì€ ì‘ë‹µì„ í™•ì¸í•˜ì—¬ HTTP ìƒíƒœ ì½”ë“œ 401ì´ë‚˜ 403ì´ ëŒì•„ì˜¨ ê²½ìš°ì— ìž˜ëª»ëœ ì¸ì¦ ì •ë³´ë¡œ ê°„ì£¼í•©ë‹ˆë‹¤. ë‹¤ë¥¸ ëª¨ë“  ìƒíƒœ ì½”ë“œëŠ” ì˜¬ë°”ë¥¸ ì¸ì¦ ì •ë³´ë¡œ ê°„ì£¼í•©ë‹ˆë‹¤."
+msgstr ""
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 65694d78e9044481b83e74bf3a484eb243483e1f..bb8c2a9f7100c8c3f8d24fedcf7432154a1b21e7 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒ"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ù‡Ù‡â€ŒÚµÙ‡"
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Ù†Ø§ÙˆÛŒ Ø¨Ù‡â€ŒÚ©Ø§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±"
@@ -461,11 +462,11 @@ msgstr "ÛŒØ§Ø±Ù…Û•ØªÛŒ"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Ù‡ÛŒÚ† Ù†Ù‡â€ŒØ¯Û†Ø²Ø±Ø§ÛŒÙ‡â€ŒÙˆÙ‡â€Œ"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ù‡Ù‡â€ŒÚµØ¨Ú˜Ø§Ø±Ø¯Ù†ÛŒ Ù¾ÛŒØ´ÙƒÙ‡â€ŒÙˆØªÙˆÙˆ"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Ø²Ø§Ù†ÛŒØ§Ø±ÛŒ ÙÛ†ÚµØ¯Ù‡â€ŒØ±"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±ÛŒ Ø¯Ø§ØªØ§Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ÙˆØ´Ù‡â€ŒÛŒ Ù†Ù‡ÛŽÙ†ÛŒ Ø¯Ø§ØªØ§ Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ù†Ø§ÙˆÛŒ Ø¯Ø§ØªØ§Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ù‡Û†Ø³ØªÛŒ Ø¯Ø§ØªØ§Ø¨Ù‡â€ŒÛŒØ³"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ÙƒÛ†ØªØ§ÛŒÛŒ Ù‡Ø§Øª Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒÙ‡â€ŒÙƒØ§Ù†"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ú†ÙˆÙˆÙ†Û•Ø¯Û•Ø±Û•ÙˆÛ•"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 6b642d4f80ce34fa952369cc35fc30b8cb5123dc..fe37c0ff65f2ac917f2d2071eedcecc486978780 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ù†Ø§Ùˆ"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "Ø¨ÙˆØ®Ú†Ù‡"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ø¯Ø§Ú¯Ø±ØªÙ†"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index 0adc093d2f9911e7889547fd1116f188bbc70eee..1aeb3d52b0a7963ebb2839526feb1a096a9f6075 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 37e7d138405fd55221735684f6dd915bc3161769..764a162a1416d86ef9db1bcaa805ea7b06c15d09 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ"
 msgid "Submit"
 msgstr "Ù†Ø§Ø±Ø¯Ù†"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s Ø¯Ø§Ø¨Ù‡â€ŒØ´ÛŒ Ú©Ø±Ø¯ÙˆÙˆÙ‡â€Œ Ø¨ÙˆØ®Ú†Ù‡â€ŒÛŒ %s Ù„Ù‡â€ŒÚ¯Ù‡â€ŒÚµ ØªÛ†"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s Ø¯Ø§Ø¨Ù‡â€ŒØ´ÛŒ Ú©Ø±Ø¯ÙˆÙˆÙ‡â€Œ Ù¾Ù‡â€ŒÚ•Ú¯Ù‡â€ŒÛŒÛŒ %s Ù„Ù‡â€ŒÚ¯Ù‡â€ŒÚµ ØªÛ†"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ø¯Ø§Ú¯Ø±ØªÙ†"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Ù‡ÛŒÚ† Ù¾ÛŽØ´Ø¨ÛŒÙ†ÛŒÙ‡â€ŒÙƒ Ø¦Ø§Ù…Ø§Ø¯Ù‡â€Œ Ù†ÛŒÙ‡ Ø¨Û†"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index a40d974e1a6dfdfb9b6a1f1f1813bb516cfa2862..1addb81ba48201655f96d36e0e3f9c62fedfe70f 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ù‡Ù‡â€ŒÚµÙ‡"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ù†Ø§Ùˆ"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index 65c39e334385b96025e893d3f7d5c5478a6f8ef7..d43375f5e909d37cb64d32fa3bd630bdb9b8d06c 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ÙˆÙ‡â€ŒØ´Ø§Ù†"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ÙˆÙ‡â€ŒØ´Ø§Ù†"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 403ef01cdf1e911678a68ea5161ca59740f8852c..4ae5859b98a0e2785ca0e6650d087079f34135ba 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Ø¨Ù‡â€ŒØ±Ù†Ø§Ù…Ù‡â€ŒÙƒØ§Ù†"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Ø¨Ù‡â€ŒÚ•ÛŽÙˆÙ‡â€ŒØ¨Ù‡â€ŒØ±ÛŒ Ø³Ù‡â€ŒØ±Ù‡â€ŒÙƒÛŒ"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ú•Ø§Ú˜Ù‡â€ŒÛŒ ÙˆÛŽØ¨ Ù„Ù‡â€ŒÚ˜ÛŽØ± Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒØª Ø¯Ø§ÛŒÙ‡"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index a3bf119c85509608eef2a32dfcc4b072df28d400..86c93e12fab37acd88504dd161d6a9c3ee650e2d 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÙˆØ´Û•ÛŒ Ù†Ù‡ÛŽÙ†ÛŒ Ù†ÙˆÛŽ"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Ø¦ÛŒÙ…Ù‡â€ŒÛŒÙ„"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index e7af1cb599be0577f82acd717b82b617e85c69d1..2e3b32f82f7d82bbd2e9516286dd827713b8cc7d 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index 14906a0a573077fd1c8da1c6b10411d5dfb74c37..3bedad7d12ee198c5951c175fd77b91e3f8ab804 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index b07d6d686bc4a9fb77d7187f59ee10156816e07a..851be8f7ccf1fcddcc8c46602135c833294afa4d 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -39,7 +39,7 @@ sub crawlFiles{
 	foreach my $i ( @files ){
 		next if substr( $i, 0, 1 ) eq '.';
 		next if $i eq 'l10n';
-		
+
 		if( -d $dir.'/'.$i ){
 			push( @found, crawlFiles( $dir.'/'.$i ));
 		}
@@ -64,6 +64,16 @@ sub readIgnorelist{
 	return %ignore;
 }
 
+sub getPluralInfo {
+	my( $info ) = @_;
+
+	# get string
+	$info =~ s/.*Plural-Forms: (.+)\\n.*/$1/;
+	$info =~ s/^(.*)\\n.*/$1/g;
+
+	return $info;
+}
+
 my $task = shift( @ARGV );
 my $place = '..';
 
@@ -100,11 +110,17 @@ if( $task eq 'read' ){
 
 		foreach my $file ( @totranslate ){
 			next if $ignore{$file};
-			my $keyword = ( $file =~ /\.js$/ ? 't:2' : 't');
+			my $keywords = '';
+			if( $file =~ /\.js$/ ){
+				$keywords = '--keyword=t:2 --keyword=n:2,3';
+			}
+			else{
+				$keywords = '--keyword=t --keyword=n:1,2';
+			}
 			my $language = ( $file =~ /\.js$/ ? 'Python' : 'PHP');
 			my $joinexisting = ( -e $output ? '--join-existing' : '');
 			print "    Reading $file\n";
-			`xgettext --output="$output" $joinexisting --keyword=$keyword --language=$language "$file" --from-code=UTF-8 --package-version="5.0.0" --package-name="ownCloud Core" --msgid-bugs-address="translations\@owncloud.org"`;
+			`xgettext --output="$output" $joinexisting $keywords --language=$language "$file" --from-code=UTF-8 --package-version="5.0.0" --package-name="ownCloud Core" --msgid-bugs-address="translations\@owncloud.org"`;
 		}
 		chdir( $whereami );
 	}
@@ -118,7 +134,7 @@ elsif( $task eq 'write' ){
 		print "  Processing $app\n";
 		foreach my $language ( @languages ){
 			next if $language eq 'templates';
-			
+
 			my $input = "${whereami}/$language/$app.po";
 			next unless -e $input;
 
@@ -126,18 +142,38 @@ elsif( $task eq 'write' ){
 			my $array = Locale::PO->load_file_asarray( $input );
 			# Create array
 			my @strings = ();
+			my $plurals;
+
 			foreach my $string ( @{$array} ){
-				next if $string->msgid() eq '""';
-				next if $string->msgstr() eq '""';
-				push( @strings, $string->msgid()." => ".$string->msgstr());
+				if( $string->msgid() eq '""' ){
+					# Translator information
+					$plurals = getPluralInfo( $string->msgstr());
+				}
+				elsif( defined( $string->msgstr_n() )){
+					# plural translations
+					my @variants = ();
+					my $identifier = $string->msgid()."::".$string->msgid_plural();
+					$identifier =~ s/"/_/g;
+
+					foreach my $variant ( sort { $a <=> $b} keys( %{$string->msgstr_n()} )){
+						push( @variants, $string->msgstr_n()->{$variant} );
+					}
+
+					push( @strings, "\"$identifier\" => array(".join(",", @variants).")");
+				}
+				else{
+					# singular translations
+					next if $string->msgstr() eq '""';
+					push( @strings, $string->msgid()." => ".$string->msgstr());
+				}
 			}
 			next if $#strings == -1; # Skip empty files
 
 			# Write PHP file
 			open( OUT, ">$language.php" );
-			print OUT "<?php \$TRANSLATIONS = array(\n";
+			print OUT "<?php\n\$TRANSLATIONS = array(\n";
 			print OUT join( ",\n", @strings );
-			print OUT "\n);\n";
+			print OUT "\n);\n\$PLURAL_FORMS = \"$plurals\";\n";
 			close( OUT );
 		}
 		chdir( $whereami );
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index f738fb548b858d128d7399514f154bc2ca4ea5d1..8af84cd24e0ecad144da60679030bdfe0135ae35 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 Minutt hir"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "virun {minutes} Minutten"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "virun 1 Stonn"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "virun {hours} Stonnen"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "haut"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "gÃ«schter"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "virun {days} Deeg"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "leschte Mount"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "virun {months} MÃ©int"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "MÃ©int hir"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Lescht Joer"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Joren hir"
 
@@ -226,8 +226,8 @@ msgstr "Den Typ vum Object ass net uginn."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Feeler"
 
@@ -247,140 +247,141 @@ msgstr "Gedeelt"
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Feeler beim Deelen"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Feeler beim AnnulÃ©iere vum Deelen"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Feeler beim Ã„nnere vun de Rechter"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeelt mat dir an der Grupp {group} vum {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Gedeelt mat dir vum {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Deele mat"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Mat Link deelen"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "PasswuertgeschÃ¼tzt"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Passwuert"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Ã‹ffentlechen Upload erlaaben"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Link enger Persoun mailen"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "SchÃ©cken"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Verfallsdatum setzen"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Verfallsdatum"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Via E-Mail deelen:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Keng Persoune fonnt"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Weiderdeelen ass net erlaabt"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Gedeelt an {item} mat {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Net mÃ©i deelen"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kann Ã¤nneren"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ZougrÃ«ffskontroll"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "aktualisÃ©ieren"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "lÃ¤schen"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "deelen"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "PasswuertgeschÃ¼tzt"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Feeler beim LÃ¤sche vum Verfallsdatum"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "GÃ«tt geschÃ©ckt..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email geschÃ©ckt"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Den Update war net erfollegrÃ¤ich. Mell dÃ«se Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Den Update war erfollegrÃ¤ich.  Du gÃ«ss elo bei d'ownCloud Ã«mgeleet."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Passwuert-ZrÃ©cksetzung vun der ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +402,7 @@ msgstr "Ufro feelfeschloen!<br>Hues du sÃ©chergestallt dass deng Email respektiv
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du kriss e Link fir dÃ¤i Passwuert zrÃ©ckzesetze via Email geschÃ©ckt."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Benotzernumm"
@@ -462,11 +463,11 @@ msgstr "HÃ«llef"
 msgid "Access forbidden"
 msgstr "ZougrÃ«ff net erlaabt"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud net fonnt"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "AktualisÃ©ier w.e.gl deng PHP-Installatioun fir ownCloud sÃ©cher benotzen ze kÃ«nnen."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "DÃ¤in Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnÃ©iert."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Kuck w.e.gl. an der <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentatioun</a> fir Informatiounen iwwert eng uerdentlech Konfiguratioun vum Server."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin-Account</strong> uleeÃ«n"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "AvancÃ©iert"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Daten-Dossier"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "D'Datebank konfigurÃ©ieren"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "wÃ¤rt benotzt ginn"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Datebank-Benotzer"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Datebank-Passwuert"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tabelle-Plaz vun der Datebank"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Datebank-Server"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Installatioun ofschlÃ©issen"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ass verfÃ¼gbar. KrÃ©i mÃ©i Informatiounen doriwwer wÃ©i d'AktualisÃ©ierung ofleeft."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ofmellen"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatesch Umeldung ofgeleent!"
@@ -608,7 +614,7 @@ msgstr "Umellen"
 msgid "Alternative Logins"
 msgstr "Alternativ Umeldungen"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 62ce2eeaa5f76f31179776dd69c875a69a7d00fb..9797f147e497e8da5cc445c5b146d4f1d62c8cf7 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Deelen"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "LÃ¤schen"
 
@@ -128,43 +128,45 @@ msgstr "LÃ¤schen"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "rÃ©ckgÃ¤ngeg man"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "GrÃ©isst"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "GeÃ¤nnert"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "Dossier"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass nÃ¤ischt. Lued eppes rop!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Net mÃ©i deelen"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "DÃ©i Dateien dÃ©i Dir probÃ©iert erop ze lueden sinn mÃ©i grouss wei dÃ©i Maximal GrÃ©isst dÃ©i op dÃ«sem Server erlaabt ass."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Datei"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Dateien"
 
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index cecd9c334341e2e25a4e3583a980ab309016bb05..15dacc9dc199ed9e350d03f763e86fed32301740 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 64092caf93e69f85d24e16b4c143c24eca933f52..faf8429b4ef007855a84e99c523d06179d5f04fe 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 7c0d9fa1175798bec1570e37991c0f75a265a63c..d221e3871f430c10e02ee994197bbad9c9813bb3 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: llaera <llaera@outlook.com>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +30,52 @@ msgstr "Passwuert"
 msgid "Submit"
 msgstr "FortschÃ©cken"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s huet den Dossier %s mad der gedeelt"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deelt den Fichier %s mad dir"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Eroplueden"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Keeng Preview do fir"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 4119d0df8217ac921e8eb975ba670798f604dff7..6e89845dc20912b6c68a794691faee837b143544 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Fehler"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Numm"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 8c2aad478e12eb1ee92d1d91f5d0990a68e6427f..4825c56c03b74f14b8b546eaebdb4de26bdaa057 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 2fa9d0d1caf9b97de0b20ff345bfbfe7717b6e8e..1e270aee7ae39793b51924ce9aaa318801ad06e8 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Benotzer"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Applikatiounen"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Web-Servicer Ã«nnert denger Kontroll"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -171,77 +183,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 Minutt hir"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "vrun 1 Stonn"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "haut"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "gÃ«schter"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "LÃ¤schte Mount"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "LÃ¤scht Joer"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Joren hier"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 38ec929bad12e8bcdc928f06a62bb6ece583cc82..5dc543150ee3a443dc74252da5e6026f05d966e5 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "SÃ©cherheets Warnung"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Share API aschalten"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Erlab Apps d'Share API ze benotzen"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Links erlaben"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Resharing erlaben"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Useren erlaben mat egal wiem ze sharen"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Useren nÃ«mmen erlaben mat Useren aus hirer Grupp ze sharen"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "MÃ©i"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Konnt dÃ¤in Passwuert net Ã¤nneren"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Momentan 't Passwuert"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Neit Passwuert"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Passwuert Ã¤nneren"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "GÃ«ff eng Email Adress an fir d'Passwuert recovery ze erlaben"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "HÃ«llef iwwersetzen"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 1fa9969fce00e75fb25fbc21ec0d2986e2187274..ef9cdec3bf8f8d589fcb06bc84725286616f0592 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 20d27db5b444be2aabb3c354e095e4e3e8abe2ed..60cd023d5cd6348469f81b30ec86cab2f5377acc 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index a4c17d666d392325625097723d57a7becdc00dab..40770b80fd5089e1bc585a6019c505c55398c2b2 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,63 @@ msgstr "Lapkritis"
 msgid "December"
 msgstr "Gruodis"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "prieÅ¡ sekundÄ™"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "PrieÅ¡ 1 minutÄ™"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "PrieÅ¡ {count} minutes"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "prieÅ¡ 1 valandÄ…"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "prieÅ¡ {hours} valandas"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "Å¡iandien"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "PrieÅ¡ {days}  dienas"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "praeitÄ… mÄ—nesÄ¯"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "prieÅ¡ {months} mÄ—nesiÅ³"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "prieÅ¡ mÄ—nesÄ¯"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "prieÅ¡ metus"
 
@@ -227,8 +231,8 @@ msgstr "Objekto tipas nenurodytas."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Klaida"
 
@@ -248,140 +252,141 @@ msgstr "Dalinamasi"
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Klaida, kai atÅ¡aukiamas dalijimasis"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Klaida, keiÄiant privilegijas"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Pasidalino su Jumis {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Dalintis su"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Dalintis nuoroda"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Apsaugotas slaptaÅ¾odÅ¾iu"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "SlaptaÅ¾odis"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "NusiÅ³sti nuorodÄ… paÅ¡tu"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "SiÅ³sti"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laikÄ…"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Dalintis per el. paÅ¡tÄ…:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Å½moniÅ³ nerasta"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis iÅ¡naujo negalimas"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "priÄ—jimo kontrolÄ—"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "iÅ¡trinti"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Apsaugota slaptaÅ¾odÅ¾iu"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laikÄ…"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laikÄ…"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "SiunÄiama..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "LaiÅ¡kas iÅ¡siÅ³stas"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Atnaujinimas buvo nesÄ—kmingas. PApie tai praÅ¡ome praneÅ¡ti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atnaujinimas buvo sÄ—kmingas. Nukreipiame Ä¯ jÅ«sÅ³ ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud slaptaÅ¾odÅ¾io atkÅ«rimas"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +407,7 @@ msgstr "Klaida!<br>Ar tikrai jÅ«sÅ³ el paÅ¡tas/vartotojo vardas buvo teisingi?"
 msgid "You will receive a link to reset your password via Email."
 msgstr "Elektroniniu paÅ¡tu gausite nuorodÄ…, su kuria galÄ—site iÅ¡ naujo nustatyti slaptaÅ¾odÄ¯."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Prisijungimo vardas"
@@ -463,11 +468,11 @@ msgstr "Pagalba"
 msgid "Access forbidden"
 msgstr "PriÄ—jimas draudÅ¾iamas"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Negalima rasti"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +501,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "JÅ«sÅ³ PHP versija yra paÅ¾eidÅ¾iama prieÅ¡ NULL Byte atakÄ… (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "PraÅ¡ome atnaujinti savo PHP norint naudotis savo ownCloud saugiai."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +523,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "JÅ«sÅ³ failai yra tikriausiai prieinami per internetÄ… nes .htaccess failas neveikia."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Norint gauti daugiau informacijos apie tai kaip tinkamai nustatyit savo serverÄ¯, praÅ¡ome perskaityti <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacijÄ…</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrÄ…</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "IÅ¡plÄ—stiniai"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "DuomenÅ³ katalogas"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Nustatyti duomenÅ³ bazÄ™"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "bus naudojama"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "DuomenÅ³ bazÄ—s vartotojas"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "DuomenÅ³ bazÄ—s slaptaÅ¾odis"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "DuomenÅ³ bazÄ—s pavadinimas"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "DuomenÅ³ bazÄ—s loginis saugojimas"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "DuomenÅ³ bazÄ—s serveris"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Baigti diegimÄ…"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimÄ…."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Atsijungti"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatinis prisijungimas atmestas!"
@@ -609,7 +619,7 @@ msgstr "Prisijungti"
 msgid "Alternative Logins"
 msgstr "AlternatyvÅ«s prisijungimai"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index bd8e7d57b889013910355dca5bd06dbb40078bdb..bda949f1ad989660053387e1a354ba0820a2b0a0 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgstr "Dalintis"
 msgid "Delete permanently"
 msgstr "IÅ¡trinti negrÄ¯Å¾tamai"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
@@ -129,43 +129,46 @@ msgstr "IÅ¡trinti"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "pasiÅ«lyti pavadinimÄ…"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "atÅ¡aukti"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} Ä¯ {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "iÅ¡trinti"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "Ä¯keliamas 1 failas"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Ä¯keliami failai"
 
@@ -201,33 +204,31 @@ msgstr "JÅ«sÅ³ atsisiuntimas yra paruoÅ¡iamas. tai gali uÅ¾trukti jei atsisiunÄ
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 aplankalas"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} aplankalai"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 failas"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} failai"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +287,61 @@ msgstr "Katalogas"
 msgid "From link"
 msgstr "IÅ¡ nuorodos"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "IÅ¡trinti failai"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "AtÅ¡aukti siuntimÄ…"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "JÅ«s neturite raÅ¡ymo leidimo."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "AtsisiÅ³sti"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ä®kÄ—limui failas per didelis"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "BandomÅ³ Ä¯kelti failÅ³ dydis virÅ¡ija maksimalÅ³, kuris leidÅ¾iamas Å¡iame serveryje"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, praÅ¡ome palaukti."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Å iuo metu skenuojama"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "failas"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "failai"
 
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index a17364ca8ecb81a0c52cebebd5d65a187518a2ce..de2cfd35f39670f7b02d2dd436996168dab6d558 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index ced401c0e4c6b84413445c7b3f817b01384c5aa3..4347ca073df67332121eb3a3548b374b3bf1d9f4 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Min2liz <min2lizz@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "PraÅ¡ome Ä¯vesti teisingus Dropbox \"app key\" ir \"secret\"."
 msgid "Error configuring Google Drive storage"
 msgstr "Klaida nustatinÄ—jant Google Drive talpyklÄ…"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Ä®spÄ—jimas:</b> \"smbclient\" nÄ—ra Ä¯diegtas. CIFS/SMB dalinimasis nÄ—ra galimas. PraÅ¡ome susisiekti su sistemos administratoriumi kad bÅ«tÅ³ Ä¯diegtas \"smbclient\""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Ä®spÄ—jimas:</b> FTP palaikymas PHP sistemoje nÄ—ra Ä¯jungtas arba nÄ—ra Ä¯diegtas.  FTP dalinimosi Ä¯jungimas nÄ—ra galimas. PraÅ¡ome susisiekti su sistemos administratoriumi kad bÅ«tÅ³ Ä¯diegtas FTP palaikymas. "
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 4a5ccadc38b49b87ccbf9071c7ff412ec1968a6a..54d647f95f33371f2f0a8ef79290ef779c9c8ae1 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "SlaptaÅ¾odis"
 msgid "Submit"
 msgstr "IÅ¡saugoti"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s pasidalino su jumis %s aplanku"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s pasidalino su jumis %s failu"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "AtsisiÅ³sti"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ä®kelti"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "AtÅ¡aukti siuntimÄ…"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "PerÅ¾iÅ«ra nÄ—ra galima"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index aa030174da81bd84eabf9e73a96f038462f38167..febfc2f1b015d78dc37da7715d22a538fc576160 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +28,47 @@ msgstr "Nepavyko negrÄ¯Å¾tamai iÅ¡trinti %s"
 msgid "Couldn't restore %s"
 msgstr "Nepavyko atkurti %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "atkurti"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Klaida"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "failÄ… iÅ¡trinti negrÄ¯Å¾tamai"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "IÅ¡trinti negrÄ¯Å¾tamai"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "IÅ¡trinti"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 aplankalas"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} aplankalai"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 failas"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} failai"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 393a714fb588b06acbfab9f11d531d8556234b6d..d3d119b1c3fd3f7eb575b3660bc9ed79f2a1e367 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Nepavyko atstatyti: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "pavyko"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Dokumentas %s buvo atstatytas Ä¯ versijÄ… %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "klaida"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Dokumento %s nepavyko atstatyti Ä¯ versijÄ… %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versijos"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "NÄ—ra senÅ³ versijÅ³"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nenurodytas kelias"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versijos"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Atstatykite dokumentÄ… Ä¯ prieÅ¡ tai buvusiÄ… versijÄ… spausdami ant jo atstatymo mygtuko"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Atstatyti"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 1b5b7fbdad9a2b99be923b1bf55dfa473771b482..14bb5eb63439877c2a4c5094b3f9ff96b9280e29 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Vartotojai"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Programos"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administravimas"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "jÅ«sÅ³ valdomos web paslaugos"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybÄ— yra iÅ¡jungta."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi bÅ«ti parsiunÄiami vienas po kito."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Atgal Ä¯ Failus"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui Ä¯ ZIP."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -171,77 +183,81 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "prieÅ¡ sekundÄ™"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "PrieÅ¡ 1 minutÄ™"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "prieÅ¡ %d minuÄiÅ³"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "prieÅ¡ 1 valandÄ…"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "prieÅ¡ %d valandÅ³"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "Å¡iandien"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "vakar"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "prieÅ¡ %d dienÅ³"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "praeitÄ… mÄ—nesÄ¯"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "prieÅ¡ %d mÄ—nesiÅ³"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "praeitais metais"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "prieÅ¡ metus"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index a07d77918a4f78bae109de50c460f4c93dcda52f..5dd33ac34191228b87602a1c250f35ffeff26493 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -36,11 +37,11 @@ msgstr ""
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "GrupÄ— jau egzistuoja"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "Nepavyko pridÄ—ti grupÄ—s"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
@@ -56,11 +57,11 @@ msgstr "Netinkamas el. paÅ¡tas"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Nepavyko iÅ¡trinti grupÄ—s"
 
 #: ajax/removeuser.php:25
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Nepavyko iÅ¡trinti vartotojo"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -77,20 +78,20 @@ msgstr ""
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Nepavyko pridÄ—ti vartotojo prie grupÄ—s %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Nepavyko iÅ¡trinti vartotojo iÅ¡ grupÄ—s %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Nepavyko atnaujinti programos."
 
 #: js/apps.js:35
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Atnaujinti iki {appversion}"
 
 #: js/apps.js:41 js/apps.js:81
 msgid "Disable"
@@ -102,7 +103,7 @@ msgstr "Ä®jungti"
 
 #: js/apps.js:60
 msgid "Please wait...."
-msgstr ""
+msgstr "PraÅ¡ome palaukti..."
 
 #: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
 msgid "Error"
@@ -110,15 +111,15 @@ msgstr "Klaida"
 
 #: js/apps.js:95
 msgid "Updating...."
-msgstr ""
+msgstr "Atnaujinama..."
 
 #: js/apps.js:98
 msgid "Error while updating app"
-msgstr ""
+msgstr "Ä®vyko klaida atnaujinant programÄ…"
 
 #: js/apps.js:101
 msgid "Updated"
-msgstr ""
+msgstr "Atnaujinta"
 
 #: js/personal.js:118
 msgid "Saving..."
@@ -126,7 +127,7 @@ msgstr "Saugoma..."
 
 #: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "iÅ¡trinta"
 
 #: js/users.js:47
 msgid "undo"
@@ -134,7 +135,7 @@ msgstr "anuliuoti"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Nepavyko iÅ¡trinti vartotojo"
 
 #: js/users.js:92 templates/users.php:26 templates/users.php:87
 #: templates/users.php:112
@@ -151,184 +152,191 @@ msgstr "IÅ¡trinti"
 
 #: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "pridÄ—ti grupÄ™"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Vartotojo vardas turi bÅ«ti tinkamas"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "Klaida kuriant vartotojÄ…"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "SlaptaÅ¾odis turi bÅ«ti tinkamas"
 
 #: personal.php:37 personal.php:38
 msgid "__language_name__"
 msgstr "Kalba"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Saugumo praneÅ¡imas"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "JÅ«sÅ³ duomenÅ³ aplankalas ir JÅ«sÅ³ failai turbÅ«t yra pasiekiami per internetÄ…. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebÅ«tÅ³ pasiekiami per internetÄ…, arba persikelti juos kitur."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "TrÅ«ksta 'fileinfo' modulio"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Dalijimasis"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Lesti nuorodas"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
-msgid "Allow resharing"
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:160
+msgid "Allow resharing"
+msgstr "Leisti dalintis"
+
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
-msgstr ""
+msgstr "Saugumas"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Å½urnalas"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Å½urnalo iÅ¡samumas"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "MaÅ¾iau"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
-msgstr ""
+msgstr "Versija"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -376,82 +384,82 @@ msgstr ""
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "Forumas"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "KlaidÅ³ sekimas"
 
 #: templates/help.php:17
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "AtsisiÅ³skite programÄ—liÅ³, kad sinchronizuotumÄ—te savo failus"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "SlaptaÅ¾odis"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "JÅ«sÅ³ slaptaÅ¾odis buvo pakeistas"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "NeÄ¯manoma pakeisti slaptaÅ¾odÅ¾io"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Dabartinis slaptaÅ¾odis"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Naujas slaptaÅ¾odis"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Pakeisti slaptaÅ¾odÄ¯"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "El. PaÅ¡tas"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "JÅ«sÅ³ el. paÅ¡to adresas"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "PamirÅ¡to slaptaÅ¾odÅ¾io atkÅ«rimui Ä¯veskite savo el. paÅ¡to adresÄ…"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "PadÄ—kite iÅ¡versti"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
@@ -460,7 +468,7 @@ msgstr ""
 
 #: templates/users.php:21
 msgid "Login Name"
-msgstr ""
+msgstr "Vartotojo vardas"
 
 #: templates/users.php:30
 msgid "Create"
@@ -482,7 +490,7 @@ msgstr ""
 
 #: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "Neribota"
 
 #: templates/users.php:66 templates/users.php:157
 msgid "Other"
@@ -502,8 +510,8 @@ msgstr ""
 
 #: templates/users.php:106
 msgid "set new password"
-msgstr ""
+msgstr "nustatyti naujÄ… slaptaÅ¾odÄ¯"
 
 #: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "Numatytasis"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 51f236b4271eab6896c5931b2af5b7e2c41ec192..c432e2956b7a60a7cd92885c9f91cf33c824d950 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr "IÅ¡jungti SSL sertifikato tikrinimÄ…."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 401e8edc0f3fabb90514d7a4339ff586d133265a..72eda2b521ba3bfa6b9007b232c7778522e49aef 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV autorizavimas"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud iÅ¡siÅ³s naudotojo duomenis Ä¯ Å¡Ä¯ WWW adresÄ…. Å is Ä¯skiepis patikrins gautÄ… atsakymÄ… ir interpretuos HTTP bÅ«senos kodÄ… 401 ir 403 kaip negaliojanÄius duomenis, ir visus kitus gautus atsakymus kaip galiojanÄius duomenis. "
+msgstr ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index df679b316f85e057234ca4b2c210939b5873cb51..c4920a2fa3afc18bc43a039bb9eb31d39fb117c8 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr "Novembris"
 msgid "December"
 msgstr "Decembris"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "IestatÄ«jumi"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekundes atpakaÄ¼"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "pirms 1 minÅ«tes"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "pirms {minutes} minÅ«tÄ“m"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "pirms 1 stundas"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "pirms {hours} stundÄm"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "Å¡odien"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "pirms {days} dienÄm"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "pagÄjuÅ¡ajÄ mÄ“nesÄ«"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "pirms {months} mÄ“neÅ¡iem"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mÄ“neÅ¡us atpakaÄ¼"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "gÄjuÅ¡ajÄ gadÄ"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "gadus atpakaÄ¼"
 
@@ -225,8 +229,8 @@ msgstr "Nav norÄdÄ«ts objekta tips."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
@@ -246,140 +250,141 @@ msgstr "KopÄ«gs"
 msgid "Share"
 msgstr "DalÄ«ties"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "KÄ¼Å«da, daloties"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "KÄ¼Å«da, beidzot dalÄ«ties"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "KÄ¼Å«da, mainot atÄ¼aujas"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} dalÄ«jÄs ar jums un grupu {group}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} dalÄ«jÄs ar jums"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "DalÄ«ties ar"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "DalÄ«ties ar saiti"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "AizsargÄt ar paroli"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Parole"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "SÅ«tÄ«t saiti personai pa e-pastu"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "SÅ«tÄ«t"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Iestaties termiÅ†a datumu"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "TermiÅ†a datums"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "DalÄ«ties, izmantojot e-pastu:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Nav atrastu cilvÄ“ku"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "AtkÄrtota dalÄ«Å¡anÄs nav atÄ¼auta"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "DalÄ«jÄs ar {item} ar {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "PÄrtraukt dalÄ«Å¡anos"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "var rediÄ£Ä“t"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "piekÄ¼uves vadÄ«ba"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "izveidot"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "atjauninÄt"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "dzÄ“st"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "dalÄ«ties"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "AizsargÄts ar paroli"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "KÄ¼Å«da, noÅ†emot termiÅ†a datumu"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "KÄ¼Å«da, iestatot termiÅ†a datumu"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "SÅ«ta..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "VÄ“stule nosÅ«tÄ«ta"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "AtjauninÄÅ¡ana beidzÄs nesekmÄ«gi. LÅ«dzu, ziÅ†ojiet par Å¡o problÄ“mu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "AtjauninÄÅ¡ana beidzÄs sekmÄ«gi. Tagad pÄrsÅ«ta jÅ«s uz ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud paroles maiÅ†a"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +405,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "JÅ«s savÄ epastÄ saÅ†emsiet interneta saiti, caur kuru varÄ“siet atjaunot paroli."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "LietotÄjvÄrds"
@@ -461,11 +466,11 @@ msgstr "PalÄ«dzÄ«ba"
 msgid "Access forbidden"
 msgstr "Pieeja ir liegta"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "MÄkonis netika atrasts"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +499,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "VisticamÄk, jÅ«su datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Lai uzzinÄtu, kÄ pareizi jÄkonfigurÄ“ Å¡is serveris, skatiet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÄciju</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Izveidot <strong>administratora kontu</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "PaplaÅ¡inÄti"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "KonfigurÄ“t datubÄzi"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "tiks izmantots"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "DatubÄzes lietotÄjs"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "DatubÄzes parole"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "DatubÄzes nosaukums"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "DatubÄzes tabulas telpa"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "DatubÄzes serveris"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Pabeigt iestatÄ«Å¡anu"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "IzrakstÄ«ties"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "AutomÄtiskÄ ierakstÄ«Å¡anÄs ir noraidÄ«ta!"
@@ -607,7 +617,7 @@ msgstr "IerakstÄ«ties"
 msgid "Alternative Logins"
 msgstr "AlternatÄ«vÄs pieteikÅ¡anÄs"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 5c41ff449231dceca6ae478cb7717cebb8296df3..c327fc7be6cc33742ea1b9a52c21f24e522b405e 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "DalÄ«ties"
 msgid "Delete permanently"
 msgstr "DzÄ“st pavisam"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "DzÄ“st"
 
@@ -128,43 +128,46 @@ msgstr "DzÄ“st"
 msgid "Rename"
 msgstr "PÄrsaukt"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Gaida savu kÄrtu"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistÄ“"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "veikt dzÄ“Å¡anas darbÄ«bu"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "AugÅ¡upielÄdÄ“ 1 datni"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +203,31 @@ msgstr "Tiek sagatavota lejupielÄde. Tas var aizÅ†emt kÄdu laiciÅ†u, ja datnes
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "NederÄ«gs mapes nosaukums. â€œKoplietotsâ€ izmantojums ir rezervÄ“ts ownCloud servisam."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "IzmÄ“rs"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "MainÄ«ts"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mape"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mapes"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 datne"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} datnes"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +286,61 @@ msgstr "Mape"
 msgid "From link"
 msgstr "No saites"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "DzÄ“stÄs datnes"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Atcelt augÅ¡upielÄdi"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Jums nav tiesÄ«bu Å¡eit rakstÄ«t."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Te vÄ“l nekas nav. RÄ«kojies, sÄc augÅ¡upielÄdÄ“t!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "LejupielÄdÄ“t"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "PÄrtraukt dalÄ«Å¡anos"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augÅ¡upielÄdÄ“tu"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "AugÅ¡upielÄdÄ“jamÄs datnes pÄrsniedz servera pieÄ¼aujamo datÅ†u augÅ¡upielÄdes apjomu"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Datnes Å¡obrÄ«d tiek caurskatÄ«tas, lÅ«dzu, uzgaidiet."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Å obrÄ«d tiek caurskatÄ«ts"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fails"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index f75bfcbdf54bbfdc2756942932898491ddd4ee31..155b94c6e20db46be67933097e9629af745a50bf 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 689df4003f6481d900cab1fa731cac4739fad788..ac2e481d533957b394b9fbf851e02dc9ecda333a 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "LÅ«dzu, norÄdiet derÄ«gu Dropbox lietotnes atslÄ“gu un noslÄ“pumu."
 msgid "Error configuring Google Drive storage"
 msgstr "KÄ¼Å«da, konfigurÄ“jot Google Drive krÄtuvi"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>BrÄ«dinÄjums:</b> nav uzinstalÄ“ts â€œsmbclientâ€. Nevar montÄ“t CIFS/SMB koplietojumus. LÅ«dzu, vaicÄjiet savam sistÄ“mas administratoram, lai to uzinstalÄ“."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>BrÄ«dinÄjums: </b> uz PHP nav aktivÄ“ts vai instalÄ“ts FTP atbalsts. Nevar montÄ“t FTP koplietojumus. LÅ«dzu, vaicÄjiet savam sistÄ“mas administratoram, lai to uzinstalÄ“."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 17d7298383bd99205ef1690912e1fdf1600a2038..1afacc6cca0cc311c6104850f91054e202bd93ea 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Parole"
 msgid "Submit"
 msgstr "Iesniegt"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ar jums dalÄ«jÄs ar mapi %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ar jums dalÄ«jÄs ar datni %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "LejupielÄdÄ“t"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "AugÅ¡upielÄdÄ“t"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Atcelt augÅ¡upielÄdi"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Nav pieejams priekÅ¡skatÄ«jums priekÅ¡"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 1223af1dff67e885341e25681e4e09357ae879f8..0bee8becab5448c0aa0294440d54e0e257f76f80 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,47 @@ msgstr "NevarÄ“ja pilnÄ«bÄ izdzÄ“st %s"
 msgid "Couldn't restore %s"
 msgstr "NevarÄ“ja atjaunot %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "veikt atjaunoÅ¡anu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "dzÄ“st datni pavisam"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "DzÄ“st pavisam"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "DzÄ“sts"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mape"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mapes"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 datne"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} datnes"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 440afe984ad8047dd84e45ab87ca079daaf49cde..2fd25c266eac11473971fceb1a40fd7e7488c172 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "NevarÄ“ja atgriezt â€” %s"
 
-#: history.php:40
-msgid "success"
-msgstr "veiksme"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Datne %s tika atgriezt uz versiju %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "neveiksme"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Datni %s nevarÄ“ja atgriezt uz versiju %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versijas"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Nav pieejamu vecÄku versiju"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nav norÄdÄ«ts ceÄ¼Å¡"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versijas"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Atgriez datni uz iepriekÅ¡Ä“ju versiju, spieÅ¾ot uz tÄs atgrieÅ¡anas pogu"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Atjaunot"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index ee0e0102dbc1f1edd3a6be5152b26672aabf7641..94dcd5afe01abc2abfcb4436553a58a3b1de8c63 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "LietotÄji"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Lietotnes"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administratori"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "tÄ«mekÄ¼a servisi tavÄ varÄ"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP lejupielÄdÄ“Å¡ana ir izslÄ“gta."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielÄdÄ“t tikai katru atseviÅ¡Ä·i."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "AtpakaÄ¼ pie datnÄ“m"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "IzvÄ“lÄ“tÄs datnes ir pÄrÄk lielas, lai izveidotu zip datni."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nevarÄ“ja noteikt"
 
@@ -170,77 +182,81 @@ msgstr "VainÄ«gÄ komanda bija \"%s\", vÄrds: %s, parole: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nav derÄ«ga PostgreSQL parole un/vai lietotÄjvÄrds"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Iestatiet administratora lietotÄjvÄrdu."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Iestatiet administratora paroli."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai Ä¼autu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "LÅ«dzu, vÄ“lreiz pÄrbaudiet <a href='%s'>instalÄ“Å¡anas palÄ«dzÄ«bu</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekundes atpakaÄ¼"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "pirms 1 minÅ«tes"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "pirms %d minÅ«tÄ“m"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "pirms 1 stundas"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "pirms %d stundÄm"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "Å¡odien"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "vakar"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "pirms %d dienÄm"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "pagÄjuÅ¡ajÄ mÄ“nesÄ«"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "pirms %d mÄ“neÅ¡iem"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "gÄjuÅ¡ajÄ gadÄ"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "gadus atpakaÄ¼"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index a2d07eb94f8df011563c048bcb607d28f81c4ad0..a4ece9b54c1aa656c9842173d6e7e1b89e630fa9 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr "JÄnorÄda derÄ«ga parole"
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "BrÄ«dinÄjums par droÅ¡Ä«bu"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "JÅ«su datu direktorija un datnes visdrÄ«zÄk ir pieejamas no interneta. ownCloud nodroÅ¡inÄtÄ .htaccess datne nedarbojas. MÄ“s iesakÄm konfigurÄ“t serveri tÄ, lai datu direktorija vairs nebÅ«tu pieejama, vai arÄ« pÄrvietojiet datu direktoriju Ärpus tÄ«mekÄ¼a servera dokumentu saknes."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "IestatÄ«Å¡anas brÄ«dinÄjums"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai Ä¼autu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "LÅ«dzu, vÄ“lreiz pÄrbaudiet <a href='%s'>instalÄ“Å¡anas palÄ«dzÄ«bu</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "TrÅ«kst modulis â€œfileinfoâ€"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "TrÅ«kst PHP modulis â€œfileinfoâ€. MÄ“s iesakÄm to aktivÄ“t, lai pÄ“c iespÄ“jas labÄk noteiktu mime tipus."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "LokÄle nestrÄdÄ"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Å is ownCloud serveris nevar iestatÄ«t sistÄ“mas lokÄli uz %s. Tas nozÄ«mÄ“, ka varÄ“tu bÅ«t problÄ“mas ar noteiktÄm rakstzÄ«mÄ“m datÅ†u nosaukumos. MÄ“s iesakÄm instalÄ“t vajadzÄ«gÄs pakotnes savÄ sistÄ“mÄ %s atbalstam."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Interneta savienojums nedarbojas"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Å im ownCloud serverim nav strÄdÄjoÅ¡a interneta savienojuma. Tas nozÄ«mÄ“, ka daÅ¾as no Å¡Ä«m iespÄ“jÄm, piemÄ“ram, ÄrÄ“jas krÄtuves montÄ“Å¡ana, paziÅ†oÅ¡ana par atjauninÄjumiem vai treÅ¡Äs puses programmatÅ«ras instalÄ“Å¡ana nestrÄdÄ. VarÄ“tu nestrÄdÄt attÄlinÄta piekÄ¼uve pie datnÄ“m un paziÅ†ojumu e-pasta vÄ“stuÄ¼u sÅ«tÄ«Å¡ana. MÄ“s iesakÄm aktivÄ“t interneta savienojumu Å¡im serverim, ja vÄ“laties visas ownCloud iespÄ“jas."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "IzpildÄ«t vienu uzdevumu ar katru ielÄdÄ“to lapu"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php ir reÄ£istrÄ“ts webcron servisÄ. Izsauciet cron.php lapu ownCloud saknÄ“ caur http reizi sekundÄ“."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Izmantot sistÄ“mas cron servisu. Izsauciet cron.php datni ownCloud mapÄ“ caur sistÄ“mas cornjob reizi minÅ«tÄ“."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "DalÄ«Å¡anÄs"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "AktivÄ“t koplietoÅ¡anas API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Ä»auj lietotnÄ“m izmantot koplietoÅ¡anas API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "AtÄ¼aut saites"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Ä»aut lietotÄjiem publiski dalÄ«ties ar vienumiem, izmantojot saites"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "AtÄ¼aut atkÄrtotu koplietoÅ¡anu"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Ä»aut lietotÄjiem dalÄ«ties ar vienumiem atkÄrtoti"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Ä»aut lietotÄjiem dalÄ«ties ar visiem"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Ä»aut lietotÄjiem dalÄ«ties ar lietotÄjiem to grupÄs"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "DroÅ¡Ä«ba"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "PiespieÅ¾ klientus savienoties ar ownCloud caur Å¡ifrÄ“tu savienojumu."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "LÅ«dzu, savienojieties ar Å¡o ownCloud pakalpojumu caur HTTPS, lai aktivÄ“tu vai deaktivÄ“tu SSL piemÄ“roÅ¡anu."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Å½urnÄls"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Å½urnÄla lÄ«menis"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "VairÄk"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "MazÄk"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "KÄ¼Å«du sekotÄjs"
 msgid "Commercial Support"
 msgstr "KomerciÄlais atbalsts"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "SaÅ†em lietotnes, lai sinhronizÄ“tu savas datnes"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "VÄ“lreiz rÄdÄ«t pirmÄs palaiÅ¡anas vedni"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "JÅ«s lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parole"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "JÅ«ru parole tika nomainÄ«ta"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Nevar nomainÄ«t jÅ«su paroli"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "PaÅ¡reizÄ“jÄ parole"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Jauna parole"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "MainÄ«t paroli"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Redzamais vÄrds"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "JÅ«su e-pasta adrese"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ievadiet e-pasta adresi, lai vÄ“lÄk varÄ“tu atgÅ«t paroli, ja bÅ«s nepiecieÅ¡amÄ«ba"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "PalÄ«dzi tulkot"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index ea4099448266dd9fb316ab1e2befb04c228725cf..92d33e2add16f556dd1a1d081c587ad144affc24 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "ApstiprinÄt dzÄ“Å¡anu"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>BrÄ«dinÄjums:</b> lietotnes user_ldap un user_webdavauth ir nesavietojamas. TÄs var izraisÄ«t negaidÄ«tu uzvedÄ«bu. LÅ«dzu, prasiet savam sistÄ“mas administratoram kÄdu no tÄm deaktivÄ“t."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,8 +221,8 @@ msgid "Disable Main Server"
 msgstr "DeaktivÄ“t galveno serveri"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Kad ieslÄ“gts, ownCloud savienosies tikai ar kopijas serveri."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "IzslÄ“gt SSL sertifikÄtu validÄ“Å¡anu."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Ja savienojums darbojas ar Å¡o opciju, importÄ“ LDAP serveru SSL sertifikÄtu savÄ ownCloud serverÄ«."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "LietotÄja redzamÄ vÄrda lauks"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP atribÅ«ts, ko izmantot lietotÄja ownCloud vÄrda veidoÅ¡anai."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "Grupas redzamÄ nosaukuma lauks"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP atribÅ«ts, ko izmantot grupas ownCloud nosaukuma veidoÅ¡anai."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index cdc12e2a8cec7897e2b6d566e9c4b506e1e14940..55a3ae91a62a7d037e81bcb07aa8afe80035dc2c 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV autentifikÄcija"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud sÅ«tÄ«s lietotÄja akreditÄcijas datus uz Å¡o URL. Å is spraudnis pÄrbauda atbildi un interpretÄ“ HTTP statusa kodus 401 un 403 kÄ nederÄ«gus akreditÄcijas datus un visas citas atbildes kÄ derÄ«gus akreditÄcijas datus."
+msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 9ac19eee9ebaa3ff80263dac44394d5e0c2e6be5..b99d5913b45811c33ff257a49b941aa85be4ef23 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸"
 msgid "December"
 msgstr "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "Ð¿Ñ€ÐµÐ´ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð¸"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Ð¿Ñ€ÐµÐ´ 1 Ñ‡Ð°Ñ"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "Ð¿Ñ€ÐµÐ´ {hours} Ñ‡Ð°ÑÐ¾Ð²Ð¸"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "Ð´ÐµÐ½ÐµÑÐºÐ°"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "Ð¿Ñ€ÐµÐ´ {days} Ð´ÐµÐ½Ð¾Ð²Ð¸"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð¼ÐµÑÐµÑ†"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "Ð¿Ñ€ÐµÐ´ {months} Ð¼ÐµÑÐµÑ†Ð¸"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð¼ÐµÑÐµÑ†Ð¸"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
@@ -225,8 +225,8 @@ msgstr "ÐÐµ Ðµ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð°Ð½ Ñ‚Ð¸Ð¿Ð¾Ñ‚ Ð½Ð° Ð¾Ð±Ñ˜ÐµÐºÑ‚."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -246,140 +246,141 @@ msgstr ""
 msgid "Share"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐºÐ¸Ð½ Ð½Ð° ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð° Ð½Ð° Ð¿Ñ€Ð¸Ð²Ð¸Ð»ÐµÐ³Ð¸Ð¸"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ ÑÐ¾ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð°Ñ‚Ð° {group} Ð¾Ð´ {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ ÑÐ¾ Ð’Ð°Ñ Ð¾Ð´ {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ ÑÐ¾"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ ÑÐ¾ Ð²Ñ€ÑÐºÐ°"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ‚Ð¸ ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "ÐŸÑ€Ð°Ñ‚Ð¸ Ð²Ñ€ÑÐºÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð° Ð»Ð¸Ñ‡Ð½Ð¾ÑÑ‚"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "ÐŸÑ€Ð°Ñ‚Ð¸"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ñ€Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Ð Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "ÐÐµ ÑÐµ Ð½Ð°Ñ˜Ð´ÐµÐ½Ð¸ Ð»ÑƒÑ“Ðµ"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ Ð½Ðµ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ Ð²Ð¾ {item} ÑÐ¾ {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "ÐÐµ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°Ñ˜"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð° Ð½Ð° Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "ÐºÑ€ÐµÐ¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ‚ÐµÐ½Ð¾ ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ‚Ñ€Ð³Ð°ÑšÐµ Ð½Ð° Ñ€Ð¾ÐºÐ¾Ñ‚ Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾ÑÑ‚Ð°Ð²ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ñ€Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "ÐŸÑ€Ð°ÑœÐ°ÑšÐµ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Ð•-Ð¿Ð¾Ñ€Ð°ÐºÐ° Ð¿Ñ€Ð°Ñ‚ÐµÐ½Ð°"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð·Ð° ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "ÐŒÐµ Ð´Ð¾Ð±Ð¸ÐµÑ‚Ðµ Ð²Ñ€ÑÐºÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ð·Ð° Ð´Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ˜Ð° Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°Ñ‚Ðµ Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
@@ -461,11 +462,11 @@ msgstr "ÐŸÐ¾Ð¼Ð¾Ñˆ"
 msgid "Access forbidden"
 msgstr "Ð—Ð°Ð±Ñ€Ð°Ð½ÐµÑ‚ Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "ÐžÐ±Ð»Ð°ÐºÐ¾Ñ‚ Ð½Ðµ Ðµ Ð½Ð°Ñ˜Ð´ÐµÐ½"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ <strong>Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ÑÐºÐ° ÑÐ¼ÐµÑ‚ÐºÐ°</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ð¾"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Ð¤Ð¾Ð»Ð´ÐµÑ€ ÑÐ¾ Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ñ˜ Ñ˜Ð° Ð±Ð°Ð·Ð°Ñ‚Ð°"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "ÑœÐµ Ð±Ð¸Ð´Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÐ½Ð¾"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ð½Ð° Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° Ð½Ð° Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ð˜Ð¼Ðµ Ð½Ð° Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Ð¢Ð°Ð±ÐµÐ»Ð° Ð²Ð¾ Ð±Ð°Ð·Ð°Ñ‚Ð° Ð½Ð° Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ ÑÐ¾ Ð±Ð°Ð·Ð°"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð³Ð¾ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐµÑ‚Ð¾"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ÐžÐ´Ñ˜Ð°Ð²Ð°"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ÐžÐ´Ð±Ð¸ÐµÐ½Ð° Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ° Ð½Ð°Ñ˜Ð°Ð²Ð°!"
@@ -607,7 +613,7 @@ msgstr "ÐÐ°Ñ˜Ð°Ð²Ð°"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index e99202a5301bdb0e19c2c78043d00fe5ce75204d..117b21ccfe4595fe7cdda940e5084fe225b4eee6 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 
@@ -128,43 +128,45 @@ msgstr "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 msgid "Rename"
 msgstr "ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ˜"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ð§ÐµÐºÐ°"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²ÐµÑœÐµ Ð¿Ð¾ÑÑ‚Ð¾Ð¸"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸ Ð¸Ð¼Ðµ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÑ‚Ð° {new_name} ÑÐ¾ {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ð²Ñ€Ð°Ñ‚Ð¸"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ð“Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÑ‚Ð¾"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿ÐºÐ¸"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "ÐžÐ´ Ð²Ñ€ÑÐºÐ°"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ÐžÑ‚ÐºÐ°Ð¶Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÑƒÐ²Ð°ÑšÐµ"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ð¢ÑƒÐºÐ° Ð½ÐµÐ¼Ð° Ð½Ð¸ÑˆÑ‚Ð¾. Ð¡Ð½Ð¸Ð¼ÐµÑ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð¸"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "ÐÐµ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°Ñ˜"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ñ˜Ð»Ð¾Ñ‚ ÐºÐ¾Ñ˜ ÑÐµ Ð²Ñ‡Ð¸Ñ‚ÑƒÐ²Ð° Ðµ Ð¿Ñ€ÐµÐ³Ð¾Ð»ÐµÐ¼"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸Ñ‚Ðµ ÐºÐ¾Ð¸ ÑÐµ Ð¾Ð±Ð¸Ð´ÑƒÐ²Ð°Ñ‚Ðµ Ð´Ð° Ð³Ð¸ Ð¿Ð¾Ð´Ð¸Ð³Ð½ÐµÑ‚Ðµ Ñ˜Ð° Ð½Ð°Ð´Ð¼Ð¸Ð½ÑƒÐ²Ð°Ð°Ñ‚ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð·Ð° Ð¿Ð¾Ð´Ð¸Ð³Ð½ÑƒÐ²Ð°ÑšÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ Ð½Ð° Ð¾Ð²Ð¾Ñ˜ ÑÐµÑ€Ð²ÐµÑ€."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Ð¡Ðµ ÑÐºÐµÐ½Ð¸Ñ€Ð°Ð°Ñ‚ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸, Ð²Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð¿Ð¾Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "ÐœÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ð»Ð½Ð¾ ÑÐºÐµÐ½Ð¸Ñ€Ð°Ð¼"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
 
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 377a5a10467d6faf6316559f15ebd23bce3a716e..466308d7950c3fd34b012831a6c1b6d2c48b0c34 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index d4d1b25f22edeff8a85314a5e904144adc4b185b..fc33716519ea7eba26a5c8693750e18d4f17a254 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "Ð’Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð´Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð²Ð°Ð»Ð¸Ð´ÐµÐ½ Dropbox ÐºÐ»ÑƒÑ‡ Ð¸ Ñ‚
 msgid "Error configuring Google Drive storage"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ˜Ð° Ð½Ð° Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> \"smbclient\" Ð½Ðµ Ðµ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½. ÐÐµ Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° CIFS/SMB Ð´Ð¸ÑÐºÐ¾Ð²Ð¸. Ð—Ð°Ð¼Ð¾Ð»ÐµÑ‚Ðµ Ð³Ð¾ Ð’Ð°ÑˆÐ¸Ð¾Ñ‚ ÑÐ¸ÑÑ‚ÐµÐ¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð´Ð° Ð³Ð¾ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> ÐÐµ Ðµ Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½Ð° Ð¸Ð»Ð¸ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ð¸ FTP Ð¿Ð¾Ð´Ñ€ÑˆÐºÐ° Ð²Ð¾ PHP. ÐÐµ Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° FTP Ð´Ð¸ÑÐºÐ¾Ð²Ð¸. Ð—Ð°Ð¼Ð¾Ð»ÐµÑ‚Ðµ Ð³Ð¾ Ð’Ð°ÑˆÐ¸Ð¾Ñ‚ ÑÐ¸ÑÑ‚ÐµÐ¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð´Ð° Ð³Ð¾ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index e91b2553ed7cbf301d59a3b91f19849fc8488e66..ffd5a17d6e775274b0799ae91f195b19c1a8c702 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 msgid "Submit"
 msgstr "ÐŸÑ€Ð°Ñ‚Ð¸"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s Ñ˜Ð° ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð°Ð¿ÐºÐ°Ñ‚Ð° %s ÑÐ¾ Ð’Ð°Ñ"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s Ñ˜Ð° ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° %s ÑÐ¾ Ð’Ð°Ñ"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð¸"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð¸"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ÐžÑ‚ÐºÐ°Ð¶Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÑƒÐ²Ð°ÑšÐµ"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ÐÐµÐ¼Ð° Ð´Ð¾ÑÑ‚Ð°Ð¿Ð½Ð¾ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´ Ð·Ð°"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index a72060212fd206a98775b3fe064a8413bfe6d23d..b92b21c1c476d69b990b0aa2e72bbcd0608d8d58 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿ÐºÐ¸"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index 0f4762644949780952c42bddc7d25036f28c8a28..09756a73cd96d164fd896dd6a3a3ba969b14a8d3 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 266b3d76011641105c66ea941310f65457369096..a8128ea681f29f4af5200e6b511472ba2cbb1aed 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸"
 
 #: app.php:409
-msgid "Apps"
-msgstr "ÐÐ¿Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð°"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ Ð²Ð¾ ZIP Ðµ Ð¸ÑÐºÐ»ÑƒÑ‡ÐµÐ½Ð¾"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸Ñ‚Ðµ Ñ‚Ñ€ÐµÐ±Ð° Ð´Ð° ÑÐµ ÑÐ¸Ð¼Ð½Ð°Ñ‚ ÐµÐ´Ð½Ð° Ð¿Ð¾ ÐµÐ´Ð½Ð°."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ ÐºÐ¾Ð½ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Ð˜Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ‚Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ ÑÐµ Ð¿Ñ€ÐµÐ³Ð¾Ð»ÐµÐ¼Ð¸ Ð·Ð° Ð´Ð° ÑÐµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð° zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "Ð¿Ñ€ÐµÐ´ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð¸"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Ð¿Ñ€ÐµÐ´ 1 Ñ‡Ð°Ñ"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Ð¿Ñ€ÐµÐ´ %d Ñ‡Ð°ÑÐ¾Ð²Ð¸"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "Ð´ÐµÐ½ÐµÑÐºÐ°"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "Ð¿Ñ€ÐµÐ´ %d Ð´ÐµÐ½Ð¾Ð²Ð¸"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð¼ÐµÑÐµÑ†"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Ð¿Ñ€ÐµÐ´ %d Ð¼ÐµÑÐµÑ†Ð¸"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index a6bb7f726e94bdca21fe122f331332c6ab380d47..8745b876368a07b6a163bc032aa00275a1fcfb11 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð¾ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ´ÑƒÐ²Ð°ÑšÐµ"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¾ Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸ Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸Ñ‚Ðµ Ðµ Ð½Ð°Ñ˜Ð²ÐµÑ€Ð¾Ñ˜Ð°Ñ‚Ð½Ð¾ Ð´Ð¾ÑÑ‚Ð°Ð¿Ð½Ð° Ð¾Ð´ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚. .htaccess Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° ÑˆÑ‚Ð¾ Ñ˜Ð° Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÑƒÐ²Ð° ownCloud Ð½Ðµ Ñ„ÑƒÐ½Ñ†Ð¸Ð¾Ð½Ð¸Ñ€Ð°. Ð¡Ð¸Ð»Ð½Ð¾ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡ÑƒÐ²Ð°Ð¼Ðµ Ð´Ð° Ð³Ð¾ Ð¸ÑÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ñ‚Ðµ Ð²Ð°ÑˆÐ¸Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ Ð·Ð° Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¾ Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸ Ð½Ðµ Ðµ Ð´Ð¾ÑÑ‚Ð°Ð¿Ð½Ð° Ð¿Ñ€ÐµÐºÑƒ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñ‚ Ð¸Ð»Ð¸ Ð¿Ñ€ÐµÐ¼ÐµÑÑ‚ÐµÑ‚Ðµ Ñ˜Ð° Ð½Ð°Ð´Ð²Ð¾Ñ€ Ð¾Ð´ ÐºÐ¾Ñ€ÐµÐ½Ð¾Ñ‚ Ð½Ð° Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€Ð¾Ñ‚."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Ð—Ð°Ð¿Ð¸ÑÐ½Ð¸Ðº"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "ÐÐ¸Ð²Ð¾ Ð½Ð° Ð»Ð¾Ð³Ð¸Ñ€Ð°ÑšÐµ"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "ÐŸÐ¾Ð²ÐµÑœÐµ"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "ÐŸÐ¾Ð¼Ð°Ð»ÐºÑƒ"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ð’ÐµÑ€Ð·Ð¸Ñ˜Ð°"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr "ÐšÐ¾Ð¼ÐµÑ€Ñ†Ð¸Ñ˜Ð°Ð»Ð½Ð° Ð¿Ð¾Ð´Ñ€ÑˆÐºÐ°"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ð˜Ð¼Ð°Ñ‚Ðµ Ð¸ÑÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÐ½Ð¾ <strong>%s</strong> Ð¾Ð´ Ð´Ð¾ÑÑ‚Ð°Ð¿Ð½Ð¸Ñ‚Ðµ <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð±ÐµÑˆÐµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÑ‚Ð°."
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð½ÐµÐ¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¼ÐµÐ½Ð¸"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ÐœÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ð»Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÐÐ¾Ð²Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ð¡Ð¼ÐµÐ½Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Ð•-Ð¿Ð¾ÑˆÑ‚Ð°"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð°Ð´Ñ€ÐµÑÐ° Ð·Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "ÐŸÐ¾Ð¿Ð¾Ð»Ð½Ð¸ Ñ˜Ð° Ð°Ð´Ñ€ÐµÑÐ°Ñ‚Ð° Ð·Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ð·Ð° Ð´Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ˜Ð° Ð¾Ð±Ð½Ð¾Ð²ÑƒÐ²Ð°Ñˆ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°Ñ‚Ð°"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "ÐˆÐ°Ð·Ð¸Ðº"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ð³Ð½Ð¸ Ð²Ð¾ Ð¿Ñ€ÐµÐ²Ð¾Ð´Ð¾Ñ‚"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 1f2d4acbecb24200dcc4ac852da782377c8f084d..c98528b81ec84e7d2ffb60c285986d7139999374 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 4f39ddca61f626d90ebe55be0dc1dbd77c6f4470..0de649364a4420829a20ace85b89c4a627e4ff05 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 11842cfad4696b2a1063bca8e98324b280e98e5f..9cf341368a1003d8bdb37551401c07b28372dc85 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +462,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 90706b4f0b6bb0be4fc63d9b43386d350128303d..35132c50fa2c58d1c8d3b1c1d83d6ee93ba07073 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:36 ajax/upload.php:48
+#: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
 msgstr ""
 
@@ -35,46 +35,46 @@ msgstr ""
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:62
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:70
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:73
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:94
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:126
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po
index 788f7259d4f8be447d4e2f7fc054a28dae050549..763878763878f89849947f3d660a2fe76480134a 100644
--- a/l10n/ml_IN/files_encryption.po
+++ b/l10n/ml_IN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
index dbf8befe5f96c6b6763704053d0e3ca4e6bbb360..088c381190f8fd809ad0eb7de5c8692b2f28183d 100644
--- a/l10n/ml_IN/files_sharing.po
+++ b/l10n/ml_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ml_IN/files_trashbin.po b/l10n/ml_IN/files_trashbin.po
index 6aae4c873145463fa1debcfec1f98abc471a3598..42c24ca6423edb0e5e6c6f11a0880c5362ca2980 100644
--- a/l10n/ml_IN/files_trashbin.po
+++ b/l10n/ml_IN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/ml_IN/files_versions.po b/l10n/ml_IN/files_versions.po
index 7fbfa21dcc72451d15a9e7704408691c96e4d47c..b760d75242b54c48d656055e4a131beaecbe4686 100644
--- a/l10n/ml_IN/files_versions.po
+++ b/l10n/ml_IN/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index d4532ad9a440e2e69629474194a918867afd7efd..8da360f24d9702501587e21836da9c7bb24a82f5 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index e1facfe86945fc70e40afcd9eb2eb9cdb6f0a666..e3333f6983a19f61c46b36c4876eecac606d22ce 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index 0488df2f5a20db3cb8856ac250a8c57b2e4caa03..ec0a03b42cec5a2a79d1db6ba8b1dce75086445c 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ml_IN/user_webdavauth.po b/l10n/ml_IN/user_webdavauth.po
index 883156e8a55d34486f363acf5e29385607f7fdb3..143a00ff5ab34de456dc8060e4d0e3dd5d4f8e31 100644
--- a/l10n/ml_IN/user_webdavauth.po
+++ b/l10n/ml_IN/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 4d3325f3955de6f5b64223635ff53efb2aae1db2..12142533623c9f7a8b2c7dd8ec8c75b9576d9162 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "November"
 msgid "December"
 msgstr "Disember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +221,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ralat"
 
@@ -246,140 +242,141 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Kata laluan"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Set semula kata lalaun ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nama pengguna"
@@ -461,11 +458,11 @@ msgstr "Bantuan"
 msgid "Access forbidden"
 msgstr "Larangan akses"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Awan tidak dijumpai"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +491,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Log keluar"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +609,7 @@ msgstr "Log masuk"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index a7d3533eb61e021d72eb4bf5f340f77093ace687..9f421613c28dc0331c90b7003885bdaf6b6d2c9a 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Kongsi"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Padam"
 
@@ -128,43 +128,44 @@ msgstr "Padam"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +201,27 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr "Folder"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fail"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fail"
 
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 80ba103e3db507de265e1ee590c6119905ae80e6..8b66830466a8d3e096fcfc1096a6af1ba5130204 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index d211554b1e643b63f532fc21f4c2b216eeb8883f..cf3fca34a5e4b7f1a1d0b9de66b576d57605f249 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 6fe4c49d477e4d742dbbae4eb15a1ae99014c978..954e77ca28a76e68eabed1636f57a8cb5933052c 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Kata laluan"
 msgid "Submit"
 msgstr "Hantar"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Muat naik"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 21c4f47f40010f91c1ecd780ee3a93ce346562bc..cb56fbd7745645e59af9cfbffce4b6a1d93683bf 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,42 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ralat"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nama"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index c76d0b2b739466fe46c5c9eba518156382529037..e18c5a6cab02cd5296f33eb7d7de9043e9ebfdb8 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index a380402a8ad63bda79060753580ae5e8dce9485a..529c2d96124c21a30aad523a719886af4f9bca7c 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Pengguna"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplikasi"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 4881af7cef993ad1296742044b50e1f9248ed375..ea53a0cd7ea5b56f74e71a53dcdb46da7f8b6b4c 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Tahap Log"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Lanjutan"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Gagal mengubah kata laluan anda "
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Kata laluan semasa"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Kata laluan baru"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ubah kata laluan"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 48074fcda94de6c5ff459ab26bba8f549a80b422..80b893685cf42b2aafd76a0c025d977e659ddffe 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index 57b4d246ca079e9e24fba65b31bec0c2e2c7093c..fb3965289328f903282910c82b41820209581b5d 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 13de476c822e3ddee00af9b8bd90022d0224462a..29ad3b362d782ff0867563bdec567cdb2c11fc39 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "á€”á€á€¯á€á€„á€ºá€˜á€¬"
 msgid "December"
 msgstr "á€’á€®á€‡á€„á€ºá€˜á€¬"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "á€…á€€á€¹á€€á€”á€·á€ºá€¡á€”á€Šá€ºá€¸á€„á€šá€ºá€€"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "á á€™á€á€”á€…á€ºá€¡á€›á€„á€ºá€€"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "á á€”á€¬á€›á€® á€¡á€›á€„á€ºá€€"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "á€šá€”á€±á€·"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "á€™á€”á€±á€·á€€"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "á€•á€¼á€®á€¸á€á€²á€·á€žá€±á€¬á€œ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "á€™á€”á€¾á€…á€ºá€€"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "á€”á€¾á€…á€º á€¡á€›á€„á€ºá€€"
 
@@ -225,8 +221,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +242,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€º"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "á€žá€€á€ºá€á€™á€ºá€¸á€€á€¯á€”á€ºá€†á€¯á€¶á€¸á€™á€Šá€·á€ºá€›á€€á€ºá€žá€á€ºá€™á€¾á€á€ºá€™á€Šá€º"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "á€žá€€á€ºá€á€™á€ºá€¸á€€á€¯á€”á€ºá€†á€¯á€¶á€¸á€™á€Šá€·á€ºá€›á€€á€º"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "á€¡á€®á€¸á€™á€±á€¸á€œá€ºá€–á€¼á€„á€·á€ºá€á€±á€™á€»á€¾á€™á€Šá€º -"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "á€•á€¼á€”á€ºá€œá€Šá€ºá€á€±á€™á€»á€¾á€á€¼á€„á€ºá€¸á€á€½á€„á€·á€ºá€™á€•á€¼á€¯á€•á€«"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "á€•á€¼á€„á€ºá€†á€„á€ºá€”á€á€¯á€„á€º"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "á€–á€”á€ºá€á€®á€¸á€™á€Šá€º"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "á€–á€»á€€á€ºá€™á€Šá€º"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "á€á€±á€™á€»á€¾á€™á€Šá€º"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€ºá€–á€¼á€„á€·á€ºá€€á€¬á€€á€½á€šá€ºá€‘á€¬á€¸á€žá€Šá€º"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "á€¡á€®á€¸á€™á€±á€¸á€œá€ºá€™á€¾á€á€…á€ºá€†á€„á€·á€º á€žá€„á€ºáá€…á€€á€¬á€¸á€á€¾á€€á€ºá€€á€á€¯ á€•á€¼á€”á€ºá€–á€±á€¬á€ºá€›á€”á€ºá€¡á€á€½á€€á€º Link á€á€…á€ºá€á€¯á€œá€€á€ºá€á€¶á€›á€›á€¾á€á€•á€«á€œá€á€™á€·á€ºá€™á€šá€ºá‹"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "á€žá€¯á€¶á€¸á€…á€½á€²á€žá€°á€¡á€™á€Šá€º"
@@ -461,11 +458,11 @@ msgstr "á€¡á€€á€°á€¡á€Šá€®"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "á€™á€á€½á€±á€·á€›á€¾á€á€™á€á€•á€«"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +491,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>á€¡á€€á€ºá€’á€™á€„á€ºá€¡á€€á€±á€¬á€„á€·á€º</strong>á€á€…á€ºá€á€¯á€–á€”á€ºá€á€®á€¸á€™á€Šá€º"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "á€¡á€†á€„á€·á€ºá€™á€¼á€„á€·á€º"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "á€¡á€á€»á€€á€ºá€¡á€œá€€á€ºá€–á€á€¯á€œá€ºá€’á€«á€œá€º"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Database á€žá€¯á€¶á€¸á€…á€½á€²á€žá€°"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Database á€…á€€á€¬á€¸á€á€¾á€€á€º"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Database á€¡á€™á€Šá€º"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "á€á€•á€ºá€†á€„á€ºá€á€¼á€„á€ºá€¸á€•á€¼á€®á€¸á€•á€«á€•á€¼á€®á‹"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +609,7 @@ msgstr "á€á€„á€ºá€›á€±á€¬á€€á€ºá€›á€”á€º"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index af636f5820f6a2903b411bab6383e8ca200bffdd..dca3d0776b4dd609c34f2518c0d473cedac3a360 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,44 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +201,27 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€º"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 3465eb2405ec5931f8228c3bdbc27beb3a6b0ae4..9aedac17d427360d99923b66c7a329ed5ba0754c 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index abe4a98494eab4b2b37f90e7f14a258064e16576..d04bb04647c454557d33b0fae6660ca343f045b4 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€º"
 msgid "Submit"
 msgstr "á€‘á€Šá€·á€ºá€žá€½á€„á€ºá€¸á€™á€Šá€º"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€º"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index 6c22f6131851e74ad1db201ebe8de1584cabd1bb..0611fe45b555f8ea10a8749fc34243defa93c792 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,42 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
index 60f265294d1088304633d7c93421429c54cf17ea..9174fddbbc57988df62320a839c37cb6bb41794b 100644
--- a/l10n/my_MM/files_versions.po
+++ b/l10n/my_MM/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 3e331051062d5344e8edcb19a03f3dd060301dbf..bac9d830bf46ed1821960e3658bd12b0cf398270 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "á€žá€¯á€¶á€¸á€…á€½á€²á€žá€°"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr "á€¡á€€á€ºá€’á€™á€„á€º"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "á€žá€„á€ºáá€‘á€á€”á€ºá€¸á€á€»á€¯á€•á€ºá€™á€¾á€¯á€·á€¡á€±á€¬á€€á€ºá€á€½á€„á€ºá€›á€¾á€á€žá€±á€¬ Web services"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€ºá€€á€á€¯á€•á€á€á€ºá€‘á€¬á€¸á€žá€Šá€º"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "á€–á€á€¯á€„á€ºá€™á€»á€¬á€¸á€žá€Šá€º á€á€…á€ºá€á€¯á€•á€¼á€®á€¸ á€á€…á€ºá€á€¯á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€ºá€á€»á€›á€”á€ºá€œá€á€¯á€¡á€•á€ºá€žá€Šá€º"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "á€–á€á€¯á€„á€ºá€žá€á€¯á€·á€•á€¼á€”á€ºá€žá€½á€¬á€¸á€™á€Šá€º"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "zip á€–á€á€¯á€„á€ºá€¡á€–á€¼á€…á€ºá€•á€¼á€¯á€œá€¯á€•á€ºá€›á€”á€º á€›á€½á€±á€¸á€á€»á€šá€ºá€‘á€¬á€¸á€žá€±á€¬á€–á€á€¯á€„á€ºá€™á€»á€¬á€¸á€žá€Šá€º á€¡á€›á€™á€ºá€¸á€€á€¼á€®á€¸á€œá€½á€”á€ºá€¸á€žá€Šá€º"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "á€™á€†á€¯á€¶á€¸á€–á€¼á€á€ºá€”á€á€¯á€„á€ºá€•á€«á‹"
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "á€…á€€á€¹á€€á€”á€·á€ºá€¡á€”á€Šá€ºá€¸á€„á€šá€ºá€€"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "á á€™á€á€”á€…á€ºá€¡á€›á€„á€ºá€€"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d á€™á€á€”á€…á€ºá€¡á€›á€„á€ºá€€"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "á á€”á€¬á€›á€® á€¡á€›á€„á€ºá€€"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d á€”á€¬á€›á€®á€¡á€›á€„á€ºá€€"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "á€šá€”á€±á€·"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "á€™á€”á€±á€·á€€"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d á€›á€€á€º á€¡á€›á€„á€ºá€€"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "á€•á€¼á€®á€¸á€á€²á€·á€žá€±á€¬á€œ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d á€œá€¡á€›á€„á€ºá€€"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "á€™á€”á€¾á€…á€ºá€€"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "á€”á€¾á€…á€º á€¡á€›á€„á€ºá€€"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index be3a8d04bcb517e1a8ef35fb1f620372113e127c..903834397b0890f94df6a110c818d8bad91c0fec 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "á€œá€¯á€¶á€á€¼á€¯á€¶á€›á€±á€¸á€žá€á€á€•á€±á€¸á€á€»á€€á€º"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€º"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "á€…á€€á€¬á€¸á€á€¾á€€á€ºá€¡á€žá€…á€º"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index be14d277016e7823fcfd7a19bd13aa36b8a552fb..f9f369565afee0447528341ffc2c33ae646fbdff 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-23 01:59+0200\n"
-"PO-Revision-Date: 2013-06-22 10:24+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
index f89dd9cd9e7ddd827d9ffa32128cd65ed50630c9..33cf95ca18dd7dbdf8053ba6ab72f7cf6e96802e 100644
--- a/l10n/my_MM/user_webdavauth.po
+++ b/l10n/my_MM/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 96655abce6629ea56a5d1bc9325d31e71cf1d04a..0201469d378301db2d8d4488d15a88f30e9d07db 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr ""
+msgstr "%s delte Â»%sÂ« med deg"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -33,7 +34,7 @@ msgstr "Ingen kategorier Ã¥ legge til?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Denne kategorien finnes allerede: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -137,59 +138,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minutt siden"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutter siden"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 time siden"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} timer siden"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dager siden"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "forrige mÃ¥ned"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} mÃ¥neder siden"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mÃ¥neder siden"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "forrige Ã¥r"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -225,8 +226,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Feil"
 
@@ -240,146 +241,147 @@ msgstr ""
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Delt"
 
 #: js/share.js:90
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Delt med deg av {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Set utlÃ¸psdato"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "UtlÃ¸psdato"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Del pÃ¥ epost"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "del"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utlÃ¸psdato"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Tilbakestill ownCloud passord"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +402,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du burde motta detaljer om Ã¥ tilbakestille passordet ditt via epost."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Brukernavn"
@@ -461,11 +463,11 @@ msgstr "Hjelp"
 msgid "Access forbidden"
 msgstr "Tilgang nektet"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Sky ikke funnet"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -474,7 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "Hei der.âŽ\nâŽ\nVille bare gjÃ¸re deg oppmerksom pÃ¥ at %s delte %s med deg.âŽ\nVis den: %sâŽ\nâŽ\nVI ses!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -494,7 +496,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Database tabellomrÃ¥de"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "FullfÃ¸r oppsetting"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Logg ut"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk pÃ¥logging avvist!"
@@ -607,7 +614,7 @@ msgstr "Logg inn"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
@@ -625,4 +632,4 @@ msgstr "neste"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index ec833b396ed06b824fbe0db7a82d9258fed10f95..84d2868ea5065651cddc582f02785613975430a2 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Hans Nesse <>, 2013
+# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +31,7 @@ msgstr "Kunne ikke flytte %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Kunne ikke sette opplastingskatalog."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
@@ -121,7 +122,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Slett"
 
@@ -129,43 +130,45 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "OmdÃ¸p"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "foreslÃ¥ navn"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "utfÃ¸r sletting"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fil lastes opp"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "filer lastes opp"
 
@@ -201,33 +204,29 @@ msgstr "Nedlastingen din klargjÃ¸res. Hvis filene er store kan dette ta litt tid
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mapper"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +285,61 @@ msgstr "Mappe"
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Slettet filer"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Du har ikke skrivetilgang her."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Filen er for stor"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prÃ¸ver Ã¥ laste opp er for store for Ã¥ laste opp til denne serveren."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Skanner etter filer, vennligst vent."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "PÃ¥gÃ¥ende skanning"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "katalog"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "kataloger"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fil"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 0daabad1ea72fea27b7059819897c297976900bd..abd3cf2a7a44e43aac713cada9ffc3e20ebbcd08 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index eee743f684e6f58220321b96261b0481c1a87ecd..b9d4ea69c8bcc0a04e22bb6f8d3405c533511016 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "VÃ¦r vennlig Ã¥ oppgi gyldig Dropbox appnÃ¸kkel og hemmelighet."
 msgid "Error configuring Google Drive storage"
 msgstr "Feil med konfigurering av Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for Ã¥ installere det."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Advarsel:</b> FTP stÃ¸tte i PHP er ikke slÃ¥tt pÃ¥ eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for Ã¥ innstallere det."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 78dc38ae304dfd4cf428e7b31e15ef7655ee9bd6..c3ad85d42b16eaf558dfc79c6a4dc0a5f41e476a 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Passordet er feil. PrÃ¸v pÃ¥ nytt."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Passord"
 msgid "Submit"
 msgstr "Send inn"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med deg"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med deg"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Last opp"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ForhÃ¥ndsvisning ikke tilgjengelig for"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 609245cc9b396b495fd4cbb8250d5f0e85c4607d..72e2ce3e7bf9fafb60c810d363bc5722e60cefa0 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Hans Nesse <>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +28,45 @@ msgstr "Kunne ikke slette %s fullstendig"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gjenopprette %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "utfÃ¸r gjenopprettings operasjon"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Feil"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "slett filer permanent"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mappe"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mapper"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} filer"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 0d1e2a829cd212faaee7e5d8c1ead7b573f1daa1..b55d8702d8fa1208bc6995f0fc7115da3cf47680 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versjoner"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versjoner"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Gjenopprett"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 72edcc1f316ccde192782e9863b4801883647d82..5e2ffdb8ffe90cb6eecd618d46894f25ca7f3864 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Brukere"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apper"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "web tjenester du kontrollerer"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslÃ¥tt"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Filene mÃ¥ lastes ned en om gangen"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til Ã¥ kunne generere ZIP-fil"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til Ã¥ ikke funkere."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minutt siden"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutter siden"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d timer siden"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d dager siden"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "forrige mÃ¥ned"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d mÃ¥neder siden"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "forrige Ã¥r"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ã¥r siden"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 76cb2a13e4199942779c1fad34a8cd729c918bd8..e812e0ae3278ea41a059d2ce0306660433e578b7 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Hans Nesse <>, 2013
+# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +171,173 @@ msgstr "Oppgi et gyldig passord"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bÃ¸r konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentomrÃ¥de."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Installasjonsadvarsel"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til Ã¥ ikke funkere."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen 'fileinfo' mangler"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for Ã¥ kunne detektere mime-typen korrekt."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "SprÃ¥k virker ikke"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Denne ownCloud serveren kan ikke sette systemsprÃ¥k til %s. Det kan vÃ¦re problemer med visse tegn i filnavn. Vi foreslÃ¥r at du installerer de nÃ¸dvendige pakkene pÃ¥ ditt system for Ã¥ stÃ¸tte %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Ingen internettilkopling"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslÃ¥r at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "UtfÃ¸r en oppgave med hver side som blir lastet"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php er registrert som webcron-tjeneste. KjÃ¸r cron.php siden  i ownCloud rot hvert minutt vha http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Bruk systemets crontjeneste. KjÃ¸r cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Aktiver API for Deling"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Tillat apps Ã¥ bruke API for Deling"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Tillat lenker"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Tillat brukere Ã¥ dele filer med lenker"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "TIllat videredeling"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Tillat brukere Ã¥ dele filer som allerede har blitt delt med dem"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Tillat brukere Ã¥ dele med alle"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Tving HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Tvinger klienter til Ã¥ bruke ownCloud via kryptert tilkopling."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "VÃ¦r vennlig, bruk denne ownCloud instansen via HTTPS for Ã¥ aktivere eller deaktivere tvungen bruk av SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "LoggnivÃ¥"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +395,77 @@ msgstr "Feilsporing"
 msgid "Commercial Support"
 msgstr "Kommersiell stÃ¸tte"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "FÃ¥ dine apps til Ã¥ synkronisere dine filer"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Vis \"FÃ¸rstegangs veiveiseren\" pÃ¥ nytt"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Passord har blitt endret"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Kunne ikke endre passordet ditt"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "NÃ¥vÃ¦rende passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Visningsnavn"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Epost"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Oppi epostadressen du vil tilbakestille passordet for"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Bruk denne adressen for Ã¥ <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">fÃ¥ tilgang til filene dine via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 03cc7901cd3b2adaf1344160c66d948989c9647e..ae3612c0d98139372a98768a2e5752c5ceb8992b 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "Bekreft sletting"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Advarsel:</b>Apps user_ldap og user_webdavauth er ikke kompatible. Du kan oppleve uventet atferd fra systemet. Vennligst spÃ¸r din system-administrator om Ã¥ deaktivere en av dem."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "SlÃ¥ av SSL-sertifikat validering"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "Vis brukerens navnfelt"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP-attributen Ã¥ bruke for Ã¥ generere brukers ownCloud navn."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "Vis gruppens navnfelt"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP-attributen Ã¥ bruke for Ã¥ generere gruppens ownCloud navn."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 189cee27197cd9d16d40d48d476494a8229d7e05..89f5f3f24e2af62f3894ddfa0d4b32835fce5419 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index a8062fa9dbdd567aecb7d722756f0e7fe71e3702..d20e5a3d3abd4d2def7c7b4bc2f1cd6b2d31eb8c 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +462,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index ef843dbbaaabe4b9b3b2697f991db141fe1c2cfb..ece51f1910abcd608805bae1dcf3c9eb54f013ab 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-04 09:30+0200\n"
-"PO-Revision-Date: 2013-07-04 07:31+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -27,54 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:39
+#: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:22
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:55
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:62
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:63
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:65
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:66
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:68
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:87
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:119
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 53e5a46e0070d6008b2e7991ff3edf2aa3af21b1..a30502e5bbf1c612dc533717bb703da4d0ed0be6 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 4dc2fd5cd44e1c94f0e66f72424add9d515be3e6..8f745e77bbe0250c330cd92d053959172cd6bf2e 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index 0eebd5d130c7b412c27304bf69c6923767ed05e3..06099b3a416256281e7f18ddf5091d331b9ab54a 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/ne/files_versions.po b/l10n/ne/files_versions.po
index 75141cb34f99aeb0088a91ddf17f7aa676d4e518..b18e79867b0264ce0566c604d48e744180de1951 100644
--- a/l10n/ne/files_versions.po
+++ b/l10n/ne/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 37489e0ed6462e6fd40952de290d884bb9e05a88..4fcfd8bc3ea7101ff1100700c05e93ea21598d18 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index b73182b3a623d1abea00eb637be4866a8f8db358..20fa4cf7fb4757a6d281bbb18198727973ea18c5 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index eca44e17a0b15b2bfc50d5a33879e9bf9ed11c21..5ca0bf8245f9781835d50bf4e7d5b64f6e8b871e 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ne/user_webdavauth.po b/l10n/ne/user_webdavauth.po
index c71f7955bdf861d85ed733e622c44f2b711bde4e..b919d04a3645c61b29564cc47f74e011cbd84bfa 100644
--- a/l10n/ne/user_webdavauth.po
+++ b/l10n/ne/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 139aef1e0f0e02d46d4dae433756f2721384fd15..0502d44098809c57e20772c3b81a19981112ea5a 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # AndrÃ© Koot <meneer@tken.net>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
 # Jorcee <mail@jordyc.nl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +140,59 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minuut geleden"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuten geleden"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 uur geleden"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} uren geleden"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dagen geleden"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} maanden geleden"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -227,8 +228,8 @@ msgstr "Het object type is niet gespecificeerd."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Fout"
 
@@ -248,140 +249,141 @@ msgstr "Gedeeld"
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Fout tijdens het stoppen met delen"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Fout tijdens het veranderen van permissies"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeeld met u en de groep {group} door {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Gedeeld met u door {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Deel met"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Deel met link"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Sta publieke uploads toe"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "E-mail link naar persoon"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Versturen"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Deel via e-mail:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "creÃ«er"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-wachtwoord herstellen"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +404,7 @@ msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoor
 msgid "You will receive a link to reset your password via Email."
 msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Gebruikersnaam"
@@ -463,11 +465,11 @@ msgstr "Help"
 msgid "Access forbidden"
 msgstr "Toegang verboden"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud niet gevonden"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +498,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +520,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configureer de database"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "zal gebruikt worden"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Gebruiker database"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Wachtwoord database"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Naam database"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Databaseserver"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Afmelden"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Meer applicaties"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatische aanmelding geweigerd!"
@@ -609,7 +616,7 @@ msgstr "Meld je aan"
 msgid "Alternative Logins"
 msgstr "Alternatieve inlogs"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 744b061df8f4668607a384380a55172b337b6257..1822ad193bf2257b13ac24bd79f2e19e8c103275 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgstr "Delen"
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -129,43 +129,45 @@ msgstr "Verwijder"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "uitvoeren verwijderactie"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 bestand wordt ge-upload"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "bestanden aan het uploaden"
 
@@ -201,38 +203,34 @@ msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestand
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 map"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mappen"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 bestand"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} bestanden"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s kon niet worden hernoemd"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,61 +284,61 @@ msgstr "Map"
 msgid "From link"
 msgstr "Vanaf link"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Verwijderde bestanden"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "U hebt hier geen schrijfpermissies."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Upload is te groot"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "directory"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "directories"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "bestand"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "bestanden"
 
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index d69aec2838528de3ef2657c09e78f2e65c930b42..67a24bf1ac1f5c7e3eb58069fb4ba98d9147e2c2 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # AndrÃ© Koot <meneer@tken.net>, 2013
+# Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:40+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,18 +61,22 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Uw privÃ©sleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privÃ©sleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Missende benodigdheden."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr "Wees er zeker van dat PHP5.3.3 of nieuwer is geÃ¯stalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index d398514a01862cce30e35add5f3c06bbe685f6f2..605a5e2ce927b9d4d333b9a835ef3f5dafe6f883 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Geef een geldige Dropbox key en secret."
 msgid "Error configuring Google Drive storage"
 msgstr "Fout tijdens het configureren van Google Drive opslag"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Waarschuwing:</b> \"smbclient\" is niet geÃ¯nstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geÃ¯nstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 349fadbe9c8a1c9d26365ff3a919d5441e2d96d0..cf2ebc5ccc0358fbb8a11217f6ac576c20dd1007 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AndrÃ© Koot <meneer@tken.net>, 2013
+# Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:20+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +21,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Wachtwoord ongeldig. Probeer het nogmaals."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +31,52 @@ msgstr "Wachtwoord"
 msgid "Submit"
 msgstr "Verzenden"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Sorry, deze link lijkt niet meer in gebruik te zijn."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Redenen kunnen zijn:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "bestand was verwijderd"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "de link is verlopen"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "delen is uitgeschakeld"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deelt de map %s met u"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deelt het bestand %s met u"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Uploaden"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Geen voorbeeldweergave beschikbaar voor"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 71d86b0e9004716fb3d37ea3f606f94b7972b910..9227cb640a505ef1ec032c70e147aed4904dc3fe 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AndrÃ© Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "Kon %s niet permanent verwijderen"
 msgid "Couldn't restore %s"
 msgstr "Kon %s niet herstellen"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "uitvoeren restore operatie"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Fout"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "verwijder bestanden definitief"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Naam"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 map"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mappen"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 bestand"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} bestanden"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "hersteld"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 83735c7ef761812a8f68dda5cf09728474286af0..8ee2fd95dab202472c137056b9aab02dd7dfd786 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 14:20+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Kon niet terugdraaien: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "succes"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Bestand %s is teruggedraaid naar versie %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "mislukking"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Bestand %s kon niet worden teruggedraaid naar versie %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versies"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Geen oudere versies beschikbaar"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Kon {file} niet terugdraaien naar revisie {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Geen pad opgegeven"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Meer versies..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versies"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Geen andere versies beschikbaar"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Herstellen"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 2cbf2845e27231af15a6805f6f0f2423abf30e5a..833787fb045af6122472140b8a4be5768aa9e0ad 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # AndrÃ© Koot <meneer@tken.net>, 2013
+# Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Beheerder"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Upgrade \"%s\" mislukt."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Kon \"%s\" niet openen"
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten Ã©Ã©n voor Ã©Ã©n worden gedownload."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Download de bestanden in kleinere brokken, appart of vraag uw administrator."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "kon niet worden vastgesteld"
 
@@ -171,77 +184,77 @@ msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Stel de gebruikersnaam van de beheerder in."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Stel een beheerderswachtwoord in."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minuut geleden"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuten geleden"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 uur geleden"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d uren geleden"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "vandaag"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "gisteren"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d dagen geleden"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "vorige maand"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d maanden geleden"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "vorig jaar"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "jaar geleden"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Gekomen door:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index a33421f91a4911fd609f9b987881f4975f2519bd..f2b74b11fb0c719f963d70a98004cc297066ffee 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -5,13 +5,14 @@
 # Translators:
 # AndrÃ© Koot <meneer@tken.net>, 2013
 # helonaut, 2013
+# Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:30+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,166 +172,173 @@ msgstr "Er moet een geldig wachtwoord worden opgegeven"
 msgid "__language_name__"
 msgstr "Nederlands"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Beveiligingswaarschuwing"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Instellingswaarschuwing"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Conntroleer de <a href='%s'>installatie handleiding</a> goed."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' ontbreekt"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Taalbestand werkt niet"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde tekens in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Internet verbinding werkt niet"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Deze ownCloud server heeft geen actieve internet verbinding. dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internet verbinding voor deze server in te schakelen als u alle functies van ownCloud wilt gebruiken."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Bij laden van elke pagina Ã©Ã©n taak uitvoeren"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php is geregistreerd bij een webcron service. Roep eens per minuut de cron.php pagina aan over http in de ownCloud root."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php is geregistreerd bij een webcron service om cron.php eens per minuut aan te roepen via http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Gebruik de systems cron service. Roep eens per minuut de cron.php file in de ownCloud map via een systeem cronjob."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Gebruik de systeem cron service om het bestand cron.php eens per minuut aan te roepen."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Delen"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activeren Share API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Apps toestaan de Share API te gebruiken"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Toestaan links"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Sta publieke uploads toe"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Afdwingen dat de clients alleen via versleutelde verbinding contact maken met ownCloud."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s"
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Maak via HTTPS verbinding met deze ownCloud inrichting om het afdwingen van gebruik van SSL te activeren of deactiveren."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,77 +396,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "CommerciÃ«le ondersteuning"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Download de apps om bestanden te syncen"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Toon de Eerste start Wizard opnieuw"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Je wachtwoord is veranderd"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nieuw"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Weergavenaam"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 37e74751bff9aac6e3033d706bd39209de652bdb..cea243ef7971450b51c7bfe1f8a68bbe8887db5f 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # AndrÃ© Koot <meneer@tken.net>, 2013
+# Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:20+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +90,7 @@ msgstr "Bevestig verwijderen"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren."
 
@@ -222,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "Deactiveren hoofdserver"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wanneer ingeschakeld, zal ownCloud allen verbinden met de replicaserver."
+msgid "Only connect to the replica server."
+msgstr "Maak alleen een verbinding met de replica server."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Schakel SSL certificaat validatie uit."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
+"certificate in your %s server."
+msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar de %s server."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "Gebruikers Schermnaam Veld"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "Groep Schermnaam Veld"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +355,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaanâ€‹â€‹: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een â€‹â€‹gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +373,14 @@ msgstr "Negeren UUID detectie"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +392,17 @@ msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een â€‹â€‹LDAP-gebruiker. De gecreÃ«erde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 16a063e349f5e38a2389d21c3d3ceaec4a29d0d5..30a7602c67d17ddb10f55b233550190a049982d3 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # AndrÃ© Koot <meneer@tken.net>, 2012-2013
+# Len <lenny@weijl.org>, 2013
 # Richard Bos <radoeka@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 21:40+0000\n"
-"Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 14:50+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV authenticatie"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr "Adres:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens."
+msgstr "De ingloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert de HTTP statuscodes 401 en 403 als invalide inloggegevens, en alle andere terugkoppelingen als valide inloggegevens."
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 633ec97c2cb4f1bbac93ab028f0927359c6806b7..29908b4d1b907c530766842ed27cad449d1f1e76 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minutt sidan"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutt sidan"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 time sidan"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} timar sidan"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dagar sidan"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "fÃ¸rre mÃ¥nad"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} mÃ¥nadar sidan"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mÃ¥nadar sidan"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ã¥r sidan"
 
@@ -227,8 +227,8 @@ msgstr "Objekttypen er ikkje spesifisert."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Feil"
 
@@ -248,140 +248,141 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Feil ved udeling"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Feil ved endring av tillatingar"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med deg og gruppa {group} av {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Del med lenkje"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Send lenkja over e-post"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Set utlÃ¸psdato"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "UtlÃ¸psdato"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Del over e-post:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Fann ingen personar"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Udel"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kan endra"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "lag"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "del"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utlÃ¸psdato"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utlÃ¸psdato"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Sender â€¦"
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringa er fullfÃ¸rt. Sender deg vidare til ownCloud no."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Nullstilling av ownCloud-passord"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +403,7 @@ msgstr "FÃ¸respurnaden feila!<br>Er du viss pÃ¥ at du skreiv inn rett e-post/bru
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du vil fÃ¥ ein e-post med ei lenkje for Ã¥ nullstilla passordet."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Brukarnamn"
@@ -463,11 +464,11 @@ msgstr "Hjelp"
 msgid "Access forbidden"
 msgstr "Tilgang forbudt"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Fann ikkje skyen"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "PHP-utgÃ¥va di er sÃ¥rbar for NULL-byteÃ¥taket (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Ver venleg og oppdater PHP-installasjonen din sÃ¥ han kÃ¸yrer ownCloud pÃ¥ ein trygg mÃ¥te."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frÃ¥ Internett sidan .htaccess-fila ikkje fungerer."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for Ã¥ lÃ¦ra korleis du set opp tenaren din pÃ¥ rett mÃ¥te."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Set opp databasen"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "vil verta nytta"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tabellnamnrom for database"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "FullfÃ¸r oppsettet"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgjengeleg. FÃ¥ meir informasjon om korleis du oppdaterer."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Logg ut"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk innlogging avvist!"
@@ -609,7 +615,7 @@ msgstr "Logg inn"
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 3d89a1e3b11afbc1a1f6e7198a55a296c1fa992d..fcc5e23ae5c104f15a0854fa2bfcd7a5ed9f418a 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,7 @@ msgstr "Del"
 msgid "Delete permanently"
 msgstr "Slett for godt"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Slett"
 
@@ -130,43 +130,45 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "byt ut"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "fÃ¸reslÃ¥ namn"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "utfÃ¸r sletting"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fil lastar opp"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "filer lastar opp"
 
@@ -202,33 +204,29 @@ msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenamn. Mappa Â«SharedÂ» er reservert av ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mappe"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -287,61 +285,61 @@ msgstr "Mappe"
 msgid "From link"
 msgstr "FrÃ¥ lenkje"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Sletta filer"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Du har ikkje skriverettar her."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Udel"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prÃ¸ver Ã¥ lasta opp er stÃ¸rre enn maksgrensa til denne tenaren."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "KÃ¸yrande skanning"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index c8ba72ef42d8f01971a26bbe0033e401c76b1432..f1295711ff8aa1c023811d6ac517b366a8c6ca9b 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index ffd057372b3c832156ee4e84a10c0ac91c8f2e67..729a5014814f1d0adb21aba78ab2359d0b144cc9 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 9ffc9f44ee57f77c105f821dc5f8cca557b3f785..4b2ff875d133a7f1ffa38e1e28e44a78bc2f18ff 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "Passord"
 msgid "Submit"
 msgstr "Send"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappa %s med deg"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte fila %s med deg"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Last opp"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Inga fÃ¸rehandsvising tilgjengeleg for"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index dd0dc2b20647d667be9e99dc389d9e616e9de131..c10ee6cd50721a6edd112bfa9c773292c32beedd 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,45 +28,45 @@ msgstr "Klarte ikkje sletta %s for godt"
 msgid "Couldn't restore %s"
 msgstr "Klarte ikkje gjenoppretta %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "utfÃ¸r gjenoppretting"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Feil"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "slett fila for godt"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Slett for godt"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Sletta"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mappe"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mapper"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} filer"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 4de20b084400d38ed5170b3112e6cb7ffda70f13..a6e633a4c28456595ec253f4c497cb459384e5a0 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,41 +18,27 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Klarte ikkje Ã¥ tilbakestilla: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "vellukka"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Tilbakestilte fila %s til utgÃ¥va %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "feil"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Klarte ikkje tilbakestilla fila %s til utgÃ¥va %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "UtgÃ¥ver"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Ingen eldre utgÃ¥ver tilgjengelege"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ingen sti gjeve"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "UtgÃ¥ver"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Tilbakestill ei fil til ei tidlegare utgÃ¥ve ved Ã¥ klikka tilbakestill-knappen"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Gjenopprett"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 673f1bc56dfe8bb62fc6b6009d3d5256810e09f4..a344f828b7b02d5c4e7f5bee19b8ae98ae6a8c23 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Brukarar"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Program"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administrer"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -171,77 +183,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til Ã¥ tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til Ã¥ vera Ã¸ydelagt."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minutt sidan"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 time sidan"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "fÃ¸rre mÃ¥nad"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "i fjor"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ã¥r sidan"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 7a98cbb5850f39679cb4cf34998be452a1aa3da6..b451c6fb503dd8b2cdf4625ef699b2f91b790a28 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -171,166 +171,173 @@ msgstr "Du mÃ¥ oppgje eit gyldig passord"
 msgid "__language_name__"
 msgstr "Nynorsk"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "TryggleiksÃ¥tvaring"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frÃ¥ Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rÃ¥r sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frÃ¥ dokumentrota til tenaren."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "OppsettsÃ¥tvaring"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til Ã¥ tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til Ã¥ vera Ã¸ydelagt."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen Â«fileinfoÂ» manglar"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP-modulen Â«fileinfoÂ» manglar. Me rÃ¥r sterkt til Ã¥ slÃ¥ pÃ¥ denne modulen for Ã¥ best mogleg oppdaga MIME-typar."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Regionaldata fungerer ikkje"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rÃ¥r sterkt til Ã¥ installera systempakkane som trengst for Ã¥ stÃ¸tta %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Nettilkoplinga fungerer ikkje"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslÃ¥r at du slÃ¥ pÃ¥ nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "UtfÃ¸r Ã©i oppgÃ¥ve for kvar sidelasting"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Bruk cron-tenesta til systemet. KÃ¸yr fila cron.php i ownCloud-mappa frÃ¥ ein cron-jobb pÃ¥ systemet ein gong i minuttet."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "SlÃ¥ pÃ¥ API-et for deling"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "La app-ar bruka API-et til deling"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "La brukarar dela ting offentleg med lenkjer"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "La brukarar dela berre med brukarar i deira grupper"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for Ã¥ slÃ¥ av/pÃ¥ SSL-handhevinga."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Log nivÃ¥"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "UtgÃ¥ve"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,72 +395,72 @@ msgstr "Feilsporar"
 msgid "Commercial Support"
 msgstr "Betalt brukarstÃ¸tte"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "FÃ¥ app-ar som kan synkronisera filene dine"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Vis Oppstartvegvisaren igjen"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Passordet ditt er endra"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Klarte ikkje endra passordet"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Visingsnamn"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Di epost-adresse"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll inn e-postadressa di for Ã¥ gjera passordgjenoppretting mogleg"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Hjelp oss Ã¥ omsetja"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index fc5a86e7c8c52a10fc0f713beb20f4f2c71ba995..f634ba786a4c4463082e374ee4e7351ecc397ac0 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index b281d34b07ebe9b3e684f83477f9e43a6ea6be64..05d3c32b03d66dd889d700e02ee579bde2bfeed8 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-autentisering"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud sender brukarakkreditiv til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
+msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index ff91f4e04d2b05d62eec71e6eda52d53d4336323..33d3488ee96c2911834916664c2e9f49dc5b6a51 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minuta a"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "uÃ¨i"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "iÃ¨r"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "ans a"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Error"
 
@@ -246,140 +246,141 @@ msgstr ""
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Error al non partejar"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permissions"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Parteja amb"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Parteja amb lo ligam"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Senhal"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Parteja tras corriÃ¨l :"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "pÃ²t modificar"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ContrarÃ²tle d'acces"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "senhal d'ownCloud tornat botar"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "ReÃ§auprÃ s un ligam per tornar botar ton senhal via corriÃ¨l."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Non d'usanciÃ¨r"
@@ -461,11 +462,11 @@ msgstr "Ajuda"
 msgid "Access forbidden"
 msgstr "Acces enebit"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "NÃvol pas trobada"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte admin</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "AvanÃ§at"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "DorsiÃ¨r de donadas"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configura la basa de donadas"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "serÃ  utilizat"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "UsanciÃ¨r de la basa de donadas"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Senhal de la basa de donadas"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nom de la basa de donadas"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Espandi de taula de basa de donadas"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ã’ste de basa de donadas"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Sortida"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr "Dintrada"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 2ef836e22708e5ef6511dc12e84750b1bcb85d10..457b51997ef25df8f739cb3bc61de60f18afd295 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Parteja"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Escafa"
 
@@ -128,43 +128,45 @@ msgstr "Escafa"
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "remplaÃ§a"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 fichiÃ¨r al amontcargar"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "fichiÃ¨rs al amontcargar"
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "DorsiÃ¨r"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Amontcargament trÃ²p grÃ²s"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los fichiÃ¨rs que sias a amontcargar son trÃ²p pesucs per la talha maxi pel servidor."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichiÃ¨rs son a Ã¨sser explorats, "
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fichiÃ¨r"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fichiÃ¨rs"
 
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index a9474224b7bdcf16549dbe97b4e5ec23dad58d5e..eba3e13368c22a279d5517c77287e9e7e68c0981 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index b8ae84d6b4eaa91936e1d74675477e4f31092353..b899bcf9b7db3bca727e0211dacb608c2582c85a 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 139c38a38e2300f7af575184b30d7ac03da0ab27..48225563d0e6465c0508949fb8c4d7bdd4159e93 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Senhal"
 msgid "Submit"
 msgstr "Sosmetre"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Amontcarga"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 5d68bda7548e07520195db37b692231e53b0306f..1f47311fecd9ed25ecbf0138d0eba5ea562acc08 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Error"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index d1964f5cfaa8019f23fe402475e70067c8bbb1f1..aa42ae8a125a4f7f2e9ffdde02dc31f333277c91 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index cdf17381116a5de85f73cf6cc533971f3107c762..7624e587690da30d38919c666204dd2a925396cd 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "UsanciÃ¨rs"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Services web jos ton contrarÃ²tle"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichiÃ¨rs devan Ã¨sser avalcargats un per un."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Torna cap als fichiÃ¨rs"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minuta a"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutas a"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "uÃ¨i"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "iÃ¨r"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d jorns a"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "mes passat"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "an passat"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "ans a"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 1d7719410c37fe9b9a0b5eeea5f05e71adf6c945..9cdc67cd70f34cf01022d5c5fbb764ce8c630c91 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Avertiment de securitat"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Executa un prÃ¨tfach amb cada pagina cargada"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Utiliza lo servici cron de ton sistÃ¨m operatiu. Executa lo fichiÃ¨r cron.php dins lo dorsier owncloud tras cronjob del sistÃ¨m cada minuta."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Al partejar"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activa API partejada"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Jornal"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mai d'aquÃ²"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ton senhal a cambiat"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Pas possible de cambiar ton senhal"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Senhal en cors"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Senhal novÃ¨l"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Cambia lo senhal"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "CorriÃ¨l"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ton adreiÃ§a de corriÃ¨l"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Emplena una adreiÃ§a de corriÃ¨l per permetre lo mandadÃs del senhal perdut"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index fd942a6a558cec33efc66842aa0a5339c22f1eb2..e2d1715e8c75b724238de246dab56234e7bd03c7 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 72a127406ac1085d2a700f0a91f101987babebe1..1717d6805c09f21c9dc600cd6679c56731cd58c4 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 47cc6875e5f664924d3a79e8f78b368567873ec3..5f7f67f6df2a54fc0bad9a2c6088466fcc79b20d 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,63 @@ msgstr "Listopad"
 msgid "December"
 msgstr "GrudzieÅ„"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minutÄ™ temu"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minut temu"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 godzinÄ™ temu"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} godzin temu"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dni temu"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "w zeszÅ‚ym miesiÄ…cu"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} miesiÄ™cy temu"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "miesiÄ™cy temu"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "w zeszÅ‚ym roku"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "lat temu"
 
@@ -227,8 +231,8 @@ msgstr "Nie okreÅ›lono typu obiektu."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -248,140 +252,141 @@ msgstr "UdostÄ™pniono"
 msgid "Share"
 msgstr "UdostÄ™pnij"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "BÅ‚Ä…d podczas wspÃ³Å‚dzielenia"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "BÅ‚Ä…d podczas zatrzymywania wspÃ³Å‚dzielenia"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "BÅ‚Ä…d przy zmianie uprawnieÅ„"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "UdostÄ™pnione tobie i grupie {group} przez {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "UdostÄ™pnione tobie przez {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "WspÃ³Å‚dziel z"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "WspÃ³Å‚dziel wraz z odnoÅ›nikiem"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Zabezpiecz hasÅ‚em"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "HasÅ‚o"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "PozwÃ³l na  publiczne wczytywanie"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "WyÅ›lij osobie odnoÅ›nik poprzez e-mail"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "WyÅ›lij"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Ustaw datÄ™ wygaÅ›niÄ™cia"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data wygaÅ›niÄ™cia"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "WspÃ³Å‚dziel poprzez e-mail:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "WspÃ³Å‚dzielenie nie jest moÅ¼liwe"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "WspÃ³Å‚dzielone w {item} z {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Zatrzymaj wspÃ³Å‚dzielenie"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "moÅ¼e edytowaÄ‡"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "kontrola dostÄ™pu"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "utwÃ³rz"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "usuÅ„"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "wspÃ³Å‚dziel"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Zabezpieczone hasÅ‚em"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "BÅ‚Ä…d podczas usuwania daty wygaÅ›niÄ™cia"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "BÅ‚Ä…d podczas ustawiania daty wygaÅ›niÄ™cia"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "WysyÅ‚anie..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-mail wysÅ‚any"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Aktualizacja zakoÅ„czyÅ‚a siÄ™ niepowodzeniem. ZgÅ‚oÅ› ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spolecznoÅ›ci ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizacji zakoÅ„czyÅ‚a siÄ™ powodzeniem. PrzekierowujÄ™ do ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "restart hasÅ‚a ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +407,7 @@ msgstr "Å»Ä…danie niepowiodÅ‚o siÄ™!<br>Czy TwÃ³j email/nazwa uÅ¼ytkownika sÄ… p
 msgid "You will receive a link to reset your password via Email."
 msgstr "OdnoÅ›nik sÅ‚uÅ¼Ä…cy do resetowania hasÅ‚a zostanie wysÅ‚any na adres e-mail."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nazwa uÅ¼ytkownika"
@@ -413,7 +418,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Pliki sÄ… szyfrowane. JeÅ›li nie wÅ‚Ä…czono klucza odzyskiwania, nie bÄ™dzie moÅ¼liwe odzyskaÄ‡ dane z powrotem po zresetowaniu hasÅ‚a. JeÅ›li nie masz pewnoÅ›ci, co zrobiÄ‡, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuowaÄ‡?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
@@ -463,11 +468,11 @@ msgstr "Pomoc"
 msgid "Access forbidden"
 msgstr "DostÄ™p zabroniony"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Nie odnaleziono chmury"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -476,7 +481,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "CzeÅ›Ä‡,\n\nInformujÄ™ ciÄ™ Å¼e %s udostÄ™pnia ci %s.\nZobacz na: %s\n\nPozdrawiam!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -496,8 +501,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "TwÃ³ja wersja PHP jest naraÅ¼ona na NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ProszÄ™ uaktualnij swojÄ… instalacje PHP, aby uÅ¼ywaÄ‡ ownCloud bezpiecznie."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "ProszÄ™ uaktualnij swojÄ… instalacje PHP aby uÅ¼ywaÄ‡ %s bezpiecznie."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +523,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "TwÃ³j katalog danych i pliki sÄ… prawdopodobnie dostÄ™pne z poziomu internetu, poniewaÅ¼ plik .htaccess nie dziaÅ‚a."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Aby uzyskaÄ‡ informacje dotyczÄ…ce prawidÅ‚owej konfiguracji serwera, siÄ™gnij do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacji</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Aby uzyskaÄ‡ informacje jak poprawnie skonfigurowaÄ‡ swÃ³j serwer, zapoznaj siÄ™ z <a href=\"%s\" target=\"_blank\">dokumentacjÄ…</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "UtwÃ³rz <strong>konta administratora</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Skonfiguruj bazÄ™ danych"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "zostanie uÅ¼yte"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "UÅ¼ytkownik bazy danych"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "HasÅ‚o do bazy danych"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Obszar tabel bazy danych"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ZakoÅ„cz konfigurowanie"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s jest dostÄ™pna. Dowiedz siÄ™ wiÄ™cej na temat aktualizacji."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Wyloguj"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "WiÄ™cej aplikacji"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatyczne logowanie odrzucone!"
@@ -609,12 +619,12 @@ msgstr "Zaloguj"
 msgid "Alternative Logins"
 msgstr "Alternatywne loginy"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "CzeÅ›Ä‡,<br><br>InformujÄ™ ciÄ™ Å¼e %s udostÄ™pnia ci Â»%sÂ«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index c2bddc7425a9a27ad3134dcd439321000d6d65fe..2f37a4f181969825c9abe1fb8041a4cd28e330c4 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -122,7 +122,7 @@ msgstr "UdostÄ™pnij"
 msgid "Delete permanently"
 msgstr "Trwale usuÅ„"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "UsuÅ„"
 
@@ -130,43 +130,46 @@ msgstr "UsuÅ„"
 msgid "Rename"
 msgstr "ZmieÅ„ nazwÄ™"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} juÅ¼ istnieje"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zastÄ…p"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piono {new_name} przez {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "wykonaj operacjÄ™ usuniÄ™cia"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 plik wczytywany"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "pliki wczytane"
 
@@ -202,33 +205,31 @@ msgstr "Pobieranie jest przygotowywane. MoÅ¼e to zajÄ…Ä‡ trochÄ™ czasu jeÅ›li pl
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "NieprawidÅ‚owa nazwa folderu. Korzystanie z nazwy â€žSharedâ€ jest zarezerwowane dla ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 folder"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "IloÅ›Ä‡ folderÃ³w: {count}"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 plik"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "IloÅ›Ä‡ plikÃ³w: {count}"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -287,61 +288,61 @@ msgstr "Folder"
 msgid "From link"
 msgstr "Z odnoÅ›nika"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Pliki usuniÄ™te"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Anuluj wysyÅ‚anie"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Nie masz uprawnieÅ„ do zapisu w tym miejscu."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. WyÅ›lij coÅ›!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Zatrzymaj wspÃ³Å‚dzielenie"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Åadowany plik jest za duÅ¼y"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki, ktÃ³re prÃ³bujesz przesÅ‚aÄ‡, przekraczajÄ… maksymalnÄ… dopuszczalnÄ… wielkoÅ›Ä‡."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plikÃ³w, proszÄ™ czekaÄ‡."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "Katalog"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "Katalogi"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "plik"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "pliki"
 
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 8342d627db94e89bb7b38a5613d283d22a0ab910..4c116aa680092cc62a832869dd3b849926477cd4 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 11:50+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,18 +60,22 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Klucz prywatny nie jest waÅ¼ny! Prawdopodobnie Twoje hasÅ‚o zostaÅ‚o zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskaÄ‡ dostÄ™p do zaszyfrowanych plikÃ³w moÅ¼na zaktualizowaÄ‡ hasÅ‚o klucza prywatnego w ustawieniach osobistych."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Brak wymagaÅ„."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr "ProszÄ™ upewniÄ‡ siÄ™, Å¼e PHP 5.3.3 lub nowszy jest zainstalowany i Å¼e OpenSSL oraz rozszerzenie PHP jest wÅ‚Ä…czone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostaÅ‚o wyÅ‚Ä…czone."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "NastÄ™pujÄ…cy uÅ¼ytkownicy nie majÄ… skonfigurowanego szyfrowania:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index a2868ee45870e78ba5415dc4bd1592ef39126aa2..759e4d7247b08d5a13730a0ae41cc5023af5febf 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "ProszÄ™ podaÄ‡ prawidÅ‚owy klucz aplikacji Dropbox i klucz sekretny."
 msgid "Error configuring Google Drive storage"
 msgstr "WystÄ…piÅ‚ bÅ‚Ä…d podczas konfigurowania zasobu Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>OstrzeÅ¼enie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogÃ³w CIFS/SMB nie jest moÅ¼liwe. Skontaktuj sie z administratorem w celu zainstalowania."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>OstrzeÅ¼enie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub wÅ‚Ä…czone.  Skontaktuj sie z administratorem w celu zainstalowania lub wÅ‚Ä…czenia go."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index edb13b5100c2d6a4cf21ec878bed155f23bbc790..1a6992cd4b68d12a499ba3b195fbff02c4e6b8ff 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "To hasÅ‚o jest niewÅ‚aÅ›ciwe. SprÃ³buj ponownie."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "HasÅ‚o"
 msgid "Submit"
 msgstr "WyÅ›lij"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Przepraszamy ale wyglÄ…da na to, Å¼e ten link juÅ¼ nie dziaÅ‚a."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "MoÅ¼liwe powody:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "element zostaÅ‚ usuniÄ™ty"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "link wygasÅ‚"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "UdostÄ™pnianie jest wyÅ‚Ä…czone"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Aby uzyskaÄ‡ wiÄ™cej informacji proszÄ™ poprosiÄ‡ osobÄ™, ktÃ³ra wysÅ‚aÅ‚ ten link."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s wspÃ³Å‚dzieli folder z tobÄ… %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s wspÃ³Å‚dzieli z tobÄ… plik %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "WyÅ›lij"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Anuluj wysyÅ‚anie"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "PodglÄ…d nie jest dostÄ™pny dla"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 21174525e23c4e56cc5ea4b3213aa2e7ab34184c..fd82c9bdd6ddd777e02399adbd5d31fdcf35458c 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,47 @@ msgstr "Nie moÅ¼na trwale usunÄ…Ä‡ %s"
 msgid "Couldn't restore %s"
 msgstr "Nie moÅ¼na przywrÃ³ciÄ‡ %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "wykonywanie operacji przywracania"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "trwale usuÅ„ plik"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Trwale usuÅ„"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "UsuniÄ™te"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 folder"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "IloÅ›Ä‡ folderÃ³w: {count}"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 plik"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "IloÅ›Ä‡ plikÃ³w: {count}"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "przywrÃ³cony"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index 897cae06adf82179d4d7a705e7c7ab4175eeac3d..d9898916d8645ab69a2ceff9c1af6fdff8918892 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-01 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 07:38+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Nie moÅ¼na byÅ‚o przywrÃ³ciÄ‡: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "sukces"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Plik %s zostaÅ‚ przywrÃ³cony do wersji %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "poraÅ¼ka"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Plik %s nie mÃ³gÅ‚ byÄ‡ przywrÃ³cony do wersji %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Wersje"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Nie sÄ… dostÄ™pne Å¼adne starsze wersje"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Nie udaÅ‚o siÄ™ przywrÃ³ciÄ‡ zmiany {sygnatura czasowa} {plik}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nie podano Å›cieÅ¼ki"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "WiÄ™cej wersji..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Wersje"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Nie sÄ… dostÄ™pne Å¼adne inne wersje"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "PrzywrÃ³Ä‡ plik do poprzedniej wersji klikajÄ…c w jego przycisk przywrÃ³cenia"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "PrzywrÃ³Ä‡"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 9aaec600a5dafa66526a2a3d3ba77875aa6dcba1..6cdef8fb4791c3d39fc03664a1cdd1ec074b0b57 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "UÅ¼ytkownicy"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Aplikacje"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Administrator"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "BÅ‚Ä…d przy aktualizacji \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Kontrolowane serwisy"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Nie moÅ¼na otworzyÄ‡ \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyÅ‚Ä…czone."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszÄ… zostaÄ‡ pobrane pojedynczo."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "WrÃ³Ä‡ do plikÃ³w"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki sÄ… zbyt duÅ¼e, aby wygenerowaÄ‡ plik zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Pobierz pliki w mniejszy kawaÅ‚kach, oddzielnie lub poproÅ› administratora o zwiÄ™kszenie limitu."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nie moÅ¼e zostaÄ‡ znaleziony"
 
@@ -171,77 +183,81 @@ msgstr "Niepoprawne polecania:  \"%s\", nazwa: %s, hasÅ‚o: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL: Nazwa uÅ¼ytkownika i/lub hasÅ‚o jest niepoprawne"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Ustaw nazwÄ™ administratora."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Ustaw hasÅ‚o administratora."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umoÅ¼liwiÄ‡ synchronizacjÄ™ plikÃ³w, poniewaÅ¼ interfejs WebDAV wydaje siÄ™ byÄ‡ uszkodzony."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "SprawdÅº ponownie <a href='%s'>przewodniki instalacji</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minutÄ™ temu"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minut temu"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 godzinÄ™ temu"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d godzin temu"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "dziÅ›"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d dni temu"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "w zeszÅ‚ym miesiÄ…cu"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d miesiecy temu"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "w zeszÅ‚ym roku"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "lat temu"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Spowodowane przez:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 2580241a4b7731e94639619b2b2286990cbe5cc0..66939daefc5d70a05ffe01c7fbf5952ee8a160d1 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 12:00+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,166 +171,173 @@ msgstr "NaleÅ¼y podaÄ‡ prawidÅ‚owe hasÅ‚o"
 msgid "__language_name__"
 msgstr "polski"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "OstrzeÅ¼enie o zabezpieczeniach"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Katalog danych i twoje pliki sÄ… prawdopodobnie dostÄ™pne z Internetu. Plik .htaccess dostarczony przez ownCloud nie dziaÅ‚a. Zalecamy skonfigurowanie serwera internetowego w taki sposÃ³b, aby katalog z danymi nie byÅ‚ dostÄ™pny lub przeniesienie katalogu z danymi poza katalog gÅ‚Ã³wny serwera internetowego."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "OstrzeÅ¼enia konfiguracji"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umoÅ¼liwiÄ‡ synchronizacjÄ™ plikÃ³w, poniewaÅ¼ interfejs WebDAV wydaje siÄ™ byÄ‡ uszkodzony."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "SprawdÅº ponownie <a href='%s'>przewodniki instalacji</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "ProszÄ™ sprawdÅº ponownie <a href=\"%s\">przewodnik instalacji</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Brak moduÅ‚u â€žfileinfoâ€"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Brak moduÅ‚u PHP â€žfileinfoâ€. Zalecamy wÅ‚Ä…czenie tego moduÅ‚u, aby uzyskaÄ‡ najlepsze wyniki podczas wykrywania typÃ³w MIME."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Lokalizacja nie dziaÅ‚a"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Ten serwer ownCloud nie moÅ¼e wÅ‚Ä…czyÄ‡ ustawieÅ„ regionalnych %s. MoÅ¼e to oznaczaÄ‡, Å¼e wystÄ…piÅ‚y problemy z niektÃ³rymi znakami w nazwach plikÃ³w. Zalecamy instalacjÄ™ wymaganych pakietÃ³w na tym systemie w celu wsparcia %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "PoÅ‚Ä…czenie internetowe nie dziaÅ‚a"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Ten serwer OwnCloud nie ma dziaÅ‚ajÄ…cego poÅ‚Ä…czenia z Internetem. Oznacza to, Å¼e niektÃ³re z funkcji, takich jak montowanie zewnÄ™trznych zasobÃ³w, powiadomienia o aktualizacji lub instalacja dodatkowych aplikacji nie bÄ™dÄ… dziaÅ‚aÄ‡. DostÄ™p do plikÃ³w z zewnÄ…trz i wysyÅ‚anie powiadomieÅ„ e-mail moÅ¼e rÃ³wnieÅ¼ nie dziaÅ‚aÄ‡. Sugerujemy, aby wÅ‚Ä…czyÄ‡ poÅ‚Ä…czenie internetowe dla tego serwera, jeÅ›li chcesz korzystaÄ‡ ze wszystkich funkcji ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Wykonuj jedno zadanie wraz z kaÅ¼dÄ… wczytanÄ… stronÄ…"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php jest zarejestrowany w usÅ‚udze webcron. PrzywoÅ‚aj stronÄ™ cron.php w katalogu gÅ‚Ã³wnym ownCloud raz na minutÄ™ przez http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "UÅ¼yj systemowej usÅ‚ugi cron. PrzywoÅ‚aj plik cron.php z katalogu ownCloud przez systemowy cronjob raz na minutÄ™."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "UdostÄ™pnianie"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "WÅ‚Ä…cz API udostÄ™pniania"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Zezwalaj aplikacjom na korzystanie z API udostÄ™pniania"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Zezwalaj na odnoÅ›niki"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Zezwalaj uÅ¼ytkownikom na publiczne wspÃ³Å‚dzielenie zasobÃ³w za pomocÄ… odnoÅ›nikÃ³w"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "PozwÃ³l na  publiczne wczytywanie"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Zezwalaj na ponowne udostÄ™pnianie"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Zezwalaj uÅ¼ytkownikom na ponowne wspÃ³Å‚dzielenie zasobÃ³w juÅ¼ z nimi wspÃ³Å‚dzielonych"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Zezwalaj uÅ¼ytkownikom na wspÃ³Å‚dzielenie z kimkolwiek"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Zezwalaj uÅ¼ytkownikom wspÃ³Å‚dzieliÄ‡ z uÅ¼ytkownikami ze swoich grup"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "BezpieczeÅ„stwo"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "WymuÅ› HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Wymusza na klientach na Å‚Ä…czenie siÄ™ ownCloud za poÅ›rednictwem poÅ‚Ä…czenia szyfrowanego."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Wymusza na klientach na Å‚Ä…czenie siÄ™ %s za poÅ›rednictwem poÅ‚Ä…czenia szyfrowanego."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "ProszÄ™ poÅ‚Ä…cz siÄ™ do tej instancji ownCloud za poÅ›rednictwem protokoÅ‚u HTTPS, aby wÅ‚Ä…czyÄ‡ lub wyÅ‚Ä…czyÄ‡ stosowanie protokoÅ‚u SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Poziom logÃ³w"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "WiÄ™cej"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,72 +395,72 @@ msgstr "ZgÅ‚aszanie bÅ‚Ä™dÃ³w"
 msgid "Commercial Support"
 msgstr "Wsparcie komercyjne"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Pobierz aplikacje Å¼eby synchronizowaÄ‡ swoje pliki"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Wykorzystujesz <strong>%s</strong> z dostÄ™pnych <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "HasÅ‚o"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Twoje hasÅ‚o zostaÅ‚o zmienione"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Nie moÅ¼na zmieniÄ‡ hasÅ‚a"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "BieÅ¼Ä…ce hasÅ‚o"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nowe hasÅ‚o"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ZmieÅ„ hasÅ‚o"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "WyÅ›wietlana nazwa"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "TwÃ³j adres e-mail"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Podaj adres e-mail, aby uzyskaÄ‡ moÅ¼liwoÅ›Ä‡ odzyskania hasÅ‚a"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "JÄ™zyk"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "PomÃ³Å¼ w tÅ‚umaczeniu"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 9f81039b8cb2e335098ab01d77c3b6ee9dd07664..ba28976a1823ee473b18d001c01dd4437a81d021 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: orcio6 <orcio6@o2.pl>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,9 +90,9 @@ msgstr "PotwierdÅº usuniÄ™cie"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>OstrzeÅ¼enie:</b> Aplikacje user_ldap i user_webdavauth nie sÄ…  kompatybilne. MogÄ… powodowaÄ‡ nieoczekiwane zachowanie. PoproÅ› administratora o wyÅ‚Ä…czenie jednej z nich."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -223,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "WyÅ‚Ä…cz serwer gÅ‚Ã³wny"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Po wÅ‚Ä…czeniu, ownCloud tylko poÅ‚Ä…czy siÄ™ z serwerem repliki."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -243,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "WyÅ‚Ä…czyÄ‡ sprawdzanie poprawnoÅ›ci certyfikatu SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "JeÅ›li poÅ‚Ä…czenie dziaÅ‚a tylko z tÄ… opcjÄ…, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -269,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "Pole wyÅ›wietlanej nazwy uÅ¼ytkownika"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Atrybut LDAP sÅ‚uÅ¼y do generowania nazwy uÅ¼ytkownika ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -293,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "Pole wyÅ›wietlanej nazwy grupy"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Atrybut LDAP sÅ‚uÅ¼y do generowania nazwy grup ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -354,13 +355,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "DomyÅ›lnie, wewnÄ™trzna nazwa uÅ¼ytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator uÅ¼ytkownika. To daje pewnoÅ›Ä‡, Å¼e nazwa uÅ¼ytkownika jest niepowtarzalna a znaki nie muszÄ… byÄ‡ konwertowane. WewnÄ™trzna nazwa uÅ¼ytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. PozostaÅ‚e znaki zamieniane sÄ… na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa siÄ™ powtarza na koÅ„cu dodawana / zwiÄ™kszana jest cyfra. WewnÄ™trzna nazwa uÅ¼ytkownika sÅ‚uÅ¼y do wewnÄ™trznej identyfikacji uÅ¼ytkownika. Jest to rÃ³wnieÅ¼ domyÅ›lna nazwa gÅ‚Ã³wnego folderu w ownCloud. Jest to rÃ³wnieÅ¼ klucz zdalnego URL, na przykÅ‚ad dla wszystkich usÅ‚ug *DAV. DziÄ™ki temu ustawieniu moÅ¼na modyfikowaÄ‡ domyÅ›lne zachowania. Aby osiÄ…gnÄ…Ä‡ podobny efekt jak w ownCloud 5 wpisz atrybut nazwy uÅ¼ytkownika w poniÅ¼szym polu. Pozostaw puste dla domyÅ›lnego zachowania. Zmiany bÄ™dÄ… miaÅ‚y wpÅ‚yw tylko na nowo stworzonych (dodane) uÅ¼ytkownikÃ³w LDAP."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -372,12 +373,12 @@ msgstr "ZastÄ…p wykrywanie UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -391,17 +392,16 @@ msgstr "Mapowanie uÅ¼ytkownika LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 2df6fe576de2f9469a2e781b072dfc472f8a0adf..7c11b63e14a9237c86f9901f60cc429be93df6d7 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 09:50+0000\n"
+"POT-Creation-Date: 2013-08-01 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 07:38+0000\n"
 "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "Uwierzytelnienie WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr "Adres:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud wyÅ›le dane uwierzytelniajÄ…ce do tego URL. Ten plugin sprawdza odpowiedÅº i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidÅ‚owe dane uwierzytelniajÄ…ce, a kaÅ¼dy inny kod odpowiedzi jako poprawne dane."
+msgstr "Dane uwierzytelniajÄ…ce uÅ¼ytkownika zostanÄ… wysÅ‚ane na ten adres. Wtyczka sprawdza odpowiedÅº i bÄ™dzie interpretowaÅ‚ status  HTTP 401 i 403 jako nieprawidÅ‚owe dane uwierzytelniajÄ…ce i wszystkie inne odpowiedzi jako prawidÅ‚owe uwierzytelnienie."
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 6d38d5bd4e60fa92ed41ec405274ac3b1772e5b0..3bfe613cabb0a1a1e0371e6da1a828eeb5b903bc 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,59 @@ msgstr "novembro"
 msgid "December"
 msgstr "dezembro"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minuto atrÃ¡s"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutos atrÃ¡s"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 hora atrÃ¡s"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} horas atrÃ¡s"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dias atrÃ¡s"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ãºltimo mÃªs"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} meses atrÃ¡s"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
@@ -227,8 +227,8 @@ msgstr "O tipo de objeto nÃ£o foi especificado."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Erro"
 
@@ -248,140 +248,141 @@ msgstr "Compartilhados"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Erro ao descompartilhar"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissÃµes"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartilhado com vocÃª e com o grupo {group} por {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Compartilhado com vocÃª por {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Compartilhar com"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Compartilhar com link"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Senha"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Permitir upload pÃºblico"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Enviar link por e-mail"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Definir data de expiraÃ§Ã£o"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "NÃ£o Ã© permitido re-compartilhar"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiraÃ§Ã£o"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiraÃ§Ã£o"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "A atualizaÃ§Ã£o falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A atualizaÃ§Ã£o teve Ãªxito. VocÃª serÃ¡ redirecionado ao ownCloud agora."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Redefinir senha ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +403,7 @@ msgstr "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corre
 msgid "You will receive a link to reset your password via Email."
 msgstr "VocÃª receberÃ¡ um link para redefinir sua senha por e-mail."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nome de usuÃ¡rio"
@@ -463,11 +464,11 @@ msgstr "Ajuda"
 msgid "Access forbidden"
 msgstr "Acesso proibido"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud nÃ£o encontrado"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Sua versÃ£o do PHP estÃ¡ vulnerÃ¡vel ao ataque NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Por favor atualize sua instalaÃ§Ã£o do PHP para utilizar o ownCloud de forma segura."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Por favor, atualize sua instalaÃ§Ã£o PHP para usar %s seguranÃ§a."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Seu diretÃ³rio de dados e arquivos sÃ£o provavelmente acessÃveis pela internet, porque o .htaccess nÃ£o funciona."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Para obter informaÃ§Ãµes sobre como configurar corretamente o seu servidor, consulte a <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentaÃ§Ã£o</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Para obter informaÃ§Ãµes sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentaÃ§Ã£o</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta de administrador</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "AvanÃ§ado"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "serÃ¡ usado"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "UsuÃ¡rio do banco de dados"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "EspaÃ§o de tabela do banco de dados"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Host do banco de dados"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Concluir configuraÃ§Ã£o"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s estÃ¡ disponÃvel. Obtenha mais informaÃ§Ãµes sobre como atualizar."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Sair"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mais aplicativos"
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Entrada AutomÃ¡tica no Sistema Rejeitada!"
@@ -609,7 +615,7 @@ msgstr "Fazer login"
 msgid "Alternative Logins"
 msgstr "Logins alternativos"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 2dd4ac5c9670ea7387711865d9cb233658d9d3dd..ffc0846ecd32420f89124fa4646bf9bec83f49e0 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: tuliouel\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,7 @@ msgstr "Compartilhar"
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Excluir"
 
@@ -131,43 +131,45 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} jÃ¡ existe"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "SubstituÃdo {old_name} por {new_name} "
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "realizar operaÃ§Ã£o de exclusÃ£o"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "enviando 1 arquivo"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "enviando arquivos"
 
@@ -203,33 +205,29 @@ msgstr "Seu download estÃ¡ sendo preparado. Isto pode levar algum tempo se os ar
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta invÃ¡lido. O uso de 'Shared' Ã© reservado para o Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 pasta"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} pastas"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 arquivo"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} arquivos"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -288,61 +286,61 @@ msgstr "Pasta"
 msgid "From link"
 msgstr "Do link"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Arquivos apagados"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "VocÃª nÃ£o possui permissÃ£o de escrita aqui."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os arquivos que vocÃª estÃ¡ tentando carregar excedeu o tamanho mÃ¡ximo para arquivos no servidor."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Scanning atual"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "diretÃ³rio"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "diretÃ³rios"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "arquivo"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "arquivos"
 
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 907be4d30a22d6c6fbaf78853a19229c6427f699..6b636c6d004d58a70723c8eb83b23123f030bdd6 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -5,12 +5,13 @@
 # Translators:
 # bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # FlÃ¡vio Veras <flaviove@gmail.com>, 2013
+# wcavassin <cavassin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 23:10+0000\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-09 12:30+0000\n"
 "Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -65,15 +66,19 @@ msgstr "Sua chave privada nÃ£o Ã© vÃ¡lida! Provavelmente sua senha foi alterada
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr "Requisitos em falta."
+msgstr "Requisitos nÃ£o encontrados."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
 msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente estÃ¡ instalado e que a extensÃ£o PHP OpenSSL estÃ¡ habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
 
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "Seguintes usuÃ¡rios nÃ£o estÃ£o configurados para criptografia:"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Salvando..."
@@ -107,7 +112,7 @@ msgstr "Senha da chave de recuperaÃ§Ã£o"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr "Habilidado"
+msgstr "Habilitado"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
@@ -149,7 +154,7 @@ msgstr "Senha antiga de login"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr "Atual senha de login"
+msgstr "Senha de login atual"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index c5995a0d728f7ebb5c6962131d423b744a2f796d..e47a052c0bd49881480d8a90b6f257a536b34f0c 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Por favor forneÃ§a um app key e secret vÃ¡lido do Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar armazenamento do Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> \"smbclient\" nÃ£o estÃ¡ instalado. ImpossÃvel montar compartilhamentos de CIFS/SMB. Por favor, peÃ§a ao seu administrador do sistema para instalÃ¡-lo."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Aviso:</b> O suporte para FTP do PHP nÃ£o estÃ¡ ativado ou instalado. ImpossÃvel montar compartilhamentos FTP. Por favor, peÃ§a ao seu administrador do sistema para instalÃ¡-lo."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 569bf6f71c3def23d5116165503cc72f7704cd00..453ca120b6fe6cd897403da06509203d8627f145 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "Senha"
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Desculpe, este link parece nÃ£o mais  funcionar."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "As razÃµes podem ser:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "o item foi removido"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "o link expirou"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "compartilhamento estÃ¡ desativada"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Para mais informaÃ§Ãµes, por favor, pergunte a pessoa que enviou este link."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartilhou a pasta %s com vocÃª"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartilhou o arquivo %s com vocÃª"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Nenhuma visualizaÃ§Ã£o disponÃvel para"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index c9abb5c0d9fe404d45475eb989d0c606e958990e..3464db7a91185e6c94b42ccbafd79b6076f7c718 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# FlÃ¡vio Veras <flaviove@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "NÃ£o foi possÃvel excluir %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "NÃ£o foi possÃvel restaurar %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "realizar operaÃ§Ã£o de restauraÃ§Ã£o"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Erro"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "excluir arquivo permanentemente"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "ExcluÃdo"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 pasta"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} pastas"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 arquivo"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} arquivos"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "restaurado"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 8da66a76aac450bbdf6b5921e6127be4c4c99ba2..a766e6df9904694c7b47925db3a7e2a8c1fbf021 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# tuliouel, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 11:40+0000\n"
+"Last-Translator: tuliouel\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "ImpossÃvel reverter: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "sucesso"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Arquivo %s revertido Ã  versÃ£o %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "falha"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Arquivo %s nÃ£o pÃ´de ser revertido Ã  versÃ£o %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "VersÃµes"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Nenhuma versÃ£o antiga disponÃvel"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Falha ao reverter {file} para a revisÃ£o {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nenhum caminho especificado"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Mais versÃµes..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "VersÃµes"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Nenhuma outra versÃ£o disponÃvel"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Reverta um arquivo a uma versÃ£o anterior clicando no botÃ£o reverter"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Restaurar"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index dde1d12d51aeddb2961b234975beef70704c09f4..b8ce85263af5311c3b7d6b34483cb8006c33b61d 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "UsuÃ¡rios"
 
 #: app.php:409
-msgid "Apps"
-msgstr "AplicaÃ§Ãµes"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Falha na atualizaÃ§Ã£o de \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "serviÃ§os web sob seu controle"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "nÃ£o pode abrir \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Download ZIP estÃ¡ desligado."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Arquivos selecionados sÃ£o muito grandes para gerar arquivo zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Baixe os arquivos em pedaÃ§os menores, separadamente ou solicite educadamente  ao seu administrador."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nÃ£o pÃ´de ser determinado"
 
@@ -171,77 +183,77 @@ msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuÃ¡rio e/ou senha PostgreSQL invÃ¡lido(s)"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Defina um nome de usuÃ¡rio de administrador."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Defina uma senha de administrador."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Seu servidor web nÃ£o estÃ¡ configurado corretamente para permitir sincronizaÃ§Ã£o de arquivos porque a interface WebDAV parece estar quebrada."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, confira os <a href='%s'>guias de instalaÃ§Ã£o</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minuto atrÃ¡s"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutos atrÃ¡s"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 hora atrÃ¡s"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d horas atrÃ¡s"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hoje"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ontem"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d dias atrÃ¡s"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ãºltimo mÃªs"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d meses atrÃ¡s"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Causados â€‹â€‹por:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 2c23249c6337f391da388268b348922053904cc1..4fefbdfdef387383e316789c27059f9529e2499e 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,166 +171,173 @@ msgstr "ForneÃ§a uma senha vÃ¡lida"
 msgid "__language_name__"
 msgstr "PortuguÃªs (Brasil)"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Aviso de SeguranÃ§a"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Seu diretÃ³rio de dados e seus arquivos estÃ£o, provavelmente, acessÃveis a partir da internet. O .htaccess que o ownCloud fornece nÃ£o estÃ¡ funcionando. NÃ³s sugerimos que vocÃª configure o seu servidor web de uma forma que o diretÃ³rio de dados esteja mais acessÃvel ou que vocÃª mova o diretÃ³rio de dados para fora da raiz do servidor web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Seu diretÃ³rio de dados e seus arquivos sÃ£o, provavelmente, acessÃveis a partir da internet. O arquivo htaccess. nÃ£o estÃ¡ funcionando. NÃ³s sugerimos fortemente que vocÃª configure o seu servidor web de uma forma que o diretÃ³rio de dados nÃ£o esteja mais acessÃvel ou mova o diretÃ³rio de dados para fora do raiz do servidor."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Aviso de ConfiguraÃ§Ã£o"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Seu servidor web nÃ£o estÃ¡ configurado corretamente para permitir sincronizaÃ§Ã£o de arquivos porque a interface WebDAV parece nÃ£o estar funcionando."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Por favor, confira o <a href='%s'>guia de instalaÃ§Ã£o</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Por favor, verifique os <a href='%s'>guias de instalaÃ§Ã£o</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "MÃ³dulo 'fileinfo' faltando"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "O mÃ³dulo PHP 'fileinfo' estÃ¡ faltando. Recomendamos que ative este mÃ³dulo para obter uma melhor detecÃ§Ã£o do tipo de mÃdia (mime-type)."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "LocalizaÃ§Ã£o nÃ£o funcionando"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Este servidor ownCloud nÃ£o pode configurar a localizaÃ§Ã£o do sistema para %s.  Isto significa que pode haver problema com alguns caracteres nos nomes de arquivos.  NÃ³s recomendamos fortemente que vocÃª instale os pacotes requeridos em seu sistema para suportar %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "A localidade do sistema nÃ£o pode ser definida para %s. Isso significa que pode haver problemas com certos caracteres em nomes de arquivos. NÃ³s sugerimos  instalar os pacotes necessÃ¡rios no seu sistema para suportar %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Sem conexÃ£o com a internet"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Este servidor ownCloud nÃ£o tem conexÃ£o com a internet. Isto significa que alguns dos recursos como montar armazenamento externo, notificar atualizaÃ§Ãµes ou instalar aplicativos de terceiros nÃ£o funcionam. Acesso remoto a arquivos e envio de e-mails de notificaÃ§Ã£o podem tambÃ©m nÃ£o funcionar. Sugerimos que habilite a conexÃ£o com a internet neste servidor se quiser usufruir de todos os recursos do ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Este servidor nÃ£o tem conexÃ£o com a internet. Isso significa que algumas das caracterÃsticas como a montagem de armazenamento externo, notificaÃ§Ãµes sobre atualizaÃ§Ãµes ou instalaÃ§Ã£o de aplicativos de 3Âºs terceiros nÃ£o funcionam. Acessar arquivos remotamente e envio de e-mails de notificaÃ§Ã£o tambÃ©m nÃ£o podem funcionar. Sugerimos permitir conexÃ£o com a internet para esse servidor, se vocÃª deseja ter todas as funcionalidades."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Execute uma tarefa com cada pÃ¡gina carregada"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php estÃ¡ registrado no serviÃ§o webcron. Chame a pÃ¡gina cron.php na raÃz do owncloud a cada minuto por http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php estÃ¡ registrado em um serviÃ§o webcron chamar cron.php uma vez por minuto usando http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Usar serviÃ§o de cron do sistema. Chama o arquivo cron.php na pasta owncloud via cronjob do sistema a cada minuto."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Utilizar sistema de serviÃ§os cron para chamar o arquivo cron.php uma vez por minuto."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Compartilhamento"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Habilitar API de Compartilhamento"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que aplicativos usem a API de Compartilhamento"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que usuÃ¡rios compartilhem itens com o pÃºblico usando links"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Permitir envio pÃºblico"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Permitir que usuÃ¡rios deem permissÃ£o a outros para enviarem arquivios para suas pastas compartilhadas publicamente"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Permitir recompartilhamento"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que usuÃ¡rios compartilhem novamente itens compartilhados com eles"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Permitir que usuÃ¡rios compartilhem com qualquer um"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que usuÃ¡rios compartilhem somente com usuÃ¡rios em seus grupos"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "SeguranÃ§a"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ForÃ§ar HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "ForÃ§a o cliente a conectar-se ao ownCloud por uma conexÃ£o criptografada."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Obrigar os clientes que se conectem a %s atravÃ©s de uma conexÃ£o criptografada."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Por favor, conecte-se a esta instÃ¢ncia do ownCloud via HTTPS para habilitar ou desabilitar 'ForÃ§ar SSL'."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Por favor, se conectar ao seu %s via HTTPS para forÃ§ar ativar ou desativar SSL."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "NÃvel de registro"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "VersÃ£o"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,77 +395,77 @@ msgstr "Rastreador de Bugs"
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "FaÃ§a com que os apps sincronize seus arquivos"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Mostrar este Assistente de novo"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "VocÃª usou <strong>%s</strong> do seu espaÃ§o de <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Senha"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Sua senha foi alterada"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "NÃ£o Ã© possivel alterar a sua senha"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Senha atual"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome de ExibiÃ§Ã£o"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Seu endereÃ§o de e-mail"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha um endereÃ§o de e-mail para habilitar a recuperaÃ§Ã£o de senha"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Use esse endereÃ§o para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 014ce39d423c6d3719c6bb1956df2a12088ff0b8..94ddf91fe146c3ccbce0952d6042b35ff79dda58 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # FlÃ¡vio Veras <flaviove@gmail.com>, 2013
+# tuliouel, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: FlÃ¡vio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: tuliouel\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +90,9 @@ msgstr "Confirmar ExclusÃ£o"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth sÃ£o incompatÃveis. VocÃª deverÃ¡ experienciar comportamento inesperado. Por favor, peÃ§a ao seu administrador do sistema para desabilitar um deles."
+msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth sÃ£o incompatÃveis. VocÃª pode experimentar comportamento inesperado. Por favor, peÃ§a ao seu administrador do sistema para desabilitar um deles."
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "Desativar Servidor Principal"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Quando ativado, ownCloud somente se conectarÃ¡ ao servidor de rÃ©plica."
+msgid "Only connect to the replica server."
+msgstr "Conectar-se somente ao servidor de rÃ©plica."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Desligar validaÃ§Ã£o de certificado SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Se a conexÃ£o sÃ³ funciona com essa opÃ§Ã£o, importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
+"certificate in your %s server."
+msgstr "Se a conexÃ£o sÃ³ funciona com esta opÃ§Ã£o, importe o certificado SSL do servidor LDAP no seu servidor %s."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "Campo Nome de ExibiÃ§Ã£o de UsuÃ¡rio"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuÃ¡rio."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "O atributo LDAP para usar para gerar o nome de exibiÃ§Ã£o do usuÃ¡rio."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "Campo Nome de ExibiÃ§Ã£o de Grupo"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "O atributo LDAP para usar para gerar o nome de apresentaÃ§Ã£o do grupo."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +355,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Por padrÃ£o, o nome de usuÃ¡rio interno serÃ¡ criado a partir do atributo UUID. Ele garante que o nome de usuÃ¡rio Ã© Ãºnica e personagens nÃ£o precisam ser convertidos. O nome de usuÃ¡rio interno tem a restriÃ§Ã£o de que apenas estes caracteres sÃ£o permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres sÃ£o substituÃdas por seu correspondente ASCII ou simplesmente serÃ£o omitidos. Em colisÃµes um nÃºmero serÃ¡ adicionado/aumentado. O nome de utilizador interna Ã© usada para identificar um utilizador internamente. Ã‰ tambÃ©m o nome padrÃ£o para a pasta home do usuÃ¡rio em ownCloud. Ã‰ tambÃ©m um porto de URLs remoto, por exemplo, para todos os serviÃ§os de *DAV. Com esta definiÃ§Ã£o, o comportamento padrÃ£o pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuÃ¡rio no campo seguinte. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas no recÃ©m mapeados (adicionado) de usuÃ¡rios LDAP. "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "Por padrÃ£o, o nome de usuÃ¡rio interno serÃ¡ criado a partir do atributo UUID. Ele garante que o nome de usuÃ¡rio Ã© Ãºnico e que caracteres nÃ£o precisam ser convertidos. O nome de usuÃ¡rio interno tem a restriÃ§Ã£o de que apenas estes caracteres sÃ£o permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres sÃ£o substituÃdos por seus correspondentes em ASCII ou simplesmente serÃ£o omitidos. Em caso de colisÃ£o um nÃºmero serÃ¡ adicionado/aumentado. O nome de usuÃ¡rio interno Ã© usado para identificar um usuÃ¡rio internamente. Ã‰ tambÃ©m o nome padrÃ£o da pasta \"home\" do usuÃ¡rio. Ã‰ tambÃ©m parte de URLs remotas, por exemplo, para todos as instÃ¢ncias *DAV. Com esta definiÃ§Ã£o, o comportamento padrÃ£o pode ser sobrescrito. Para alcanÃ§ar um comportamento semelhante ao de antes do ownCloud 5, forneÃ§a o atributo do nome de exibiÃ§Ã£o do usuÃ¡rio no campo seguinte. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas para usuÃ¡rios LDAP recÃ©m mapeados (adicionados)."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +373,14 @@ msgstr "Substituir detecÃ§Ã£o UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Por padrÃ£o, ownCloud detecta automaticamente o atributo UUID. O atributo UUID Ã© usado para identificar, sem dÃºvida, os usuÃ¡rios e grupos LDAP. AlÃ©m disso, o nome de usuÃ¡rio interno serÃ¡ criado com base no UUID, se nÃ£o especificada acima. VocÃª pode substituir a configuraÃ§Ã£o e passar um atributo de sua escolha. VocÃª deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuÃ¡rios e grupos e Ã© Ãºnico. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas no recÃ©m mapeados (adicionado) de usuÃ¡rios e grupos LDAP."
+msgstr "Por padrÃ£o, o atributo UUID Ã© detectado automaticamente. O atributo UUID Ã© usado para identificar, sem dÃºvidas, os usuÃ¡rios e grupos LDAP. AlÃ©m disso, o nome de usuÃ¡rio interno serÃ¡ criado com base no UUID, se nÃ£o especificado acima. VocÃª pode substituir a configuraÃ§Ã£o e passar um atributo de sua escolha. VocÃª deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuÃ¡rios como para grupos, e que seja Ãºnico. Deixe-o vazio para o comportamento padrÃ£o. As alteraÃ§Ãµes terÃ£o efeito apenas para usuÃ¡rios e grupos LDAP recÃ©m mapeados (adicionados)."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +392,17 @@ msgstr "UsuÃ¡rio-LDAP Mapeamento de UsuÃ¡rio"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud usa nomes de usuÃ¡rios para armazenar e atribuir (meta) dados. A fim de identificar com precisÃ£o e reconhecer usuÃ¡rios, cada usuÃ¡rio LDAP terÃ¡ um nome de usuÃ¡rio interno. Isso requer um mapeamento de ownCloud do nome de usuÃ¡rio para usuÃ¡rio LDAP. O nome de usuÃ¡rio criado Ã© mapeado para o UUID do usuÃ¡rio LDAP. AlÃ©m disso, o DN estÃ¡ em cache, assim como para reduzir a interaÃ§Ã£o LDAP, mas que nÃ£o Ã© utilizado para a identificaÃ§Ã£o. Se a DN muda, as mudanÃ§as serÃ£o encontradas pelo ownCloud. O nome ownCloud interno Ã© utilizado em todo ownCloud. Limpando os mapeamentos terÃ¡ sobras em todos os lugares. Limpeza dos mapeamentos nÃ£o sÃ£o sensÃveis a configuraÃ§Ã£o, isso afeta todas as configuraÃ§Ãµes LDAP! Nunca limpar os mapeamentos em um ambiente de produÃ§Ã£o. Somente limpe os mapeamentos em uma fase de testes ou experimental."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "Nomes de usuÃ¡rios sÃ£i usados para armazenar e atribuir (meta) dados. A fim de identificar com precisÃ£o e reconhecer usuÃ¡rios, cada usuÃ¡rio LDAP terÃ¡ um nome de usuÃ¡rio interno. Isso requer um mapeamento nome de usuÃ¡rio para usuÃ¡rio LDAP. O nome de usuÃ¡rio criado Ã© mapeado para o UUID do usuÃ¡rio LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interaÃ§Ã£o LDAP, mas nÃ£o Ã© utilizado para a identificaÃ§Ã£o. Se o DN muda, as mudanÃ§as serÃ£o encontradas. O nome de usuÃ¡rio interno Ã© utilizado em todo lugar. Limpar os mapeamentos nÃ£o influencia a configuraÃ§Ã£o. Limpar os mapeamentos deixarÃ¡ rastros em todo lugar. Limpar os mapeamentos nÃ£o influencia a configuraÃ§Ã£o, mas afeta as configuraÃ§Ãµes LDAP! Somente limpe os mapeamentos em embiente de testes ou em estÃ¡gio experimental."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index c62680557cd8b348da5f9ef6b88faa1297790fae..04e4f7ff71c41f63e55c85aa02ad0887ae6afac2 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -6,13 +6,14 @@
 # bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013
 # thoriumbr <thoriumbr@gmail.com>, 2012
+# tuliouel, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-21 08:49+0200\n"
-"PO-Revision-Date: 2013-06-20 21:50+0000\n"
-"Last-Translator: bjamalaro <bjamalaro@yahoo.com.br>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 11:40+0000\n"
+"Last-Translator: tuliouel\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +26,12 @@ msgid "WebDAV Authentication"
 msgstr "AutenticaÃ§Ã£o WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "EndereÃ§o:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "O ownCloud enviarÃ¡ as credenciais do usuÃ¡rio para esta URL. Este plugin verifica a resposta e interpreta o os cÃ³digos de status do HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras respostas como credenciais vÃ¡lidas."
+msgstr "As credenciais de usuÃ¡rio serÃ£o enviadas para este endereÃ§o. Este plugin verifica a resposta e interpretarÃ¡ os cÃ³digos de status HTTP 401 e 403 como \"credenciais invÃ¡lidas\", e todas as outras respostas como \"credenciais vÃ¡lidas\"."
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 61c058b6b264378de250ea1247be596b90f63092..7b568baecacfb60a54201f05d601cb9626568fe7 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bruno Martins <bruno@bmartins.eu>, 2013
 # bmgmatias <bmgmatias@gmail.com>, 2013
 # Mouxy <daniel@mouxy.net>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +24,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr ""
+msgstr "%s partilhado Â»%sÂ« contigo"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -139,59 +141,59 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ConfiguraÃ§Ãµes"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Minutos atrÃ¡s"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "HÃ¡ 1 minuto"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutos atrÃ¡s"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "HÃ¡ 1 horas"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "HÃ¡ {hours} horas atrÃ¡s"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dias atrÃ¡s"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "ultÃmo mÃªs"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "HÃ¡ {months} meses atrÃ¡s"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
@@ -227,8 +229,8 @@ msgstr "O tipo de objecto nÃ£o foi especificado"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Erro"
 
@@ -248,140 +250,141 @@ msgstr "Partilhado"
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Erro ao deixar de partilhar"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissÃµes"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Partilhado consigo e com o grupo {group} por {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Partilhado consigo por {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Partilhar com"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Partilhar com link"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Permitir Envios PÃºblicos"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Enviar o link por e-mail"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Especificar data de expiraÃ§Ã£o"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "NÃ£o foi encontrado ninguÃ©m"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "NÃ£o Ã© permitido partilhar de novo"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiraÃ§Ã£o"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiraÃ§Ã£o"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "A actualizaÃ§Ã£o falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualizaÃ§Ã£o foi concluÃda com sucesso. Vai ser redireccionado para o ownCloud agora."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ReposiÃ§Ã£o da password ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +405,7 @@ msgstr "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vai receber um endereÃ§o para repor a sua password"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nome de utilizador"
@@ -413,11 +416,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Os seus ficheiros estÃ£o encriptados. Se nÃ£o activou a chave de recuperaÃ§Ã£o, nÃ£o vai ser possÃvel recuperar os seus dados no caso da sua password ser reinicializada. Se nÃ£o tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora."
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -463,11 +466,11 @@ msgstr "Ajuda"
 msgid "Access forbidden"
 msgstr "Acesso interdito"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud nao encontrada"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -476,7 +479,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "OlÃ¡,\n\nApenas para lhe informar que %s partilhou %s consigo.\nVeja-o: %s\n\nCumprimentos!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -496,8 +499,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "A sua versÃ£o do PHP Ã© vulnerÃ¡vel ao ataque Byte Null (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Por favor atualize a sua versÃ£o PHP instalada para usar o ownCloud com seguranÃ§a."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Por favor atualize a sua versÃ£o PHP instalada para usar o %s com seguranÃ§a."
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "A pasta de dados do ownCloud e os respectivos ficheiros, estarÃ£o provavelmente acessÃveis a partir da internet, pois o ficheiros .htaccess nÃ£o funciona."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Para obter informaÃ§Ãµes de como configurar correctamente o servidor, veja em: <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Para obter informaÃ§Ãµes de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentaÃ§Ã£o</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "AvanÃ§ado"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "vai ser usada"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tablespace da base de dados"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "AnfitriÃ£o da base de dados"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Acabar instalaÃ§Ã£o"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s estÃ¡ disponÃvel. Tenha mais informaÃ§Ãµes como actualizar."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Sair"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Login automÃ¡tico rejeitado!"
@@ -609,12 +617,12 @@ msgstr "Entrar"
 msgid "Alternative Logins"
 msgstr "Contas de acesso alternativas"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "OlÃ¡,<br><br>Apenas para lhe informar que %s partilhou Â»%sÂ« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 35bd2cd5c5774b48b2fae50f0909012aef0781be..496c1b0ba47af28c34efd8457007e5c7d414bc92 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # bmgmatias <bmgmatias@gmail.com>, 2013
+# FernandoMASilva, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +31,11 @@ msgstr "NÃ£o foi possÃvel move o ficheiro %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "NÃ£o foi possÃvel criar o diretÃ³rio de upload"
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "Token invÃ¡lido"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -121,7 +122,7 @@ msgstr "Partilhar"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -129,43 +130,45 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} jÃ¡ existe"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Executar a tarefa de apagar"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "A enviar 1 ficheiro"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "A enviar os ficheiros"
 
@@ -201,38 +204,34 @@ msgstr "O seu download estÃ¡ a ser preparado. Este processo pode demorar algum t
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta invÃ¡lido. O Uso de 'shared' Ã© reservado para o ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 pasta"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} pastas"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 ficheiro"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s nÃ£o pode ser renomeada"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,61 +285,61 @@ msgstr "Pasta"
 msgid "From link"
 msgstr "Da ligaÃ§Ã£o"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "NÃ£o tem permissÃµes de escrita aqui."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiro que estÃ¡ a tentar enviar excedem o tamanho mÃ¡ximo de envio neste servidor."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estÃ£o a ser analisados, por favor aguarde."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "AnÃ¡lise actual"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "diretÃ³rio"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "diretÃ³rios"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "ficheiro"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 7ad79e88e85db96adbaa8c8b1016e83fa57328db..7f8803616a8ac3ab721810f722eb2c5009ddde0c 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Mouxy <daniel@mouxy.net>, 2013
+# moura232 <moura232@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +54,7 @@ msgstr ""
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "NÃ£o foi possÃvel alterar a chave. Possivelmente a password antiga nÃ£o estÃ¡ correcta."
 
 #: files/error.php:7
 msgid ""
@@ -61,17 +62,21 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Chave privada nÃ£o Ã© vÃ¡lida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretÃ³rio corporativo). Pode atualizar password da chave privada em configuraÃ§Ãµes personalizadas para recuperar o acesso aos seus arquivos encriptados."
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Faltam alguns requisitos."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -90,7 +95,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:7
 msgid "personal settings"
-msgstr ""
+msgstr "configuraÃ§Ãµes personalizadas "
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
@@ -99,11 +104,11 @@ msgstr "EncriptaÃ§Ã£o"
 #: templates/settings-admin.php:10
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Active a chave de recuperaÃ§Ã£o (permite recuperar os ficheiros no caso de perda da password):"
 
 #: templates/settings-admin.php:14
 msgid "Recovery key password"
-msgstr ""
+msgstr "Chave de recuperaÃ§Ã£o da conta"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
@@ -115,15 +120,15 @@ msgstr "Desactivado"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "Alterar a chave de recuperaÃ§Ã£o:"
 
 #: templates/settings-admin.php:41
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Chave anterior de recuperaÃ§Ã£o da conta"
 
 #: templates/settings-admin.php:48
 msgid "New Recovery key password"
-msgstr ""
+msgstr "Nova chave de recuperaÃ§Ã£o da conta"
 
 #: templates/settings-admin.php:53
 msgid "Change Password"
@@ -145,11 +150,11 @@ msgstr ""
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "Password anterior da conta"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "Password actual da conta"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
@@ -157,13 +162,13 @@ msgstr ""
 
 #: templates/settings-personal.php:45
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "ativar recuperaÃ§Ã£o do password:"
 
 #: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Ao activar esta opÃ§Ã£o, tornar-lhe-a possÃvel a obtenÃ§Ã£o de acesso aos seus ficheiros encriptados caso perca a password."
 
 #: templates/settings-personal.php:63
 msgid "File recovery settings updated"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 15ecfd45cfcfee8ace9cb6ee68ca613abc7d5fa6..33b1d070b50638f66c1aba5ef7f8e55cc7dabb7f 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Por favor forneÃ§a uma \"app key\" e \"secret\" do Dropbox vÃ¡lidas."
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar o armazenamento do Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>AtenÃ§Ã£o:</b> O cliente \"smbclient\" nÃ£o estÃ¡ instalado. NÃ£o Ã© possÃvel montar as partilhas CIFS/SMB . PeÃ§a ao seu administrador para instalar."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Aviso:</b> O suporte FTP no PHP nÃ£o estÃ¡ activate ou instalado. NÃ£o Ã© possÃvel montar as partilhas FTP. PeÃ§a ao seu administrador para instalar."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 4997ef14d9409b09b9f95fb1981c15d167741b7d..b69a517b10a29b82233c3090a6e441cf467a8cdc 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2013
+# moliveira <manuel.oliveira@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-08 11:00+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +21,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Password errada, por favor tente de novo"
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +31,52 @@ msgstr "Password"
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Desculpe, mas este link parece nÃ£o estar a funcionar."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "As razÃµes poderÃ£o ser:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "O item foi removido"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "O link expirou"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "A partilha estÃ¡ desativada"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Para mais informaÃ§Ãµes, por favor questione a pessoa que lhe enviou este link"
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s partilhou a pasta %s consigo"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s partilhou o ficheiro %s consigo"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Carregar"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "NÃ£o hÃ¡ prÃ©-visualizaÃ§Ã£o para"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 57fea671259ce0521fffe96a8c9c512db3c03134..e23fb508d18da523cbf0f46542e76830bb7d8575 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "NÃ£o foi possÃvel eliminar %s de forma permanente"
 msgid "Couldn't restore %s"
 msgstr "NÃ£o foi possÃvel restaurar %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "executar a operaÃ§Ã£o de restauro"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Erro"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "Eliminar permanentemente o(s) ficheiro(s)"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Apagado"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 pasta"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} pastas"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 ficheiro"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Restaurado"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 07264486f6a61883791e758a7bd875c89dba70a1..d7bba2e218b1c902ebbde04e261440ce990e6d43 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-30 01:55-0400\n"
+"PO-Revision-Date: 2013-07-29 15:40+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "NÃ£o foi possÃvel reverter: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "Sucesso"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "O ficheiro %s foi revertido para a versÃ£o %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "VersÃµes"
 
-#: history.php:49
-msgid "failure"
-msgstr "Falha"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Falhou a recuperaÃ§Ã£o do ficheiro {file} para a revisÃ£o {timestamp}."
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "NÃ£o foi possÃvel reverter o ficheiro %s para a versÃ£o %s"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Mais versÃµes..."
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr "NÃ£o existem versÃµes mais antigas"
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nenhum caminho especificado"
-
-#: js/versions.js:6
-msgid "Versions"
-msgstr "VersÃµes"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Reverter um ficheiro para uma versÃ£o anterior clicando no seu botÃ£o reverter."
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Restaurar"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index ac87ceedb31200e0140aa1fd4d52ce6404dbd5b8..890855582cf895c0af9633ab1d9cb2f84737291c 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Utilizadores"
 
 #: app.php:409
-msgid "Apps"
-msgstr "AplicaÃ§Ãµes"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "A actualizaÃ§Ã£o \"%s\" falhou."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "serviÃ§os web sob o seu controlo"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "NÃ£o foi possÃvel abrir \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP estÃ¡ desligado."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados sÃ£o grandes demais para gerar um ficheiro zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Descarregue os ficheiros em partes menores, separados ou peÃ§a gentilmente ao seu administrador."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "NÃ£o foi possÃvel determinar"
 
@@ -171,77 +183,77 @@ msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de utilizador/password do PostgreSQL invÃ¡lido"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Definir um nome de utilizador de administrador"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Definiar uma password de administrador"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web nÃ£o estÃ¡ configurado correctamente para autorizar sincronizaÃ§Ã£o de ficheiros, pois o interface WebDAV parece estar com problemas."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Minutos atrÃ¡s"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "HÃ¡ 1 minuto"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "hÃ¡ %d minutos"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "HÃ¡ 1 horas"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "HÃ¡ %d horas"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hoje"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ontem"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "hÃ¡ %d dias"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "ultÃmo mÃªs"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "HÃ¡ %d meses atrÃ¡s"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "ano passado"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Causado por:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 76d8aeafcff89a3be8fad07ff677419d9bab0324..b367d9ee7e481344c8681de446f5483eae3fcf31 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -5,14 +5,15 @@
 # Translators:
 # bmgmatias <bmgmatias@gmail.com>, 2013
 # Mouxy <daniel@mouxy.net>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013
 # Nelson Rosado <nelsontrosado@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -172,166 +173,173 @@ msgstr "Uma password vÃ¡lida deve ser fornecida"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Aviso de SeguranÃ§a"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "A sua pasta com os dados e os seus ficheiros estÃ£o provavelmente acessÃveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessÃvel, ou mova a pasta com os dados para fora da raiz de documentos do servidor web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "A sua pasta com os dados e os seus ficheiros estÃ£o provavelmente acessÃveis a partir das internet. O seu ficheiro .htaccess nÃ£o estÃ¡ a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessÃvel, ou mova a pasta com os dados para fora da raiz de documentos do servidor web."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Aviso de setup"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web nÃ£o estÃ¡ configurado correctamente para autorizar sincronizaÃ§Ã£o de ficheiros, pois o interface WebDAV parece estar com problemas."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Por favor verifique <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "Por favor verifique o<a href='%s'>Guia de instalaÃ§Ã£o</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Falta o mÃ³dulo 'fileinfo'"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "O MÃ³dulo PHP 'fileinfo' nÃ£o se encontra instalado/activado. Ã‰ fortemente recomendado que active este mÃ³dulo para obter os melhores resultado com a detecÃ§Ã£o dos tipos de mime."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "InternacionalizaÃ§Ã£o nÃ£o estÃ¡ a funcionar"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr "Este servidor de ownCloud nÃ£o consegue definir a codificaÃ§Ã£o de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. Ã‰ fortemente recomendado que instale o pacote recomendado para ser possÃvel ver caracteres codificados em %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "A ligaÃ§Ã£o Ã  internet nÃ£o estÃ¡ a funcionar"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Este servidor ownCloud nÃ£o tem uma ligaÃ§Ã£o de internet funcional. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificaÃ§Ãµes sobre actualizÃ§Ãµes, ou a instalaÃ§Ã£o de aplicaÃ§Ãµes nÃ£o irÃ¡ funcionar. Sugerimos que active uma ligaÃ§Ã£o Ã  internet se pretende obter todas as funcionalidades do ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Este servidor ownCloud nÃ£o tem uma ligaÃ§Ã£o de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificaÃ§Ãµes sobre actualizÃ§Ãµes, ou a instalaÃ§Ã£o de aplicaÃ§Ãµes nÃ£o irÃ¡ funcionar. Sugerimos que active uma ligaÃ§Ã£o Ã  internet se pretender obter todas as funcionalidades do ownCloud."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Executar uma tarefa com cada pÃ¡gina carregada"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php estÃ¡ registado como um serviÃ§o webcron. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php estÃ¡ registado num serviÃ§o webcron para chamar a pÃ¡gina cron.php por http uma vez por minuto."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Usar o serviÃ§o cron do sistema. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Use o serviÃ§o cron do sistema para chamar o ficheiro cron.php uma vez por minuto."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Partilha"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activar a API de partilha"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os utilizadores usem a API de partilha"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os utilizadores partilhem itens com o pÃºblico utilizando um link."
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Permitir Envios PÃºblicos"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "SeguranÃ§a"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ForÃ§ar HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "ForÃ§ar clientes a ligar atravÃ©s de uma ligaÃ§Ã£o encriptada"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "ForÃ§ar os clientes a ligar a %s atravÃ©s de uma ligaÃ§Ã£o encriptada"
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Por favor ligue-se ao ownCloud atravÃ©s de uma ligaÃ§Ã£o HTTPS para ligar/desligar o forÃ§ar da ligaÃ§Ã£o por SSL"
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Por favor ligue-se a %s atravÃ©s de uma ligaÃ§Ã£o HTTPS para ligar/desligar o uso de ligaÃ§Ã£o por SSL"
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "NÃvel do registo"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "VersÃ£o"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,77 +397,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Obtenha as aplicaÃ§Ãµes para sincronizar os seus ficheiros"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Mostrar novamente Wizard de Arranque Inicial"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "A sua palavra-passe foi alterada"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "NÃ£o foi possivel alterar a sua palavra-chave"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Palavra-chave actual"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome pÃºblico"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "O seu endereÃ§o de email"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha com o seu endereÃ§o de email para ativar a recuperaÃ§Ã£o da palavra-chave"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Use este endereÃ§o para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 88d851ab545581248223859a12dcd8fa94a1549d..b843c86fd17fa1be2a7b52eaa24f611df07ce067 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bruno Martins <bruno@bmartins.eu>, 2013
 # Mouxy <daniel@mouxy.net>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +91,9 @@ msgstr "Confirmar a operaÃ§Ã£o de apagar"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Aviso:</b> A aplicaÃ§Ã£o user_ldap e user_webdavauth sÃ£o incompativeis. A aplicaÃ§Ã£o pode tornar-se instÃ¡vel. Por favor, peÃ§a ao seu administrador para desactivar uma das aplicaÃ§Ãµes."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +224,8 @@ msgid "Disable Main Server"
 msgstr "Desactivar servidor principal"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Se estiver ligado, o ownCloud vai somente ligar-se a este servidor de rÃ©plicas."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +244,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Desligar a validaÃ§Ã£o de certificado SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Se a ligaÃ§Ã£o apenas funcionar com estÃ¡ opÃ§Ã£o, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +271,8 @@ msgid "User Display Name Field"
 msgstr "Mostrador do nome de utilizador."
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +295,8 @@ msgid "Group Display Name Field"
 msgstr "Mostrador do nome do grupo."
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,12 +356,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -371,12 +374,12 @@ msgstr "Passar a detecÃ§Ã£o do UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -390,17 +393,16 @@ msgstr "Mapeamento do utilizador LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index bee54e46dab1e05d77669bea1856f26415b5fbe2..34a04dacb0d7b342b01f4ac1c5a130eed2e32f3f 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Mouxy <daniel@mouxy.net>, 2012-2013
-# Helder Meneses <helder.meneses@gmail.com>, 2012
+# Helder Meneses <helder.meneses@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-30 01:55-0400\n"
+"PO-Revision-Date: 2013-07-29 15:30+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "AutenticaÃ§Ã£o WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr ""
+msgid "Address: "
+msgstr "EndereÃ§o:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "O ownCloud vai enviar as credenciais do utilizador atravÃ©s deste URL. Este plugin verifica a resposta e vai interpretar os cÃ³digos de estado HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras como vÃ¡lidas."
+msgstr "As credenciais do utilizador vÃ£o ser enviadas para endereÃ§o URL. Este plugin verifica a resposta e vai interpretar os cÃ³digos de estado HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras respostas como vÃ¡lidas."
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 7b3fa9071a6c79f86054d2fa43f8b641d36d7f24..39cd512c1a51c562460e9856cd29dfcfc9fb66d3 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# corneliu.e <corneliueva@yahoo.com>, 2013
 # dimaursu16 <dima@ceata.org>, 2013
 # ripkid666 <ripkid666@gmail.com>, 2013
 # sergiu_sechel <sergiu.sechel@gmail.com>, 2013
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +43,7 @@ msgstr "AceastÄƒ categorie deja existÄƒ: %s"
 #: ajax/vcategories/favorites.php:24
 #: ajax/vcategories/removeFromFavorites.php:26
 msgid "Object type not provided."
-msgstr "Tipul obiectului nu este prevazut"
+msgstr "Tipul obiectului nu este prevÄƒzut"
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
@@ -53,16 +54,16 @@ msgstr "ID-ul %s nu a fost introdus"
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "Eroare la adÄƒugarea %s la favorite"
+msgstr "Eroare la adÄƒugarea %s la favorite."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Nici o categorie selectatÄƒ pentru È™tergere."
+msgstr "Nicio categorie selectatÄƒ pentru È™tergere."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Eroare la È™tergerea %s din favorite"
+msgstr "Eroare la È™tergerea %s din favorite."
 
 #: js/config.php:32
 msgid "Sunday"
@@ -140,59 +141,63 @@ msgstr "Noiembrie"
 msgid "December"
 msgstr "Decembrie"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "SetÄƒri"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "secunde Ã®n urmÄƒ"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minut Ã®n urmÄƒ"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minute in urma"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Acum o ora"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} ore Ã®n urmÄƒ"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "astÄƒzi"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} zile in urma"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "ultima lunÄƒ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} luni Ã®n urmÄƒ"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "luni Ã®n urmÄƒ"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "ani Ã®n urmÄƒ"
 
@@ -223,19 +228,19 @@ msgstr "Ok"
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
-msgstr "Tipul obiectului nu a fost specificat"
+msgstr "Tipul obiectului nu este specificat."
 
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Eroare"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "Numele aplicaÈ›iei nu a fost specificat"
+msgstr "Numele aplicaÈ›iei nu este specificat."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
@@ -249,140 +254,141 @@ msgstr "Partajat"
 msgid "Share"
 msgstr "PartajeazÄƒ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Eroare la anularea partajÄƒrii"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Eroare la modificarea permisiunilor"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Distribuie cu tine si grupul {group} de {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Distribuie cu tine de {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Partajat cu"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Partajare cu legÄƒturÄƒ"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Protejare cu parolÄƒ"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ParolÄƒ"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "PermiteÅ£i Ã®ncÄƒrcarea publicÄƒ."
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "ExpediazÄƒ legÄƒtura prin poÈ™ta electronicÄƒ"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "ExpediazÄƒ"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "SpecificÄƒ data expirÄƒrii"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data expirÄƒrii"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Distribuie prin email:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Nici o persoanÄƒ gÄƒsitÄƒ"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisÄƒ"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Distribuie in {item} si {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "È™tergere"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Protejare cu parolÄƒ"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Se expediazÄƒ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "Modernizarea a eÈ™uat! <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Te rugam sa raportezi problema aici.</a>."
+msgstr "Actualizarea a eÈ™uat! RaportaÈ›i problema cÄƒtre <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Modernizare reusita! Vei fii redirectionat!"
+msgstr "Actualizare reuÈ™itÄƒ. EÈ™ti redirecÈ›ionat cÄƒtre ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Resetarea parolei ownCloud "
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,9 +407,9 @@ msgstr "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corec
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "Vei primi un mesaj prin care vei putea reseta parola via email"
+msgstr "Vei primi un mesaj prin care vei putea reseta parola via email."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Nume utilizator"
@@ -454,7 +460,7 @@ msgstr "AplicaÈ›ii"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrator"
 
 #: strings.php:9
 msgid "Help"
@@ -462,13 +468,13 @@ msgstr "Ajutor"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Acces interzis"
+msgstr "Acces restricÈ›ionat"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Nu s-a gÄƒsit"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,105 +500,110 @@ msgstr "Avertisment de securitate"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "Versiunea dvs. PHP este vulnerabil la acest atac un octet null  (CVE-2006-7243)"
+msgstr "Versiunea dvs. PHP este vulnerabilÄƒ la un atac cu un octet NULL  (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "VÄƒ rugÄƒm sÄƒ actualizaÈ›i instalarea dvs. PHP pentru a utiliza ownCloud in siguranÈ›Äƒ."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Te rog actualizeazÄƒ versiunea PHP pentru a utiliza %s Ã®n mod securizat."
 
 #: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL"
+msgstr "Nu este disponibil niciun generator securizat de numere aleatoare, vÄƒ rog activaÈ›i extensia PHP OpenSSL."
 
 #: templates/installation.php:33
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau"
+msgstr "FÄƒrÄƒ generatorul securizat de numere aleatoare , un atacator poate anticipa simbolurile de resetare a parolei È™i poate prelua controlul asupra contului tÄƒu."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Directorul de date È™i fiÈ™iere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcÈ›ioneazÄƒ."
+msgstr "Directorul tÄƒu de date È™i fiÈ™iere sunt probabil accesibile de pe Internet, deoarece fiÈ™ierul .htaccess nu funcÈ›ioneazÄƒ."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Pentru informatii despre configurarea corecta a serverului accesati pagina <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Documentare</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Pentru informaÈ›ii despre cum sÄƒ configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentaÈ›ia</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "CreazÄƒ un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ConfigureazÄƒ baza de date"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "vor fi folosite"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tabela de spaÈ›iu a bazei de date"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "BazÄƒ date"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "FinalizeazÄƒ instalarea"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s este disponibil. Vezi mai multe informaÈ›ii despre procesul de actualizare."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "IeÈ™ire"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "Logare automata respinsa"
+msgstr "Autentificare automatÄƒ respinsÄƒ!"
 
 #: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis"
+msgstr "DacÄƒ nu È›i-ai schimbat parola recent, contul tÄƒu ar putea fi compromis!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou."
+msgstr "Te rog schimbÄƒ-È›i parola pentru a-È›i securiza din nou contul."
 
 #: templates/login.php:34
 msgid "Lost your password?"
@@ -610,7 +621,7 @@ msgstr "Autentificare"
 msgid "Alternative Logins"
 msgstr "ConectÄƒri alternative"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 3462c483be40b3ef09b5a91db1168386f7bce9d6..07c31dd14349f8bb0e9d69c83984613f99ef3723 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: sergiu_sechel <sergiu.sechel@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,7 @@ msgstr "PartajeazÄƒ"
 msgid "Delete permanently"
 msgstr "Stergere permanenta"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "È˜terge"
 
@@ -131,43 +131,46 @@ msgstr "È˜terge"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ÃŽn aÈ™teptare"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ã®nlocuire"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugereazÄƒ nume"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "AnuleazÄƒ ultima acÈ›iune"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "efectueaza operatiunea de stergere"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "un fiÈ™ier se Ã®ncarcÄƒ"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "fiÈ™iere se Ã®ncarcÄƒ"
 
@@ -203,33 +206,31 @@ msgstr "Se pregÄƒteÈ™te descÄƒrcarea. Aceasta poate sÄƒ dureze ceva timp dacÄƒ f
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 folder"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} foldare"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fisier"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} fisiere"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -288,61 +289,61 @@ msgstr "Dosar"
 msgid "From link"
 msgstr "de la adresa"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Sterge fisierele"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "AnuleazÄƒ Ã®ncÄƒrcarea"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Nu ai permisiunea de a sterge fisiere aici."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. ÃŽncarcÄƒ ceva!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "DescarcÄƒ"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "FiÈ™ierul Ã®ncÄƒrcat este prea mare"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "FiÈ™ierul care l-ai Ã®ncÄƒrcat a depÄƒÈ™itÄƒ limita maximÄƒ admisÄƒ la Ã®ncÄƒrcare pe acest server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "FiÈ™ierele sunt scanate, te rog aÈ™teptÄƒ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "ÃŽn curs de scanare"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "catalog"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "cataloage"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fiÈ™ier"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "fiÈ™iere"
 
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index d499ad94c54db7fc2e8381f3356f9c8ebebb41f5..6a275845501aaa98f97164edf5a0f70a38ef6964 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 420d1c1fce5b105d1026c41b26a3c558edf577b7..3d7a2b5f8c07c2022be0c6ee1351e2a0cd0e47d7 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "PrezintÄƒ te rog o cheie de Dropbox validÄƒ È™i parola"
 msgid "Error configuring Google Drive storage"
 msgstr "Eroare la configurarea mediului de stocare Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>AtenÈ›ie:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilÄƒ. SolicitÄƒ administratorului sistemului tÄƒu sÄƒ Ã®l instaleaze."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>AtenÈ›ie:</b> suportul pentru FTP Ã®n PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilÄƒ. SolicitÄƒ administratorului sistemului tÄƒu sÄƒ Ã®l instaleze."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 7724a00bde2985974fa1394b041a8c6edcdf65c1..bf1518c49c38249e9e53106fa44e7dc934882a2a 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: sergiu_sechel <sergiu.sechel@gmail.com>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +30,52 @@ msgstr "ParolÄƒ"
 msgid "Submit"
 msgstr "Trimite"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partajat directorul %s cu tine"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partajat fiÈ™ierul %s cu tine"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "DescarcÄƒ"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ÃŽncÄƒrcare"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "AnuleazÄƒ Ã®ncÄƒrcarea"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Nici o previzualizare disponibilÄƒ pentru "
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index be6255c8f7dbb0f899eee9f09ddfdb906f9f9b20..59197c9f4fdbc2a1e04b6cba64f83558ae65818e 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,47 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Eroare"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Stergere permanenta"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Nume"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 folder"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} foldare"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fisier"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} fisiere"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 07ce3897b263a053f35bb3c8958cb722b3f147a3..fca319471ecf9e7b332218ab2be15a278212c021 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Nu a putut reveni: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "success"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Fisierul %s a revenit la versiunea %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "eÈ™ec"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Fisierele %s nu au putut reveni la versiunea %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versiuni"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Versiunile vechi nu sunt disponibile"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nici un dosar specificat"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versiuni"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Readuceti un fiÈ™ier la o versiune anterioarÄƒ, fÄƒcÃ¢nd clic pe butonul revenire"
+#: js/versions.js:149
+msgid "Restore"
+msgstr ""
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index eb126e248e55aa066a057cc716cbd89ff5554026..0aec6a81b4a2799e120b451cbec751157d9d4b3c 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Utilizatori"
 
 #: app.php:409
-msgid "Apps"
-msgstr "AplicaÈ›ii"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "DescÄƒrcarea ZIP este dezactivatÄƒ."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "FiÈ™ierele trebuie descÄƒrcate unul cÃ¢te unul."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ÃŽnapoi la fiÈ™iere"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "FiÈ™ierele selectate sunt prea mari pentru a genera un fiÈ™ier zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nu poate fi determinat"
 
@@ -170,77 +182,81 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serverul de web nu este Ã®ncÄƒ setat corespunzÄƒtor pentru a permite sincronizarea fiÈ™ierelor deoarece interfaÈ›a WebDAV pare a fi Ã®ntreruptÄƒ."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "VÄƒ rugÄƒm sÄƒ verificaÈ›i <a href='%s'>ghiduri de instalare</ a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "secunde Ã®n urmÄƒ"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minut Ã®n urmÄƒ"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minute Ã®n urmÄƒ"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Acum o ora"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ore in urma"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "astÄƒzi"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ieri"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d zile Ã®n urmÄƒ"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "ultima lunÄƒ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d luni in urma"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "ultimul an"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "ani Ã®n urmÄƒ"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index ca4b3daf03647258b6b14f79fa901a8f88822994..1889d0846af8dd06da742c1ee91861a75b31d545 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr "Trebuie sÄƒ furnizaÅ£i o parolÄƒ validÄƒ"
 msgid "__language_name__"
 msgstr "_language_name_"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Avertisment de securitate"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Directorul tÄƒu de date È™i fiÈ™ierele tale probabil sunt accesibile prin internet. FiÈ™ierul .htaccess oferit de ownCloud nu funcÈ›ioneazÄƒ. ÃŽÈ›i recomandÄƒm sÄƒ configurezi server-ul tÄƒu web Ã®ntr-un mod Ã®n care directorul de date sÄƒ nu mai fie accesibil sau mutÄƒ directorul de date Ã®n afara directorului root al server-ului web."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "AtenÅ£ie la implementare"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serverul de web nu este Ã®ncÄƒ setat corespunzÄƒtor pentru a permite sincronizarea fiÈ™ierelor deoarece interfaÈ›a WebDAV pare a fi Ã®ntreruptÄƒ."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "VÄƒ rugÄƒm sÄƒ verificaÈ›i <a href='%s'>ghiduri de instalare</ a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modulul \"Fileinfo\" lipseÈ™te"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Modulul PHP \"Fileinfo\" lipseÈ™te. Va recomandam sa activaÅ£i acest modul pentru a obÈ›ine cele mai bune rezultate cu detectarea mime-type."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Localizarea nu funcÈ›ioneazÄƒ"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Acest server ownCloud nu poate seta sistemul de localizare pentru% s. Acest lucru Ã®nseamnÄƒ cÄƒ ar putea exista probleme cu anumite caractere Ã®n numele de fiÈ™iere. VÄƒ recomandÄƒm sÄƒ instalaÈ›i pachetele necesare pe sistemul dumneavoastrÄƒ pentru a sprijini% s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Conexiunea la internet nu funcÈ›ioneazÄƒ"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Acest server ownCloud nu are nici o conexiune la internet activÄƒ. Acest lucru Ã®nseamnÄƒ cÄƒ anumite caracteristici, cum ar fi montarea mediilor de stocare externe, notificÄƒri despre actualizÄƒri sau instalarea de aplicatii tereÅ£e nu funcÈ›ioneazÄƒ. Accesarea fiÈ™ierelor de la distanÈ›Äƒ È™i trimiterea de e-mailuri de notificare s-ar putea, de asemenea, sÄƒ nu funcÈ›ioneze. VÄƒ sugerÄƒm sÄƒ permiteÅ£i conectarea la Internet pentru acest server, dacÄƒ doriÈ›i sÄƒ aveÈ›i toate caracteristicile de oferite de ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "ExecutÄƒ o sarcinÄƒ la fiecare paginÄƒ Ã®ncÄƒrcatÄƒ"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php este Ã®nregistrat Ã®n serviciul webcron. AcceseazÄƒ pagina cron.php din root-ul owncloud odatÄƒ pe minut prin http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "FoloseÈ™te serviciul cron al sistemului. AcceseazÄƒ fiÈ™ierul cron.php din directorul owncloud printr-un cronjob de sistem odatÄƒ la fiecare minut."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Partajare"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Activare API partajare"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Permite aplicaÈ›iilor sÄƒ foloseascÄƒ API-ul de partajare"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Pemite legÄƒturi"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Permite utilizatorilor sÄƒ partajeze fiÈ™iere Ã®n mod public prin legÄƒturi"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Permite repartajarea"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Permite utilizatorilor sÄƒ repartajeze fiÈ™iere partajate cu ei"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Permite utilizatorilor sÄƒ partajeze cu oricine"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Permite utilizatorilor sÄƒ partajeze doar cu utilizatori din acelaÈ™i grup"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Securitate"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Nivel jurnal"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Mai puÈ›in"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,72 +394,72 @@ msgstr "UrmÄƒrire bug-uri"
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Ia acum aplicatia pentru sincronizarea fisierelor "
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "AÈ›i utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ParolÄƒ"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Parola a fost modificatÄƒ"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Imposibil de-aÈ›i schimbat parola"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Parola curentÄƒ"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Noua parolÄƒ"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "SchimbÄƒ parola"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "CompleteazÄƒ o adresÄƒ de mail pentru a-È›i putea recupera parola"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "AjutÄƒ la traducere"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index b6b64f2a32268bf91a166e40b2c4eb363081203f..2d78008fc4ed2b0c8c284c083d43c4c814203192 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. VÄƒ rugÄƒm sÄƒ Ã®ntrebaÈ›i administratorul de sistem pentru a dezactiva una dintre ele."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "OpreÈ™te validarea certificatelor SSL "
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "DacÄƒ conexiunea lucreazÄƒ doar cu aceastÄƒ opÈ›iune, importeazÄƒ certificatul SSL al serverului LDAP Ã®n serverul ownCloud."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "CÃ¢mpul cu numele vizibil al utilizatorului"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "CÃ¢mpul cu numele grupului"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 79f4ebb8a790942de08371322b7d43f364a4ecc6..a4507bddf333569d7f07ba646d8347375b4b0fd9 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "Autentificare WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud va trimite datele de autentificare la acest URL. Acest modul verificÄƒ rÄƒspunsul È™i va interpreta codurile de status HTTP 401 sau 403 ca fiind date de autentificare invalide, È™i orice alt rÄƒspuns ca fiind date valide."
+msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 11a016c019df58faf18f553a54ba484bfb0c0cea..81dee27e6ca6b8c8a8b3eee1ab7b6caeb214ef3d 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -8,14 +8,15 @@
 # foool <andrglad@mail.ru>, 2013
 # Victor Bravo <>, 2013
 # Vyacheslav Muranov <s@neola.ru>, 2013
+# Den4md <denstarr@mail.md>, 2013
 # Langaru <langaru@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
-"Last-Translator: Victor Bravo <>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -143,59 +144,63 @@ msgstr "ÐÐ¾ÑÐ±Ñ€ÑŒ"
 msgid "December"
 msgstr "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
@@ -231,8 +236,8 @@ msgstr "Ð¢Ð¸Ð¿ Ð¾Ð±ÑŠÐµÐºÑ‚Ð° Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
@@ -252,140 +257,141 @@ msgstr "ÐžÐ±Ñ‰Ð¸Ðµ"
 msgid "Share"
 msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¼ÐµÐ½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ð¹"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ {group} "
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑŒÑÑ Ñ"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑŒÑÑ Ñ ÑÑÑ‹Ð»ÐºÐ¾Ð¹"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑƒÑŽ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÑƒ"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ð°Ñ ÑÑÑ‹Ð»ÐºÐ° Ð½Ð° Ð¿ÐµÑ€ÑÐ¾Ð½Ñƒ"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑÑ Ñ‡ÐµÑ€ÐµÐ· ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½ÑƒÑŽ Ð¿Ð¾Ñ‡Ñ‚Ñƒ:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "ÐÐ¸ Ð¾Ð´Ð¸Ð½ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº {item} Ñ {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶ÐµÑ‚ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¼ÐµÐ½Ðµ ÑÑ€Ð¾ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ ÑÑ€Ð¾ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð»ÑÐµÑ‚ÑÑ ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "ÐŸÐ¸ÑÑŒÐ¼Ð¾ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¾"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "ÐŸÑ€Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ°. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° ÑÐ¾Ð¾Ð±Ñ‰Ð¸Ñ‚Ðµ Ð¾Ð± ÑÑ‚Ð¾Ð¼ Ð² <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ÑÐ¾Ð¾Ð±Ñ‰ÐµÑÑ‚Ð²Ð¾</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾. ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÐµÐ¼ÑÑ Ð² Ð’Ð°Ñˆ ownCloud..."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ "
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -406,7 +412,7 @@ msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ ÑƒÐ´Ð°Ð»ÑÑ. Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ email Ð¸Ð»Ð¸
 msgid "You will receive a link to reset your password via Email."
 msgstr "ÐÐ° Ð²Ð°Ñˆ Ð°Ð´Ñ€ÐµÑ Email Ð²Ñ‹ÑÐ»Ð°Ð½Ð° ÑÑÑ‹Ð»ÐºÐ° Ð´Ð»Ñ ÑÐ±Ñ€Ð¾ÑÐ° Ð¿Ð°Ñ€Ð¾Ð»Ñ."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
@@ -467,11 +473,11 @@ msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
 msgid "Access forbidden"
 msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "ÐžÐ±Ð»Ð°ÐºÐ¾ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -500,8 +506,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Ð’Ð°ÑˆÐ° Ð²ÐµÑ€ÑÐ¸Ñ PHP ÑƒÑÐ·Ð²Ð¸Ð¼Ð° Ðº Ð°Ñ‚Ð°ÐºÐµ NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ð’Ð°Ñˆ PHP Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ownCloud Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ð’Ð°ÑˆÑƒ PHP ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ Ð´Ð»Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ %s."
 
 #: templates/installation.php:32
 msgid ""
@@ -521,68 +528,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Ð’Ð°ÑˆÐ° Ð¿Ð°Ð¿ÐºÐ° Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð¸ Ñ„Ð°Ð¹Ð»Ñ‹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð¸Ð· Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð° Ð¿Ð¾Ñ‚Ð¾Ð¼Ñƒ Ñ‡Ñ‚Ð¾ Ñ„Ð°Ð¹Ð» .htaccess Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Ð”Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ ÐºÐ°Ðº Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð’Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€, Ð¿Ð¾Ð¶Ð°Ð»Ð¹ÑÑ‚Ð° Ð·Ð°Ð³Ð»ÑÐ½Ð¸Ñ‚Ðµ Ð² <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÑŽ</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Ð”Ð»Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸, ÐºÐ°Ðº Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð’Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð·Ð°Ð³Ð»ÑÐ½Ð¸Ñ‚Ðµ Ð² <a hrev=\"%s\"target=\"blank\">Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÑŽ</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ <strong>ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¾"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ‡Ð¾Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾. ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½ÑƒÑŽ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð¿Ð¾Ñ€ÑÐ´ÐºÐµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ð’Ñ‹Ð¹Ñ‚Ð¸"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ð²Ñ…Ð¾Ð´ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½!"
@@ -613,7 +624,7 @@ msgstr "Ð’Ð¾Ð¹Ñ‚Ð¸"
 msgid "Alternative Logins"
 msgstr "ÐÐ»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ðµ Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 55a94ed8cd90b4e8a563190ae17ee25aa612fbbb..eed35b95f72dba7ffb75e9f0d6df0d62e4003bef 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -5,14 +5,15 @@
 # Translators:
 # lord93 <lordakryl@gmail.com>, 2013
 # Victor Bravo <>, 2013
+# hackproof <hackproof.ai@gmail.com>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: Victor Bravo <>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +124,7 @@ msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 msgid "Delete permanently"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
@@ -131,43 +132,46 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 msgid "Rename"
 msgstr "ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ÐžÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {new_name} Ð½Ð° {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
-msgstr "Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÑÐµÑ‚ÑÑ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
+msgstr "Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸ÑŽ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ 1 Ñ„Ð°Ð¹Ð»"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Ñ„Ð°Ð¹Ð»Ñ‹ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÑŽÑ‚ÑÑ"
 
@@ -203,33 +207,31 @@ msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð½Ð°Ñ‡Ð°Ð»Ð°ÑÑŒ. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¾Ð²Ð°
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ð˜Ð¼Ñ"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ñ‘Ð½"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -288,61 +290,61 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "Ð˜Ð· ÑÑÑ‹Ð»ÐºÐ¸"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ð£Ð´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Ð£ Ð²Ð°Ñ Ð½ÐµÑ‚ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ð¹ Ð½Ð° Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð´ÐµÑÑŒ."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð» ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸Ðº"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ñ‹ Ð¿Ñ‹Ñ‚Ð°ÐµÑ‚ÐµÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ, Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÑŽÑ‚ Ð»Ð¸Ð¼Ð¸Ñ‚ Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð½Ð° ÑÑ‚Ð¾Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ðµ."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "ÐŸÐ¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ, Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐºÐ°Ð½Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Ð¢ÐµÐºÑƒÑ‰ÐµÐµ ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Ñ„Ð°Ð¹Ð»"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Ñ„Ð°Ð¹Ð»Ñ‹"
 
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index d206ebc812059b226bb5267497062fe6a59987b4..c8c997b80a2d2647396d496471393c7d89afb496 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 10:40+0000\n"
-"Last-Translator: Victor Bravo <>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,10 +72,14 @@ msgstr "Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÑŽÑ‚."
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑƒÐ±ÐµÐ´Ð¸Ñ‚ÐµÑÑŒ, Ñ‡Ñ‚Ð¾ PHP 5.3.3 Ð¸Ð»Ð¸ Ð½Ð¾Ð²ÐµÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ Ñ‡Ñ‚Ð¾ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ðµ OpenSSL PHP Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½ Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½. Ð’ Ð½Ð°ÑÑ‚Ð¾ÑÑ‰ÐµÐµ Ð²Ñ€ÐµÐ¼Ñ, ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 5a43cc160475ce1e554d13d04cc0d5a7ad5d1799..bad6e0f93060176b4286504ec3411e73585de62d 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ð¹ Ðº
 msgid "Error configuring Google Drive storage"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐµ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ð° Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> \"smbclient\" Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½. ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¿Ð¾ CIFS/SMB Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> ÐŸÐ¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° FTP Ð½Ðµ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° Ð² PHP. ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¿Ð¾ FTP Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 0e02ea287bd890ca2db831814a3b55e35592c412..244bdea5e0b9d235882362705362993ebc31601b 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Victor Bravo <>, 2013
+# Den4md <denstarr@mail.md>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Victor Bravo <>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Den4md <denstarr@mail.md>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,28 +31,52 @@ msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 msgid "Submit"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "Ðš ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸ÑŽ, ÑÑ‚Ð° ÑÑÑ‹Ð»ÐºÐ°, Ð¿Ð¾Ñ…Ð¾Ð¶Ðµ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ Ð±Ð¾Ð»ÑŒÑˆÐµ."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "ÐŸÑ€Ð¸Ñ‡Ð¸Ð½Ð¾Ð¹ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "Ð¾Ð±ÑŠÐµÐºÑ‚ Ð±Ñ‹Ð» ÑƒÐ´Ð°Ð»Ñ‘Ð½"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "ÑÑ€Ð¾Ðº ÑÑÑ‹Ð»ÐºÐ¸ Ð¸ÑÑ‚Ñ‘Ðº"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "Ð¾Ð±Ð¼ÐµÐ½ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑÐ¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ñ‚Ð¾Ð³Ð¾ ÐºÑ‚Ð¾ Ð¾Ñ‚Ð¾ÑÐ»Ð°Ð» Ð´Ð°Ð½Ð½ÑƒÑŽ ÑÑÑ‹Ð»ÐºÑƒ."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ %s Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ñƒ %s Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ°"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ÐŸÑ€ÐµÐ´Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½ Ð´Ð»Ñ"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 3ee3410a04971c80b0a506fba5c59f13165e0a77..c0a473a4e6de557b6633e32d9641c8dbacd4720d 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Den4md <denstarr@mail.md>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,47 @@ msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ´Ð°Ð»Ñ‘Ð½ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
 msgid "Couldn't restore %s"
 msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸ÑŽ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¾ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ð˜Ð¼Ñ"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Ð£Ð´Ð°Ð»Ñ‘Ð½"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 78d3f7898b96c174eacfe2b47376cf7eabc9389b..792666d741e2f4ce83db6ceb4a23ca5f71bcef78 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alexander Shashkevych <alex@stunpix.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-07-30 01:55-0400\n"
+"PO-Revision-Date: 2013-07-29 10:50+0000\n"
+"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: ru\n"
 "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);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ñ‘Ð½: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "ÑƒÑÐ¿ÐµÑ…"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Ð¤Ð°Ð¹Ð» %s Ð±Ñ‹Ð» Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ñ‘Ð½ Ðº Ð²ÐµÑ€ÑÐ¸Ð¸ %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "Ð¿Ñ€Ð¾Ð²Ð°Ð»"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Ð¤Ð°Ð¹Ð» %s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‰Ñ‘Ð½ Ðº Ð²ÐµÑ€ÑÐ¸Ð¸ %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "ÐÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… ÑÑ‚Ð°Ñ€Ñ‹Ñ… Ð²ÐµÑ€ÑÐ¸Ð¹"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ {file} Ðº Ñ€ÐµÐ²Ð¸Ð·Ð¸Ð¸ {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "ÐŸÑƒÑ‚ÑŒ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Ð•Ñ‰Ñ‘ Ð²ÐµÑ€ÑÐ¸Ð¸..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Ð”Ñ€ÑƒÐ³Ð¸Ñ… Ð²ÐµÑ€ÑÐ¸Ð¹ Ð½Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ñ„Ð°Ð¹Ð» Ðº Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½Ð°Ð¶Ð°Ñ‚Ð¸ÐµÐ¼ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð²Ð¾Ð·Ð²Ñ€Ð°Ñ‚Ð°"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ð’Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index ad2eabc93ffc4e30e782a0d26bfd831a90b8a6bd..fe99071b8b577ddaf51c81b335fb811b9c80d847 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alexander Shashkevych <alex@stunpix.com>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
 
 #: app.php:409
-msgid "Apps"
-msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "ÐÐµ ÑÐ¼Ð¾Ð³ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ð¸ÑÑ‹ Ð¿Ð¾Ð´ Ð²Ð°ÑˆÐ¸Ð¼ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸ÐµÐ¼"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Ð½Ðµ Ð¼Ð¾Ð³Ñƒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP-ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¿Ð¾ Ð¾Ð´Ð½Ð¾Ð¼Ñƒ."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ zip Ñ„Ð°Ð¹Ð»."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð» Ð¼Ð°Ð»ÐµÐ½ÑŒÑˆÐ¸Ð¼Ð¸ Ð¿Ð¾Ñ€Ñ†Ð¸ÑÐ¼Ð¸, Ñ€Ð°Ð·Ð´ÐµÐ»ÑŒÐ½Ð¾ Ð¸Ð»Ð¸ Ð²ÐµÐ¶Ð»Ð¸Ð²Ð¾ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ð’Ð°ÑˆÐµÐ³Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
@@ -171,77 +184,81 @@ msgstr "Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð±Ñ‹Ð»Ð°: \"%s\", Ð¸Ð¼Ñ: %s, Ð¿Ð°Ñ€
 msgid "PostgreSQL username and/or password not valid"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸/Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ PostgreSQL"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ admin."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ admin."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’Ð°Ñˆ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð¾ ÑÐ¸Ñ… Ð¿Ð¾Ñ€ Ð½Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð², Ð¿Ð¾Ñ…Ð¾Ð¶Ðµ Ñ‡Ñ‚Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð² Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ÑÑ‚Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ° WebDAV."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ <a href='%s'>Ð¸Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ð¸ Ð¿Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Ð’Ñ‹Ð·Ð²Ð°Ð½Ð¾:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index be58d8197737bda3ebbf3f0a625acdc6248d8d39..32a1640562dec7f19f079637e4d480ad99c6f9bf 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,17 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alexander Shashkevych <alex@stunpix.com>, 2013
 # alfsoft <alfsoft@gmail.com>, 2013
 # lord93 <lordakryl@gmail.com>, 2013
 # eurekafag <eurekafag@eureka7.ru>, 2013
+# hackproof <hackproof.ai@gmail.com>, 2013
 # Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,166 +175,173 @@ msgstr "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð²Ð°Ð»Ð¸Ð´Ð½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 msgid "__language_name__"
 msgstr "Ð ÑƒÑÑÐºÐ¸Ð¹ "
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ð’Ð°Ñˆ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð¸ Ñ„Ð°Ð¹Ð»Ñ‹, Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð¸Ð· Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð°. Ð¤Ð°Ð¹Ð» .htaccess, Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÑÐµÐ¼Ñ‹Ð¹ ownCloud, Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚. ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¸Ð¼ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð±Ñ‹Ð»Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹, Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚ÑŒ Ð¸Ñ… Ð·Ð° Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‹ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð³Ð¾ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€Ð°."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ, Ñ‡Ñ‚Ð¾ Ð¿Ð°Ð¿ÐºÐ° Ñ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð¸ Ð’Ð°ÑˆÐ¸ Ñ„Ð°Ð¹Ð»Ñ‹ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð¸Ð· Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð°. Ð¤Ð°Ð¹Ð» .htaccess Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚. ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð¾ Ð¿Ñ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼ Ð’Ð°Ð¼ ÑÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²ÐµÐ±ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¸Ð¼ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð°Ð¿ÐºÐ° Ñ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ Ð±Ñ‹Ð»Ð° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð° Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ ÐºÑƒÐ´Ð°-Ð½Ð¸Ð±ÑƒÐ´ÑŒ Ð² Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾ Ð²Ð½Ðµ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð²ÐµÐ±ÑÐµÑ€Ð²ÐµÑ€Ð°."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð¾ ÑÐ¸Ñ… Ð¿Ð¾Ñ€ Ð½Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð². ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ Ñ‡Ñ‚Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð² Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ÑÑ‚Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ° WebDAV."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ <a href='%s'>Ð¸Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ð¸ Ð¿Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "ÐœÐ¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP Ð¼Ð¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚. ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ‚Ð¸Ð¿Ð¾Ð² (mime-type) Ñ„Ð°Ð¹Ð»Ð¾Ð²."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Ð›Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "ÐÑ‚Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ·Ñ‹Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð½Ð° %s. ÐÑ‚Ð¾ Ð¾Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚, Ñ‡Ñ‚Ð¾ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼Ð¸ Ð² Ð¸Ð¼ÐµÐ½Ð°Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð². ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð² Ð²Ð°ÑˆÐµÐ¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ ÑÐ·Ñ‹Ðº Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð² %s. ÐÑ‚Ð¾ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ Ð¼Ð¾Ð³ÑƒÑ‚ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½ÑƒÑ‚ÑŒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼Ð¸ Ð² Ð¸Ð¼ÐµÐ½Ð°Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð². ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð¾ Ð¿Ñ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð² Ð’Ð°ÑˆÐµÐ¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "ÐÑ‚Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ. ÐÑ‚Ð¾ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€: Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»ÐµÐ¹, ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÑ…, ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÑ‚Ð¾Ñ€Ð¾Ð½Ð½Ð¸Ñ… Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "ÐÑ‚Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ‚Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚. ÐÑ‚Ð¾ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸, Ñ‚Ð°ÐºÐ¸Ðµ ÐºÐ°Ðº Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… Ð´Ð¸ÑÐºÐ¾Ð², ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÑ… Ð¸Ð»Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÑ‚Ð¾Ñ€Ð¾Ð½Ð½Ð¸Ñ… Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ â€“ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÑŽÑ‚. Ð£Ð´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼ Ð¸ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ° ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ Ð¿Ð¾ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ðµ Ð²ÐµÑ€Ð¾ÑÑ‚Ð½ÐµÐµ Ð²ÑÐµÐ³Ð¾ Ñ‚Ð¾Ð¶Ðµ Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÑ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð¾Ð¼ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°, ÐµÑÐ»Ð¸ Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸Ð¼ÐµÑ‚ÑŒ Ð²ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "ÐŸÐ»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ñ‰Ð¸Ðº Ð·Ð°Ð´Ð°Ñ‡ Ð¿Ð¾ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸ÑŽ"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½ÑÑ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð·Ð°Ð´Ð°Ð½Ð¸Ðµ Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†ÐµÐ¹"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "Ð—Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ cron.php Ð² ÑÐ»ÑƒÐ¶Ð±Ðµ webcron ÑÐµÑ€Ð²Ð¸ÑÐµ. Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÑ‚ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ cron.php Ð² ÐºÐ¾Ñ€Ð½Ðµ owncloud Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ñ‡ÐµÑ€ÐµÐ· http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ð² ÑÐµÑ€Ð²Ð¸ÑÐµ webcron, Ñ‡Ñ‚Ð¾Ð±Ñ‹ cron.php Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ð»ÑÑ Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½ÑƒÑŽ ÑÐ»ÑƒÐ¶Ð±Ñƒ cron. Ð’Ñ‹Ð·Ð¾Ð² Ñ„Ð°Ð¹Ð»Ð° cron.php Ð² Ð¿Ð°Ð¿ÐºÐµ owncloud Ñ‡ÐµÑ€ÐµÐ· ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ cronjob Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²Ð¸Ñ cron Ð´Ð»Ñ Ð²Ñ‹Ð·Ð¾Ð²Ð° cron.php Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ API Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ API Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ ÑÑÑ‹Ð»ÐºÐ¸"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð² Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ‹ Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑÑ‹Ð»ÐºÐ¾Ð¹"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Ð² Ð¸Ñ… Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð¿Ð°Ð¿ÐºÐ¸"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ðµ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÐ»Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð°Ð¼ ÑƒÐ¶Ðµ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ Ð² Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð»ÑŽÐ±Ð¾Ð¼Ñƒ"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸Ñ… Ð³Ñ€ÑƒÐ¿Ð¿"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÑŒ Ðº HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº ownCloud Ñ‡ÐµÑ€ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº %s Ñ‡ÐµÑ€ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÑ‚Ð¾Ð¼Ñƒ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ€Ñƒ ownCloud Ñ‡ÐµÑ€ÐµÐ· HTTPS Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ SSL Ð¿Ñ€Ð¸Ð½ÑƒÐ¶Ð´ÐµÐ½Ð¸Ñ."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÐµÑÑŒ Ðº %s Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ HTTPS Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ SSL."
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Ð›Ð¾Ð³"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Ð£Ñ€Ð¾Ð²ÐµÐ½ÑŒ Ð»Ð¾Ð³Ð°"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐµ"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "ÐœÐµÐ½ÑŒÑˆÐµ"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ñ"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -390,77 +399,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "ÐšÐ¾Ð¼Ð¼ÐµÑ€Ñ‡ÐµÑÐºÐ°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ°"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ð²Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð½Ð¸Ðº Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ð’Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð»Ð¸ <strong>%s</strong> Ð¸Ð· Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ð’Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Ð¢ÐµÐºÑƒÑ‰Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ð¡Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ð’Ð°Ñˆ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾ÑÐ²Ð¸Ð»Ð°ÑÑŒ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Ð¯Ð·Ñ‹Ðº"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‡ÑŒ Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÑ‚Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑ Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð²Ð°ÑˆÐ¸Ð¼ Ñ„Ð°Ð¹Ð»Ð°Ð¼ Ñ‡ÐµÑ€ÐµÐ· WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 226679950cc98ea92c1910636cb092e618bf6090..a2e443c735b215687c52e5d128e11fe196e18974 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alexander Shashkevych <alex@stunpix.com>, 2013
 # Fenuks <fenuksuh@ya.ru>, 2013
 # alfsoft <alfsoft@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: alfsoft <alfsoft@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,9 +91,9 @@ msgstr "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ðµ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b>ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap Ð¸ user_webdavauth Ð½ÐµÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ñ‹. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÑ‚Ð¾Ð»ÐºÐ½ÑƒÑ‚ÑŒÑÑ Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¼ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸ÐµÐ¼. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð¸Ð· Ð½Ð¸Ñ…."
+msgstr "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap Ð¸ user_webdavauth Ð½Ðµ ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ñ‹. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð½Ð°Ð±Ð»ÑŽÐ´Ð°Ñ‚ÑŒ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ðµ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ð’Ð°ÑˆÐµÐ³Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð¸Ð· Ð½Ð¸Ñ…."
 
 #: templates/settings.php:12
 msgid ""
@@ -223,8 +224,8 @@ msgid "Disable Main Server"
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "ÐšÐ¾Ð³Ð´Ð° Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, ownCloud Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾ÐµÐ´Ð¸Ð½ÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -243,10 +244,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÑƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Ð•ÑÐ»Ð¸ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ ÑÑ‚Ð¾Ð¹ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹, Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ Ð½Ð° Ð²Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€ ownCloud ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ SSL ÑÐµÑ€Ð²ÐµÑ€Ð° LDAP."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -269,8 +271,8 @@ msgid "User Display Name Field"
 msgstr "ÐŸÐ¾Ð»Ðµ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -293,8 +295,8 @@ msgid "Group Display Name Field"
 msgstr "ÐŸÐ¾Ð»Ðµ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -354,13 +356,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "ÐŸÐ¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±ÑƒÐ´ÐµÑ‚ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Ð¸Ð· Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð° UUID. ÐÑ‚Ð¾ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±Ñ‹Ð»Ð¾ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼ Ð¸ Ð½Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð»Ð¾ Ð² ÑÐµÐ±Ðµ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð½Ñ‹Ñ… ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð². Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ‚ ÑÐ¾ÑÑ‚Ð¾ÑÑ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¸Ð· ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ñ… ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²: [ a-zA-Z0-9_.@- ]. ÐžÑÑ‚Ð°Ð»ÑŒÐ½Ñ‹Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð·Ð°Ð¼ÐµÑ‰Ð°ÑŽÑ‚ÑÑ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸ÑÐ¼Ð¸ Ð¸Ð· Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ ASCII Ð¸Ð»Ð¸ Ð¶Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ð¾ Ð¿Ñ€Ð¾Ð¿ÑƒÑÐºÐ°ÑŽÑ‚ÑÑ. ÐŸÑ€Ð¸ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ð¸ Ðº Ð¸Ð¼ÐµÐ½Ð¸ Ð±ÑƒÐ´ÐµÑ‚ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ Ñ‡Ð¸ÑÐ»Ð¾. Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ¹ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. Ð¢Ð°ÐºÐ¶Ðµ Ð¾Ð½Ð¾ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð´Ð»Ñ Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ownCloud. ÐžÐ½Ð¾ Ñ‚Ð°ÐºÐ¶Ðµ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð¼ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ñ‹Ñ… ÑÑÑ‹Ð»Ð¾Ðº, Ðº Ð¿Ñ€Ð¸Ð¼ÐµÑ€Ñƒ, Ð´Ð»Ñ Ð²ÑÐµÑ… ÑÐµÑ€Ð²Ð¸ÑÐ¾Ð² *DAV. Ð¡ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ÑŽ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð§Ñ‚Ð¾Ð±Ñ‹ Ð´Ð¾ÑÑ‚Ð¸Ñ‡ÑŒ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ, ÐºÐ°Ðº Ð±Ñ‹Ð»Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¾ Ð´Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ, ownCloud 5 Ð²Ñ‹Ð²Ð¾Ð´Ð¸Ñ‚ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² ÑÑ‚Ð¾Ð¼ Ð¿Ð¾Ð»Ðµ. ÐžÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ ÐµÐ³Ð¾ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ Ð¸Ð¼ÐµÑ‚ÑŒ ÑÑ„Ñ„ÐµÐºÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ñ… (Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ…) Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ LDAP."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -372,14 +374,14 @@ msgstr "ÐŸÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "ÐŸÐ¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ, ownCloud Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÐµÑ‚ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ UUID Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸. ÐÑ‚Ð¾Ñ‚ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ð¾ Ð¸Ð½Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ LDAP. Ð¢Ð°ÐºÐ¶Ðµ, Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð° UUID ÑÐ¾Ð·Ð´Ð°ÐµÑ‚ÑÑ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, ÐµÑÐ»Ð¸ Ð²Ñ‹ÑˆÐµ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ Ð¸Ð½Ð°Ñ‡Ðµ. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿ÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ ÑÑ‚Ñƒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ Ð¸ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¿Ð¾ Ð²Ñ‹Ð±Ð¾Ñ€Ñƒ. Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ ÑƒÐ´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒÑÑ, Ñ‡Ñ‚Ð¾ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ð²Ð°Ð¼Ð¸ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿, Ð° Ñ‚Ð°ÐºÐ¶Ðµ Ñ‚Ð¾, Ñ‡Ñ‚Ð¾ Ð¾Ð½ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¹. ÐžÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ðµ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ Ð´Ð»Ñ Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²ÑÑ‚ÑƒÐ¿ÑÑ‚ Ð² ÑÐ¸Ð»Ñƒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ‹Ñ… (Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ…) Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿ LDAP."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -391,18 +393,17 @@ msgstr "Ð¡Ð¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð˜Ð¼Ñ-ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ LDAP"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¸ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð°Ð´Ð°Ð½Ð½Ñ‹Ñ…. Ð”Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð¹ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð¸ Ñ€Ð°ÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹, ÐºÐ°Ð¶Ð´Ñ‹Ð¹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ LDAP Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð¼ÐµÑ‚ÑŒ ÑÐ²Ð¾Ðµ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ. ÐÑ‚Ð¾ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ñ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud Ðº Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŽ LDAP. ÐŸÑ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚ÑÑ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ñƒ UUID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ LDAP. ÐŸÐ¾Ð¼Ð¸Ð¼Ð¾ ÑÑ‚Ð¾Ð³Ð¾ ÐºÑÑˆÐ¸Ñ€ÑƒÐµÑ‚ÑÑ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ (DN) Ð´Ð»Ñ ÑÐ½Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ LDAP, Ð¾Ð´Ð½Ð°ÐºÐ¾ Ð¾Ð½Ð¾ Ð½Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸. Ð•ÑÐ»Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾, Ð¾Ð± ÑÑ‚Ð¾Ð¼ ÑÑ‚Ð°Ð½ÐµÑ‚ Ð¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾ ownCloud. Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐµ Ð¸Ð¼Ñ ownCloud Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð¿Ð¾Ð²ÑÐµÐ¼ÐµÑÑ‚Ð½Ð¾ Ð² ownCloud. ÐŸÑ€Ð¸ Ð¾Ñ‡Ð¸ÑÑ‚ÐºÐµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ð¹ Ð¿Ð¾Ð²ÑÑŽÐ´Ñƒ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾ÑÑ‚Ð°Ð²Ð°Ñ‚ÑŒÑÑ \"Ñ…Ð²Ð¾ÑÑ‚Ñ‹\". ÐžÑ‡Ð¸ÑÑ‚ÐºÐ° ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ð¹ Ð½Ðµ Ð¿Ñ€Ð¸Ð²ÑÐ·Ð°Ð½Ð° Ðº ÐºÐ¾Ð½ÐºÑ€ÐµÑ‚Ð½Ð¾Ð¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸, Ð¾Ð½Ð° Ð²Ð»Ð¸ÑÐµÑ‚ Ð½Ð° Ð²ÑÐµ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸ LDAP! ÐÐ¸ÐºÐ¾Ð³Ð´Ð° Ð½Ðµ Ð¾Ñ‡Ð¸Ñ‰Ð°Ð¹Ñ‚Ðµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ð² Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¼ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ð¸. ÐžÑ‡Ð¸Ñ‰Ð°Ð¹Ñ‚Ðµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ñ‚ÐµÑÑ‚Ð¾Ð² Ð¸Ð»Ð¸ Ð² ÑÐºÑÐ¿ÐµÑ€Ð¸Ð¼ÐµÐ½Ñ‚Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑÑ…."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index c246ab7984969895d15318bf685b556e795a96e1..c209524a13f8410fb5c28adcedcc4d0213a5ad00 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alexander Shashkevych <alex@stunpix.com>, 2013
 # lord93 <lordakryl@gmail.com>, 2013
 # Denis <reg.transifex.net@demitel.ru>, 2013
 # adol <sharov3@gmail.com>, 2012
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 10:40+0000\n"
-"Last-Translator: Victor Bravo <>\n"
+"POT-Creation-Date: 2013-07-30 01:55-0400\n"
+"PO-Revision-Date: 2013-07-29 12:40+0000\n"
+"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,12 +28,12 @@ msgid "WebDAV Authentication"
 msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "ÐÐ´Ñ€ÐµÑ:"
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑ. Ð—Ð°Ñ‚ÐµÐ¼ Ð¿Ð»Ð°Ð³Ð¸Ð½ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ Ð¾Ñ‚Ð²ÐµÑ‚, Ð² ÑÐ»ÑƒÑ‡Ð°Ðµ HTTP Ð¾Ñ‚Ð²ÐµÑ‚Ð° 401 Ð¸Ð»Ð¸ 403 Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð±ÑƒÐ´ÑƒÑ‚ ÑÑ‡Ð¸Ñ‚Ð°Ñ‚ÑŒÑÑ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¼Ð¸, Ð¿Ñ€Ð¸ Ð»ÑŽÐ±Ñ‹Ñ… Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¾Ñ‚Ð²ÐµÑ‚Ð°Ñ… - Ð²ÐµÑ€Ð½Ñ‹Ð¼Ð¸."
+msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ‹ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑ. ÐŸÐ»Ð°Ð³Ð¸Ð½ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ Ð¾Ñ‚Ð²ÐµÑ‚ Ð¸ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°ÑÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ HTTP ÐºÐ¾Ð´Ñ‹ 401 Ð¸ 403 ÐºÐ°Ðº Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ðµ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ, Ð¿Ñ€Ð¸ Ð»ÑŽÐ±Ð¾Ð¼ Ð´Ñ€ÑƒÐ³Ð¾Ð¼ Ð¾Ñ‚Ð²ÐµÑ‚Ðµ - ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð²ÐµÑ€Ð½Ñ‹."
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index bdaeceabc2cd874a15680ed292229afe1f59f556..01e83cce14ab9082015093540cd5b2fcf7f763de 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "à¶±à·œà·€à·à¶¸à·Šà¶¶à¶»à·Š"
 msgid "December"
 msgstr "à¶¯à·™à·ƒà·à¶¸à·Šà¶¶à¶»à·Š"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "à·ƒà·’à¶§à·”à·€à¶¸à·Š"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "à¶…à¶¯"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "à¶Šà¶ºà·š"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "à¶´à·™à¶» à¶¸à·à·ƒà¶ºà·š"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "à¶¸à·à·ƒ à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "à¶¯à·à·‚à¶ºà¶šà·Š"
 
@@ -246,140 +246,141 @@ msgstr ""
 msgid "Share"
 msgstr "à¶¶à·™à¶¯à· à·„à¶¯à· à¶œà¶±à·Šà¶±"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "à¶ºà·œà¶¸à·”à·€à¶šà·Š à¶¸à¶Ÿà·’à¶±à·Š à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·’à¶±à·Š à¶†à¶»à¶šà·Šà·à·à¶šà¶»à¶±à·Šà¶±"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à·€à·’à¶¸à·š à¶¯à·’à¶±à¶º à¶¯à¶¸à¶±à·Šà¶±"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à·€à·’à¶¸à·š à¶¯à·’à¶±à¶º"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·‘à¶½ à¶¸à¶Ÿà·’à¶±à·Š à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±: "
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "à¶±à·œà¶¶à·™à¶¯à·”"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "à·ƒà¶‚à·ƒà·Šà¶šà¶»à¶«à¶º à¶šà·… à·„à·à¶š"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "à¶´à·Šâ€à¶»à·€à·šà· à¶´à·à¶½à¶±à¶º"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "à·ƒà¶¯à¶±à·Šà¶±"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "à¶ºà·à·€à¶à·Šà¶šà·à¶½à·“à¶± à¶šà¶»à¶±à·Šà¶±"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "à¶¸à¶šà¶±à·Šà¶±"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "à¶¶à·™à¶¯à·à·„à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·’à¶±à·Š à¶†à¶»à¶šà·Šà·à·à¶šà¶» à¶‡à¶"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à¶‰à·€à¶à·Š à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud à¶¸à·”à¶»à¶´à¶¯à¶º à¶´à·Šâ€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· à¶šà¶»à¶±à·Šà¶±"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "à¶”à¶¶à¶œà·š à¶¸à·”à¶»à¶´à¶¯à¶º à¶´à·Šâ€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· à¶šà·’à¶»à·“à¶¸ à·ƒà¶³à·„à· à¶ºà·œà¶¸à·”à·€ à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·‘à¶½à·™à¶±à·Š à¶½à·à¶¶à·™à¶±à·” à¶‡à¶"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "à¶´à¶»à·’à·à·“à¶½à¶š à¶±à¶¸"
@@ -461,11 +462,11 @@ msgstr "à¶‹à¶¯à·€à·Š"
 msgid "Access forbidden"
 msgstr "à¶‡à¶à·”à¶½à·Š à·€à·“à¶¸ à¶à·„à¶±à¶¸à·Š"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "à·ƒà·œà¶ºà· à¶œà¶ à¶±à·œà·„à·à¶š"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "à¶¯à·’à¶ºà·”à¶«à·”/à¶‹à·ƒà·ƒà·Š"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "à¶¯à¶à·Šà¶ à·†à·à¶½à·Šà¶©à¶»à¶º"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "à¶¯à¶à·Šà¶ à·ƒà¶¸à·”à¶¯à·à¶º à·„à·à¶©à¶œà·à·ƒà·“à¶¸"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "à¶·à·à·€à·’à¶à· à·€à¶±à·” à¶‡à¶"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à· à¶·à·à·€à·’à¶à·à¶šà¶»à·”"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š à¶¸à·”à¶»à¶´à¶¯à¶º"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š à¶±à¶¸"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à· à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà·"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸ à¶…à·€à·ƒà¶±à·Š à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "à¶±à·’à¶šà·Šà¶¸à·“à¶¸"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr "à¶´à·Šâ€à¶»à·€à·šà·à·€à¶±à·Šà¶±"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index caa8b082fc8d38bb212da2afc8c1be601abe3864..5311955e9d229aaac766803d629ecc784a59d920 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "à¶¶à·™à¶¯à· à·„à¶¯à· à¶œà¶±à·Šà¶±"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "à¶¸à¶šà· à¶¯à¶¸à¶±à·Šà¶±"
 
@@ -128,43 +128,45 @@ msgstr "à¶¸à¶šà· à¶¯à¶¸à¶±à·Šà¶±"
 msgid "Rename"
 msgstr "à¶±à·à·€à¶ à¶±à¶¸à·Š à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "à¶´à·Šâ€à¶»à¶à·’à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "à¶±à¶¸à¶šà·Š à¶ºà·à¶¢à¶±à· à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "à¶±à·’à·‚à·Šà¶´à·Šâ€à¶»à¶· à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 à¶œà·œà¶±à·”à·€à¶šà·Š à¶‹à¶©à¶œà¶ à¶šà·™à¶»à·š"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "à¶±à¶¸"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "à¶´à·Šâ€à¶»à¶¸à·à¶«à¶º"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "à·€à·™à¶±à·ƒà·Š à¶šà·…"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 à¶œà·œà¶±à·”à·€à¶šà·Š"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º"
 msgid "From link"
 msgstr "à¶ºà·œà¶¸à·”à·€à·™à¶±à·Š"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "à¶¸à·™à·„à·’ à¶šà·’à·ƒà·’à·€à¶šà·Š à¶±à·œà¶¸à·à¶. à¶ºà¶¸à¶šà·Š à¶‹à¶©à·”à¶œà¶ à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "à¶¶à·à¶±à·Šà¶±"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "à¶±à·œà¶¶à·™à¶¯à·”"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à·€à·’à·à·à¶½ à·€à·à¶©à·’à¶º"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à¶”à¶¶ à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à¶§ à¶à·à¶à·Š à¶šà¶»à¶± à¶œà·œà¶±à·” à¶¸à·™à¶¸ à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà· à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à¶§ à¶‰à¶©à¶¯à·“ à¶‡à¶à·’ à¶‹à¶´à¶»à·’à¶¸ à¶œà·œà¶±à·” à·€à·’à·à·à¶½à¶à·Šà·€à¶ºà¶§ à·€à¶©à· à·€à·à¶©à·’à¶º"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "à¶œà·œà¶±à·” à¶´à¶»à·’à¶šà·Šà·‚à· à¶šà·™à¶»à·š. à¶¸à¶³à¶šà·Š à¶»à·à¶³à·“ à·ƒà·’à¶§à·’à¶±à·Šà¶±"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "à·€à¶»à·Šà¶à¶¸à·à¶± à¶´à¶»à·’à¶šà·Šà·‚à·à·€"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "à¶œà·œà¶±à·”à·€"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "à¶œà·œà¶±à·”"
 
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index fee22ab53772f069b6121cdaf0f84acb502743df..96c41e6e93e904f96b9c95b293bb9ac363a2fea9 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index a930bda8fb846beab76d5c77214e05f68e89a284..84135df646df17a8b5367a8f0207414b9a705c75 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "à¶šà¶»à·”à¶«à·à¶šà¶» à·€à¶½à¶‚à¶œà·” Dropbox à¶ºà·™à¶¯à·”à¶¸à·Š à¶ºà¶
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive à¶œà¶¶à¶©à·à·€ à·€à·’à¶±à·Šâ€à¶ºà·à·ƒ à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·à¶ºà¶šà·Š à¶‡à¶"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index a2fa9374a69d5af4e547def094edd67b8b8e3280..83f086d0d7ce1c6f51512d94459ac8e860591d05 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º"
 msgid "Submit"
 msgstr "à¶ºà·œà¶¸à·” à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s à¶”à¶¶à·€ %s à·†à·à¶½à·Šà¶©à¶»à¶ºà¶§ à·„à·€à·”à¶½à·Š à¶šà¶»à¶œà¶à·Šà¶à·šà¶º"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s à¶”à¶¶ à·ƒà¶¸à¶Ÿ %s à¶œà·œà¶±à·”à·€ à¶¶à·™à¶¯à·à·„à¶¯à·à¶œà¶à·Šà¶à·šà¶º"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "à¶¶à·à¶±à·Šà¶±"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "à¶´à·–à¶»à·Šà·€à¶¯à¶»à·Šà·à¶±à¶ºà¶šà·Š à¶±à·œà¶¸à·à¶"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index ba8606fbccb5175c6b2eab550c4400ee1533bba9..ef616c5a5481bf39a8342a4e1ef63a01379d2741 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "à¶±à¶¸"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 à¶œà·œà¶±à·”à·€à¶šà·Š"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index 5106a985d4fbecb2105824e6822a23cb35bb9caf..ab29f2138c5cecda064cd9dbf3eb0f6402108e5c 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "à¶…à¶±à·”à·€à·à¶¯"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "à¶…à¶±à·”à·€à·à¶¯"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 22f25e24cdfc4ca1ef6ad60df2b7517aa4ea2110..838b32a1fdc642d9325c6c77d3063e643ae61a74 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "à¶´à¶»à·’à·à·“à¶½à¶šà¶ºà¶±à·Š"
 
 #: app.php:409
-msgid "Apps"
-msgstr "à¶ºà·™à¶¯à·”à¶¸à·Š"
-
-#: app.php:417
 msgid "Admin"
 msgstr "à¶´à¶»à·’à¶´à·à¶½à¶š"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "à¶”à¶¶à¶§ à¶´à·à¶½à¶±à¶º à¶šà·… à·„à·à¶šà·’ à·€à·™à¶¶à·Š à·ƒà·šà·€à·à·€à¶±à·Š"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP à¶·à·à¶œà¶ à¶šà·’à¶»à·“à¶¸à·Š à¶…à¶šà·Šâ€à¶»à·’à¶ºà¶ºà·’"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "à¶œà·œà¶±à·” à¶‘à¶šà·’à¶±à·Š à¶‘à¶š à¶·à·à¶œà¶ à¶ºà·”à¶à·”à¶ºà·’"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "à¶œà·œà¶±à·” à·€à·™à¶à¶§ à¶±à·à·€à¶ à¶ºà¶±à·Šà¶±"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "à¶à·à¶»à·à¶œà¶à·Š à¶œà·œà¶±à·” ZIP à¶œà·œà¶±à·”à·€à¶šà·Š à¶à·à¶±à·“à¶¸à¶§ à·€à·’à·à·à¶½ à·€à·à¶©à·’à¶º."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶±à·Šà¶§ à¶´à·™à¶»"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "à¶…à¶¯"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "à¶Šà¶ºà·š"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d à¶¯à·’à¶±à¶šà¶§ à¶´à·™à¶»"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "à¶´à·™à¶» à¶¸à·à·ƒà¶ºà·š"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 641f07cdda5d40bf7889563078cd9b64d142b226..1d82e019d907e7e078e50f60417481566e2eed07 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "à¶†à¶»à¶šà·Šà·‚à¶š à¶±à·’à·€à·šà¶¯à¶±à¶ºà¶šà·Š"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "à¶”à¶¶à¶œà·š à¶¯à¶à·Šà¶ à¶©à·’à¶»à·™à¶šà·Šà¶§à¶»à·’à¶º à·„à· à¶œà·œà¶±à·”à·€à¶½à¶§ à¶…à¶±à·Šà¶à¶»à·Šà¶¢à·à¶½à¶ºà·™à¶±à·Š à¶´à·’à·€à·’à·ƒà·’à¶º à·„à·à¶š. ownCloud à·ƒà¶´à¶ºà· à¶‡à¶à·’ .htaccess à¶œà·œà¶±à·”à·€ à¶šà·Šâ€à¶»à·’à¶ºà·à¶šà¶»à¶±à·Šà¶±à·š à¶±à·à¶. à¶…à¶´à·’ à¶à¶»à¶ºà·š à¶šà·’à¶ºà· à·ƒà·’à¶§à·’à¶±à·”à¶ºà·š à¶±à¶¸à·Š, à¶¸à·™à¶¸ à¶¯à¶à·Šà¶ à·„à· à¶œà·œà¶±à·” à¶‘à·ƒà·š à¶´à·’à·€à·’à·ƒà·“à¶¸à¶§ à¶±à·œà·„à·à¶šà·’ à·€à¶± à¶½à·™à·ƒ à¶”à¶¶à·š à·€à·™à¶¶à·Š à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà·  à·€à·’à¶±à·Šâ€à¶ºà·à·ƒ à¶šà¶»à¶± à¶½à·™à·ƒ à·„à· à¶‘à¶¸ à¶©à·’à¶»à·™à¶šà·Šà¶§à¶»à·’à¶º à·€à·™à¶¶à·Š à¶¸à·–à¶½à¶ºà·™à¶±à·Š à¶´à·’à¶§à¶à¶§ à¶œà·™à¶±à¶ºà¶± à¶½à·™à·ƒà¶º."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "à·„à·”à·€à¶¸à·à¶»à·” à¶šà·’à¶»à·“à¶¸"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "à¶ºà·œà¶¸à·” à·ƒà¶½à·ƒà¶±à·Šà¶±"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "à¶ºà·…à·’ à¶ºà·…à·’à¶à·Š à·„à·”à·€à¶¸à·à¶»à·”à·€à¶§ à¶…à·€à·ƒà¶» à¶¯à·™à¶¸à·’"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "à·„à·”à·€à¶¸à·à¶»à·” à¶šà·…  à·„à·”à·€à¶¸à·à¶»à·”à·€à¶§ à¶…à·€à·ƒà¶» à¶¯à·™à¶¸à·’"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "à¶•à¶±à·‘à¶¸ à¶…à¶ºà·™à¶šà·” à·„à· à·„à·”à·€à¶¸à·à¶»à·”à·€à¶§ à¶…à·€à·ƒà¶» à¶¯à·™à¶¸à·’"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "à¶à¶¸ à¶šà¶«à·Šà¶©à·à¶ºà¶¸à·š à¶…à¶ºà·™à¶šà·” à·„à· à¶´à¶¸à¶«à¶šà·Š à·„à·”à·€à¶¸à·à¶»à·”à·€à¶§ à¶…à·€à·ƒà¶» à¶¯à·™à¶¸à·’"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "à¶½à¶à·”à·€"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "à·€à·à¶©à·’"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "à¶…à¶©à·”"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "à¶”à¶¶à¶œà·š à¶¸à·”à¶» à¶´à¶¯à¶º à·€à·™à¶±à·ƒà·Š à¶šà·™à¶»à·”à¶«à·’"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º à·€à·™à¶±à·ƒà·Š à¶šà·… à¶±à·œà·„à·à¶šà·’ à·€à·’à¶º"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "à·€à¶à·Šà¶¸à¶±à·Š à¶¸à·”à¶»à¶´à¶¯à¶º"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "à¶±à·€ à¶¸à·”à¶»à¶´à¶¯à¶º"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "à¶¸à·”à¶»à¶´à¶¯à¶º à·€à·™à¶±à·ƒà·Š à¶šà·’à¶»à·“à¶¸"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·‘à¶½"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "à¶”à¶¶à¶œà·š à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·‘à¶½"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "à¶¸à·”à¶»à¶´à¶¯ à¶´à·Šâ€à¶»à¶à·’à·ƒà·Šà¶®à·à¶´à¶±à¶º à·ƒà¶³à·„à· à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·à¶½à·Š à·€à·’à·ƒà·Šà¶à¶» à¶½à¶¶à· à¶¯à·™à¶±à·Šà¶±"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "à¶·à·à·‚à·à·€"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "à¶´à¶»à·’à·€à¶»à·Šà¶®à¶± à·ƒà·„à¶º"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index d2c3e7c6a3ff82f9cd5925769a8d47091678d447..fef4fb3d55a806e077aa180dcbfe1d40500fb314 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index f9745043cb11894738885d7d7b4e45532c64a821..3018e01ed39b7d8d1bd62c63e0332f177aec4d7c 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 0afee3edf45f3ad3dc7e822462a5c0c756a4a3ee..d92fbb15323f2faf9131e7afb77f3be7546d2691 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +229,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +250,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +405,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +466,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +499,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +617,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index d2ec9cb542b5e50e28bc2f73708544c4c165d110..1e164aa3dca714043fa81f9097cc43324654bccb 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-04 09:30+0200\n"
-"PO-Revision-Date: 2013-07-04 07:31+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,54 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:39
+#: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:22
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:55
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:62
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:63
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:65
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:66
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:68
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:87
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:119
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,46 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +203,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +286,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index f4a23c5980a6e5623172eb3d6e24b4d5fbd84276..796557674c439a39531d39d7383f3c90cef061bd 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 00454814546bc40502b3cca139e556a238c1c07e..42e2cda81b6b6a8f4864eee09a11994242d97034 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 101816d2a65655db3cf2cf681413baeea312c405..322a3dbd56e8c00adf754aa703e6ba9ca9f2c1fc 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,46 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/sk/files_versions.po b/l10n/sk/files_versions.po
index e61ebf4f94365ff128f53db1ee283eebcb58a1fb..8c49fe8cc5f62d83539e707d3cab8b84b72d2915 100644
--- a/l10n/sk/files_versions.po
+++ b/l10n/sk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index d1f1b336f10d5b054111c33d4e18a670d76bfdd2..1956868b0dbff4fe33701c5d20a3a11381abbd57 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,81 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 937bab7f327bdd290e674b3e87a13675ace64e20..bb053c28194d7e90904eb58fb4287efcc8cf81b8 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 2dd52e55933899c067b573b71c12589eeee30201..96f620bab610523bd0cb32aef450d4ae86576db5 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
index 6704af8cc4133dc732429a89f98cc4e1f07be137..0cb6ce89fac993321b343f4ed526431774b75b15 100644
--- a/l10n/sk/user_webdavauth.po
+++ b/l10n/sk/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 984ca1d84147e48df18f529e124e8c9708d68678..025c8016e018b9134e6556f913695249f42a3b55 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,63 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "pred minÃºtou"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "pred {minutes} minÃºtami"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Pred 1 hodinou"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "Pred {hours} hodinami."
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "vÄera"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "pred {days} dÅˆami"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "minulÃ½ mesiac"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "Pred {months} mesiacmi."
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -226,8 +230,8 @@ msgstr "NeÅ¡pecifikovanÃ½ typ objektu."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Chyba"
 
@@ -247,140 +251,141 @@ msgstr "ZdieÄ¾anÃ©"
 msgid "Share"
 msgstr "ZdieÄ¾aÅ¥"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Chyba poÄas zdieÄ¾ania"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Chyba poÄas ukonÄenia zdieÄ¾ania"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Chyba poÄas zmeny oprÃ¡vnenÃ"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ZdieÄ¾anÃ© s vami a so skupinou {group} pouÅ¾ÃvateÄ¾om {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "ZdieÄ¾anÃ© s vami pouÅ¾ÃvateÄ¾om {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "ZdieÄ¾aÅ¥ s"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "ZdieÄ¾aÅ¥ cez odkaz"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ChrÃ¡niÅ¥ heslom"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "PovoliÅ¥ verejnÃ© nahrÃ¡vanie"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "OdoslaÅ¥ odkaz emailom"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "OdoslaÅ¥"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "NastaviÅ¥ dÃ¡tum expirÃ¡cie"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "DÃ¡tum expirÃ¡cie"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "ZdieÄ¾aÅ¥ cez e-mail:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "PouÅ¾ÃvateÄ¾ nenÃ¡jdenÃ½"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ZdieÄ¾anie uÅ¾ zdieÄ¾anej poloÅ¾ky nie je povolenÃ©"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "ZdieÄ¾anÃ© v {item} s {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "ZruÅ¡iÅ¥ zdieÄ¾anie"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "mÃ´Å¾e upraviÅ¥"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "prÃstupovÃ© prÃ¡va"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "vytvoriÅ¥"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "aktualizovaÅ¥"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "vymazaÅ¥"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "zdieÄ¾aÅ¥"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "ChrÃ¡nenÃ© heslom"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraÅˆovanÃ dÃ¡tumu expirÃ¡cie"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavenÃ dÃ¡tumu expirÃ¡cie"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email odoslanÃ½"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "AktualizÃ¡cia nebola ÃºspeÅ¡nÃ¡. ProblÃ©m nahlÃ¡ste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "AktualizÃ¡cia bola ÃºspeÅ¡nÃ¡. PresmerovÃ¡vam na prihlasovaciu strÃ¡nku."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Obnovenie hesla pre ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +406,7 @@ msgstr "PoÅ¾iadavka zlyhala.<br>Uistili ste sa, Å¾e VaÅ¡e pouÅ¾ÃvateÄ¾skÃ© meno
 msgid "You will receive a link to reset your password via Email."
 msgstr "Odkaz pre obnovenie hesla obdrÅ¾Ãte e-mailom."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Meno pouÅ¾ÃvateÄ¾a"
@@ -412,7 +417,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "VaÅ¡e sÃºbory sÃº Å¡ifrovanÃ©. Ak nemÃ¡te povolenÃ½ kÄ¾ÃºÄ obnovy, nie je spÃ´sob, ako zÃskaÅ¥ po obnove hesla VaÅ¡e dÃ¡ta. Ak nie ste si isÃ tÃ½m, Äo robÃte, obrÃ¡Å¥te sa najskÃ´r na administrÃ¡tora. Naozaj chcete pokraÄovaÅ¥?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
@@ -462,11 +467,11 @@ msgstr "Pomoc"
 msgid "Access forbidden"
 msgstr "PrÃstup odmietnutÃ½"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "NenÃ¡jdenÃ©"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +500,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Verzia VÃ¡Å¡ho PHP je napadnuteÄ¾nÃ¡ pomocou techniky \"NULL Byte\" (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Aktualizujte prosÃm VaÅ¡u inÅ¡tanciu PHP pre bezpeÄnÃ© pouÅ¾Ãvanie ownCloud."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Aktualizujte prosÃm vaÅ¡u inÅ¡tanciu PHP pre bezpeÄnÃ© pouÅ¾Ãvanie %s."
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +522,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "VÃ¡Å¡ prieÄinok s dÃ¡tami a sÃºbormi je dostupnÃ½ z internetu, lebo sÃºbor .htaccess nefunguje."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Pre informÃ¡cie, ako sprÃ¡vne nastaviÅ¥ VÃ¡Å¡ server sa pozrite do <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentÃ¡cie</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Pre informÃ¡cie, ako sprÃ¡vne nastaviÅ¥ vÃ¡Å¡ server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentÃ¡cie</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "VytvoriÅ¥ <strong>administrÃ¡torskÃ½ ÃºÄet</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "RozÅ¡ÃrenÃ©"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "PrieÄinok dÃ¡t"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "NastaviÅ¥ databÃ¡zu"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "bude pouÅ¾itÃ©"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "HostiteÄ¾ databÃ¡zy"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Heslo databÃ¡zy"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Meno databÃ¡zy"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "TabuÄ¾kovÃ½ priestor databÃ¡zy"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Server databÃ¡zy"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "DokonÄiÅ¥ inÅ¡talÃ¡ciu"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupnÃ¡. ZÃskajte viac informÃ¡ciÃ k postupu aktualizÃ¡ce."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "OdhlÃ¡siÅ¥"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "AutomatickÃ© prihlÃ¡senie bolo zamietnutÃ©!"
@@ -608,7 +618,7 @@ msgstr "PrihlÃ¡siÅ¥ sa"
 msgid "Alternative Logins"
 msgstr "AlternatÃvne prihlasovanie"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 593d01de313cc74305d1d9fcfcc64f0a847e26a6..d6958617e5047bb5eff2b6852fbe64018edd705c 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +30,11 @@ msgstr "Nie je moÅ¾nÃ© presunÃºÅ¥ %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "NemoÅ¾no nastaviÅ¥ prieÄinok pre nahranÃ© sÃºbory."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "NeplatnÃ½ token"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -77,7 +77,7 @@ msgstr "Nedostatok dostupnÃ©ho ÃºloÅ¾nÃ©ho priestoru"
 
 #: ajax/upload.php:123
 msgid "Invalid directory."
-msgstr "NeplatnÃ½ prieÄinok"
+msgstr "NeplatnÃ½ prieÄinok."
 
 #: appinfo/app.php:12
 msgid "Files"
@@ -93,7 +93,7 @@ msgstr "Nie je k dispozÃcii dostatok miesta"
 
 #: js/file-upload.js:64
 msgid "Upload cancelled."
-msgstr "Odosielanie zruÅ¡enÃ©"
+msgstr "Odosielanie zruÅ¡enÃ©."
 
 #: js/file-upload.js:167 js/files.js:266
 msgid ""
@@ -102,7 +102,7 @@ msgstr "Opustenie strÃ¡nky zruÅ¡Ã prÃ¡ve prebiehajÃºce odosielanie sÃºboru."
 
 #: js/file-upload.js:233 js/files.js:339
 msgid "URL cannot be empty."
-msgstr "URL nemÃ´Å¾e byÅ¥ prÃ¡zdne"
+msgstr "URL nemÃ´Å¾e byÅ¥ prÃ¡zdne."
 
 #: js/file-upload.js:238 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
@@ -121,7 +121,7 @@ msgstr "ZdieÄ¾aÅ¥"
 msgid "Delete permanently"
 msgstr "ZmazaÅ¥  trvalo"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "ZmazaÅ¥"
 
@@ -129,43 +129,46 @@ msgstr "ZmazaÅ¥"
 msgid "Rename"
 msgstr "PremenovaÅ¥"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} uÅ¾ existuje"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "nahradiÅ¥"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "pomÃ´cÅ¥ s menom"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "zruÅ¡iÅ¥"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepÃsanÃ½ {new_name} sÃºborom {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "vrÃ¡tiÅ¥"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "vykonaÅ¥ zmazanie"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 sÃºbor sa posiela "
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "nahrÃ¡vanie sÃºborov"
 
@@ -201,38 +204,36 @@ msgstr "VaÅ¡e sÅ¥ahovanie sa pripravuje. Ak sÃº sÅ¥ahovanÃ© sÃºbory veÄ¾kÃ©, mÃ´
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "NeplatnÃ© meno prieÄinka. PouÅ¾Ãvanie mena 'Shared' je vyhradenÃ© len pre Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "NÃ¡zov"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "VeÄ¾kosÅ¥"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "UpravenÃ©"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 prieÄinok"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} prieÄinkov"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 sÃºbor"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} sÃºborov"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s nemohol byÅ¥ premenovanÃ½"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,61 +287,61 @@ msgstr "PrieÄinok"
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "ZmazanÃ© sÃºbory"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ZruÅ¡iÅ¥ odosielanie"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "NemÃ¡te oprÃ¡vnenie na zÃ¡pis."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Å½iadny sÃºbor. Nahrajte nieÄo!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "SÅ¥ahovanie"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "ZruÅ¡iÅ¥ zdieÄ¾anie"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "NahrÃ¡vanie je prÃliÅ¡ veÄ¾kÃ©"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "SÃºbory, ktorÃ© sa snaÅ¾Ãte nahraÅ¥, presahujÃº maximÃ¡lnu veÄ¾kosÅ¥ pre nahratie sÃºborov na tento server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "ÄŒakajte, sÃºbory sÃº prehÄ¾adÃ¡vanÃ©."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "PrÃ¡ve prezeranÃ©"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "prieÄinok"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "prieÄinky"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "sÃºbor"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "sÃºbory"
 
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index f32ee0daedd6a398863beb27054bd1b792979ece..06be789dd2e7215e2eea1d88cea6bc98761a8844 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 845aabe6bd192b6e9bfe7c2b04dac26de073fdbb..5f990176d0b0f4bcd1570d5b93a79836607d28a7 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Zadajte platnÃ½ kÄ¾ÃºÄ aplikÃ¡cie a heslo Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba pri konfigurÃ¡cii ÃºloÅ¾iska Google drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Upozornenie:</b> \"smbclient\" nie je nainÅ¡talovanÃ½. Nie je moÅ¾nÃ© pripojenie oddielov CIFS/SMB. PoÅ¾iadajte administrÃ¡tora systÃ©mu, nech ho nainÅ¡taluje."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Upozornenie:</b> Podpora FTP v PHP nie je povolenÃ¡ alebo nainÅ¡talovanÃ¡. Nie je moÅ¾nÃ© pripojenie oddielov FTP. PoÅ¾iadajte administrÃ¡tora systÃ©mu, nech ho nainÅ¡taluje."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 6d964232d50b2c5ec717c0cd9d0334ef0b5f9ef7..24320a2a13ccb94ed6fdb00719a787ed16855b77 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 19:30+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Heslo je chybnÃ©. SkÃºste to znova."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +30,52 @@ msgstr "Heslo"
 msgid "Submit"
 msgstr "OdoslaÅ¥"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "To je neprÃjemnÃ©, ale tento odkaz uÅ¾ nie je funkÄnÃ½."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "MoÅ¾nÃ© dÃ´vody:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "poloÅ¾ka bola presunutÃ¡"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "linke vyprÅ¡ala platnosÅ¥"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "zdieÄ¾anie je zakÃ¡zanÃ©"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "Pre viac informÃ¡ciÃ kontaktujte osobu, ktorÃ¡ vÃ¡m poslala tento odkaz."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s zdieÄ¾a s vami prieÄinok %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s zdieÄ¾a s vami sÃºbor %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "SÅ¥ahovanie"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "OdoslaÅ¥"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ZruÅ¡iÅ¥ odosielanie"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Å½iaden nÃ¡hÄ¾ad k dispozÃcii pre"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index f1edfc2a4fb506c9def256d4338fbf7be981ad1d..31b22df580b50d06a8106053c293455e1a646262 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,47 @@ msgstr "NemoÅ¾no zmazaÅ¥ %s navÅ¾dy"
 msgid "Couldn't restore %s"
 msgstr "NemoÅ¾no obnoviÅ¥ %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "vykonaÅ¥ obnovu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Chyba"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "trvalo zmazaÅ¥ sÃºbor"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "ZmazaÅ¥  trvalo"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "NÃ¡zov"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "ZmazanÃ©"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 prieÄinok"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} prieÄinkov"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 sÃºbor"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} sÃºborov"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "obnovenÃ©"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 2e4b2d84383153032a2fe704fdada6c6797683cf..afbd44c4156f38a8dac8770d74a713f065d55fbe 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 19:40+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +18,27 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "NemoÅ¾no obnoviÅ¥: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "Ãºspech"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "SÃºbor %s bol obnovenÃ½ na verziu %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "chyba"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "SÃºbor %s nemohol byÅ¥ obnovenÃ½ na verziu %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Verzie"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Nie sÃº dostupnÃ© Å¾iadne starÅ¡ie verzie"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Zlyhalo obnovenie sÃºboru {file} na verziu {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Nevybrali ste cestu"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Viac verziÃ..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Verzie"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Å½iadne ÄalÅ¡ie verzie nie sÃº dostupnÃ©"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Obnovte sÃºbor do predoÅ¡lej verzie kliknutÃm na tlaÄÃtko obnoviÅ¥"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "ObnoviÅ¥"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 54784fb9d3d4fe8d6e44d2a2fcb959afa7bb11f9..b403893d8bb45a95b15f226290b8acadc4c17866 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "PouÅ¾Ãvatelia"
 
 #: app.php:409
-msgid "Apps"
-msgstr "AplikÃ¡cie"
-
-#: app.php:417
 msgid "Admin"
 msgstr "AdministrÃ¡tor"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Zlyhala aktualizÃ¡cia \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "webovÃ© sluÅ¾by pod VaÅ¡ou kontrolou"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "nemoÅ¾no otvoriÅ¥ \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "SÅ¥ahovanie sÃºborov ZIP je vypnutÃ©."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "SÃºbory musia byÅ¥ nahrÃ¡vanÃ© jeden za druhÃ½m."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "SpÃ¤Å¥ na sÃºbory"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "ZvolenÃ© sÃºbory sÃº prÃliÅ¡ veÄ¾kÃ© na vygenerovanie zip sÃºboru."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Stiahnite sÃºbory po menÅ¡Ãch Äastiach, samostatne, alebo sa obrÃ¡Å¥te na sprÃ¡vcu."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nedÃ¡ sa zistiÅ¥"
 
@@ -171,77 +183,81 @@ msgstr "PodozrivÃ½ prÃkaz bol: \"%s\", meno: %s, heslo: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PouÅ¾ÃvateÄ¾skÃ© meno a/alebo heslo pre PostgreSQL databÃ¡zu je neplatnÃ©"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Zadajte pouÅ¾ÃvateÄ¾skÃ© meno administrÃ¡tora."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Zadajte heslo administrÃ¡tora."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "VÃ¡Å¡ webovÃ½ server nie je sprÃ¡vne nastavenÃ½ na synchronizÃ¡ciu, pretoÅ¾e rozhranie WebDAV je poÅ¡kodenÃ©."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "ProsÃm skontrolujte <a href='%s'>inÅ¡talaÄnÃº prÃruÄku</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "pred minÃºtou"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "pred %d minÃºtami"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Pred 1 hodinou"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Pred %d hodinami."
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "dnes"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "vÄera"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "pred %d dÅˆami"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "minulÃ½ mesiac"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Pred %d mesiacmi."
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "pred rokmi"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "PrÃÄina:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index c8d392242e78f0ea457c9e68393e9a97157522bb..2d3c21ee9a049a2636f5946d0d95a37e87a03801 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr "MusÃte zadaÅ¥ platnÃ© heslo"
 msgid "__language_name__"
 msgstr "Slovensky"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "BezpeÄnostnÃ© varovanie"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "VÃ¡Å¡ prieÄinok s dÃ¡tami a VaÅ¡e sÃºbory sÃº pravdepodobne dostupnÃ© z internetu. .htaccess sÃºbor dodÃ¡vanÃ½ s inÅ¡talÃ¡ciou ownCloud nespÄºÅˆa Ãºlohu. DÃ´razne VÃ¡m doporuÄujeme nakonfigurovaÅ¥ webserver takÃ½m spÃ´sobom, aby dÃ¡ta v prieÄinku neboli verejnÃ©, alebo presuÅˆte dÃ¡ta mimo Å¡truktÃºry prieÄinkov webservera."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Nastavenia oznÃ¡menÃ"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "VÃ¡Å¡ webovÃ½ server nie je sprÃ¡vne nastavenÃ½ na synchronizÃ¡ciu, pretoÅ¾e rozhranie WebDAV je poÅ¡kodenÃ©."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "ProsÃm skontrolujte <a href='%s'>inÅ¡talaÄnÃº prÃruÄku</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "ChÃ½ba modul 'fileinfo'"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "ChÃ½ba modul 'fileinfo'. DÃ´razne doporuÄujeme ho povoliÅ¥ pre dosiahnutie najlepÅ¡Ãch vÃ½sledkov zisÅ¥ovania mime-typu."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "LokalizÃ¡cia nefunguje"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Tento server ownCloud nemÃ´Å¾e nastaviÅ¥ nÃ¡rodnÃ© prostredie systÃ©mu na %s. To znamenÃ¡, Å¾e by mohli byÅ¥ problÃ©my s niektorÃ½mi znakmi v nÃ¡zvoch sÃºborov. VeÄ¾mi odporÃºÄame nainÅ¡talovaÅ¥ poÅ¾adovanÃ© balÃky na podporu %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Pripojenie na internet nefunguje"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Tento server ownCloud nemÃ¡ funkÄnÃ© pripojenie k internetu. To znamenÃ¡, Å¾e niektorÃ© z funkciÃ, ako je pripojenie externÃ©ho ÃºloÅ¾iska, oznÃ¡menia o aktualizÃ¡ciÃ¡ch Äi inÅ¡talÃ¡cia aplikÃ¡ciÃ tretÃch strÃ¡n nefungujÃº. PrÃstup k sÃºborom zo vzdialenÃ½ch miest a odosielanie oznamovacÃch e-mailov tieÅ¾ nemusÃ fungovaÅ¥. OdporÃºÄame pripojiÅ¥ tento server  k internetu, ak chcete vyuÅ¾ÃvaÅ¥ vÅ¡etky vlastnosti ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "VykonaÅ¥ jednu Ãºlohu s kaÅ¾dÃ½m naÄÃtanÃ strÃ¡nky"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php je registrovanÃ¡ u sluÅ¾by webcron. ZavolÃ¡ cron.php strÃ¡nku v koreÅˆovom prieÄinku owncloud raz za minÃºtu cez protokol HTTP."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "PouÅ¾ÃvaÅ¥ systÃ©movÃº sluÅ¾bu cron. ZavolaÅ¥ cron.php v prieÄinku owncloud cez systÃ©movÃº Ãºlohu raz za minÃºtu"
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "ZdieÄ¾anie"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "PovoliÅ¥ API zdieÄ¾ania"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "PovoliÅ¥ aplikÃ¡ciÃ¡m pouÅ¾ÃvaÅ¥ API na zdieÄ¾anie"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "PovoliÅ¥ odkazy"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "PovoliÅ¥ pouÅ¾ÃvateÄ¾om zdieÄ¾aÅ¥ poloÅ¾ky pre verejnosÅ¥ cez odkazy"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "PovoliÅ¥ zdieÄ¾anie Äalej"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "PovoliÅ¥ pouÅ¾ÃvateÄ¾om Äalej zdieÄ¾aÅ¥ zdieÄ¾anÃ© poloÅ¾ky"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "PovoliÅ¥ pouÅ¾ÃvateÄ¾om zdieÄ¾aÅ¥ s kÃ½mkoÄ¾vek"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "PovoliÅ¥ pouÅ¾ÃvateÄ¾om zdieÄ¾aÅ¥ len s pouÅ¾ÃvateÄ¾mi v ich skupinÃ¡ch"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "ZabezpeÄenie"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "VynÃºtiÅ¥ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "VynÃºti pripojovanie klientov ownCloud cez Å¡ifrovanÃ© pripojenie."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Pripojte sa k tejto inÅ¡tancii ownCloud cez HTTPS pre povolenie alebo zakÃ¡zanie vynÃºtenia SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "ZÃ¡znam"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "ÃšroveÅˆ zÃ¡znamu"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +394,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "KomerÄnÃ¡ podpora"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ZÃskaÅ¥ aplikÃ¡cie na synchronizÃ¡ciu VaÅ¡ich sÃºborov"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobraziÅ¥ sprievodcu prvÃ½m spustenÃm"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "PouÅ¾ili ste <strong>%s</strong> z <strong>%s</strong> dostupnÃ½ch "
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Heslo bolo zmenenÃ©"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Nie je moÅ¾nÃ© zmeniÅ¥ vaÅ¡e heslo"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "AktuÃ¡lne heslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "NovÃ© heslo"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ZmeniÅ¥ heslo"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "ZobrazovanÃ© meno"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "VaÅ¡a emailovÃ¡ adresa"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "VyplÅˆte emailovÃº adresu pre aktivovanie obnovy hesla"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "PomÃ´cÅ¥ s prekladom"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "PouÅ¾ite tÃºto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prÃstup k sÃºborom cez WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 0a0257a54faea41063cad466fd9d54f1726c8864..cdf1ed0ff8c997f76df75f1653e0434335b12b09 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -89,9 +89,9 @@ msgstr "PotvrdiÅ¥ vymazanie"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Upozornenie:</b> AplikÃ¡cie user_ldap a user_webdavauth nie sÃº kompatibilnÃ©. MÃ´Å¾e nastÃ¡vaÅ¥ neoÄakÃ¡vanÃ© sprÃ¡vanie. PoÅ¾iadajte administrÃ¡tora systÃ©mu aby jednu z nich zakÃ¡zal."
+msgstr "<b>Upozornenie:</b> AplikÃ¡cie user_ldap a user_webdavauth sÃº navzÃ¡jom nekompatibilnÃ©. MÃ´Å¾ete zaznamenaÅ¥ neoÄakÃ¡vanÃ© sprÃ¡vanie. PoÅ¾iadajte prosÃm vÃ¡Å¡ho systÃ©movÃ©ho administrÃ¡tora pre zakÃ¡zanie jednÃ©ho z nich."
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "ZakÃ¡zaÅ¥ hlavnÃ½ server"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Pri zapnutÃ sa ownCloud pripojÃ len k zÃ¡loÅ¾nÃ©mu serveru."
+msgid "Only connect to the replica server."
+msgstr "PripojiÅ¥ sa len k zÃ¡loÅ¾nÃ©mu serveru."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "VypnÃºÅ¥ overovanie SSL certifikÃ¡tu."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Ak pripojenie pracuje len s touto moÅ¾nosÅ¥ou, tak importujte SSL certifikÃ¡t LDAP serveru do vÃ¡Å¡ho servera ownCloud."
+"certificate in your %s server."
+msgstr "Ak pripojenie pracuje len s touto moÅ¾nosÅ¥ou, tak naimportujte SSL certifikÃ¡t LDAP servera do vÃ¡Å¡ho %s servera."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Pole pre zobrazenia mena pouÅ¾ÃvateÄ¾a"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie mena pouÅ¾ÃvateÄ¾a ownCloud "
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie zobrazovanÃ©ho mena pouÅ¾ÃvateÄ¾a. "
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Pole pre zobrazenie mena skupiny"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie mena skupiny ownCloud "
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "AtribÃºt LDAP pouÅ¾itÃ½ na vygenerovanie zobrazovanÃ©ho mena skupiny."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "V predvolenom nastavenÃ bude internÃ© pouÅ¾ÃvateÄ¾skÃ© meno vytvorenÃ© z UUID atribÃºtu. ZabezpeÄÃ sa to, Å¾e pouÅ¾ÃvateÄ¾skÃ© meno bude jedineÄnÃ© a znaky nemusia byÅ¥ prevedenÃ©. InternÃ© meno mÃ¡ obmedzenie, iba tieto znaky sÃº povolenÃ©: [a-zA-Z0-9_ @ -.]. OstatnÃ© znaky sÃº nahradenÃ© ich ASCII alebo jednoducho vynechanÃ©. Pri kolÃziÃ¡ch bude ÄÃslo byÅ¥ pridanÃ© / odobranÃ©. InternÃ© pouÅ¾ÃvateÄ¾skÃ© meno sa pouÅ¾Ãva na identifikÃ¡ciu pouÅ¾ÃvateÄ¾a interne. Je to tieÅ¾ predvolenÃ½ nÃ¡zov pouÅ¾ÃvateÄ¾skÃ©ho domovskÃ©ho prieÄinka v ownCloud. To je tieÅ¾ port vzdialenÃ©ho URL, naprÃklad pre vÅ¡etky sluÅ¾by * DAV. S tÃ½mto nastavenÃm sa dÃ¡ prepÃsaÅ¥ predvolenÃ© sprÃ¡vanie. Pre dosiahnutie podobnÃ©ho sprÃ¡vania sa ako pred ownCloud 5 zadajte atribÃºt zobrazenia pouÅ¾ÃvateÄ¾skÃ©ho mena v tomto poli. Ponechajte prÃ¡zdne pre predvolenÃ© sprÃ¡vanie. Zmeny budÃº maÅ¥ vplyv iba na novo mapovanÃ½ch (pridanÃ½ch) LDAP pouÅ¾ÃvateÄ¾ov."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr "V predvolenom nastavenÃ bude internÃ© pouÅ¾ÃvateÄ¾skÃ© meno vytvorenÃ© z UUID atribÃºtu. ZabezpeÄÃ sa to, Å¾e pouÅ¾ÃvateÄ¾skÃ© meno bude jedineÄnÃ© a znaky nemusia byÅ¥ prevedenÃ©. InternÃ© meno mÃ¡ obmedzenie, iba tieto znaky sÃº povolenÃ©: [a-zA-Z0-9_ @ -.]. OstatnÃ© znaky sÃº nahradenÃ© ich ASCII alebo jednoducho vynechanÃ©. Pri kolÃziÃ¡ch pouÅ¾ÃvateÄ¾skÃ½ch mien bude ÄÃslo pridanÃ© / odobranÃ©. InternÃ© pouÅ¾ÃvateÄ¾skÃ© meno sa pouÅ¾Ãva na internÃº identifikÃ¡ciu pouÅ¾ÃvateÄ¾a. Je tieÅ¾ predvolenÃ½m nÃ¡zvom pouÅ¾ÃvateÄ¾skÃ©ho domovskÃ©ho prieÄinka v ownCloud. Je tieÅ¾ sÃºÄasÅ¥ou URL pre vzdialenÃ½ prÃstup, naprÃklad pre vÅ¡etky sluÅ¾by * DAV. S tÃ½mto nastavenÃm sa dÃ¡ prepÃsaÅ¥ predvolenÃ© sprÃ¡vanie. Pre dosiahnutie podobnÃ©ho sprÃ¡vania sa ako pred verziou ownCloud 5 zadajte atribÃºt zobrazenia pouÅ¾ÃvateÄ¾skÃ©ho mena v tomto poli. Ponechajte prÃ¡zdne pre predvolenÃ© sprÃ¡vanie. Zmeny budÃº maÅ¥ vplyv iba na novo namapovanÃ½ch (pridanÃ½ch) LDAP pouÅ¾ÃvateÄ¾ov."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "PrepÃsaÅ¥ UUID detekciu"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "V predvolenom nastavenÃ je UUID atribÃºt detekovanÃ½ automaticky. UUID atribÃºt je pouÅ¾itÃ½ na jedineÄnÃº identifikÃ¡ciu pouÅ¾ÃvateÄ¾ov a skupÃn z LDAP. Naviac je na zÃ¡klade UUID vytvorenÃ© tieÅ¾ internÃ© pouÅ¾ivateÄ¾skÃ© meno, ak nie je nastavenÃ© inak. MÃ´Å¾ete predvolenÃ© nastavenie prepÃsaÅ¥ a pouÅ¾iÅ¥ atribÃºt ktorÃ½ si sami zvolÃte. MusÃte sa ale ubezpeÄiÅ¥, Å¾e atribÃºt ktorÃ½ vyberiete bude uvedenÃ½ pri pouÅ¾ivateÄ¾och, aj pri skupinÃ¡ch a je jedineÄnÃ½. Ponechajte prÃ¡zdne pre predvolenÃ© sprÃ¡vanie. Zmena bude maÅ¥ vplyv len na novo namapovanÃ½ch (pridanÃ½ch) pouÅ¾ÃvateÄ¾ov a skupiny z LDAP."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "Mapovanie nÃ¡zvov LDAP pouÅ¾ÃvateÄ¾skÃ½ch mien"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr "PouÅ¾ivateÄ¾skÃ© menÃ¡ sa pouÅ¾ÃvajÃº pre uchovÃ¡vanie a priraÄovanie (meta)dÃ¡t. Pre sprÃ¡vnu identifikÃ¡ciu a rozpoznanie pouÅ¾ÃvateÄ¾ov bude maÅ¥ kaÅ¾dÃ½ pouÅ¾ÃvateÄ¾ z LDAP internÃ© pouÅ¾ÃvateÄ¾skÃ© meno. To je nevyhnutnÃ© pre namapovanie pouÅ¾ÃvateÄ¾skÃ½ch mien na pouÅ¾ÃvateÄ¾ov v LDAP. VytvorenÃ© pouÅ¾ÃvateÄ¾skÃ© meno je namapovanÃ© na UUID pouÅ¾ÃvateÄ¾a v LDAP. Naviac je cachovanÃ¡ DN pre obmedzenie interakcie s LDAP, ale nie je pouÅ¾ÃvanÃ¡ pre identifikÃ¡ciu. Ak sa DN zmenÃ, bude to sprÃ¡vne rozpoznanÃ©. InternÃ© pouÅ¾ÃvateÄ¾skÃ© meno sa pouÅ¾Ãva vÅ¡ade. VyÄistenie namapovÃ¡nÃ vymaÅ¾e zvyÅ¡ky vÅ¡ade. VyÄistenie naviac nie je Å¡pecifickÃ©, bude maÅ¥ vplyv na vÅ¡etky LDAP konfigurÃ¡cie! Nikdy neÄistite namapovanie v produkÄnom prostredÃ, len v testovacej alebo experimentÃ¡lnej fÃ¡ze."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index ae90bb92d46978e69d8399ee96d4a3fd06f8efde..b3e32008582d954a43be019d53b0400d58e4778e 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # mhh <marian.hvolka@stuba.sk>, 2013
-# martin <zatroch.martin@gmail.com>, 2012
+# martin, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-21 08:49+0200\n"
-"PO-Revision-Date: 2013-06-20 17:30+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 19:50+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV overenie"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL: "
+msgid "Address: "
+msgstr "Adresa: "
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud odoÅ¡le pouÅ¾ÃvateÄ¾skÃ© Ãºdaje na zadanÃº URL. Plugin skontroluje odpoveÄ a povaÅ¾uje nÃ¡vratovÃº hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡etky ostatnÃ© hodnoty ako platnÃ© prihlasovacie Ãºdaje."
+msgstr "PouÅ¾ÃvateÄ¾skÃ© prihlasovacie Ãºdaje budÃº odoslanÃ© na tÃºto adresu. Tento plugin skontroluje odpoveÄ servera a interpretuje nÃ¡vratovÃ½ kÃ³d HTTP 401 a 403 ako neplatnÃ© prihlasovacie Ãºdaje a akÃ½koÄ¾vek inÃ½ ako platnÃ© prihlasovacie Ãºdaje."
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index d62fe931e4e7323b93ae5117f420f54691f687fe..f659c22faf9ae36b6d33ab86b9a643e5a7947893 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,67 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "pred minuto"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "pred {minutes} minutami"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "Pred 1 uro"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "pred {hours} urami"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "vÄeraj"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "pred {days} dnevi"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "pred {months} meseci"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -227,8 +235,8 @@ msgstr "Vrsta predmeta ni podana."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Napaka"
 
@@ -248,140 +256,141 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Napaka med odstranjevanjem souporabe"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Napaka med spreminjanjem dovoljenj"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "V souporabi z vami. Lastnik je {owner}."
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "OmogoÄi souporabo z"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "OmogoÄi souporabo preko povezave"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "ZaÅ¡Äiti z geslom"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Geslo"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "Dovoli javne prenose na streÅ¾nik"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Posreduj povezavo po elektronski poÅ¡ti"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "PoÅ¡lji"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Souporaba preko elektronske poÅ¡te:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Nadaljnja souporaba ni dovoljena"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "PrekliÄi souporabo"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "izbriÅ¡i"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "doloÄi souporabo"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "ZaÅ¡Äiteno z geslom"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Napaka med nastavljanjem datuma preteka"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "PoÅ¡iljanje ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Elektronska poÅ¡ta je poslana"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Posodobitev ni uspela. PoÅ¡ljite poroÄilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Posodobitev je uspeÅ¡no konÄana. Stran bo preusmerjena na oblak ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ponastavitev gesla za oblak ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +411,7 @@ msgstr "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniÅ¡k
 msgid "You will receive a link to reset your password via Email."
 msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "UporabniÅ¡ko ime"
@@ -463,11 +472,11 @@ msgstr "PomoÄ"
 msgid "Access forbidden"
 msgstr "Dostop je prepovedan"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Oblaka ni mogoÄe najti"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +505,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Uporabljena razliÄica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "PriporoÄeno je posodobiti namestitev PHP in varno uporabljati oblak ownCloud"
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Za varno uporabo storitve %s posodobite PHP"
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +527,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Navodila, kako pravilno namestiti streÅ¾nik, so na straneh <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacije</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "Za navodila, kako pravilno nastaviti vaÅ¡ streÅ¾nik, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniÅ¡ki raÄun</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Napredne moÅ¾nosti"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Podatkovna mapa"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "bo uporabljen"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Uporabnik podatkovne zbirke"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Razpredelnica podatkovne zbirke"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "KonÄaj namestitev"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je na voljo. Pridobite veÄ podrobnosti za posodobitev."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Odjava"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Samodejno prijavljanje je zavrnjeno!"
@@ -609,7 +623,7 @@ msgstr "Prijava"
 msgid "Alternative Logins"
 msgstr "Druge prijavne moÅ¾nosti"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index e0e6f04d0672ea420d0d6118b257e79efbae8783..c3d977dbb327c4c25131a2b5a45438e3fcbb473d 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
-"Last-Translator: barbarak <barbarak@arnes.si>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121,7 +121,7 @@ msgstr "Souporaba"
 msgid "Delete permanently"
 msgstr "IzbriÅ¡i dokonÄno"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "IzbriÅ¡i"
 
@@ -129,43 +129,47 @@ msgstr "IzbriÅ¡i"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "V Äakanju ..."
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Å¾e obstaja"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "prekliÄi"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "izvedi opravilo brisanja"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "PoÅ¡iljanje 1 datoteke"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "poteka poÅ¡iljanje datotek"
 
@@ -201,33 +205,33 @@ msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, Äe je datote
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadrÅ¾an za sistem ownCloud."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mapa"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} map"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 datoteka"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} datotek"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +290,61 @@ msgstr "Mapa"
 msgid "From link"
 msgstr "Iz povezave"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Izbrisane datoteke"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "PrekliÄi poÅ¡iljanje"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Za to mesto ni ustreznih dovoljenj za pisanje."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj Å¡e ni niÄesar. Najprej je treba kakÅ¡no datoteko poslati v oblak!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "PrekliÄi souporabo"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "PrekoraÄenje omejitve velikosti"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke, ki jih Å¾elite poslati, presegajo najveÄjo dovoljeno velikost na streÅ¾niku."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preuÄevanje datotek, poÄakajte ..."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Trenutno poteka preuÄevanje"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "direktorij"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "direktoriji"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "datoteka"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 0386afaca31bdbcddc8f74a682b7f4b56c5531dd..4ad47a20489060f91f93fba4a4f26914c14eaf54 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-11 08:50+0000\n"
+"Last-Translator: barbarak <barbarak@arnes.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,14 +64,18 @@ msgstr "VaÅ¡ zasebni kljuÄ ni veljaven. Morda je bilo vaÅ¡e geslo spremenjeno z
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "ManjkajoÄe zahteve"
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr "Preverite, da imate na streÅ¾niku nameÅ¡Äen paket PHP 5.3.3 ali novejÅ¡i in da je omogoÄen in pravilno nastavljen PHP OpenSSL . Zaenkrat je Å¡ifriranje onemogoÄeno."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "Naslednji uporabniki Å¡e nimajo nastavljenega Å¡ifriranja:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 611bd1db93baa2c7a0d6117fe34461dcc843386a..90cc598ec893452be60400546ddcbff691977b78 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Vpisati je treba veljaven kljuÄ programa in kodo za Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Napaka nastavljanja shrambe Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Opozorilo:</b> paket \"smbclient\" ni nameÅ¡Äen. Priklapljanje pogonov CIFS/SMB ne bo mogoÄe."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Opozorilo:</b> podpora FTP v PHP ni omogoÄena ali pa ni nameÅ¡Äena. Priklapljanje pogonov FTP zato ne bo mogoÄe."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 382af2ad3f843d595bdc6e56ad352bbc4841d3d6..47e1076f579273344d87a9b8ffb301562a590dda 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Geslo"
 msgid "Submit"
 msgstr "PoÅ¡lji"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "Oseba %s je doloÄila mapo %s za souporabo"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "Oseba %s je doloÄila datoteko %s za souporabo"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "PoÅ¡lji"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "PrekliÄi poÅ¡iljanje"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Predogled ni na voljo za"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 9c4071419f92b5bb082c3819bcb75b36251496bc..866885ca0cb56b956a6c6c81a868b6861fda098e 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,49 @@ msgstr "Datoteke %s ni mogoÄe dokonÄno izbrisati."
 msgid "Couldn't restore %s"
 msgstr "Ni mogoÄe obnoviti %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "izvedi opravilo obnavljanja"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Napaka"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "dokonÄno izbriÅ¡i datoteko"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "IzbriÅ¡i dokonÄno"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Izbrisano"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mapa"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} map"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 datoteka"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} datotek"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 3ca64dce8f9317be284834e159483d9ddc1b36f1..13f114ac55016b1bebeda9ef9076c05a4b5e4f54 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Ni mogoÄe povrniti: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "uspeÅ¡no"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Datoteka %s je povrnjena na razliÄico %s."
-
-#: history.php:49
-msgid "failure"
-msgstr "spodletelo"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Datoteke %s ni mogoÄe povrniti na razliÄico %s."
+#: js/versions.js:7
+msgid "Versions"
+msgstr "RazliÄice"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Ni starejÅ¡ih razliÄic."
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ni doloÄene poti"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "RazliÄice"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Povrni datoteko na predhodno razliÄico s klikom na gumb za povrnitev."
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Obnovi"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index cb45c24fe9caa0a8fb48bedc65a2dfde6e9454c9..fc3455dabda102f5e28c62ba693d86ba3b9ddc28 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "Uporabniki"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Programi"
-
-#: app.php:417
 msgid "Admin"
 msgstr "SkrbniÅ¡tvo"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "spletne storitve pod vaÅ¡im nadzorom"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Prejemanje datotek v paketu ZIP je onemogoÄeno."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoÄe prejeti le posamiÄno."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ni mogoÄe doloÄiti"
 
@@ -171,77 +183,85 @@ msgstr "NapaÄni ukaz je: \"%s\", ime: %s, geslo: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "UporabniÅ¡ko ime ali geslo PostgreSQL ni veljavno"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Nastavi uporabniÅ¡ko ime skrbnika."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Nastavi geslo skrbnika."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Spletni straÅ¾nik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Preverite <a href='%s'>navodila namestitve</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "pred minuto"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "pred %d minutami"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "Pred 1 uro"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Pred %d urami"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "danes"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "vÄeraj"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "pred %d dnevi"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Pred %d meseci"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "lansko leto"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "let nazaj"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index a198d4211836273162f92493977376f0fce1b35d..2733327ae900b2f30653ac874ed8be25c29f5ad5 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -171,166 +171,173 @@ msgstr "Navedeno mora biti veljavno geslo"
 msgid "__language_name__"
 msgstr "SlovenÅ¡Äina"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogoÄen vsem uporabnikom na omreÅ¾ju. Datoteka .htaccess, vkljuÄena v ownCloud, namreÄ ni ustrezno nastavljena. PriporoÄljivo je nastaviti spletni streÅ¾nik tako, da mapa podatkov ne bo javno dostopna, ali pa, da jo prestavite v podrejeno mapo korenske mape spletnega streÅ¾nika."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Opozorilo nastavitve"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Spletni straÅ¾nik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Preverite <a href='%s'>navodila namestitve</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Manjka modul 'fileinfo'."
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "Manjka modul PHP 'fileinfo'. PriporoÄljivo je omogoÄiti ta modul za popolno zaznavanje vrst MIME."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Jezikovne prilagoditve ne delujejo."
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Na streÅ¾niku ownCloud ni mogoÄe nastaviti jezikovnih doloÄil na jezik %s. Najverjetneje so teÅ¾ave s posebnimi znaki v imenih datotek. PriporoÄljivo je namestiti zahtevane pakete za podporo jeziku %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Internetna povezava ne deluje."
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "StreÅ¾nik ownCloud je brez delujoÄe internetne povezave. To pomeni, da bodo nekatere moÅ¾nosti onemogoÄene. Ne bo mogoÄe priklapljati zunanjih priklopnih toÄk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoÄe poÅ¡iljati obvestilnih sporoÄil preko elektronske poÅ¡te. Za uporabo vseh zmoÅ¾nosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoÄa."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "PeriodiÄno opravilo"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Izvedi eno nalogo z vsako naloÅ¾eno stranjo."
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Souporaba"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "OmogoÄi API souporabe"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Dovoli programom uporabo vmesnika API souporabe"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Dovoli povezave"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Varnost"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "Zahtevaj uporabo HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Zahtevaj Å¡ifrirano povezovanje odjemalcev v oblak ownCloud"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Prijava mora biti vzpostavljena z uporabo protokola HTTPS za omogoÄanje Å¡ifriranja SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Raven beleÅ¾enja"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "VeÄ"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "RazliÄica"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -388,72 +395,72 @@ msgstr "Sledilnik hroÅ¡Äev"
 msgid "Commercial Support"
 msgstr "Podpora strankam"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Pridobi programe za usklajevanje datotek"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "ZaÅ¾eni Äarovnika prvega zagona"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Uporabljenega je <strong>%s</strong> od razpoloÅ¾ljivih <strong>%s</strong> prostora."
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Geslo je spremenjeno"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Gesla ni mogoÄe spremeniti."
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Prikazano ime"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Elektronski naslov"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Osebni elektronski naslov"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "VpiÅ¡ite osebni elektronski naslov in s tem omogoÄite obnovitev gesla"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 39b5621f64996e2c9d5f4ba86686a00200ececde..165251eeea37a5cce0c23ad660b17e360fdf5d51 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: barbarak <barbarak@arnes.si>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +89,9 @@ msgstr "Potrdi brisanje"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Opozorilo:</b> moÅ¾nosti user_ldap in user_webdavauth nista zdruÅ¾ljivi. Pri uporabi je mogoÄe nepriÄakovano obnaÅ¡anje sistema. Eno izmed moÅ¾nosti je priporoÄeno onemgoÄiti."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "OnemogoÄi glavni streÅ¾nik"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Ob priklopu bo streÅ¾nik ownCloud povezan le s kopijo (repliko) streÅ¾nika."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "OnemogoÄi doloÄanje veljavnosti potrdila SSL."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Kadar deluje povezava le s to moÅ¾nostjo, uvozite potrdilo SSL iz streÅ¾nika LDAP na vaÅ¡ streÅ¾nik ownCloud."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "Polje za uporabnikovo prikazano ime"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniÅ¡kih imen ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "Polje za prikazano ime skupine"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "Po privzetih nastavitvah bo uporabniÅ¡ko ime nastavljeno na podlagi atributa UUID. Ta zagotovi, da je uporabniÅ¡ko ime unikatno in, da znakov ni potrebno pretvarjati. Interno uporabniÅ¡ko ime ima omejitev v uporabi znakov, in sicer so dovoljeni le znaki [ a-zA-Z0-9_.@- ]. Ostali znaki so nadomeÅ¡Äeni z njihovimi ustreznicami v ASCII ali so enostavno prezrti. Pri prekrivanju znakov bo dodana Å¡tevilka. Interno uporabniÅ¡ko ime je v uporabi za interno identifikacijo uporabnika. Je tudi privzeto ime za uporabnikovo domaÄo mapo v ownCloudu.  Predstavlja tudi vrata za oddaljene internetne naslove, na primer za vse storitve *DAV. S to nastavitvijo se privzete nastavitve ne bodo upoÅ¡tevale. ÄŒe boste Å¾eleli doseÄi isto obnaÅ¡anje kot pri razliÄicah ownClouda 5, vnesite atribut za Ime za prikaz v spodnje polje. ÄŒe boste polje pustili prazno, bo uporabljena privzeta vrednost. Spremembe bodo vplivale samo na novo dodane LDAP-uporabnike."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "Prezri zaznavo UUID"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Po privzetih nastavitvah ownCloud sam zazna atribute UUID. Atribut UUID je uporabljen za identifikacijo LDAP-uporabnikov in skupin. Na podlagi atributa UUID se ustvari tudi interno uporabniÅ¡ko ime, Äe ne navedete drugaÄnih nastavitev sami. Nastavitev lahko povozite in izberete nastavitev po vaÅ¡i izbiri. Potrebno je zagotoviti, da je izbran atribut lahko uporabljen tako za kreiranje uporabnikov kot skupin in je unikaten. Pustite praznega, Äe Å¾elite, da sistem uporabi privzete nastavitve. Spremembe bodo uporabljene Å¡ele pri novo preslikanih ali dodanih LDAP-uporabnikih in skupinah."
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "Preslikava uporabniÅ¡ko ime - LDAP-uporabnik"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloud uporablja uporabniÅ¡ka imena za shranjevanje in doloÄanje metapodatkov. Za natanÄno identifikacijo in prepoznavo uporabnikov, ima vsak LDAP-uporabnik svoje interno uporabniÅ¡ko ime. To zahteva preslikavo iz uporabniÅ¡kega imena v ownCloudu v LDAP-uporabnika.  Ustvarjeno uporabniÅ¡ko ime je preslikano v UUID LDAP-uporabnika. Hkrati je v predpomnilnik shranjen DN uporabnika, zato da se zmanjÅ¡ajo povezave z LDAP-om, ni pa uporabljen za identifikacijo uporabnikov. ÄŒe se DN spremeni, bo ownCloud sam naÅ¡el te spremembe. Interno ime v ownCloudu je uporabljeno v celotnem sistemu. Brisanje preslikav bo pustilo posledice povsod. Brisanje preslikav je zato problematiÄno za konfiguracijo, vpliva na celotno LDAP-konfiguracijo. Nikoli ne briÅ¡ite preslikav na produkcijskem okolju. Preslikave briÅ¡ite samo v fazi preizkuÅ¡anja storitve."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index 3f1ee543539d118e5e3a969bd866b3fdb719c828..1906a62c581315601c62bd6f2a9e6c57d89e8bf8 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-29 02:03+0200\n"
-"PO-Revision-Date: 2013-06-28 17:00+0000\n"
-"Last-Translator: barbarak <barbarak@arnes.si>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "Overitev WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "Sistem ownCloud bo poslal uporabniÅ¡ka poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmaÄi kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila."
+msgstr ""
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index afa5e12d5da5590e22b90ad099c9497fe35d6fec..0c6e10ceee2d4cf01ebd652776450424396055d5 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Odeen <rapid_odeen@zoho.com>, 2013
+# Odeen <rapid_odeen@zoho.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +139,59 @@ msgstr "NÃ«ntor"
 msgid "December"
 msgstr "Dhjetor"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekonda mÃ« parÃ«"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minutÃ« mÃ« parÃ«"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuta mÃ« parÃ«"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 orÃ« mÃ« parÃ«"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} orÃ« mÃ« parÃ«"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} ditÃ« mÃ« parÃ«"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} muaj mÃ« parÃ«"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "muaj mÃ« parÃ«"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "vite mÃ« parÃ«"
 
@@ -204,7 +205,7 @@ msgstr "Anulo"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Veprim i gabuar gjatÃ« ngarkimit tÃ« modelit tÃ« zgjedhÃ«sit tÃ« skedarÃ«ve"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -226,8 +227,8 @@ msgstr "Nuk Ã«shtÃ« specifikuar tipi i objektit."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Veprim i gabuar"
 
@@ -247,140 +248,141 @@ msgstr "NdarÃ«"
 msgid "Share"
 msgstr "Nda"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Veprim i gabuar gjatÃ« ndarjes"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Veprim i gabuar gjatÃ« heqjes sÃ« ndarjes"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Veprim i gabuar gjatÃ« ndryshimit tÃ« lejeve"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "NdarÃ« me ju dhe me grupin {group} nga {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "NdarÃ« me ju nga {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Nda me"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Nda me lidhje"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Mbro me kod"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Kodi"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Lejo Ngarkimin Publik"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "DÃ«rgo email me lidhjen"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "DÃ«rgo"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Cakto datÃ«n e pÃ«rfundimit"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Data e pÃ«rfundimit"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Nda me email:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Nuk u gjet asnjÃ« person"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Rindarja nuk lejohet"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "NdarÃ« nÃ« {item} me {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "mund tÃ« ndryshosh"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "kontrollimi i hyrjeve"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "krijo"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "azhurno"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "elimino"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "nda"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Mbrojtur me kod"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatÃ« heqjes sÃ« datÃ«s sÃ« pÃ«rfundimit"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatÃ« caktimit tÃ« datÃ«s sÃ« pÃ«rfundimit"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Duke dÃ«rguar..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email-i u dÃ«rgua"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Azhurnimi dÃ«shtoi. Ju lutemi njoftoni pÃ«r kÃ«tÃ« problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Rivendosja e kodit tÃ« ownCloud-it"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +403,7 @@ msgstr "KÃ«rkesa dÃ«shtoi!<br>A u siguruat qÃ« email-i/pÃ«rdoruesi juaj ishte i
 msgid "You will receive a link to reset your password via Email."
 msgstr "Do t'iu vijÃ« njÃ« email qÃ« pÃ«rmban njÃ« lidhje pÃ«r ta rivendosur kodin."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "PÃ«rdoruesi"
@@ -416,7 +418,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Po, dua ta rivendos kodin tani"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -462,11 +464,11 @@ msgstr "NdihmÃ«"
 msgid "Access forbidden"
 msgstr "Ndalohet hyrja"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud-i nuk u gjet"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -475,7 +477,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "Tungjatjeta,\n\nju njoftojmÃ« qÃ« %s ka ndarÃ« %s me ju.\nShikojeni: %s\n\nPÃ«shÃ«ndetje!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -495,8 +497,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Versioni juaj i PHP-sÃ« Ã«shtÃ« i cÃ«nueshÃ«m nga sulmi NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Ju lutem azhurnoni instalimin tuaj tÃ« PHP-sÃ« qÃ« tÃ« pÃ«rdorni ownCloud-in nÃ« mÃ«nyrÃ« tÃ« sigurt."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +519,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Dosja dhe skedarÃ«t e tÃ« dhÃ«nave tuaja mbase janÃ« tÃ« arritshme nga interneti sepse skedari .htaccess nuk po punon."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "PÃ«r mÃ« shumÃ« informacion mbi konfigurimin e duhur tÃ« serverit tuaj, ju lutem shikoni <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentacionin</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krijo njÃ« <strong>llogari administruesi</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "TÃ« pÃ«rparuara"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Emri i dosjes"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfiguro database-in"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "do tÃ« pÃ«rdoret"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "PÃ«rdoruesi i database-it"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Kodi i database-it"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Emri i database-it"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Tablespace-i i database-it"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Pozicioni (host) i database-it"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Mbaro setup-in"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Dalje"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Hyrja automatike u refuzua!"
@@ -608,7 +615,7 @@ msgstr "Hyrje"
 msgid "Alternative Logins"
 msgstr "Hyrje alternative"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 271290a46d2aa043924edeac48f7f2ac638f3b66..a0cc88f60416c47d54b1817352f0db38ef35940f 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Nda"
 msgid "Delete permanently"
 msgstr "Elimino pÃ«rfundimisht"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Elimino"
 
@@ -128,43 +128,45 @@ msgstr "Elimino"
 msgid "Rename"
 msgstr "RiemÃ«rto"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Pezulluar"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} ekziston"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "zÃ«vÃ«ndÃ«so"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "sugjero njÃ« emÃ«r"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "anulo"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "U zÃ«vÃ«ndÃ«sua {new_name} me {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "anulo"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "ekzekuto operacionin e eliminimit"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "Po ngarkohet 1 skedar"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "po ngarkoj skedarÃ«t"
 
@@ -200,33 +202,29 @@ msgstr "Shkarkimi juaj po pÃ«rgatitet. Mund tÃ« duhet pak kohÃ« nqse skedarÃ«t j
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Emri i dosjes Ã«shtÃ« i pavlefshÃ«m. PÃ«rdorimi i \"Shared\" Ã«shtÃ« i rezervuar nga Owncloud-i."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 dosje"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} dosje"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 skedar"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} skedarÃ«"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "Dosje"
 msgid "From link"
 msgstr "Nga lidhja"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "SkedarÃ« tÃ« eliminuar"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Anulo ngarkimin"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Nuk keni tÃ« drejta pÃ«r tÃ« shkruar kÃ«tu."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "KÃ«tu nuk ka asgjÃ«. Ngarkoni diÃ§ka!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ngarkimi Ã«shtÃ« shumÃ« i madh"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "SkedarÃ«t qÃ« doni tÃ« ngarkoni tejkalojnÃ« dimensionet maksimale pÃ«r ngarkimet nÃ« kÃ«tÃ« server."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "SkedarÃ«t po analizohen, ju lutemi pritni."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Analizimi aktual"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index 1642b96a8247e981a113f830e5ff6d56641bacd3..ccb7cbaa9260d885c49b5bab8daca5668ad14f1d 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index da8e68b6b9047c0faa03fb8da4acd2c36cb9b4e4..c8c772a9bdc7a94c0e1806d1eca0ea840397de39 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 40709ec5c0d358c99994c13674265847dd7d90b4..64007bf9f0853c116895f1e9853c27b7cecbe770 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Kodi"
 msgid "Submit"
 msgstr "Parashtro"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ndau me ju dosjen %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ndau me ju skedarin %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ngarko"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Anulo ngarkimin"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Shikimi paraprak nuk Ã«shtÃ« i mundur pÃ«r"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index de0fdf1de9c6d7feec5e8036fa67ec4da0414959..cd243657ba0acb936ab6dd8a53837159075c6f28 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr "Nuk munda ta eliminoj pÃ«rfundimisht %s"
 msgid "Couldn't restore %s"
 msgstr "Nuk munda ta rivendos %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "ekzekuto operacionin e rivendosjes"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "eliminoje pÃ«rfundimisht skedarin"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Elimino pÃ«rfundimisht"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Emri"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminuar"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 dosje"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} dosje"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 skedar"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} skedarÃ«"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index 3c148e4911f7392b54ccc3fdd088bd7c354bba6c..e4c86ec1c7c99bf77455ca92f87bccb5cde4d4e9 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Rivendos"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index b1e0e426abd4446308daf0bd270574d601ed2ebe..7fa5b3bf04e684ac35abc104cc9e1d10489dcaea 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "PÃ«rdoruesit"
 
 #: app.php:409
-msgid "Apps"
-msgstr "App"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "shÃ«rbime web nÃ«n kontrollin tÃ«nd"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Shkarimi i skedarÃ«ve ZIP Ã«shtÃ« i Ã§aktivizuar."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "SkedarÃ«t duhet tÃ« shkarkohen njÃ« nga njÃ«."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Kthehu tek skedarÃ«t"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "SkedarÃ«t e selektuar janÃ« shumÃ« tÃ« mÃ«dhenj pÃ«r tÃ« krijuar njÃ« skedar ZIP."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "nuk u vendos dot"
 
@@ -170,77 +182,77 @@ msgstr "Komanda e gabuar ishte: \"%s\", pÃ«rdoruesi: %s, kodi: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PÃ«rdoruesi dhe/apo kodi i PostgreSQL i pavlefshÃ«m"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Cakto emrin e administratorit."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Cakto kodin e administratorit."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serveri web i juaji nuk Ã«shtÃ« konfiguruar akoma pÃ«r tÃ« lejuar sinkronizimin e skedarÃ«ve sepse ndÃ«rfaqja WebDAV mund tÃ« jetÃ« e dÃ«mtuar."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ju lutemi kontrolloni mirÃ« <a href='%s'>shoqÃ«ruesin e instalimit</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekonda mÃ« parÃ«"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minutÃ« mÃ« parÃ«"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuta mÃ« parÃ«"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 orÃ« mÃ« parÃ«"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d orÃ« mÃ« parÃ«"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "sot"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "dje"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d ditÃ« mÃ« parÃ«"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d muaj mÃ« parÃ«"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "vite mÃ« parÃ«"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index ec3c439bdfa6eb75800c8a52abde34cabbb2b6d6..3b0ed93302f0b3068937eb50f0b5ef5d9d5398cb 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "ParalajmÃ«rim sigurie"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serveri web i juaji nuk Ã«shtÃ« konfiguruar akoma pÃ«r tÃ« lejuar sinkronizimin e skedarÃ«ve sepse ndÃ«rfaqja WebDAV mund tÃ« jetÃ« e dÃ«mtuar."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ju lutemi kontrolloni mirÃ« <a href='%s'>shoqÃ«ruesin e instalimit</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Merrni app-et pÃ«r sinkronizimin e skedarÃ«ve tuaj"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kodi"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Kodi i ri"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email-i"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 8dbb483cdc933ec2a6c68e3cf44e984786094435..67a99bb61b2a047d5a67d26adb70e6d02e3d9d19 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 953547cd5912da6c7bbcec431cb3aaa0b90f0718..d2c5a9a34ea2ba24daa030f908f2162f8ede1f52 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index a4be0812787288f824655f533b347c5cebc49bfc..8072e39202bf723fd15ecfbb8fc900a40575744b 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr "ÐÐ¾Ð²ÐµÐ¼Ð±Ð°Ñ€"
 msgid "December"
 msgstr "Ð”ÐµÑ†ÐµÐ¼Ð±Ð°Ñ€"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "Ð¿Ñ€Ðµ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "ÐŸÑ€Ðµ Ñ˜ÐµÐ´Ð½Ð¾Ð³ ÑÐ°Ñ‚Ð°"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "ÐŸÑ€Ðµ {hours} ÑÐ°Ñ‚Ð° (ÑÐ°Ñ‚Ð¸)"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "Ð´Ð°Ð½Ð°Ñ"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ñ˜ÑƒÑ‡Ðµ"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "Ð¿Ñ€Ðµ {days} Ð´Ð°Ð½Ð°"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³ Ð¼ÐµÑÐµÑ†Ð°"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "ÐŸÑ€Ðµ {months} Ð¼ÐµÑÐµÑ†Ð° (Ð¼ÐµÑÐµÑ†Ð¸)"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Ð¼ÐµÑÐµÑ†Ð¸ Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
@@ -225,8 +229,8 @@ msgstr "Ð’Ñ€ÑÑ‚Ð° Ð¾Ð±Ñ˜ÐµÐºÑ‚Ð° Ð½Ð¸Ñ˜Ðµ Ð¿Ð¾Ð´ÐµÑˆÐµÐ½Ð°."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -246,140 +250,141 @@ msgstr ""
 msgid "Share"
 msgstr "Ð”ÐµÐ»Ð¸"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ñƒ Ð´ÐµÑ™ÐµÑšÑƒ"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÑšÐ° Ð´ÐµÑ™ÐµÑšÐ°"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ð°"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ð”ÐµÑ™ÐµÐ½Ð¾ ÑÐ° Ð²Ð°Ð¼Ð° Ð¸ ÑÐ° Ð³Ñ€ÑƒÐ¿Ð¾Ð¼ {group}. ÐŸÐ¾Ð´ÐµÐ»Ð¸Ð¾ {owner}."
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ð¾ ÑÐ° Ð²Ð°Ð¼Ð° {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ ÑÐ°"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð»Ð¸Ð½Ðº"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ð´Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð¿Ð¾ÑˆÑ‚Ð¾Ð¼:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "ÐžÑÐ¾Ð±Ðµ Ð½Ð¸ÑÑƒ Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½Ðµ."
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð½Ð¾ Ð´ÐµÑ™ÐµÑšÐµ Ð½Ð¸Ñ˜Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ™ÐµÐ½Ð¾"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "ÐŸÐ¾Ð´ÐµÑ™ÐµÐ½Ð¾ ÑƒÐ½ÑƒÑ‚Ð°Ñ€ {item} ÑÐ° {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ð£ÐºÐ¸Ð½Ð¸ Ð´ÐµÑ™ÐµÑšÐµ"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¼ÐµÑšÐ°"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Ð¿Ñ€Ð°Ð²Ð° Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "Ð¾Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Ð¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾Ð½Ð¸ÑˆÑ‚Ð°Ð²Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾ÑÑ‚Ð°Ð²Ñ™Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Ð¨Ð°Ñ™ÐµÐ¼..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "ÐŸÐ¾Ñ€ÑƒÐºÐ° Ñ˜Ðµ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ð°"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð°Ð²Ð°ÑšÐµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ð·Ð° ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +405,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ð”Ð¾Ð±Ð¸Ñ›ÐµÑ‚Ðµ Ð²ÐµÐ·Ñƒ Ð·Ð° Ñ€ÐµÑÐµÑ‚Ð¾Ð²Ð°ÑšÐµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ð¿ÑƒÑ‚ÐµÐ¼ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
@@ -461,11 +466,11 @@ msgstr "ÐŸÐ¾Ð¼Ð¾Ñ›"
 msgid "Access forbidden"
 msgstr "Ð—Ð°Ð±Ñ€Ð°ÑšÐµÐ½ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "ÐžÐ±Ð»Ð°Ðº Ð½Ð¸Ñ˜Ðµ Ð½Ð°Ñ’ÐµÐ½"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +499,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸ <strong>Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ð¸ Ð½Ð°Ð»Ð¾Ð³</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ð¾"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Ð¤Ð°Ñ†Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÐ½"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ð˜Ð¼Ðµ Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Ð Ð°Ð´Ð½Ð¸ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€ Ð±Ð°Ð·Ðµ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ð”Ð¾Ð¼Ð°Ñ›Ð¸Ð½ Ð±Ð°Ð·Ðµ"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ÐžÐ´Ñ˜Ð°Ð²Ð°"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ÐÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ° Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð° Ñ˜Ðµ Ð¾Ð´Ð±Ð¸Ñ˜ÐµÐ½Ð°!"
@@ -607,7 +617,7 @@ msgstr "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð°"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 46985b4a4bf7459a235cb090a34982213576ed39..6a510b356b1294bc29179bf20608421e8d1e249d 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Ð”ÐµÐ»Ð¸"
 msgid "Delete permanently"
 msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸ Ð·Ð° ÑÑ‚Ð°Ð»Ð½Ð¾"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
 
@@ -128,43 +128,46 @@ msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
 msgid "Rename"
 msgstr "ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÑ˜"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ÐÐ° Ñ‡ÐµÐºÐ°ÑšÑƒ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²ÐµÑ› Ð¿Ð¾ÑÑ‚Ð¾Ñ˜Ð¸"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸ Ð½Ð°Ð·Ð¸Ð²"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÑšÐµÐ½Ð¾ {new_name} ÑÐ° {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ð¾Ð¿Ð¾Ð·Ð¾Ð²Ð¸"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Ð¾Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼ 1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ ÑÐµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°Ñ˜Ñƒ"
 
@@ -200,33 +203,31 @@ msgstr "ÐŸÑ€Ð¸Ð¿Ñ€ÐµÐ¼Ð°Ð¼ Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ. ÐžÐ²Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ð¾Ñ‚Ñ€Ð°
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÐÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ Ð¸Ð¼Ðµ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ. Ð¤Ð°ÑÑ†Ð¸ÐºÐ»Ð° â€žSharedâ€œ Ñ˜Ðµ Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸ÑÐ°Ð½Ð° Ð·Ð° ownCloud."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ð’ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Ð˜Ð·Ð¼ÐµÑšÐµÐ½Ð¾"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ/Ð¸"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +286,61 @@ msgstr "Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
 msgid "From link"
 msgstr "Ð¡Ð° Ð²ÐµÐ·Ðµ"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "ÐžÐ±Ñ€Ð¸ÑÐ°Ð½Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ÐŸÑ€ÐµÐºÐ¸Ð½Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ñƒ Ð·Ð° Ð¿Ð¸ÑÐ°ÑšÐµ."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³. ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸Ñ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ð£ÐºÐ¸Ð½Ð¸ Ð´ÐµÑ™ÐµÑšÐµ"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜Ðµ Ð¿Ñ€ÐµÐ²ÐµÐ»Ð¸ÐºÐ°"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ ÐºÐ¾Ñ˜Ðµ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ñ‚Ðµ Ð¿Ñ€ÐµÐ»Ð°Ð·Ðµ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÑšÐµ Ñƒ Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð¸."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Ð¡ÐºÐµÐ½Ð¸Ñ€Ð°Ð¼ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµâ€¦"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ ÑÐºÐµÐ½Ð¸Ñ€Ð°ÑšÐµ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 081f03f53f64a17d98ed3af9873dc7c24474faa5..85eb46828ff2a4e2dfcc343e128aafc18354d304 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index d1d0a2f26bab7057d5cd0487b7460d2d3c3241ee..3ae0a9272fc3ebeb8516eae27bf367d13ca8df91 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 2e5a7e40f2eb880500753f5b77eab376be9af3c2..5fe336ebf12440eb2dd2eb9690b93a9884d13719 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 msgid "Submit"
 msgstr "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ÐŸÑ€ÐµÐºÐ¸Ð½Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index db05ac6f9dbccda2eeaa144975a977b73abe429d..9fed460b7d4ccd1b78cb3b07cf3aea08cc1118de 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,47 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Ð²Ñ€Ð°Ñ‚Ð¸ Ñƒ Ð¿Ñ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¾ ÑÑ‚Ð°ÑšÐµ"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸ Ð·Ð° ÑÑ‚Ð°Ð»Ð½Ð¾"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "ÐžÐ±Ñ€Ð¸ÑÐ°Ð½Ð¾"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ/Ð¸"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 74cb70e53d311356956b56f207470bb4905624f6..5f8025ecf56cb82731c07b98b1c07f237219f8b4 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: sr\n"
 "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);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ð’Ñ€Ð°Ñ‚Ð¸"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 9cb12e7ac5c589dc17a006ab6ac15c171d197ec8..28031d756c0a5f3f96273956afa2e63528e82d24 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸"
 
 #: app.php:409
-msgid "Apps"
-msgstr "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¾Ð¼"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ ZIP-Ð° Ñ˜Ðµ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÐ½Ð¾."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ˜ÐµÐ´Ð½Ñƒ Ð¿Ð¾ Ñ˜ÐµÐ´Ð½Ñƒ."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Ð˜Ð·Ð°Ð±Ñ€Ð°Ð½Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ ÑÑƒ Ð¿Ñ€ÐµÐ²ÐµÐ»Ð¸ÐºÐµ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸ ZIP Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "Ð½Ð¸Ñ˜Ðµ Ð¾Ð´Ñ€ÐµÑ’ÐµÐ½Ð¾"
 
@@ -170,77 +182,81 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’Ð°Ñˆ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ˜Ñƒ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜ÐµÑ€ ÑÐµ Ñ‡Ð¸Ð½Ð¸ Ð´Ð° Ñ˜Ðµ WebDAV ÑÑƒÑ‡ÐµÑ™Ðµ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ <a href='%s'>Ð²Ð¾Ð´Ð¸Ñ‡Ðµ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "Ð¿Ñ€Ðµ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "ÐŸÑ€Ðµ Ñ˜ÐµÐ´Ð½Ð¾Ð³ ÑÐ°Ñ‚Ð°"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "Ð¿Ñ€Ðµ %d ÑÐ°Ñ‚Ð°/Ð¸"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "Ð´Ð°Ð½Ð°Ñ"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ñ˜ÑƒÑ‡Ðµ"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "Ð¿Ñ€Ðµ %d Ð´Ð°Ð½Ð°"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³ Ð¼ÐµÑÐµÑ†Ð°"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "Ð¿Ñ€Ðµ %d Ð¼ÐµÑÐµÑ†Ð°/Ð¸"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index b974ca52bf3ecc19310e30b67707b0bc6f2b8c3c..d0ab5f6c7836af11ae6508b7f2dd47ffb5640d34 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr "ÐœÐ¾Ñ€Ð°Ñ‚Ðµ ÑƒÐ½ÐµÑ‚Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ñƒ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ÑÐ½Ð¾ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ ÑÑƒ Ð²Ð°ÑˆÐ¸ Ð¿Ð¾Ð´Ð°Ñ†Ð¸ Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ðµ ÑÐ° Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð°. Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° .htaccess ÐºÐ¾Ñ˜Ñƒ Ñ˜Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ð¾ Ð¿Ð°ÐºÐµÑ‚ ownCloud Ð½Ðµ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð¸ÑˆÐµ. Ð¡Ð°Ð²ÐµÑ‚ÑƒÑ˜ÐµÐ¼Ð¾ Ð²Ð°Ð¼ Ð´Ð° Ð¿Ð¾Ð´ÐµÑÐ¸Ñ‚Ðµ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¾ Ð´Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼ ÑÐ° Ð¿Ð¾Ð´Ð°Ñ†Ð¸Ð¼Ð° Ð½Ðµ Ð±ÑƒÐ´Ðµ Ð¸Ð·Ð»Ð¾Ð¶ÐµÐ½ Ð¸Ð»Ð¸ Ð´Ð° Ð³Ð° Ð¿Ñ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚Ðµ Ð¸Ð·Ð²Ð°Ð½ ÐºÐ¾Ñ€ÐµÐ½ÑÐºÐ¾Ð³ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼Ð° Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€Ð°."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ Ð¾ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÑƒ"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’Ð°Ñˆ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ˜Ñƒ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜ÐµÑ€ ÑÐµ Ñ‡Ð¸Ð½Ð¸ Ð´Ð° Ñ˜Ðµ WebDAV ÑÑƒÑ‡ÐµÑ™Ðµ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ <a href='%s'>Ð²Ð¾Ð´Ð¸Ñ‡Ðµ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ˜Ðµ Ð¼Ð¾Ð´ÑƒÐ» â€žfileinfoâ€œ"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ˜Ðµ PHP Ð¼Ð¾Ð´ÑƒÐ» â€žfileinfoâ€œ. ÐŸÑ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜ÐµÐ¼Ð¾ Ð²Ð°Ð¼ Ð´Ð° Ð³Ð° Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸Ñ‚Ðµ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð´Ð¾Ð±Ð¸Ð»Ð¸ Ð½Ð°Ñ˜Ð±Ð¾Ñ™Ðµ Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ðµ Ñ Ð¾Ñ‚ÐºÑ€Ð¸Ð²Ð°ÑšÐµÐ¼ MIME Ð²Ñ€ÑÑ‚Ð°."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Ð›Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ˜Ð° Ð½Ðµ Ñ€Ð°Ð´Ð¸"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Ð’ÐµÐ·Ð° Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð¾Ð¼ Ð½Ðµ Ñ€Ð°Ð´Ð¸"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Ð˜Ð·Ð²Ñ€ÑˆÐ¸ Ñ˜ÐµÐ´Ð°Ð½ Ð·Ð°Ð´Ð°Ñ‚Ð°Ðº ÑÐ° ÑÐ²Ð°ÐºÐ¾Ð¼ ÑƒÑ‡Ð¸Ñ‚Ð°Ð½Ð¾Ð¼ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð¾Ð¼"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Ð”ÐµÑ™ÐµÑšÐµ"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸ API Share"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ñ™Ð°Ð²Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°Ð¼Ð° Ð´Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚Ðµ API Share"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð²ÐµÐ·Ðµ"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° Ð´Ð° Ð´ÐµÐ»Ðµ ÑÑ‚Ð°Ð²ÐºÐµ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð° Ð¿ÑƒÑ‚ÐµÐ¼ Ð²ÐµÐ·Ð°"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð´ÐµÑ™ÐµÑšÐµ"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° Ð´Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð´ÐµÐ»Ðµ ÑÑ‚Ð°Ð²ÐºÐµ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð°"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° Ð´Ð° Ð´ÐµÐ»Ðµ ÑÐ° Ð±Ð¸Ð»Ð¾ ÐºÐ¸Ð¼"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° Ð´Ð° Ð´ÐµÐ»Ðµ ÑÐ°Ð¼Ð¾ ÑÐ° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° Ñƒ ÑšÐ¸Ñ…Ð¾Ð²Ð¸Ð¼ Ð³Ñ€ÑƒÐ¿Ð°Ð¼Ð°"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ‚"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ÐÐ°Ð¼ÐµÑ‚Ð½Ð¸ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "ÐÐ°Ð¼ÐµÑ›Ðµ ÐºÐ»Ð¸Ñ˜ÐµÐ½Ñ‚Ð¸Ð¼Ð° Ð´Ð° ÑÐµ Ð¿Ð¾Ð²ÐµÐ¶Ñƒ ÑÐ° ownCloud-Ð¾Ð¼ Ð¿ÑƒÑ‚ÐµÐ¼ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ðµ Ð²ÐµÐ·Ðµ."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Ð‘ÐµÐ»ÐµÐ¶ÐµÑšÐµ"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "ÐÐ¸Ð²Ð¾ Ð±ÐµÐ»ÐµÐ¶ÐµÑšÐ°"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Ð’Ð¸ÑˆÐµ"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "ÐœÐ°ÑšÐµ"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ð’ÐµÑ€Ð·Ð¸Ñ˜Ð°"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "ÐŸÑ€Ð°Ñ›ÐµÑšÐµ Ð³Ñ€ÐµÑˆÐ°ÐºÐ°"
 msgid "Commercial Support"
 msgstr "ÐšÐ¾Ð¼ÐµÑ€Ñ†Ð¸Ñ˜Ð°Ð»Ð½Ð° Ð¿Ð¾Ð´Ñ€ÑˆÐºÐ°"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸Ñ‚Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ Ñ€Ð°Ð´Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð¾Ð²Ð°ÑšÐ° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð¾ Ð¿Ñ€Ð¸ÐºÐ°Ð¶Ð¸ Ñ‡Ð°Ñ€Ð¾Ð±ÑšÐ°Ðº Ð·Ð° Ð¿Ñ€Ð²Ð¾ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ð°ÑšÐµ"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ð˜ÑÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ð»Ð¸ ÑÑ‚Ðµ <strong>%s</strong> Ð¾Ð´ Ð´Ð¾Ð·Ð²Ð¾Ñ™ÐµÐ½Ð¸Ñ… <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° Ñ˜Ðµ Ð¿Ñ€Ð¾Ð¼ÐµÑšÐµÐ½Ð°"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð¼ Ð²Ð°ÑˆÑƒ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÐÐ¾Ð²Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Ð˜Ð¼Ðµ Ð·Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð·"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Ð•-Ð¿Ð¾ÑˆÑ‚Ð°"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ð’Ð°ÑˆÐ° Ð°Ð´Ñ€ÐµÑÐ° Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ð£Ð½"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "ÐˆÐµÐ·Ð¸Ðº"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr " ÐŸÐ¾Ð¼Ð¾Ð·Ð¸Ñ‚Ðµ Ñƒ Ð¿Ñ€ÐµÐ²Ð¾Ñ’ÐµÑšÑƒ"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 47fff93e5afa86f826890449825b68210ee57a2b..c3dad89049fd4eeae8f719ba47fc26e3c931e6f2 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð°."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Ð£Ð²ÐµÐ·Ð¸Ñ‚Ðµ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ LDAP ÑÐµÑ€Ð²ÐµÑ€Ð° Ñƒ ÑÐ²Ð¾Ñ˜ ownCloud Ð°ÐºÐ¾ Ð²ÐµÐ·Ð° Ñ€Ð°Ð´Ð¸ ÑÐ°Ð¼Ð¾ ÑÐ° Ð¾Ð²Ð¾Ð¼ Ð¾Ð¿Ñ†Ð¸Ñ˜Ð¾Ð¼."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "Ð˜Ð¼Ðµ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð·Ð° ÑÑ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¸Ð¼ÐµÐ½Ð° ownCloud-Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "Ð˜Ð¼Ðµ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð° Ð³Ñ€ÑƒÐ¿Ðµ"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚ Ð·Ð° ÑÑ‚Ð²Ð°Ñ€Ð°ÑšÐµ Ð¸Ð¼ÐµÐ½Ð° ownCloud-Ð° Ð³Ñ€ÑƒÐ¿Ðµ."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index bff29cbe68597d5174b290f677efa31ff47b7e07..0e8a056c79f7c175c1df7e90bdd0a81e920b404f 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud Ñ›Ðµ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ð¸ Ð°ÐºÑ€ÐµÐ´Ð¸Ñ‚Ð¸Ð²Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° Ð½Ð° Ð¾Ð²Ñƒ Ð°Ð´Ñ€ÐµÑÑƒ. ÐžÐ²Ð°Ñ˜ Ð¿Ñ€Ð¸ÐºÑ™ÑƒÑ‡Ð°Ðº Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð°Ð²Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€ Ð¸ Ñ‚ÑƒÐ¼Ð°Ñ‡Ð¸ HTTP ÑÑ‚Ð°Ñ‚ÑƒÑÐ½Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ 401 Ð¸ 403 ÐºÐ°Ð¾ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ðµ Ð°ÐºÑ€ÐµÐ´Ð¸Ñ‚Ð¸Ð²Ðµ, Ð° ÑÐ²Ðµ Ð¾ÑÑ‚Ð°Ð»Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ðµ ÐºÐ°Ð¾ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ðµ."
+msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 40097f22d9fdfd953b6719e38f85859b85edc87f..507913d3bfb7be4ce319732bc74407f69b48e99b 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr "Novembar"
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "PodeÅ¡avanja"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +229,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +250,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +405,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "DobiÄ‡ete vezu za resetovanje lozinke putem e-poÅ¡te."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "KorisniÄko ime"
@@ -461,11 +466,11 @@ msgstr "PomoÄ‡"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Oblak nije naÄ‘en"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +499,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Facikla podataka"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "PodeÅ¡avanje baze"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ä‡e biti koriÅ¡Ä‡en"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "DomaÄ‡in baze"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ZavrÅ¡i podeÅ¡avanje"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Odjava"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +617,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 9f8ff6085afca03c2fbf8493129eb9019cedf898..863ac3e7f68d4a22585e522f3f462161e88de856 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "ObriÅ¡i"
 
@@ -128,43 +128,46 @@ msgstr "ObriÅ¡i"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +203,31 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "VeliÄina"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +286,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "PoÅ¡iljka je prevelika"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fajlovi koje Å¾elite da poÅ¡aljete prevazilaze ograniÄenje maksimalne veliÄine poÅ¡iljke na ovom serveru."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index a85e29f4eb3aafa96e302d293334f9e7140eede4..2f15da5caaee7abe466b170289cc7d98fd92177f 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 484ca6e14ce9d8ec55ce2280c7f2231c44abbad9..cf5df4bfa849fde31026c239f65030ae44946de1 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index eeaef9e5000bd71c051f78f476c183ff6d9abab0..0b6b7c8042181731bc5c64980a87ba2e9b5c5701 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Lozinka"
 msgid "Submit"
 msgstr "PoÅ¡alji"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "PoÅ¡alji"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index c2b234735cf0f2959277b7d125de65d746fccdff..f1524d3b935fdb17169d7f30bb0262913f51ea9a 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,46 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:198
-msgid "{count} files"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index ccd4cfed296b5484159016335baa30c0d5f068e1..7eee4964e9a90b58707fe5676afad87d425c272e 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: sr@latin\n"
 "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);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index eca7f3d72e1c6b1ff6a26522467f7b4512f54bde..fd83ff452b3ae5181aaa97f02029350948a95fde 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Korisnici"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Programi"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Adninistracija"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,81 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index d038943c25b24022d38bd534afb29816461887fd..95200220f7dd440abfcdc896dc8f6151f182813a 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:01+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ne mogu da izmenim vaÅ¡u lozinku"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index b828fa148051718a4efeb22670c901417f9599a1..cab46e6a8dd78d3e06c394756755b37f816bedd0 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-23 01:59+0200\n"
-"PO-Revision-Date: 2013-06-22 10:24+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 7c1b403c83b7682bbd897eca981afc84766deb3d..63f3f7465abd0c96b2b035ae1d50dcd1a926c3f3 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 5eecdeddd88d9e72766cea8e48782d6344fdb848..36486c22d65c4e2c5bd2473f38327907a6a8cd22 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -141,59 +141,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "InstÃ¤llningar"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 minut sedan"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuter sedan"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 timme sedan"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} timmar sedan"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} dagar sedan"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "fÃ¶rra mÃ¥naden"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} mÃ¥nader sedan"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "mÃ¥nader sedan"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "fÃ¶rra Ã¥ret"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
@@ -229,8 +229,8 @@ msgstr "Objekttypen Ã¤r inte specificerad."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Fel"
 
@@ -250,140 +250,141 @@ msgstr "Delad"
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Fel nÃ¤r delning skulle avslutas"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Fel vid Ã¤ndring av rÃ¤ttigheter"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delad med dig och gruppen {group} av {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "Delad med dig av {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Delad med"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Delad med lÃ¤nk"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "LÃ¶senordsskydda"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "LÃ¶senord"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "TillÃ¥t publik uppladdning"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "E-posta lÃ¤nk till person"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Skicka"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "SÃ¤tt utgÃ¥ngsdatum"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "UtgÃ¥ngsdatum"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Hittar inga anvÃ¤ndare"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Dela vidare Ã¤r inte tillÃ¥tet"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Ã¥tkomstkontroll"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "LÃ¶senordsskyddad"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgÃ¥ngsdatum"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Fel vid sÃ¤ttning av utgÃ¥ngsdatum"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "E-post skickat"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-gemenskapen</a>."
+msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud lÃ¶senordsÃ¥terstÃ¤llning"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -404,7 +405,7 @@ msgstr "BegÃ¤ran misslyckades!<br>Ã„r du helt sÃ¤ker pÃ¥ att din e-postadress/an
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du fÃ¥r en lÃ¤nk att Ã¥terstÃ¤lla ditt lÃ¶senord via e-post."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "AnvÃ¤ndarnamn"
@@ -465,11 +466,11 @@ msgstr "HjÃ¤lp"
 msgid "Access forbidden"
 msgstr "Ã…tkomst fÃ¶rbjuden"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Hittade inget moln"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -498,8 +499,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Din version av PHP Ã¤r sÃ¥rbar fÃ¶r NULL byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Uppdatera din PHP-installation fÃ¶r att anvÃ¤nda ownCloud sÃ¤kert."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "Var god uppdatera din PHP-installation fÃ¶r att anvÃ¤nda %s sÃ¤kert."
 
 #: templates/installation.php:32
 msgid ""
@@ -519,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Din datakatalog och filer Ã¤r fÃ¶rmodligen tillgÃ¤ngliga frÃ¥n Internet, eftersom .htaccess-filen inte fungerar."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "FÃ¶r information hur man korrekt konfigurera servern, var god se <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "FÃ¶r information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>."
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratÃ¶rskonto</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "kommer att anvÃ¤ndas"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "DatabasanvÃ¤ndare"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "LÃ¶senord till databasen"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Databas tabellutrymme"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s Ã¤r tillgÃ¤nglig. FÃ¥ mer information om hur du gÃ¥r tillvÃ¤ga fÃ¶r att uppdatera."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Logga ut"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk inloggning inte tillÃ¥ten!"
@@ -611,7 +617,7 @@ msgstr "Logga in"
 msgid "Alternative Logins"
 msgstr "Alternativa inloggningar"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index f019207f7e726fdf75a32aac8c384c045d5dd68d..b2a64bde8cf6f66d33b409f433f463780029f714 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Gunnar Norin <blittan@xbmc.org>, 2013
+# medialabs, 2013
 # Magnus HÃ¶glund <magnus@linux.com>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +124,7 @@ msgstr "Dela"
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Radera"
 
@@ -131,43 +132,45 @@ msgstr "Radera"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "VÃ¤ntar"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "ersÃ¤tt"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "fÃ¶reslÃ¥ namn"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "utfÃ¶r raderingen"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 filuppladdning"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "filer laddas upp"
 
@@ -203,33 +206,29 @@ msgstr "Din nedladdning fÃ¶rbereds. Det kan ta tid om det Ã¤r stora filer."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ogiltigt mappnamn. AnvÃ¤ndande av 'Shared' Ã¤r reserverat av ownCloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Ã„ndrad"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 mapp"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} mappar"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 fil"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -288,61 +287,61 @@ msgstr "Mapp"
 msgid "From link"
 msgstr "FrÃ¥n lÃ¤nk"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Raderade filer"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Du saknar skrivbehÃ¶righet hÃ¤r."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting hÃ¤r. Ladda upp nÃ¥got!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "FÃ¶r stor uppladdning"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerna du fÃ¶rsÃ¶ker ladda upp Ã¶verstiger den maximala storleken fÃ¶r filÃ¶verfÃ¶ringar pÃ¥ servern."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vÃ¤nta"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr "mapp"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr "mappar"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "fil"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index e311ebaf59e8937c5d973e1a3bf323212f103348..53394af770a14c1f3b7f5ba9f259b4cdfa4904a9 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -6,13 +6,14 @@
 # medialabs, 2013
 # Magnus HÃ¶glund <magnus@linux.com>, 2013
 # medialabs, 2013
+# Stefan Gagner <stefan@mei-ya.se>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-11 08:07-0400\n"
+"PO-Revision-Date: 2013-08-09 12:41+0000\n"
+"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,14 +67,18 @@ msgstr "Din privata lÃ¶senordsnyckel Ã¤r inte giltig! Troligen har ditt lÃ¶senor
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
-msgstr ""
+msgstr "Krav som saknas"
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
-msgstr ""
+"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."
+msgstr "Kontrollera att PHP 5.3.3 eller senare Ã¤r installerad och att tillÃ¤gget OpenSSL PHP Ã¤r aktiverad och korrekt konfigurerad. Kryptering Ã¤r tillsvidare inaktiverad."
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
+msgstr "FÃ¶ljande anvÃ¤ndare har inte aktiverat kryptering:"
 
 #: js/settings-admin.js:11
 msgid "Saving..."
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 5acbd87427ab0e3f0b2b2f545aca5ee80bb6aaf8..af1c578869d242719634c82a919b6c0305868e4a 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Ange en giltig Dropbox nyckel och hemlighet."
 msgid "Error configuring Google Drive storage"
 msgstr "Fel vid konfigurering av Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Varning:</b> \"smb-klienten\" Ã¤r inte installerad. Montering av CIFS/SMB delningar Ã¤r inte mÃ¶jligt. Kontakta din systemadministratÃ¶r fÃ¶r att fÃ¥ den installerad."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Varning:</b> StÃ¶d fÃ¶r FTP i PHP Ã¤r inte aktiverat eller installerat. Montering av FTP-delningar Ã¤r inte mÃ¶jligt. Kontakta din systemadministratÃ¶r fÃ¶r att fÃ¥ det installerat."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index c7ad79c4fc6be662d691012da397c243681d7c6a..95e8da89b115a91b90e9f1d6f2a169d4582263ef 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Magnus HÃ¶glund <magnus@linux.com>, 2013
+# Stefan Gagner <stefan@mei-ya.se>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +21,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "LÃ¶senordet Ã¤r fel. FÃ¶rsÃ¶k igen."
 
 #: templates/authenticate.php:7
 msgid "Password"
@@ -29,28 +31,52 @@ msgstr "LÃ¶senord"
 msgid "Submit"
 msgstr "Skicka"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr "TyvÃ¤rr, denna lÃ¤nk verkar inte fungera lÃ¤ngre."
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr "Orsaker kan vara:"
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr "objektet togs bort"
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr "giltighet fÃ¶r lÃ¤nken har gÃ¥tt ut"
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr "delning Ã¤r inaktiverat"
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr "FÃ¶r mer information, kontakta den person som skickade den hÃ¤r lÃ¤nken."
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delade mappen %s med dig"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delade filen %s med dig"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "Ingen fÃ¶rhandsgranskning tillgÃ¤nglig fÃ¶r"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 1f447a92fc75ced813f5fb09817e83c09d451fd7..ac516cb4cb435469eb3432395b50a8344eda5f2a 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Magnus HÃ¶glund <magnus@linux.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,45 @@ msgstr "Kunde inte radera %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunde inte Ã¥terstÃ¤lla %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "utfÃ¶r Ã¥terstÃ¤llning"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Fel"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "radera filen permanent"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Raderad"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 mapp"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} mappar"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Ã¥terstÃ¤lld"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index ff6e4700fd6e7ad537e92cb506a188e5d6cc31ce..92efc58d66e287e802eb146c9e504a105ff55097 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# medialabs <medialabs@gmail.com>, 2013
+# medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:20+0000\n"
-"Last-Translator: medialabs <medialabs@gmail.com>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 22:00+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,41 +18,27 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Kunde inte Ã¥terstÃ¤lla: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "lyckades"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Filen %s Ã¥terstÃ¤lldes till version %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "misslyckades"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Filen %s kunde inte Ã¥terstÃ¤llas till version %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Versioner"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Inga gamla versioner finns tillgÃ¤ngliga"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr "Kunde inte Ã¥terstÃ¤lla {file} till revision {timestamp}."
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ingen sÃ¶kvÃ¤g angiven"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr "Fler versioner..."
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Versioner"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr "Inga andra versioner tillgÃ¤ngliga"
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Ã…terstÃ¤ll en fil till en tidigare version genom att klicka pÃ¥ Ã¥terstÃ¤llningsknappen"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ã…terskapa"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 959ecb84a842c2fc196355ed5f291c9c314f66a3..1f5f24739bf6b891b3335579d2510500d5333f66 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # medialabs, 2013
+# medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +36,46 @@ msgid "Users"
 msgstr "AnvÃ¤ndare"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Program"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Admin"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr "Misslyckades med att uppgradera \"%s\"."
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "webbtjÃ¤nster under din kontroll"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr "Kan inte Ã¶ppna \"%s\""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP Ã¤r avstÃ¤ngd."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en Ã¥t gÃ¥ngen."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer Ã¤r fÃ¶r stora fÃ¶r att skapa zip-fil."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr "Ladda ner filerna i mindre bitar, separat eller frÃ¥ga din administratÃ¶r."
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "kunde inte bestÃ¤mmas"
 
@@ -171,77 +184,77 @@ msgstr "Det felande kommandot var: \"%s\", name: %s, password: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL-anvÃ¤ndarnamnet och/eller lÃ¶senordet Ã¤r felaktigt"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Ange ett anvÃ¤ndarnamn fÃ¶r administratÃ¶ren."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Ange ett administratÃ¶rslÃ¶senord."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webbserver Ã¤r inte korrekt konfigurerad fÃ¶r att tillÃ¥ta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 minut sedan"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuter sedan"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 timme sedan"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d timmar sedan"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "i dag"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d dagar sedan"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "fÃ¶rra mÃ¥naden"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d mÃ¥nader sedan"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "fÃ¶rra Ã¥ret"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr "Orsakad av:"
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index a900eb929ba9d92163d81fc704c5ddd894563229..aa682e15aad1b4a74ede05c37d16efc19e286cd5 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -7,13 +7,15 @@
 # Jan Busk, 2013
 # Jan Busk, 2013
 # medialabs, 2013
+# Magnus HÃ¶glund <magnus@linux.com>, 2013
+# medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,166 +175,173 @@ msgstr "Ett giltigt lÃ¶senord mÃ¥ste anges"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "SÃ¤kerhetsvarning"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Din datakatalog och dina filer Ã¤r fÃ¶rmodligen tillgÃ¤ngliga frÃ¥n Internet. Den .htaccess-fil som ownCloud tillhandahÃ¥ller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern sÃ¥ att datakatalogen inte lÃ¤ngre Ã¤r tillgÃ¤nglig eller att du flyttar datakatalogen utanfÃ¶r webbserverns dokument-root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr "Din datakatalog och dina filer Ã¤r fÃ¶rmodligen Ã¥tkomliga frÃ¥n internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver sÃ¥ att datakatalogen inte lÃ¤ngre Ã¤r Ã¥tkomlig eller du flyttar datakatalogen utanfÃ¶r webbserverns rotkatalog."
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Installationsvarning"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webbserver Ã¤r inte korrekt konfigurerad fÃ¶r att tillÃ¥ta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr "VÃ¤nligen dubbelkolla igenom <a href=\"%s\">installationsguiden</a>."
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen \"fileinfo\" saknas"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den hÃ¤r modulen fÃ¶r att kunna upptÃ¤cka korrekt mime-typ."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Locale fungerar inte"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Denna ownCloud server kan inte sÃ¤tta system locale till %s. Det innebÃ¤r att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nÃ¶dvÃ¤ndiga paket pÃ¥ ditt system fÃ¶r att stÃ¶dja %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "Systemets sprÃ¥k kan inte sÃ¤ttas till %s. Detta innebÃ¤r att det kan vara problem med vissa tecken i filnamn. Det Ã¤r starkt rekommenderat att installera nÃ¶dvÃ¤ndiga paket sÃ¥ att systemet fÃ¥r stÃ¶d fÃ¶r %s."
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "InternetfÃ¶rbindelsen fungerar inte"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Den hÃ¤r ownCloudservern har ingen fungerande internetfÃ¶rbindelse. Det innebÃ¤r att nÃ¥gra funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara sÃ¥ att det inte gÃ¥r att fÃ¥ fjÃ¤rrÃ¥tkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillÃ¥ter internetÃ¥tkomst fÃ¶r den hÃ¤r servern om du vill ha tillgÃ¥ng till alla funktioner hos ownCloud"
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "Servern har ingen fungerande internetanslutning. Detta innebÃ¤r att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Ã…tkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling fÃ¶r denna server om du vill ha alla funktioner."
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Exekvera en uppgift vid varje sidladdning"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php Ã¤r registrerad som en webcron-tjÃ¤nst. Anropa cron.php sidan i ownCloud en gÃ¥ng i minuten Ã¶ver HTTP."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php Ã¤r registrerad som en webcron-tjÃ¤nst fÃ¶r att anropa cron.php varje minut Ã¶ver http."
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "AnvÃ¤nd system-tjÃ¤nsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "AnvÃ¤nd system-tjÃ¤nsten cron fÃ¶r att anropa cron.php varje minut."
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Dela"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Aktivera delat API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "TillÃ¥t applikationer att anvÃ¤nda delat API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "TillÃ¥t lÃ¤nkar"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "TillÃ¥t delning till allmÃ¤nheten via publika lÃ¤nkar"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "TillÃ¥t offentlig uppladdning"
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "TillÃ¥t anvÃ¤ndare att aktivera\nTillÃ¥t anvÃ¤ndare att gÃ¶ra det mÃ¶jligt fÃ¶r andra att ladda upp till sina offentligt delade mappar"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "TillÃ¥t vidaredelning"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "TillÃ¥t anvÃ¤ndare att dela vidare filer som delats med dem"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "TillÃ¥t delning med alla"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "TillÃ¥t bara delning med anvÃ¤ndare i egna grupper"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "SÃ¤kerhet"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "KrÃ¤v HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Tvingar klienter att ansluta till ownCloud via en krypterad fÃ¶rbindelse."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "Tvingar klienterna att ansluta till %s via en krypterad anslutning."
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "VÃ¤nligen anslut till denna instans av ownCloud via HTTPS fÃ¶r att aktivera/avaktivera SSL"
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "Anslut till din %s via HTTPS fÃ¶r att aktivera/deaktivera SSL"
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "NivÃ¥ pÃ¥ loggning"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -390,77 +399,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommersiell support"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Skaffa apparna fÃ¶r att synkronisera dina filer"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Visa FÃ¶rsta uppstarts-guiden igen"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har anvÃ¤nt <strong>%s</strong> av tillgÃ¤ngliga <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "LÃ¶senord"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ditt lÃ¶senord har Ã¤ndrats"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Kunde inte Ã¤ndra ditt lÃ¶senord"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Nuvarande lÃ¶senord"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Nytt lÃ¶senord"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ã„ndra lÃ¶senord"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Visningsnamn"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll i en e-postadress fÃ¶r att aktivera Ã¥terstÃ¤llning av lÃ¶senord"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "HjÃ¤lp att Ã¶versÃ¤tta"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "AnvÃ¤nd denna adress fÃ¶r att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma Ã¥t dina filer via WebDAV</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index b7a2685a68fb79a02eb05feebc4ee6c6fa120b1e..44eefd82f2105001ae2bf1d1ad366e1870656004 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Jan Busk, 2013
+# Magnus HÃ¶glund <magnus@linux.com>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,7 +91,7 @@ msgstr "BekrÃ¤fta radering"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth Ã¤r inkompatibla. OvÃ¤ntade problem kan uppstÃ¥. Be din systemadministratÃ¶r att inaktivera en av dom."
 
@@ -223,8 +224,8 @@ msgid "Disable Main Server"
 msgstr "Inaktivera huvudserver"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "NÃ¤r denna Ã¤r pÃ¥kopplad kommer ownCloud att koppla upp till replika-servern, endast."
+msgid "Only connect to the replica server."
+msgstr "Anslut endast till replikaservern."
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -243,10 +244,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "StÃ¤ng av verifiering av SSL-certifikat."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Om anslutningen bara fungerar med det hÃ¤r alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
+"certificate in your %s server."
+msgstr "Om anslutningen bara fungerar med detta alternativ, importera LDAP-serverns SSL-certifikat i din% s server."
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -269,8 +271,8 @@ msgid "User Display Name Field"
 msgstr "Attribut fÃ¶r anvÃ¤ndarnamn"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Attribut som anvÃ¤nds fÃ¶r att generera anvÃ¤ndarnamn i ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr "LDAP-attributet som ska anvÃ¤ndas fÃ¶r att generera anvÃ¤ndarens visningsnamn."
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -293,8 +295,8 @@ msgid "Group Display Name Field"
 msgstr "Attribut fÃ¶r gruppnamn"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Attribut som anvÃ¤nds fÃ¶r att generera gruppnamn i ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr "LDAP-attributet som ska anvÃ¤ndas fÃ¶r att generera gruppens visningsnamn."
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -354,12 +356,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr "Som standard skapas det interna anvÃ¤ndarnamnet frÃ¥n UUID-attributet. Det sÃ¤kerstÃ¤ller att anvÃ¤ndarnamnet Ã¤r unikt och tecken inte behÃ¶ver konverteras. Det interna anvÃ¤ndarnamnet har restriktionerna att endast fÃ¶ljande tecken Ã¤r tillÃ¥tna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelÃ¤mnas helt. En siffra kommer att lÃ¤ggas till eller Ã¶kas pÃ¥ vid en kollision. Det interna anvÃ¤ndarnamnet anvÃ¤nds fÃ¶r att identifiera anvÃ¤ndaren internt. Det Ã¤r Ã¤ven fÃ¶rvalt som anvÃ¤ndarens anvÃ¤ndarnamn i ownCloud. Det Ã¤r Ã¤ven en port fÃ¶r fjÃ¤rrÃ¥tkomst, t.ex. fÃ¶r alla *DAV-tjÃ¤nster. Med denna instÃ¤llning kan det fÃ¶rvalda beteendet Ã¥sidosÃ¤ttas. FÃ¶r att uppnÃ¥ ett liknande beteende som innan ownCloud 5, ange attributet fÃ¶r anvÃ¤ndarens visningsnamn i detta fÃ¤lt. LÃ¤mna det tomt fÃ¶r fÃ¶rvalt beteende. Ã„ndringarna kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-anvÃ¤ndare"
 
 #: templates/settings.php:103
@@ -372,12 +374,12 @@ msgstr "Ã…sidosÃ¤tt UUID detektion"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Som standard upptÃ¤cker ownCloud automatiskt UUID-attributet. Det UUID-attributet anvÃ¤nds fÃ¶r att utan tvivel identifiera LDAP-anvÃ¤ndare och grupper. Dessutom kommer interna anvÃ¤ndarnamn skapas baserat pÃ¥ detta UUID, om inte annat anges ovan. Du kan Ã¥sidosÃ¤tta instÃ¤llningen och passera ett attribut som du sjÃ¤lv vÃ¤ljer. Du mÃ¥ste se till att attributet som du vÃ¤ljer kan hÃ¤mtas fÃ¶r bÃ¥de anvÃ¤ndare och grupper och att det Ã¤r unikt. LÃ¤mna det tomt fÃ¶r standard beteende. FÃ¶rÃ¤ndringar kommer endast att pÃ¥verka nyligen mappade (tillagda) LDAP-anvÃ¤ndare och grupper."
 
@@ -391,17 +393,16 @@ msgstr "AnvÃ¤ndarnamn-LDAP User Mapping"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr "ownCloud anvÃ¤nder sig av anvÃ¤ndarnamn fÃ¶r att lagra och tilldela (meta) data. FÃ¶r att exakt kunna identifiera och kÃ¤nna igen anvÃ¤ndare, kommer varje LDAP-anvÃ¤ndare ha ett internt anvÃ¤ndarnamn. Detta krÃ¤ver en mappning frÃ¥n ownCloud-anvÃ¤ndarnamn till LDAP-anvÃ¤ndare. Det skapade anvÃ¤ndarnamnet mappas till UUID fÃ¶r LDAP-anvÃ¤ndaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den anvÃ¤nds inte fÃ¶r identifiering. Om DN fÃ¶rÃ¤ndras, kommer fÃ¶rÃ¤ndringarna hittas av ownCloud. Det interna ownCloud-namnet anvÃ¤nds Ã¶verallt i ownCloud. Om du rensar/raderar mappningarna kommer att lÃ¤mna referenser Ã¶verallt i systemet. Men den Ã¤r inte konfigurationskÃ¤nslig, den pÃ¥verkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljÃ¶. Utan gÃ¶r detta endast pÃ¥ i testmiljÃ¶!"
 
 #: templates/settings.php:109
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index e8848e9ada136be51509bb64e580867b212426a3..fe31213d10fb41cf079bedda091e12c32f8bf630 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-16 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 10:50+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-08-03 01:55-0400\n"
+"PO-Revision-Date: 2013-08-02 10:50+0000\n"
+"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Autentisering"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "URL:"
+msgid "Address: "
+msgstr "Adress: "
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr "ownCloud kommer skicka anvÃ¤ndaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 834f706c36bb0922e1c94ed665c5444f20da2160..19567db98dddf9cff5b92b031cfd8e15b43801eb 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:02+0200\n"
-"PO-Revision-Date: 2013-07-06 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +462,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 024ede3858ba567a28822cb31a50db11c8f12d6d..d234fdfc7b3406f7d2b71eb743473b33594a958c 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-04 09:30+0200\n"
-"PO-Revision-Date: 2013-07-04 07:31+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,54 +27,54 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/upload.php:16 ajax/upload.php:39
+#: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:22
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:55
+#: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:62
+#: ajax/upload.php:66
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:63
+#: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:65
+#: ajax/upload.php:69
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:66
+#: ajax/upload.php:70
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:67
+#: ajax/upload.php:71
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:68
+#: ajax/upload.php:72
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:73
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:87
+#: ajax/upload.php:91
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:119
+#: ajax/upload.php:123
 msgid "Invalid directory."
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 50c13bf25ed458b5064a4cb6225f9683bc027fc4..44bd37d47a128cc6d74a119476a4a32052f63636 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 5e4f08ccb5228611130cbc5d8720b50452fa08ed..0cf4663cb99b2cd07f51c2c15f72fad0dfbd94a6 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-07-31 01:55-0400\n"
+"PO-Revision-Date: 2013-07-31 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index d76092bcb49df3a9993a198df54f041abdca65b9..3edc43234c3a18b342939e88c5cb7d3ac3b45f1c 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:186
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:194
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
index 93654e24af738a94d7a9f8121e4250a63f0a3729..e49e3ef2f0e951259aba1035dbd3bbf1b189fb92 100644
--- a/l10n/sw_KE/files_versions.po
+++ b/l10n/sw_KE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index cf3d110e8eb3765c2e38597e5272b72ed91da91a..ed7bf38925e2f7c6f6b9b3f058995f3b8f348367 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index cabca70f94809300f844b4e25096fed60721995f..262dc578d1b9482fe99ae7a116a2b0099a3a8614 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-25 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 14bfbf0acb2cf8baac6026ca9be43b84233d1581..b340fa14d80a973a04c84e130e85ff5f0d28414c 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/sw_KE/user_webdavauth.po b/l10n/sw_KE/user_webdavauth.po
index f37c585e1edd97b26d532d128556f8e4f8b10c0a..902fbaf5f759c9c4f5ea6c0651c65a2488bec0fa 100644
--- a/l10n/sw_KE/user_webdavauth.po
+++ b/l10n/sw_KE/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 74ce7e2d617b4f8e282634df278ccc18bd2b5fbe..b39ec3ce71b9e6ffc65a6bba864d9bc8fd6ab319 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "à®•à®¾à®°à¯à®¤à¯à®¤à®¿à®•à¯ˆ"
 msgid "December"
 msgstr "à®®à®¾à®°à¯à®•à®´à®¿"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ "
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯} à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯ "
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à¯} à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "à®‡à®©à¯à®±à¯"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "à®¨à¯‡à®±à¯à®±à¯"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{à®¨à®¾à®Ÿà¯à®•à®³à¯} à®¨à®¾à®Ÿà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®®à®¾à®¤à®®à¯"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{à®®à®¾à®¤à®™à¯à®•à®³à¯} à®®à®¾à®¤à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "à®®à®¾à®¤à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
@@ -225,8 +225,8 @@ msgstr "à®ªà¯Šà®°à¯à®³à¯ à®µà®•à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà®µ
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "à®µà®´à¯"
 
@@ -246,140 +246,141 @@ msgstr ""
 msgid "Share"
 msgstr "à®ªà®•à®¿à®°à¯à®µà¯"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "à®ªà®•à®¿à®°à¯à®®à¯ à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "à®ªà®•à®¿à®°à®¾à®®à®²à¯ à®‰à®³à¯à®³à®ªà¯à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "à®…à®©à¯à®®à®¤à®¿à®•à®³à¯ à®®à®¾à®±à¯à®®à¯à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà®©à¯à®®à¯ à®•à¯à®´à¯à®µà¯à®•à¯à®•à®¿à®Ÿà¯ˆà®¯à®¿à®²à¯à®®à¯ {à®•à¯à®´à¯} à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {à®‰à®°à®¿à®®à¯ˆà®¯à®¾à®³à®°à¯}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà®©à¯ à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {à®‰à®°à®¿à®®à¯ˆà®¯à®¾à®³à®°à¯}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "à®‡à®£à¯ˆà®ªà¯à®ªà¯à®Ÿà®©à¯ à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®ªà®¾à®¤à¯à®•à®¾à®¤à¯à®¤à®²à¯"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿ à®¤à¯‡à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®•"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "à®•à®¾à®²à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "à®®à®¿à®©à¯à®©à®žà¯à®šà®²à®¿à®©à¯‚à®Ÿà®¾à®© à®ªà®•à®¿à®°à¯à®µà¯: "
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "à®¨à®ªà®°à¯à®•à®³à¯ à®¯à®¾à®°à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "à®®à¯€à®³à¯à®ªà®•à®¿à®°à¯à®µà®¤à®±à¯à®•à¯ à®…à®©à¯à®®à®¤à®¿ à®‡à®²à¯à®²à¯ˆ "
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "{à®ªà®¯à®©à®¾à®³à®°à¯} à®‰à®Ÿà®©à¯ {à®‰à®°à¯à®ªà¯à®ªà®Ÿà®¿} à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "à®¤à¯Šà®•à¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà®¾à®© à®…à®£à¯à®•à®²à¯"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "à®‰à®°à¯à®µà®µà®¾à®•à¯à®•à®²à¯"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "à®‡à®±à¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "à®¨à¯€à®•à¯à®•à¯à®•"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®ªà®¾à®¤à¯à®•à®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®¾à®®à¯ˆà®•à¯à®•à®¾à®© à®µà®´à¯"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®µà®¤à®¿à®²à¯ à®µà®´à¯"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud à®‡à®©à¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®®à¯€à®³à®®à¯ˆà®ªà¯à®ªà¯"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "à®¨à¯€à®™à¯à®•à®³à¯ à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯ à®®à¯‚à®²à®®à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à¯€à®³à®®à¯ˆà®ªà¯à®ªà®¤à®±à¯à®•à®¾à®© à®‡à®£à¯ˆà®ªà¯à®ªà¯ˆ à®ªà¯†à®±à¯à®µà¯€à®°à¯à®•à®³à¯. "
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "à®ªà®¯à®©à®¾à®³à®°à¯ à®ªà¯†à®¯à®°à¯"
@@ -461,11 +462,11 @@ msgstr "à®‰à®¤à®µà®¿"
 msgid "Access forbidden"
 msgstr "à®…à®£à¯à®• à®¤à®Ÿà¯ˆ"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud à®•à®¾à®£à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong> à®¨à®¿à®°à¯à®µà®¾à®• à®•à®£à®•à¯à®•à¯Šà®©à¯à®±à¯ˆ </strong> à®‰à®°à¯à®µà®¾à®•à¯à®•à¯à®•"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "à®‰à®¯à®°à¯à®¨à¯à®¤"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "à®¤à®°à®µà¯ à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³à®¤à¯à®¤à¯ˆ à®¤à®•à®µà®®à¯ˆà®•à¯à®•"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®®à¯"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®ªà®¯à®©à®¾à®³à®°à¯"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®ªà¯†à®¯à®°à¯"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®…à®Ÿà¯à®Ÿà®µà®£à¯ˆ"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®“à®®à¯à®ªà¯à®©à®°à¯"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯ˆ à®®à¯à®Ÿà®¿à®•à¯à®•"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "à®µà®¿à®Ÿà¯à®ªà®¤à®¿à®•à¯ˆ à®šà¯†à®¯à¯à®•"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "à®¤à®©à¯à®©à®¿à®šà¯à®šà¯ˆà®¯à®¾à®© à®ªà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ à®¨à®¿à®°à®¾à®•à®°à®¿à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯!"
@@ -607,7 +613,7 @@ msgstr "à®ªà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index cb2e4557517df042da948168c9efaf7aaa944e8e..22787fe4795bc80cce927a379bbb85b11c2472a1 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "à®ªà®•à®¿à®°à¯à®µà¯"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "à®¨à¯€à®•à¯à®•à¯à®•"
 
@@ -128,43 +128,45 @@ msgstr "à®¨à¯€à®•à¯à®•à¯à®•"
 msgid "Rename"
 msgstr "à®ªà¯†à®¯à®°à¯à®®à®¾à®±à¯à®±à®®à¯"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "à®¨à®¿à®²à¯à®µà¯ˆà®¯à®¿à®²à¯à®³à¯à®³"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} à®à®±à¯à®•à®©à®µà¯‡ à®‰à®³à¯à®³à®¤à¯"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "à®®à®¾à®±à¯à®±à®¿à®Ÿà¯à®•"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "à®ªà¯†à®¯à®°à¯ˆ à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} à®†à®©à®¤à¯ {old_name} à®‡à®©à®¾à®²à¯ à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "à®®à¯à®©à¯ à®šà¯†à®¯à®²à¯ à®¨à¯€à®•à¯à®•à®®à¯ "
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "à®ªà¯†à®¯à®°à¯"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "à®…à®³à®µà¯"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®•à®³à¯"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 à®•à¯‹à®ªà¯à®ªà¯"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
 msgid "From link"
 msgstr "à®‡à®£à¯ˆà®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "à®‡à®™à¯à®•à¯ à®’à®©à¯à®±à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à¯à®•"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®®à®¿à®•à®ªà¯à®ªà¯†à®°à®¿à®¯à®¤à¯"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®± à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®•à¯à®®à¯ à®•à¯‹à®ªà¯à®ªà¯à®•à®³à®¾à®©à®¤à¯ à®‡à®¨à¯à®¤ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®²à¯ à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®•à¯à®•à¯‚à®Ÿà®¿à®¯ à®†à®•à®•à¯à®•à¯‚à®Ÿà®¿à®¯ à®…à®³à®µà®¿à®²à¯à®®à¯ à®•à¯‚à®Ÿà®¿à®¯à®¤à¯."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®µà®°à¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ à®•à®¾à®¤à¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "à®¤à®±à¯à®ªà¯‹à®¤à¯ à®µà®°à¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®ªà®µà¯ˆ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index fc2389171d96517d046f03ecf53684a51b1d565c..c6a45e1e1153cf443151eb6aa71cb4d21838ee1f 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index e427009892a9efa47af0b275e31074e2aa34fc05..510a8d15dccbaa17c0a52ba1950f4ffa4f7ccaa1 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ à®’à®°à¯ à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯
 msgid "Error configuring Google Drive storage"
 msgstr "Google à®‡à®¯à®•à¯à®• à®šà¯‡à®®à®¿à®ªà¯à®ªà®•à®¤à¯à®¤à¯ˆ à®¤à®•à®®à¯ˆà®ªà¯à®ªà®¤à®¿à®²à¯ à®µà®´à¯"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 37ae904c1e8049e19906ff1e63f7bcc16af2f20e..f5ecc9d83d98968d006a449bb2c7c6293cb507f6 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 msgid "Submit"
 msgstr "à®šà®®à®°à¯à®ªà¯à®ªà®¿à®•à¯à®•à¯à®•"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®¯à®¾à®©à®¤à¯ %s à®‰à®Ÿà®©à¯ à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s à®•à¯‹à®ªà¯à®ªà®¾à®©à®¤à¯ %s à®‰à®Ÿà®©à¯ à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à¯à®•"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "à®…à®¤à®±à¯à®•à¯ à®®à¯à®©à¯à®©à¯‹à®•à¯à®•à¯ à®’à®©à¯à®±à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index 063876a95c42f914ac20de1fca756b2dbb484d03..6cf36b94cdef9bcd231fea597fb9b5889e603273 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "à®µà®´à¯"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "à®ªà¯†à®¯à®°à¯"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®•à®³à¯"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 à®•à¯‹à®ªà¯à®ªà¯"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index 7fbbf568c95b9ce8d5ccaf3ccb938f1c42ff1329..f0a3792aea0e44fdd9ce850ed3b61e4b364d984f 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 9a0ae339b0ba6c88197b7092d49d524ae417bcef..7b29aad397e7397f26d75d42d5b660d705b35542 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "à®ªà®¯à®©à®¾à®³à®°à¯"
 
 #: app.php:409
-msgid "Apps"
-msgstr "à®šà¯†à®¯à®²à®¿à®•à®³à¯"
-
-#: app.php:417
 msgid "Admin"
 msgstr "à®¨à®¿à®°à¯à®µà®¾à®•à®®à¯"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®•à®³à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ à®•à¯€à®´à¯ à®‰à®³à¯à®³à®¤à¯"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "à®µà¯€à®šà¯Šà®²à®¿à®ªà¯ à®ªà¯‚à®Ÿà¯à®Ÿà¯ à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à®®à¯ à®¨à®¿à®±à¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯à®’à®©à¯à®±à®©à¯ à®ªà®¿à®©à¯ à®’à®©à¯à®±à®¾à®• à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à®ªà¯à®ªà®Ÿà®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ à®šà¯†à®²à¯à®•"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "à®µà¯€ à®šà¯†à®¾à®²à®¿à®•à¯ à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®•à¯à®µà®¤à®±à¯à®•à¯ à®¤à¯†à®°à®¿à®µà¯à®šà¯†à®¯à¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿ à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®®à®¿à®•à®ªà¯à®ªà¯†à®°à®¿à®¯à®µà¯ˆ"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ "
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "à®‡à®©à¯à®±à¯"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "à®¨à¯‡à®±à¯à®±à¯"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d à®¨à®¾à®Ÿà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®®à®¾à®¤à®®à¯"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d à®®à®¾à®¤à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 6ef832ad718cd2af1515bbed9f1f5f01f51e0f16..a70525ca6c97467245841fd0788ff76ef7991ea1 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "_à®®à¯Šà®´à®¿_à®ªà¯†à®¯à®°à¯_"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®Žà®šà¯à®šà®°à®¿à®•à¯à®•à¯ˆ"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ à®®à®±à¯à®±à¯à®®à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à¯‹à®ªà¯à®ªà¯à®•à¯à®•à®³à¯ˆ à®ªà¯†à®°à¯à®®à¯à®ªà®¾à®²à¯à®®à¯ à®‡à®£à¯ˆà®¯à®¤à¯à®¤à®¿à®©à¯‚à®Ÿà®¾à®• à®…à®£à¯à®•à®²à®¾à®®à¯. ownCloud à®‡à®©à®¾à®²à¯ à®µà®´à®™à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®± .htaccess à®•à¯‹à®ªà¯à®ªà¯ à®µà¯‡à®²à¯ˆ à®šà¯†à®¯à¯à®¯à®µà®¿à®²à¯à®²à¯ˆ. à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ˆ à®¨à¯€à®£à¯à®Ÿ à®¨à¯‡à®°à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®…à®£à¯à®•à®•à¯à®•à¯‚à®Ÿà®¿à®¯à®¤à®¾à®• à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à¯ˆ à®¤à®•à®µà®®à¯ˆà®•à¯à®•à¯à®®à®¾à®±à¯ à®¨à®¾à®™à¯à®•à®³à¯ à®‰à®±à¯à®¤à®¿à®¯à®¾à®• à®•à¯‚à®±à¯à®•à®¿à®±à¯‹à®®à¯ à®…à®²à¯à®²à®¤à¯ à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ˆ à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®¯à®• à®®à¯‚à®² à®†à®µà®£à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà¯†à®³à®¿à®¯à¯‡ à®…à®•à®±à¯à®±à¯à®•.  "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "à®®à¯‡à®²à®¤à®¿à®•"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "à®•à¯à®±à¯ˆà®µà®¾à®©"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "à®¨à¯€à®™à¯à®•à®³à¯ <strong>%s</strong> à®‡à®²à¯à®³à¯à®³ <strong>%s</strong>à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿à®¯à¯à®³à¯à®³à¯€à®°à¯à®•à®³à¯"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à®¾à®±à¯à®±à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "à®¤à®±à¯à®ªà¯‹à®¤à¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "à®ªà¯à®¤à®¿à®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à®¾à®±à¯à®±à¯à®•"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯ à®®à¯à®•à®µà®°à®¿"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®®à¯€à®³à¯ à®ªà¯†à®±à¯à®µà®¤à¯ˆ à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®µà®¤à®±à¯à®•à¯ à®®à®¿à®©à¯à®©à®žà¯à®šà®²à¯ à®®à¯à®•à®µà®°à®¿à®¯à¯ˆ à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "à®®à¯Šà®´à®¿"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "à®®à¯†à®¾à®´à®¿à®ªà¯†à®¯à®°à¯à®•à¯à®• à®‰à®¤à®µà®¿"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index c48bc476d1c9f3d582d05adbc9e47639f360971b..12e9c3a0b1bdb59b5d0a490d35afe994ff818461 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "SSL à®šà®¾à®©à¯à®±à®¿à®¤à®´à®¿à®©à¯ à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à¯ˆ à®¨à®¿à®±à¯à®¤à¯à®¤à®¿à®µà®¿à®Ÿà®µà¯à®®à¯"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "à®‡à®¨à¯à®¤ à®¤à¯†à®°à®¿à®µà¯à®•à®³à®¿à®²à¯ à®®à®Ÿà¯à®Ÿà¯à®®à¯ à®‡à®£à¯ˆà®ªà¯à®ªà¯ à®µà¯‡à®²à¯ˆà®šà¯†à®¯à¯à®¤à®¾à®²à¯, à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ owncloud à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ LDAP à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®©à¯ SSL à®šà®¾à®©à¯à®±à®¿à®¤à®´à¯ˆ à®‡à®±à®•à¯à®•à¯à®®à®¤à®¿ à®šà¯†à®¯à¯à®¯à®µà¯à®®à¯"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "à®ªà®¯à®©à®¾à®³à®°à¯ à®•à®¾à®Ÿà¯à®šà®¿à®ªà¯à®ªà¯†à®¯à®°à¯ à®ªà¯à®²à®®à¯"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "à®ªà®¯à®©à®¾à®³à®°à®¿à®©à¯ ownCloud à®ªà¯†à®¯à®°à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®• LDAP à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "à®•à¯à®´à¯à®µà®¿à®©à¯ à®•à®¾à®Ÿà¯à®šà®¿ à®ªà¯†à®¯à®°à¯ à®ªà¯à®²à®®à¯ "
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ownCloud à®•à¯à®´à¯à®•à¯à®•à®³à®¿à®©à¯ à®ªà¯†à®¯à®°à¯à®•à®³à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®• LDAP à®ªà®£à¯à®ªà¯à®•à¯à®•à¯‚à®±à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index 143001981c695e00c32a7a2ebdb1961466df38fd..2eb6a2e393c2660f3902cbbc201604c886287a7a 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 948ef1a81c89bc2de1cfbee4db33ed64620f8e15..7cd1f3cd42e4181386043d1ebde06fcceb33831c 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "à°¨à°µà°‚à°¬à°°à±"
 msgid "December"
 msgstr "à°¡à°¿à°¸à±†à°‚à°¬à°°à±"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "à°…à°®à°°à°¿à°•à°²à±"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 à°¨à°¿à°®à°¿à°·à°‚ à°•à±à°°à°¿à°¤à°‚"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} à°¨à°¿à°®à°¿à°·à°¾à°² à°•à±à°°à°¿à°¤à°‚"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "à°ˆà°°à±‹à°œà±"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "à°¨à°¿à°¨à±à°¨"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} à°°à±‹à°œà±à°² à°•à±à°°à°¿à°¤à°‚"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "à°ªà±‹à°¯à°¿à°¨ à°¨à±†à°²"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} à°¨à±†à°²à°² à°•à±à°°à°¿à°¤à°‚"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "à°¨à±†à°²à°² à°•à±à°°à°¿à°¤à°‚"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "à°ªà±‹à°¯à°¿à°¨ à°¸à°‚à°µà°¤à±à°¸à°°à°‚"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "à°¸à°‚à°µà°¤à±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "à°ªà±Šà°°à°ªà°¾à°Ÿà±"
 
@@ -246,139 +246,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "à°ªà°‚à°ªà°¿à°‚à°šà±"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "à°•à°¾à°²à°‚ à°šà±†à°²à±à°²à± à°¤à±‡à°¦à±€"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "à°µà°¾à°¡à±à°•à°°à°¿ à°ªà±‡à°°à±"
@@ -461,11 +462,11 @@ msgstr "à°¸à°¹à°¾à°¯à°‚"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "à°¨à°¿à°·à±à°•à±à°°à°®à°¿à°‚à°šà±"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 506f67f7e3f85a2c21a911b893f4de99b85856ab..0f9470cfbb83984471837e080f9fb7a7e0c20ae2 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr "à°¶à°¾à°¶à±à°µà°¤à°‚à°—à°¾ à°¤à±Šà°²à°—à°¿à°‚à°šà±"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
 
@@ -128,43 +128,45 @@ msgstr "à°¤à±Šà°²à°—à°¿à°‚à°šà±"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "à°ªà±‡à°°à±"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "à°ªà°°à°¿à°®à°¾à°£à°‚"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr "à°¸à°‚à°šà°¯à°‚"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index 20a34b874a488e7b9fd4404959001fa42cbf47a9..c592c5b12d8ac6ef2d46b44c27d44d6bfb87da44 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 3d725c5ac3a08f94823acffa98ec173b11ced136..91be85d763577701d25f30f32acbbe6959e8c3d3 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 1016563e1e949763a9de969b2dca3c6a306761d7..ed863a3da3141cba61a13e91a379f86a40829627 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚"
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index fe1b162137f49f09d0b412c094ea02039b769ef1..b4d02b2255831d6c7152717403df9f3a02bc793b 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "à°ªà±Šà°°à°ªà°¾à°Ÿà±"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "à°¶à°¾à°¶à±à°µà°¤à°‚à°—à°¾ à°¤à±Šà°²à°—à°¿à°‚à°šà±"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "à°ªà±‡à°°à±"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/te/files_versions.po b/l10n/te/files_versions.po
index b745dfb02003ef9f6315c58d0612d52d200b58b1..535e7a6f374a7c6a1d073df28f3c8ec492e44199 100644
--- a/l10n/te/files_versions.po
+++ b/l10n/te/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index b67354d7333aa4a57e6553947c38f31c6c854868..ed3dcbca484f34941eace3f0604b206a80008984 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "à°µà°¾à°¡à±à°•à°°à±à°²à±"
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 à°¨à°¿à°®à°¿à°·à°‚ à°•à±à°°à°¿à°¤à°‚"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "à°ˆà°°à±‹à°œà±"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "à°¨à°¿à°¨à±à°¨"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "à°ªà±‹à°¯à°¿à°¨ à°¨à±†à°²"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "à°ªà±‹à°¯à°¿à°¨ à°¸à°‚à°µà°¤à±à°¸à°°à°‚"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "à°¸à°‚à°µà°¤à±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 57fb9f924292e43b6b29bb14aabee27c432a27be..5a519c6cefb1f99b7cf6908af67c4c9990ac23b3 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "à°®à°°à°¿à°¨à±à°¨à°¿"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "à°•à±Šà°¤à±à°¤ à°¸à°‚à°•à±‡à°¤à°ªà°¦à°‚"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "à°ˆà°®à±†à°¯à°¿à°²à±"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "à°®à±€ à°ˆà°®à±†à°¯à°¿à°²à± à°šà°¿à°°à±à°¨à°¾à°®à°¾"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "à°à°¾à°·"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index ce2953de04f3592b84fd3870f17a6eb9884cf2fc..bd0c8f48a74095cf627e5ef3ce12a903733bd6d3 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
index e586de734ddde2a2f03b7c6fcbbce63cb359baff..cc0b2628425999c207af288af223cb73579f8507 100644
--- a/l10n/te/user_webdavauth.po
+++ b/l10n/te/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index f6e6c824610c6e4773ece51b55fa0aee800525e5..9c1e7c8a3e1f465e8124d731994bf023b937bedb 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ajax/share.php:97
 #, php-format
@@ -137,59 +138,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +226,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr ""
 
@@ -246,139 +247,140 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr ""
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr ""
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a href="
 "\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +402,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr ""
@@ -461,11 +463,11 @@ msgstr ""
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +496,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +614,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 069030e91ce6cef84558062e1a53186f01b47fd1..47e0ff68ec30d6968922a2ebde8fb7feb70c1668 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ajax/move.php:17
 #, php-format
@@ -120,7 +121,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +129,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +203,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +284,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b91f3e01f42c3c812ce0e3d98a5a2c9f9781800c..362ebe2228c3865f725d8d88a0612f06a8dfdfdc 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -66,9 +66,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 2ac6ff26f2f24d51c21502f3fdd831c887999545..c714c261018f3afd2e7dc377e2b10e1bc46ef2ca 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
 msgid "Access granted"
 msgstr ""
 
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
 msgid "Grant access"
 msgstr ""
 
@@ -33,24 +33,24 @@ msgstr ""
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:448
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:451
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting "
 "of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:454
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index d12989de97f680a0e423c9144082e96e7af27234..79730114d3d294c276c3c2927aad6f8c1f9a0e12 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: templates/authenticate.php:4
@@ -29,28 +29,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 69f6d18c549372efca9e1c066cd81132c0483069..5ddde84ff38c508f605cc932e175df323d931f68 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ajax/delete.php:42
 #, php-format
@@ -27,44 +28,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr ""
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index e0b355280491d49a8dd985eac8fbd58bfb8881f3..dea5359fc0a69149a90193e494ba7c43e0444ed2 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 24e4eb4da71de7028501e2f6be9451bbdc4d2e20..a44a0949804a2caf7809629a46bfb9a907a78bcd 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: app.php:360
 msgid "Help"
@@ -34,34 +35,46 @@ msgid "Users"
 msgstr ""
 
 #: app.php:409
-msgid "Apps"
+msgid "Admin"
 msgstr ""
 
-#: app.php:417
-msgid "Admin"
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: defaults.php:33
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +183,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d213b6da242bd98b690a4bc6d947ca352b613ddb..03a8a524e9ab18cd649613642f0b5b9cae0f8387 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -169,166 +169,172 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the "
-"webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest "
-"to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to "
-"enable internet connection for this server if you want to have all features "
-"of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -386,72 +392,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 76be8f58e139b90c82e0162c2c03663c2d86f490..2c2db08e547bf0c1915cbcbb5882b853e254671b 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may "
-"experience unexpected behaviour. Please ask your system administrator to "
+"experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -240,9 +240,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -266,7 +267,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -290,7 +291,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -350,12 +351,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name "
-"attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also "
+"a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -368,12 +369,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute "
+"is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both "
-"users and groups and it is unique. Leave it empty for default behaviour. "
+"users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -387,17 +388,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN "
-"is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN "
+"changes, the changes will be found. The internal username is used all over. "
+"Clearing the mappings will have leftovers everywhere. Clearing the mappings "
+"is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index d20d80e3bbed68a9d53ecf21ebd1b2f94b65104c..40b6476b9df7a8a39ffe53b533081fde34d51cb6 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 8f9bfb84900e743096c4b0cd86031d896f0ceb7e..b38592551771fcf5affb522cdc6b3b69c994300b 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "à¸žà¸¤à¸¨à¸ˆà¸´à¸à¸²à¸¢à¸™"
 msgid "December"
 msgstr "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "à¸§à¸´à¸™à¸²à¸—à¸µ à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "à¸§à¸±à¸™à¸™à¸µà¹‰"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "à¹€à¸¡à¸·à¹ˆà¸à¸§à¸²à¸™à¸™à¸µà¹‰"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{day} à¸§à¸±à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "à¹€à¸”à¸·à¸à¸™à¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} à¹€à¸”à¸·à¸à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "à¹€à¸”à¸·à¸à¸™ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "à¸›à¸µ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
@@ -225,8 +221,8 @@ msgstr "à¸Šà¸™à¸´à¸”à¸‚à¸à¸‡à¸§à¸±à¸•à¸–à¸¸à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸š
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”"
 
@@ -246,140 +242,141 @@ msgstr "à¹à¸Šà¸£à¹Œà¹à¸¥à¹‰à¸§"
 msgid "Share"
 msgstr "à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡ {group} à¹‚à¸”à¸¢ {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "à¸–à¸¹à¸à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“à¹‚à¸”à¸¢ {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸š"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "à¹à¸Šà¸£à¹Œà¸”à¹‰à¸§à¸¢à¸¥à¸´à¸‡à¸à¹Œ"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "à¹ƒà¸ªà¹ˆà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "à¸ªà¹ˆà¸‡à¸¥à¸´à¸‡à¸à¹Œà¹ƒà¸«à¹‰à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "à¸ªà¹ˆà¸‡"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "à¸à¸³à¸«à¸™à¸”à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "à¹à¸Šà¸£à¹Œà¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "à¹„à¸¡à¹ˆà¸žà¸šà¸šà¸¸à¸„à¸„à¸¥à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‹à¹‰à¸³à¹„à¸”à¹‰"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œ {item} à¹ƒà¸«à¹‰à¸à¸±à¸š {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "à¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸à¹‰à¹„à¸‚"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "à¸£à¸°à¸”à¸±à¸šà¸„à¸§à¸šà¸„à¸¸à¸¡à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "à¸ªà¸£à¹‰à¸²à¸‡"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "à¸à¸±à¸žà¹€à¸”à¸—"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "à¸¥à¸š"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "à¹ƒà¸ªà¹ˆà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¹ˆà¸‡..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œà¹à¸¥à¹‰à¸§"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹„à¸¡à¹ˆà¹€à¸›à¹‡à¸™à¸œà¸¥à¸ªà¸³à¹€à¸£à¹‡à¸ˆ à¸à¸£à¸¸à¸“à¸²à¹à¸ˆà¹‰à¸‡à¸›à¸±à¸à¸«à¸²à¸—à¸µà¹ˆà¹€à¸à¸´à¸”à¸‚à¸¶à¹‰à¸™à¹„à¸›à¸¢à¸±à¸‡ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">à¸„à¸à¸¡à¸¡à¸¹à¸™à¸´à¸•à¸µà¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud</a>"
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹€à¸ªà¸£à¹‡à¸ˆà¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§ à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—à¸²à¸‡à¹„à¸›à¸—à¸µà¹ˆ ownCloud à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸‚à¸“à¸°à¸™à¸µà¹‰"
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "à¸£à¸µà¹€à¸‹à¹‡à¸•à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™ ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "à¸„à¸¸à¸“à¸ˆà¸°à¹„à¸”à¹‰à¸£à¸±à¸šà¸¥à¸´à¸‡à¸„à¹Œà¹€à¸žà¸·à¹ˆà¸à¸à¸³à¸«à¸™à¸”à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆà¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œ"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
@@ -461,11 +458,11 @@ msgstr "à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸"
 msgid "Access forbidden"
 msgstr "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¸–à¸¹à¸à¸«à¸§à¸‡à¸«à¹‰à¸²à¸¡"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "à¹„à¸¡à¹ˆà¸žà¸š Cloud"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +491,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "à¸ªà¸£à¹‰à¸²à¸‡ <strong>à¸šà¸±à¸à¸Šà¸µà¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸š</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "à¸‚à¸±à¹‰à¸™à¸ªà¸¹à¸‡"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "à¸ˆà¸°à¸–à¸¹à¸à¹ƒà¸Šà¹‰"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "à¸Šà¸·à¹ˆà¸à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸•à¸²à¸£à¸²à¸‡à¹ƒà¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸šà¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´à¸–à¸¹à¸à¸›à¸à¸´à¹€à¸ªà¸˜à¹à¸¥à¹‰à¸§"
@@ -607,7 +609,7 @@ msgstr "à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 0aeaf1cf4acf88ba5225b432ce1ef757ec9e7d39..107f5264514105770ccb80a894128ca182d38eca 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "à¹à¸Šà¸£à¹Œ"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "à¸¥à¸š"
 
@@ -128,43 +128,44 @@ msgstr "à¸¥à¸š"
 msgid "Rename"
 msgstr "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸Šà¸·à¹ˆà¸"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} à¸¡à¸µà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§à¹ƒà¸™à¸£à¸°à¸šà¸š"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "à¹à¸—à¸™à¸—à¸µà¹ˆ"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "à¹à¸™à¸°à¸™à¸³à¸Šà¸·à¹ˆà¸"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "à¹à¸—à¸™à¸—à¸µà¹ˆ {new_name} à¸”à¹‰à¸§à¸¢ {old_name} à¹à¸¥à¹‰à¸§"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "à¹€à¸¥à¸´à¸à¸—à¸³"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¸•à¸²à¸¡à¸„à¸³à¸ªà¸±à¹ˆà¸‡à¸¥à¸š"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ 1 à¹„à¸Ÿà¸¥à¹Œ"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ"
 
@@ -200,33 +201,27 @@ msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¸‚à¹‰à¸à¸¡
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "à¸Šà¸·à¹ˆà¸à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 'à¹à¸Šà¸£à¹Œ' à¸ªà¸‡à¸§à¸™à¹„à¸§à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š Owncloud à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "à¸Šà¸·à¹ˆà¸"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "à¸‚à¸™à¸²à¸”"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "à¹à¸à¹‰à¹„à¸‚à¹à¸¥à¹‰à¸§"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 à¹„à¸Ÿà¸¥à¹Œ"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} à¹„à¸Ÿà¸¥à¹Œ"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£"
 msgid "From link"
 msgstr "à¸ˆà¸²à¸à¸¥à¸´à¸‡à¸à¹Œ"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸”à¹†à¸à¸¢à¸¹à¹ˆà¸—à¸µà¹ˆà¸™à¸µà¹ˆ à¸à¸£à¸¸à¸“à¸²à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆà¹€à¸à¸´à¸™à¹„à¸›"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸žà¸¢à¸²à¸¢à¸²à¸¡à¸—à¸µà¹ˆà¸ˆà¸°à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¡à¸µà¸‚à¸™à¸²à¸”à¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸‚à¸™à¸²à¸”à¸ªà¸¹à¸‡à¸ªà¸¸à¸”à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹„à¸§à¹‰à¹ƒà¸«à¹‰à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸³à¸¥à¸±à¸‡à¸ªà¹à¸à¸™à¸à¸¢à¸¹à¹ˆà¸‚à¸“à¸°à¸™à¸µà¹‰"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "à¹„à¸Ÿà¸¥à¹Œ"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "à¹„à¸Ÿà¸¥à¹Œ"
 
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index ad469023b19e95e738f1aa94967a2f3a742d41a9..91f26a124e184cf69c9e42dd28e0ac1c3ccfa3e3 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 88502ed3a9cb4254757389765896cc93dac9e9a9..3036782c91db0d238ce00cc57002e54b19eceddb 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "à¸à¸£à¸¸à¸“à¸²à¸à¸£à¸à¸à¸£à¸«à¸±à¸ª app key à¸‚à¸à¸‡ Dropbox à¹à¸¥
 msgid "Error configuring Google Drive storage"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¸à¸²à¸£à¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸‚à¸à¸‡ Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> \"smbclient\" à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡. à¸à¸²à¸£à¸Šà¸µà¹‰ CIFS/SMB à¹€à¸žà¸·à¹ˆà¸à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸£à¸°à¸—à¸³à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸ªà¸à¸šà¸–à¸²à¸¡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¸à¸²à¸£à¸ªà¸™à¸±à¸šà¸ªà¸™à¸¸à¸™à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ FTP à¹ƒà¸™à¸ à¸²à¸©à¸² PHP à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸«à¸£à¸·à¸à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡. à¸à¸²à¸£à¸Šà¸µà¹‰ FTP à¹€à¸žà¸·à¹ˆà¸à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸ªà¸à¸šà¸–à¸²à¸¡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 0b3f51e870471e23e53dbab47ef3af466540e10d..425f2d18d5c018eb0cea38519d89b89b23d71142 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 msgid "Submit"
 msgstr "à¸ªà¹ˆà¸‡"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ %s à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹„à¸Ÿà¸¥à¹Œ %s à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸¹à¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¹„à¸”à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index b428adbf5bc0c25b455f51f253c70fbe3aef302c..d4723ca5dc7d833201a20202d1133dc2cb473c62 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¸„à¸·à¸™à¸„à¹ˆà¸²"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "à¸Šà¸·à¹ˆà¸"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "à¸¥à¸šà¹à¸¥à¹‰à¸§"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 à¹„à¸Ÿà¸¥à¹Œ"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} à¹„à¸Ÿà¸¥à¹Œ"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 484c5c2cdad15fbed73559d5792550b3d66372ed..19e294e26961ae59e599603f43450a3f862fd700 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
+#: js/versions.js:7
+msgid "Versions"
+msgstr "à¸£à¸¸à¹ˆà¸™"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "à¸£à¸¸à¹ˆà¸™"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+#: js/versions.js:149
+msgid "Restore"
+msgstr "à¸„à¸·à¸™à¸„à¹ˆà¸²"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index fc8068910bb200f7b629c4a77e4aae35894417c0..afaf5b524b65e1996a72739be143308ac2456b6c 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
 #: app.php:409
-msgid "Apps"
-msgstr "à¹à¸à¸›à¸¯"
-
-#: app.php:417
 msgid "Admin"
 msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "à¹€à¸§à¹‡à¸šà¹€à¸‹à¸à¸£à¹Œà¸§à¸´à¸ªà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸„à¸§à¸šà¸„à¸¸à¸¡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "à¸„à¸¸à¸“à¸ªà¸¡à¸šà¸±à¸•à¸´à¸à¸²à¸£à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸” zip à¸–à¸¹à¸à¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸§à¹‰"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰à¸—à¸µà¸¥à¸°à¸„à¸£à¸±à¹‰à¸‡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "à¸à¸¥à¸±à¸šà¹„à¸›à¸—à¸µà¹ˆà¹„à¸Ÿà¸¥à¹Œ"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹€à¸¥à¸·à¸à¸à¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆà¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸—à¸µà¹ˆà¸ˆà¸°à¸ªà¸£à¹‰à¸²à¸‡à¹€à¸›à¹‡à¸™à¹„à¸Ÿà¸¥à¹Œ zip"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸³à¸«à¸™à¸”à¹„à¸”à¹‰"
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "à¸§à¸´à¸™à¸²à¸—à¸µ à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d à¸™à¸²à¸—à¸µà¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "à¸§à¸±à¸™à¸™à¸µà¹‰"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "à¹€à¸¡à¸·à¹ˆà¸à¸§à¸²à¸™à¸™à¸µà¹‰"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d à¸§à¸±à¸™à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "à¹€à¸”à¸·à¸à¸™à¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d à¹€à¸”à¸·à¸à¸™à¸¡à¸²à¹à¸¥à¹‰à¸§"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "à¸›à¸µ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 8d3fcdbb4c31f38e037b5d630f547bfcd2f2b482..f50763964473a620f84cdf6befa34e2f8649ec47 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "à¸ à¸²à¸©à¸²à¹„à¸—à¸¢"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "à¸„à¸³à¹€à¸•à¸·à¸à¸™à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹à¸¥à¸°à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸”à¹‰à¸ˆà¸²à¸à¸à¸´à¸™à¹€à¸—à¸à¸£à¹Œà¹€à¸™à¹‡à¸• à¹„à¸Ÿà¸¥à¹Œ .htaccess à¸—à¸µà¹ˆ ownCloud à¸¡à¸µà¹ƒà¸«à¹‰à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸«à¸¡à¸²à¸°à¸ªà¸¡ à¹€à¸£à¸²à¸‚à¸à¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸„à¸¸à¸“à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹€à¸§à¹‡à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹ƒà¸«à¸¡à¹ˆà¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸—à¸µà¹ˆà¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸”à¹‰à¸à¸µà¸à¸•à¹ˆà¸à¹„à¸› à¸«à¸£à¸·à¸à¸„à¸¸à¸“à¹„à¸”à¹‰à¸¢à¹‰à¸²à¸¢à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸›à¸à¸¢à¸¹à¹ˆà¸ à¸²à¸¢à¸™à¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡ root à¸‚à¸à¸‡à¹€à¸§à¹‡à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹à¸¥à¹‰à¸§"
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "à¸›à¸£à¸°à¸¡à¸§à¸¥à¸„à¸³à¸ªà¸±à¹ˆà¸‡à¸«à¸™à¸¶à¹ˆà¸‡à¸‡à¸²à¸™à¹ƒà¸™à¹à¸•à¹ˆà¸¥à¸°à¸„à¸£à¸±à¹‰à¸‡à¸—à¸µà¹ˆà¸¡à¸µà¸à¸²à¸£à¹‚à¸«à¸¥à¸”à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸š"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™à¹à¸¥à¹‰à¸§à¸à¸±à¸šà¹€à¸§à¹‡à¸šà¸œà¸¹à¹‰à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£ webcron à¹€à¸£à¸µà¸¢à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸š cron.php à¸—à¸µà¹ˆà¸•à¸³à¹à¸«à¸™à¹ˆà¸‡ root à¸‚à¸à¸‡ owncloud à¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸à¸™à¸µà¹‰à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆà¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡ http"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "à¹ƒà¸Šà¹‰à¸šà¸£à¸´à¸à¸²à¸£ cron à¸ˆà¸²à¸à¸£à¸°à¸šà¸š à¹€à¸£à¸µà¸¢à¸à¹„à¸Ÿà¸¥à¹Œ cron.php à¹ƒà¸™à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ owncloud à¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡ cronjob à¸‚à¸à¸‡à¸£à¸°à¸šà¸šà¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸à¸™à¸µà¹‰à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ"
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ API à¸ªà¸³à¸«à¸£à¸±à¸šà¸„à¸¸à¸“à¸ªà¸¡à¸šà¸±à¸•à¸´à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸à¸›à¸¯à¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰ API à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸”à¹‰"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸¥à¸´à¸‡à¸à¹Œà¹„à¸”à¹‰"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹†à¹„à¸›à¹ƒà¸«à¹‰à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°à¸Šà¸™à¹€à¸›à¹‡à¸™à¸¥à¸´à¸‡à¸à¹Œà¹„à¸”à¹‰"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‹à¹‰à¸³à¹ƒà¸«à¸¡à¹ˆà¹„à¸”à¹‰"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸•à¹ˆà¸²à¸‡à¹†à¸—à¸µà¹ˆà¸–à¸¹à¸à¹à¸Šà¸£à¹Œà¸¡à¸²à¹ƒà¸«à¹‰à¸•à¸±à¸§à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸–à¸¶à¸‡à¹ƒà¸„à¸£à¸à¹‡à¹„à¸”à¹‰"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸”à¹‰à¹€à¸‰à¸žà¸²à¸°à¸à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡à¹€à¸”à¸µà¸¢à¸§à¸à¸±à¸™à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "à¸šà¸±à¸™à¸—à¸¶à¸à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "à¸£à¸°à¸”à¸±à¸šà¸à¸²à¸£à¹€à¸à¹‡à¸šà¸šà¸±à¸™à¸—à¸¶à¸ log"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "à¸¡à¸²à¸"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "à¸™à¹‰à¸à¸¢"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "à¸£à¸¸à¹ˆà¸™"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "à¸šà¸£à¸´à¸à¸²à¸£à¸¥à¸¹à¸à¸„à¹‰à¸²à¹à¸šà¸šà¹€à¸ªà¸µà¸¢à¸„à¹ˆà¸²à¹ƒà¸Šà¹‰à¸ˆà¹ˆà¸²à¸¢"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "à¹à¸ªà¸”à¸‡à¸«à¸™à¹‰à¸²à¸ˆà¸à¸§à¸´à¸‹à¸²à¸£à¹Œà¸”à¸™à¸³à¸—à¸²à¸‡à¸„à¸£à¸±à¹‰à¸‡à¹à¸£à¸à¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "à¸„à¸¸à¸“à¹„à¸”à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸›à¹à¸¥à¹‰à¸§ <strong>%s</strong> à¸ˆà¸²à¸à¸ˆà¸³à¸™à¸§à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¹„à¸”à¹‰ <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¸–à¸¹à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸¥à¹‰à¸§"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸”à¹‰"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "à¸Šà¸·à¹ˆà¸à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹à¸ªà¸”à¸‡"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "à¸à¸µà¹€à¸¡à¸¥"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "à¸à¸£à¸à¸à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸´à¸”à¹ƒà¸«à¹‰à¸¡à¸µà¸à¸²à¸£à¸à¸¹à¹‰à¸„à¸·à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸”à¹‰"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "à¸ à¸²à¸©à¸²"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "à¸Šà¹ˆà¸§à¸¢à¸à¸±à¸™à¹à¸›à¸¥"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 773c7002a76761a83abba9601246eca56e0d25da..4046e14dd9cf94e999d5d3047297f669976186d3 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "à¸¢à¸·à¸™à¸¢à¸±à¸™à¸à¸²à¸£à¸¥à¸šà¸—à¸´à¹‰à¸‡"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¹à¸à¸›à¸¯ user_ldap à¹à¸¥à¸° user_webdavauth à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸£à¹ˆà¸§à¸¡à¸à¸±à¸™à¹„à¸”à¹‰. à¸„à¸¸à¸“à¸à¸²à¸ˆà¸›à¸£à¸°à¸ªà¸žà¸›à¸±à¸à¸«à¸²à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸„à¸²à¸”à¸„à¸´à¸”à¸ˆà¸²à¸à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§ à¸à¸£à¸¸à¸“à¸²à¸•à¸´à¸”à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸£à¸°à¸‡à¸±à¸šà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸à¸›à¸¯ à¸•à¸±à¸§à¹ƒà¸”à¸•à¸±à¸§à¸«à¸™à¸¶à¹ˆà¸‡à¸‚à¹‰à¸²à¸‡à¸•à¹‰à¸™"
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr "à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸«à¸¥à¸±à¸"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢ SSL"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "à¸«à¸²à¸à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰à¹€à¸‰à¸žà¸²à¸°à¸à¸±à¸šà¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™, à¹ƒà¸«à¹‰à¸™à¸³à¹€à¸‚à¹‰à¸²à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¹à¸šà¸š SSL à¸‚à¸à¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ LDAP à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹€à¸‚à¹‰à¸²à¹„à¸›à¹„à¸§à¹‰à¹ƒà¸™à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ ownCloud"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "à¸Šà¹ˆà¸à¸‡à¹à¸ªà¸”à¸‡à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸° LDAP à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "à¸Šà¹ˆà¸à¸‡à¹à¸ªà¸”à¸‡à¸Šà¸·à¹ˆà¸à¸à¸¥à¸¸à¹ˆà¸¡à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "à¸„à¸¸à¸“à¸¥à¸±à¸à¸©à¸“à¸° LDAP à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸à¸¥à¸¸à¹ˆà¸¡à¸‚à¸à¸‡ ownCloud"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index 08cda589473a7ea106f6c918122aa1b92c451874..f2d70cb174f504b4a2e659b9a305855ba588baab 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Authentication"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud à¸ˆà¸°à¸ªà¹ˆà¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸›à¸¢à¸±à¸‡à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆ URL à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸™à¸µà¹‰ à¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸µà¹ˆà¹‚à¸•à¹‰à¸•à¸à¸šà¸à¸¥à¸±à¸šà¸¡à¸²à¹à¸¥à¸°à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¹à¸›à¸¥à¸£à¸«à¸±à¸ª HTTP statuscodes 401 à¹à¸¥à¸° 403 à¹ƒà¸«à¹‰à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰ à¸ªà¹ˆà¸§à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸·à¹ˆà¸™à¹†à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
+msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index f117ad685315e660992abd96f41d306dd006cc3e..9cb943bb0ace15e2b00ed1eed757aef74dcbb84e 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr ""
+msgstr "%s  sizinle Â»%sÂ« paylaÅŸÄ±mÄ±nda bulundu"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -138,59 +138,59 @@ msgstr "KasÄ±m"
 msgid "December"
 msgstr "AralÄ±k"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "saniye Ã¶nce"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 dakika Ã¶nce"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} dakika Ã¶nce"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 saat Ã¶nce"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} saat Ã¶nce"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "bugÃ¼n"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "dÃ¼n"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} gÃ¼n Ã¶nce"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "geÃ§en ay"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} ay Ã¶nce"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "ay Ã¶nce"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "geÃ§en yÄ±l"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "yÄ±l Ã¶nce"
 
@@ -226,8 +226,8 @@ msgstr "Nesne tÃ¼rÃ¼ belirtilmemiÅŸ."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Hata"
 
@@ -247,140 +247,141 @@ msgstr "PaylaÅŸÄ±lan"
 msgid "Share"
 msgstr "PaylaÅŸ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "PaylaÅŸÄ±m sÄ±rasÄ±nda hata  "
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "PaylaÅŸÄ±m iptal ediliyorken hata"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Ä°zinleri deÄŸiÅŸtirirken hata oluÅŸtu"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr " {owner} tarafÄ±ndan sizinle ve {group} ile paylaÅŸtÄ±rÄ±lmÄ±ÅŸ"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} trafÄ±ndan sizinle paylaÅŸtÄ±rÄ±ldÄ±"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "ile PaylaÅŸ"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "BaÄŸlantÄ± ile paylaÅŸ"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Åžifre korunmasÄ±"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Parola"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Herkes tarafÄ±ndan yÃ¼klemeye izin ver"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "KiÅŸiye e-posta linki"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "GÃ¶nder"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Son kullanÄ±m tarihi"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Eposta ile paylaÅŸ"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "KiÅŸi bulunamadÄ±"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaÅŸmaya izin verilmiyor"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr " {item} iÃ§inde  {user} ile paylaÅŸÄ±lanlarlar"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "PaylaÅŸÄ±lmayan"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "dÃ¼zenleyebilir"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "eriÅŸim kontrolÃ¼"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "oluÅŸtur"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "gÃ¼ncelle"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "paylaÅŸ"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Paralo korumalÄ±"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "GeÃ§erlilik tarihi tanÄ±mlama kaldÄ±rma hatasÄ±"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "GeÃ§erlilik tarihi tanÄ±mlama hatasÄ±"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "GÃ¶nderiliyor..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Eposta gÃ¶nderildi"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "GÃ¼ncelleme baÅŸarÄ±lÄ± olmadÄ±. LÃ¼tfen bu hatayÄ± bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "GÃ¼ncelleme baÅŸarÄ±lÄ±. ownCloud'a yÃ¶nlendiriliyor."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud parola sÄ±fÄ±rlama"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +402,7 @@ msgstr "IsteÄŸi baÅŸarÄ±sÄ±z oldu!<br>E-posta / kullanÄ±cÄ± adÄ±nÄ±zÄ± doÄŸru ol
 msgid "You will receive a link to reset your password via Email."
 msgstr "ParolanÄ±zÄ± sÄ±fÄ±rlamak iÃ§in bir baÄŸlantÄ± Eposta olarak gÃ¶nderilecek."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "KullanÄ±cÄ± AdÄ±"
@@ -412,11 +413,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "DosyalarÄ±nÄ±z ÅŸifrelenmiÅŸ. EÄŸer kurtarma anahtarÄ±nÄ± aktif etmediyseniz parola sÄ±fÄ±rlama iÅŸleminden sonra verilerinize eriÅŸmeniz imkansÄ±z olacak. EÄŸer ne yaptÄ±ÄŸÄ±nÄ±zdan emin deÄŸilseniz, devam etmeden Ã¶nce sistem yÃ¶neticiniz ile irtibata geÃ§iniz. GerÃ§ekten devam etmek istiyor musunuz?"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Evet,Åžu anda parolamÄ± sÄ±fÄ±rlamak istiyorum."
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -462,11 +463,11 @@ msgstr "YardÄ±m"
 msgid "Access forbidden"
 msgstr "EriÅŸim yasaklÄ±"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Bulut bulunamadÄ±"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -475,7 +476,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "Merhaba\n\n%s sizinle %s dosyasÄ±nÄ± paylaÅŸtÄ±ÄŸÄ±\nPaylaÅŸÄ±mÄ± gÃ¶r:%s\n\nÄ°yi gÃ¼nler!"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -495,8 +496,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "PHP sÃ¼rÃ¼mÃ¼nÃ¼z NULL Byte saldÄ±rÄ±sÄ±na aÃ§Ä±k (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ownCloud'u gÃ¼venli olarak kullanmak iÃ§in, lÃ¼tfen PHP kurulumunuzu gÃ¼ncelleyin."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +518,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Veri klasÃ¶rÃ¼nÃ¼z ve dosyalarÄ±nÄ±z .htaccess dosyasÄ± Ã§alÄ±ÅŸmadÄ±ÄŸÄ± iÃ§in internet'ten eriÅŸime aÃ§Ä±k."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Server'Ä±nÄ±zÄ± nasÄ±l ayarlayacaÄŸÄ±nÄ±za dair bilgi iÃ§in, lÃ¼tfen bu linki ziyaret edin <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yÃ¶netici hesabÄ±</strong> oluÅŸturun"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "GeliÅŸmiÅŸ"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "Veri klasÃ¶rÃ¼"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "VeritabanÄ±nÄ± ayarla"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "kullanÄ±lacak"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "VeritabanÄ± kullanÄ±cÄ± adÄ±"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "VeritabanÄ± parolasÄ±"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "VeritabanÄ± adÄ±"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "VeritabanÄ± tablo alanÄ±"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "VeritabanÄ± sunucusu"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s mevcuttur. GÃ¼ncelleÅŸtirme hakkÄ±nda daha fazla bilgi alÄ±n."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ã‡Ä±kÄ±ÅŸ yap"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Otomatik oturum aÃ§ma reddedildi!"
@@ -608,12 +614,12 @@ msgstr "GiriÅŸ yap"
 msgid "Alternative Logins"
 msgstr "Alternatif GiriÅŸler"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "Merhaba, <br><br> %s sizinle Â»%sÂ« paylaÅŸÄ±mÄ±nda bulundu.<br><a href=\"%s\">PaylaÅŸÄ±mÄ± gÃ¶r!</a><br><br>Ä°yi gÃ¼nler!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 2284b09f265520308946b9b4976bea36e9f4e521..bcc36b26943f5f03584aa5ce23063d7c2a24a3b1 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +30,11 @@ msgstr "%s taÅŸÄ±namadÄ±"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "YÃ¼kleme dizini tanÄ±mlanamadÄ±."
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "GeÃ§eriz simge"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -121,7 +121,7 @@ msgstr "PaylaÅŸ"
 msgid "Delete permanently"
 msgstr "KalÄ±cÄ± olarak sil"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Sil"
 
@@ -129,43 +129,45 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "Ä°sim deÄŸiÅŸtir."
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Ã–neri ad"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Silme iÅŸlemini gerÃ§ekleÅŸtir"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 dosya yÃ¼klendi"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Dosyalar yÃ¼kleniyor"
 
@@ -201,38 +203,34 @@ msgstr "Ä°ndirmeniz hazÄ±rlanÄ±yor. Dosya bÃ¼yÃ¼k ise biraz zaman alabilir."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "GeÃ§ersiz dizin adÄ±. Shared isminin kullanÄ±mÄ± Owncloud tarafÄ±ndan rezerver edilmiÅŸtir."
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 dizin"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} dizin"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 dosya"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} dosya"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s yeniden adlandÄ±rÄ±lamadÄ±"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,61 +284,61 @@ msgstr "KlasÃ¶r"
 msgid "From link"
 msgstr "BaÄŸlantÄ±dan"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Dosyalar silindi"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "YÃ¼klemeyi iptal et"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Buraya eriÅŸim hakkÄ±nÄ±z yok."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiÃ§bir ÅŸey yok. BirÅŸeyler yÃ¼kleyin!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "PaylaÅŸÄ±lmayan"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "YÃ¼kleme Ã§ok bÃ¼yÃ¼k"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "YÃ¼klemeye Ã§alÄ±ÅŸtÄ±ÄŸÄ±nÄ±z dosyalar bu sunucudaki maksimum yÃ¼kleme boyutunu aÅŸÄ±yor."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranÄ±yor, lÃ¼tfen bekleyin."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "GÃ¼ncel tarama"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "dizin"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "dizinler"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "dosya"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "dosyalar"
 
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 5948a3dedb375809e908e6ebdc48bf41269a9d97..9909513fdba788f9537c8210f7cda94b94439ee7 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index cbab67b3afe34010cb6c89287c4f9d49023d34f3..c2e5f4c34162ab8bb233c5b86da7cd8804ea159c 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "LÃ¼tfen Dropbox app key ve secret temin ediniz"
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive depo yapÄ±landÄ±rma hatasÄ±"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Uyari.</b>''smbclient''yÃ¼klÃ¼ deÄŸil. Mont etme CIFS/SMB hissenin mÃ¼mkÃ¼n deÄŸildir. Lutfen kullanici sistemin sormak onu yuklemek ici,  "
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<Uyari.</b>. Sistem FTP PHPden aktif degil veya yuklemedi. Monte etme hissenin FTP mumkun degildir. Lutfen kullaniici sistemin sormak onu yuklemek icin."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index d4d266cb28cda31ea75a80a7181a22e89e2ab2ae..494628568cc701117aff64341d4b07268a8c5d60 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Parola"
 msgid "Submit"
 msgstr "GÃ¶nder"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s sizinle paylaÅŸÄ±lan  %s klasÃ¶r"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s sizinle paylaÅŸÄ±lan  %s klasÃ¶r"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "YÃ¼kle"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "YÃ¼klemeyi iptal et"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "KullanÄ±labilir Ã¶nizleme yok"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 498b114a1b48d48230c7428207ce9cccc90f18dd..91d3658658d30b86aedaab2e6957f689d141c8e7 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,45 @@ msgstr "%s KalÄ±cÄ± olarak silinemedi"
 msgid "Couldn't restore %s"
 msgstr "%s Geri yÃ¼klenemedi"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Geri yÃ¼kleme iÅŸlemini gerÃ§ekleÅŸtir"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Hata"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "DosyayÄ± kalÄ±cÄ± olarak sil"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "KalÄ±cÄ± olarak sil"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Silindi"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 dizin"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} dizin"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 dosya"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} dosya"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 9f1d643d13ec99f02e43ea366392a4d64783f067..57a5449a0149597444c14eb7b5a1ee9527629764 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Geri alÄ±namÄ±yor: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "BaÅŸarÄ±lÄ±."
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Dosya %s, %s versiyonuna dÃ¶ndÃ¼rÃ¼ldÃ¼"
-
-#: history.php:49
-msgid "failure"
-msgstr "hata"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Dosya %s, %s versiyonuna dÃ¶ndÃ¼rÃ¼lemedi."
+#: js/versions.js:7
+msgid "Versions"
+msgstr "SÃ¼rÃ¼mler"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Eski versiyonlar mevcut deÄŸil."
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Yama belirtilmemiÅŸ"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "SÃ¼rÃ¼mler"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "DosyanÄ±n Ã¶nceki sÃ¼rÃ¼mÃ¼ne geri dÃ¶nmek iÃ§in, deÄŸiÅŸiklikleri geri al butonuna tÄ±klayÄ±n"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Geri yÃ¼kle"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 54441f8c3045f3289ae4353a25e961b60ccfdb4a..61357f76689e3f69be9e41483db09b880a05e0d8 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "KullanÄ±cÄ±lar"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Uygulamalar"
-
-#: app.php:417
 msgid "Admin"
 msgstr "YÃ¶netici"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Bilgileriniz gÃ¼venli ve ÅŸifreli"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatÄ±lmÄ±ÅŸtÄ±r."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "DosyalarÄ±n birer birer indirilmesi gerekmektedir."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Dosyalara dÃ¶n"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "SeÃ§ilen dosyalar bir zip dosyasÄ± oluÅŸturmak iÃ§in fazla bÃ¼yÃ¼ktÃ¼r."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "tespit edilemedi"
 
@@ -171,77 +183,77 @@ msgstr "HatalÄ± komut: \"%s\", ad: %s, parola: %s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Bir adi kullanici vermek. "
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Parola yonetici birlemek. "
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web sunucunuz dosya transferi iÃ§in dÃ¼zgÃ¼n bir ÅŸekilde yapÄ±landÄ±rÄ±lmamÄ±ÅŸ. WevDAV arabirimini sorunlu gÃ¶zÃ¼kÃ¼yor."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "LÃ¼tfen <a href='%s'>kurulum kÄ±lavuzlarÄ±nÄ±</a> iki kez kontrol edin."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "saniye Ã¶nce"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 dakika Ã¶nce"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d dakika Ã¶nce"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 saat Ã¶nce"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d saat Ã¶nce"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "bugÃ¼n"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "dÃ¼n"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d gÃ¼n Ã¶nce"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "geÃ§en ay"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d ay Ã¶nce"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "geÃ§en yÄ±l"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "yÄ±l Ã¶nce"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 3a005e03331c160bd5a4c356e0d38000dac4240d..fd3d00a306576215905ccb356a6ba119176c3969 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -170,166 +170,173 @@ msgstr "GeÃ§erli bir parola mutlaka saÄŸlanmalÄ±"
 msgid "__language_name__"
 msgstr "TÃ¼rkÃ§e"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "GÃ¼venlik Uyarisi"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "data dizininiz ve dosyalarÄ±nÄ±z bÃ¼yÃ¼k ihtimalle internet Ã¼zerinden eriÅŸilebilir. Owncloud tarafÄ±ndan saÄŸlanan .htaccess  dosyasÄ± Ã§alÄ±ÅŸmÄ±yor. Web sunucunuzu yapÄ±landÄ±rarak data dizinine eriÅŸimi kapatmanÄ±zÄ± veya data dizinini web sunucu dÃ¶kÃ¼man dizini dÄ±ÅŸÄ±na almanÄ±zÄ± ÅŸiddetle tavsiye ederiz."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "Kurulum UyarÄ±sÄ±"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web sunucunuz dosya transferi iÃ§in dÃ¼zgÃ¼n bir ÅŸekilde yapÄ±landÄ±rÄ±lmamÄ±ÅŸ. WevDAV arabirimini sorunlu gÃ¶zÃ¼kÃ¼yor."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "LÃ¼tfen <a href='%s'>kurulum kÄ±lavuzlarÄ±nÄ±</a> iki kez kontrol edin."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "ModÃ¼l 'fileinfo' kayÄ±p"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP modÃ¼lÃ¼ 'fileinfo' kayÄ±p. MIME-tip tanÄ±ma ile en iyi sonuÃ§larÄ± elde etmek iÃ§in bu modÃ¼lÃ¼ etkinleÅŸtirmenizi Ã¶neririz."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Locale Ã§alÄ±ÅŸmÄ±yor."
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Bu ownCloud sunucusu sistem yerelini %s olarak deÄŸiÅŸtiremedi. Bu, dosya adlarÄ±ndaki bazÄ± karakterler ile sorun yaÅŸanabileceÄŸi anlamÄ±na gelir. %s yerelini desteklemek iÃ§in gerekli paketleri kurmanÄ±zÄ± ÅŸiddetle Ã¶neririz."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Ä°nternet baÄŸlantÄ±sÄ± Ã§alÄ±ÅŸmÄ±yor"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "ownCloud sunucusunun internet baÄŸlantÄ±sÄ± yok. Bu nedenle harici depolama baÄŸlantÄ±sÄ±, gÃ¼ncelleÅŸtirme bildirimleri veya 3. parti uygulama kurma gibi bazÄ± Ã¶zellikler Ã§alÄ±ÅŸmayacaktÄ±r. Uzak dosyalara eriÅŸim ve e-posta ile bildirim gÃ¶nderme Ã§alÄ±ÅŸmayacak. EÄŸer ownCloud tÃ¼m Ã¶zelliklerini kullanmak istiyorsanÄ±z, internet baÄŸlantÄ±sÄ± gerekmektedir."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "YÃ¼klenen her sayfa ile bir gÃ¶rev Ã§alÄ±ÅŸtÄ±r"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php bir webcron hizmetinde kaydedilir. Owncloud kÃ¶kÃ¼ndeki cron.php sayfasÄ±nÄ± http Ã¼zerinden dakikada bir Ã§aÄŸÄ±r."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Sistemin cron hizmetini kullan. Bir sistem cronjob'Ä± ile owncloud klasÃ¶rÃ¼ndeki cron.php dosyasÄ±nÄ± dakikada bir Ã§aÄŸÄ±r."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "PaylaÅŸÄ±m"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "PaylaÅŸÄ±m API'sini etkinleÅŸtir."
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "UygulamalarÄ±n paylaÅŸÄ±m API'sini kullanmasÄ±na izin ver"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "BaÄŸlantÄ±larÄ± izin ver."
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "KullanÄ±cÄ±larÄ±n nesneleri paylaÅŸÄ±mÄ± iÃ§in herkese aÃ§Ä±k baÄŸlantÄ±lara izin ver"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "PaylaÅŸÄ±ma izin ver"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "KullanÄ±cÄ±larÄ±n kendileri ile paylaÅŸÄ±lan Ã¶ÄŸeleri yeniden paylaÅŸmasÄ±na izin ver"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "KullanÄ±cÄ±larÄ±n herÅŸeyi paylaÅŸmalarÄ±na izin ver"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "KullanÄ±cÄ±larÄ±n sadece kendi gruplarÄ±ndaki kullanÄ±cÄ±larla paylaÅŸmasÄ±na izin ver"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "GÃ¼venlik"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "HTTPS baÄŸlantÄ±sÄ±na zorla"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Ä°stemcileri ownCloud'a ÅŸifreli bir baÄŸlantÄ± ile baÄŸlanmaya zorlar."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "SSL zorlamasÄ±nÄ± etkinleÅŸtirmek ya da devre dÄ±ÅŸÄ± bÄ±rakmak iÃ§in lÃ¼tfen bu ownCloud Ã¶rneÄŸine HTTPS ile baÄŸlanÄ±n."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "KayÄ±tlar"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "GÃ¼nlÃ¼k seviyesi"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "SÃ¼rÃ¼m"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +394,77 @@ msgstr "Hata Takip Sistemi"
 msgid "Commercial Support"
 msgstr "Ticari Destek"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "DosyalarÄ±nÄ±zÄ± senkronize etmek iÃ§in uygulamayÄ± indirin"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Ä°lk Ã‡alÄ±ÅŸtÄ±rma SihirbazÄ±nÄ± yeniden gÃ¶ster"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "KullandÄ±ÄŸÄ±nÄ±z:<strong>%s</strong> seÃ§ilebilecekler: <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parola"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Åžifreniz deÄŸiÅŸtirildi"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ParolanÄ±z deÄŸiÅŸtirilemiyor"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Mevcut parola"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Yeni parola"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Parola deÄŸiÅŸtir"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "Ekran AdÄ±"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Eposta"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Eposta adresiniz"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parola kurtarmayÄ± etkinleÅŸtirmek iÃ§in bir eposta adresi girin"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ã‡evirilere yardÄ±m edin"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">DosyalarÄ±nÄ±za WebDAV Ã¼zerinen eriÅŸme </a> iÃ§in  bu adresi kullanÄ±n"
 
 #: templates/users.php:21
 msgid "Login Name"
@@ -475,7 +482,7 @@ msgstr "YÃ¶netici kurtarma parolasÄ±"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Parola deÄŸiÅŸtirme sÄ±rasÄ±nda kullanÄ±cÄ± dosyalarÄ±nÄ± kurtarmak iÃ§in bir kurtarma paroalsÄ± girin"
 
 #: templates/users.php:42
 msgid "Default Storage"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 3723c199ec68291ed2dc4b8ff07d7e2058f4a15e..71a2cad9ab6751c6ddc87f1169cd070ee89fef55 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: ismail yenigÃ¼l <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,9 +90,9 @@ msgstr "Silmeyi onayla"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. "
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -223,8 +223,8 @@ msgid "Disable Main Server"
 msgstr "Ana sunucuyu devredÄ±ÅŸÄ± birak"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -243,10 +243,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "SSL sertifika doÄŸrulamasÄ±nÄ± kapat."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. "
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -269,8 +270,8 @@ msgid "User Display Name Field"
 msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. "
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -293,8 +294,8 @@ msgid "Group Display Name Field"
 msgstr "Grub Ekrane Alani Adi"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP kullamayin grub adi ownCloud uremek icin. "
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -354,12 +355,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -372,12 +373,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -391,17 +392,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index 5e69022bb6ee26cbe0e7920fad1773bbe77802b6..d138eeec59280d9cb94588b3630435a53e15726e 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +26,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Kimlik doÄŸrulamasÄ±"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud deneyme kullanicin URLe gonderecek. Bu toplan cepaplama muayene edecek ve status kodeci HTTPden 401 ve 403 deneyi  gecerli ve hepsi baska cevaplamari mantekli gibi yorumlacak. "
+msgstr ""
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index d4a9c58db568a4cce20ad902549c87accccca2e0..962ef65e3e6ae12c2783bbc836c6e49c84a7a41b 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "Ø¦ÙˆØºÙ„Ø§Ù‚"
 msgid "December"
 msgstr "ÙƒÛ†Ù†Û•Ùƒ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ØªÛ•ÚØ´Û•ÙƒÙ„Û•Ø±"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 Ù…Ù‰Ù†Û‡Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 Ø³Ø§Ø¦Û•Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "Ø¨ÛˆÚ¯ÛˆÙ†"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "ØªÛˆÙ†ÛˆÚ¯ÛˆÙ†"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +221,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ø®Ø§ØªØ§Ù„Ù‰Ù‚"
 
@@ -246,139 +242,140 @@ msgstr ""
 msgid "Share"
 msgstr "Ú¾Û•Ù…Ø¨Û•Ú¾Ù‰Ø±"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Ú¾Û•Ù…Ø¨Û•Ú¾Ù‰Ø±"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Ø¦Ù‰Ù…"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "ÙŠÙˆÙ„Ù„Ø§"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ú¾Û•Ù…Ø¨Û•Ú¾Ù‰Ø±Ù„Ù‰Ù…Û•"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr ""
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr ""
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "Ø¦Û†Ú†ÛˆØ±"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Ú¾Û•Ù…Ø¨Û•Ú¾Ù‰Ø±"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰ Ø¦Ø§ØªÙ‰"
@@ -461,11 +458,11 @@ msgstr "ÙŠØ§Ø±Ø¯Û•Ù…"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +491,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ø¦Ø§Ù„Ù‰ÙŠ"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "ØªÛ•ÚØ´Û•Ùƒ ØªØ§Ù…Ø§Ù…"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ØªÙ‰Ø²Ù‰Ù…Ø¯Ù‰Ù† Ú†Ù‰Ù‚"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +609,7 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 22d66ad7f921f1b60fb52521e8bf7269bec3e3b1..17201c81c7e50c5551d4a78c250e361f29f0e7be 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "Ú¾Û•Ù…Ø¨Û•Ú¾Ù‰Ø±"
 msgid "Delete permanently"
 msgstr "Ù…Û•ÚÚ¯ÛˆÙ„ÛˆÙƒ Ø¦Û†Ú†ÛˆØ±"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ø¦Û†Ú†ÛˆØ±"
 
@@ -128,43 +128,44 @@ msgstr "Ø¦Û†Ú†ÛˆØ±"
 msgid "Rename"
 msgstr "Ø¦Ø§Øª Ø¦Û†Ø²Ú¯Û•Ø±Øª"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ÙƒÛˆØªÛˆÛ‹Ø§ØªÙ‰Ø¯Û‡"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Ù…Û•Û‹Ø¬Û‡Øª"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ø¦Ø§Ù„Ù…Ø§Ø´ØªÛ‡Ø±"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "ØªÛ•Û‹Ø³Ù‰ÙŠÛ• Ø¦Ø§Øª"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Û‹Ø§Ø² ÙƒÛ•Ú†"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "ÙŠÛÙ†Ù‰Û‹Ø§Ù„"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 Ú¾Û†Ø¬Ø¬Û•Øª ÙŠÛˆÙƒÙ„Ù‰Ù†Ù‰Û‹Ø§ØªÙ‰Ø¯Û‡"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Ú¾Û†Ø¬Ø¬Û•Øª ÙŠÛˆÙƒÙ„Ù‰Ù†Ù‰Û‹Ø§ØªÙ‰Ø¯Û‡"
 
@@ -200,33 +201,27 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ø¦Ø§ØªÙ‰"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ú†ÙˆÚÙ„Û‡Ù‚Ù‰"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Ø¦Û†Ø²Ú¯Û•Ø±ØªÙƒÛ•Ù†"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ù‚Ù‰Ø³Ù‚Û‡Ú†"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Ú¾Û†Ø¬Ø¬Û•Øª"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Ú¾Û†Ø¬Ø¬Û•Øª"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr "Ù‚Ù‰Ø³Ù‚Û‡Ú†"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ø¦Û†Ú†ÛˆØ±ÛˆÙ„Ú¯Û•Ù† Ú¾Û†Ø¬Ø¬Û•ØªÙ„Û•Ø±"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ÙŠÛˆÙƒÙ„Û•Ø´ØªÙ‰Ù† Û‹Ø§Ø² ÙƒÛ•Ú†"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ø¨Û‡ Ø¬Ø§ÙŠØ¯Ø§ Ú¾ÛÚ†Ù†ÛÙ…Û• ÙŠÙˆÙ‚. Upload something!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ú†ÛˆØ´ÛˆØ±"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ú¾Û•Ù…Ø¨Û•Ú¾Ù‰Ø±Ù„Ù‰Ù…Û•"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "ÙŠÛˆÙƒÙ„Û•Ù†Ø¯Ù‰ØºÙ‰Ù†Ù‰ Ø¨Û•Ùƒ Ú†ÙˆÚ"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index 896e7bb478669159947fd18b207f1410790f5d05..21c46db204f2c9a213ab82c46a0e8144d05bbd05 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index 375957102152a63fcdd4cb4014fbe20c95453ea8..ed4e95513c8d1a0709e3be2ee8bcb6e3aa2c2589 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 4c804a9683226b1fa1240145845638bcf39a140b..54a98b555d4fd79aa8ca68244dd5e8df0d31eb82 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "Ø¦Ù‰Ù…"
 msgid "Submit"
 msgstr "ØªØ§Ù¾Ø´Û‡Ø±"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ú†ÛˆØ´ÛˆØ±"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ÙŠÛˆÙƒÙ„Û•"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ÙŠÛˆÙƒÙ„Û•Ø´ØªÙ‰Ù† Û‹Ø§Ø² ÙƒÛ•Ú†"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index c5e4aa8c9913c753174670883191d60aebffc5f0..df0057cd76b445b8712239b125d777a9c306951f 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,45 +27,43 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ø®Ø§ØªØ§Ù„Ù‰Ù‚"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Ù…Û•ÚÚ¯ÛˆÙ„ÛˆÙƒ Ø¦Û†Ú†ÛˆØ±"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ø¦Ø§ØªÙ‰"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Ø¦Û†Ú†ÛˆØ±ÛˆÙ„Ø¯Ù‰"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ù‚Ù‰Ø³Ù‚Û‡Ú†"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Ú¾Û†Ø¬Ø¬Û•Øª"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Ú¾Û†Ø¬Ø¬Û•Øª"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ug/files_versions.po b/l10n/ug/files_versions.po
index 65557768200c49138a82cb6389cafb9a266b908a..b1544b54569eac87a24cfa8e55a69f8391e4cbb0 100644
--- a/l10n/ug/files_versions.po
+++ b/l10n/ug/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "Ø¦Û•Ø³Ù„Ù‰Ú¯Û• Ù‚Ø§ÙŠØªÛ‡Ø±Ø§Ù„Ù…Ø§ÙŠØ¯Û‡: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "Ù…Û‡Û‹Û•Ù¾Ù¾Û•Ù‚Ù‰ÙŠÛ•ØªÙ„Ù‰Ùƒ"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Ú¾Û†Ø¬Ø¬Û•Øª %s Ù†Ù‰ %s Ù†Û•Ø´Ø±Ù‰Ú¯Û• Ø¦Û•Ø³Ù„Ù‰Ú¯Û• Ù‚Ø§ÙŠØªÛ‡Ø±Ø¯Ù‰"
-
-#: history.php:49
-msgid "failure"
-msgstr "Ù…Û•ØºÙ„Û‡Ù¾ Ø¨ÙˆÙ„Ø¯Ù‰"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Ù†Û•Ø´Ø±Ù‰"
 
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "ÙƒÙˆÙ†Ø§ Ù†Û•Ø´Ø±Ù‰ ÙŠÙˆÙ‚"
-
-#: history.php:74
-msgid "No path specified"
-msgstr "ÙŠÙˆÙ„ Ø¨Û•Ù„Ú¯Ù‰Ù„Û•Ù†Ù…Ù‰Ú¯Û•Ù†"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Ù†Û•Ø´Ø±Ù‰"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 1d2f1bb84ad9fce29fcec06f4382741a9d298a68..657d41ba627f1c1809deebf253991b713695996b 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰Ù„Û•Ø±"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Ø¦Û•Ù¾Ù„Û•Ø±"
-
-#: app.php:417
 msgid "Admin"
 msgstr ""
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 Ù…Ù‰Ù†Û‡Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d Ù…Ù‰Ù†Û‡Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 Ø³Ø§Ø¦Û•Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d Ø³Ø§Ø¦Û•Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "Ø¨ÛˆÚ¯ÛˆÙ†"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "ØªÛˆÙ†ÛˆÚ¯ÛˆÙ†"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d ÙƒÛˆÙ† Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d Ø¦Ø§ÙŠ Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index d9b3ced2e992a58f8ee94941944f3328ece14b1b..30a1f8a9f4846f259ab956688a2f99802b3063dc 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Ú¾Û•Ù…Ø¨Û•Ú¾Ù‰Ø±"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Ø¨Ù‰Ø®Û•ØªÛ•Ø±Ù„Ù‰Ùƒ"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Ø®Ø§ØªÙ‰Ø±Û•"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Ø®Ø§ØªÙ‰Ø±Û• Ø¯Û•Ø±Ù‰Ø¬Ù‰Ø³Ù‰"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "ØªÛØ®Ù‰Ù…Û‡ ÙƒÛ†Ù¾"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Ø¦Ø§Ø²"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ù†Û•Ø´Ø±Ù‰"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Ø¦Ù‰Ù…"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ø¦Ù‰Ù…Ù‰ÚÙ‰Ø² Ù…Û‡Û‹Û•Ù¾Ù¾Û•Ù‚Ù‰ÙŠÛ•ØªÙ„Ù‰Ùƒ Ø¦Û†Ø²Ú¯Û•Ø±ØªÙ‰Ù„Ø¯Ù‰"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Ø¦Ù‰Ù…Ù†Ù‰ Ø¦Û†Ø²Ú¯Û•Ø±ØªÙƒÙ‰Ù„Ù‰ Ø¨ÙˆÙ„Ù…Ø§ÙŠØ¯Û‡."
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Ù†Û†Û‹Û•ØªØªÙ‰ÙƒÙ‰ Ø¦Ù‰Ù…"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÙŠÛÚÙ‰ Ø¦Ù‰Ù…"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ø¦Ù‰Ù… Ø¦Û†Ø²Ú¯Û•Ø±Øª"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "ÙƒÛ†Ø±Ø³Ù‰ØªÙ‰Ø´ Ø¦Ù‰Ø³Ù…Ù‰"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "ØªÙˆØ±Ø®Û•Øª"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "ØªÙˆØ±Ø®Û•Øª Ø¦Ø§Ø¯Ø±ÛØ³Ù‰ÚÙ‰Ø²"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ø¦Ù‰Ù… Ø¦Û•Ø³Ù„Ù‰Ú¯Û• ÙƒÛ•Ù„ØªÛˆØ±ÛˆØ´ØªÛ• Ø¦Ù‰Ø´Ù„Ù‰ØªÙ‰Ø¯Ù‰ØºØ§Ù† ØªÙˆØ± Ø®Û•Øª Ø¦Ø§Ø¯Ø±ÛØ³Ù‰Ù†Ù‰ ØªÙˆÙ„Ø¯Û‡Ø±Û‡Ú"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "ØªÙ‰Ù„"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "ØªÛ•Ø±Ø¬Ù‰Ù…Ù‰Ú¯Û• ÙŠØ§Ø±Ø¯Û•Ù…"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 761a1959a2fd87a2ba59ecef335dc1cc8b71f465..ded7b0cd7bff33bee6c83e02ed631777eef4fe78 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
index ebca1d6ca9bb3758004a789def304d807541bec7..654c1406a2a738a3d35dd48a21c3611b523d2ad7 100644
--- a/l10n/ug/user_webdavauth.po
+++ b/l10n/ug/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Ø³Ø§Ù„Ø§Ú¾Ù‰ÙŠÛ•Øª Ø¯Û•Ù„Ù‰Ù„Ù„Û•Ø´"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 413a1e212bd95fbbf984e3a6d643516592611c52..e5cc3c9037da74c4a12f160b6a075e73a2b387fc 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr "Ð›Ð¸ÑÑ‚Ð¾Ð¿Ð°Ð´"
 msgid "December"
 msgstr "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 Ð³Ð¾Ð´Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} Ð³Ð¾Ð´Ð¸Ð½Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: js/js.js:726
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:818
 msgid "today"
 msgstr "ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "Ð²Ñ‡Ð¾Ñ€Ð°"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} Ð´Ð½Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ð¼Ñ–ÑÑÑ†Ñ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} Ð¼Ñ–ÑÑÑ†Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "Ð¼Ñ–ÑÑÑ†Ñ– Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ"
 
@@ -225,8 +229,8 @@ msgstr "ÐÐµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñ‚Ð¸Ð¿ Ð¾Ð±'Ñ”ÐºÑ‚Ñƒ."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°"
 
@@ -246,140 +250,141 @@ msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾"
 msgid "Share"
 msgstr "ÐŸÐ¾Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ÑÑ"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð¼Ñ–Ð½Ñ– Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½ÑŒ"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr " {owner} Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² Ð´Ð»Ñ Ð’Ð°Ñ Ñ‚Ð° Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¸ {group}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Ð—Ð°Ñ…Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð°Ð»ÐµÐ¶Ð¸Ñ‚ÑŒ ÐŸÐ°Ð½Ñƒ"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "ÐÐ°Ð´Ñ–ÑÐ»Ð°Ñ‚Ð¸"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ‚ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ—"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "Ð¢ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ—"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡ÐµÑ€ÐµÐ· Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ñƒ:"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ð–Ð¾Ð´Ð½Ð¾Ñ— Ð»ÑŽÐ´Ð¸Ð½Ð¸ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐµÑ€Ðµ-Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ”Ñ‚ÑŒÑÑ"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾ {item} Ð´Ð»Ñ {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Ð—Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ñ– Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ð° Ð´Ñ–Ñ—"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ– Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ð° Ð´Ñ–Ñ—"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð°Ð´Ñ–ÑÐ»Ð°Ð½Ð°"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ Ð½ÐµÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ñ‚Ðµ Ð¿Ñ€Ð¾ Ñ†ÑŽ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ Ð² <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¾Ñ‚Ñ– ownCloud</a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð»Ð¾ÑÑŒ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾. ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ”Ð¼Ð¾ Ð²Ð°Ñ Ð½Ð°  ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +405,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ð’Ð¸ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ”Ñ‚Ðµ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ Ð½Ð° Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ñƒ."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "Ð†Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°"
@@ -461,11 +466,11 @@ msgstr "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°"
 msgid "Access forbidden"
 msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½ÐµÐ½Ð¾"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Cloud Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,8 +499,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "Ð’Ð°ÑˆÐ° Ð²ÐµÑ€ÑÑ–Ñ PHP Ð²Ñ€Ð°Ð·Ð»Ð¸Ð²Ð° Ð´Ð»Ñ Ð°Ñ‚Ð°Ðº NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¾Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ñ–Ð½ÑÑ‚Ð°Ð»ÑÑ†Ñ–ÑŽ PHP Ð´Ð»Ñ Ð±ÐµÐ·Ð¿ÐµÑ‡Ð½Ð¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ ownCloud."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -515,68 +521,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "Ð’Ð°ÑˆÑ– Ð´Ð°Ð½Ñ– ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ–Ð² Ñ– Ñ„Ð°Ð¹Ð»Ñ–Ð², Ð¹Ð¼Ð¾Ð²Ñ–Ñ€Ð½Ð¾, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ– Ð· Ñ–Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ, Ñ‚Ð¾Ð¼Ñƒ Ñ‰Ð¾  .htaccess Ñ„Ð°Ð¹Ð» Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”."
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—, ÑÐº Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐµÑ€Ð²ÐµÑ€, Ð·Ð²ÐµÑ€Ð½Ñ–Ñ‚ÑŒÑÑ Ð´Ð¾  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ—</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ <strong>Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ð±ÑƒÐ´Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð¾"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "ÐÐ°Ð·Ð²Ð° Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ð’Ð¸Ñ…Ñ–Ð´"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¸Ð¹ Ð²Ñ…Ñ–Ð´ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð²Ñ–Ð´Ñ…Ð¸Ð»ÐµÐ½Ð¸Ð¹!"
@@ -607,7 +617,7 @@ msgstr "Ð’Ñ…Ñ–Ð´"
 msgid "Alternative Logins"
 msgstr "ÐÐ»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ– Ð›Ð¾Ð³Ñ–Ð½Ð¸"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 9748af119cb667844ea1f1fcdce5ae1d0c48a59c..848b36fa68e251a8017d9ff209d901fd97b9500e 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# zubr139 <zubr139@ukr.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +121,7 @@ msgstr "ÐŸÐ¾Ð´Ñ–Ð»Ð¸Ñ‚Ð¸ÑÑ"
 msgid "Delete permanently"
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 
@@ -128,43 +129,46 @@ msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 msgid "Rename"
 msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²Ð¶Ðµ Ñ–ÑÐ½ÑƒÑ”"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "Ð·Ð°Ð¼Ñ–Ð½Ð°"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ð¿Ð¾Ð½ÑƒÐ¹Ñ‚Ðµ Ð½Ð°Ð·Ð²Ñƒ"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð°"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ð¾ {new_name} Ð½Ð° {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–ÑŽ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 Ñ„Ð°Ð¹Ð» Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑ”Ñ‚ÑŒÑÑ"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "Ñ„Ð°Ð¹Ð»Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑŽÑ‚ÑŒÑÑ"
 
@@ -200,38 +204,36 @@ msgstr "Ð’Ð°ÑˆÐµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð¾Ñ‚ÑƒÑ”Ñ‚ÑŒÑÑ. Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ Ñ‚ÐµÐºÐ¸. Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ \"Shared\" Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ð½Ð¾ Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "Ð†Ð¼'Ñ"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Ð—Ð¼Ñ–Ð½ÐµÐ½Ð¾"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð²"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ð¹"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -285,61 +287,61 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "Ð— Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Ð£ Ð²Ð°Ñ Ñ‚ÑƒÑ‚ Ð½ÐµÐ¼Ð°Ñ” Ð¿Ñ€Ð°Ð² Ð½Ð° Ð·Ð°Ð¿Ð¸Ñ."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "Ð¢ÑƒÑ‚ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”. Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ñ‚Ðµ Ñ‰Ð¾-Ð½ÐµÐ±ÑƒÐ´ÑŒ!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð» Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð²ÐµÐ»Ð¸ÐºÐ¸Ð¹"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸,Ñ‰Ð¾ Ð²Ð¸ Ð½Ð°Ð¼Ð°Ð³Ð°Ñ”Ñ‚ÐµÑÑŒ Ð²Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÑƒÑŽÑ‚ÑŒ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸Ð¹ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð½Ð° Ñ†ÑŒÐ¾Ð¼Ñƒ ÑÐµÑ€Ð²ÐµÑ€Ñ–."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐºÐ°Ð½ÑƒÑŽÑ‚ÑŒÑÑ, Ð·Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð±ÑƒÐ´ÑŒ-Ð»Ð°ÑÐºÐ°."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ðµ ÑÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¸"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "Ñ„Ð°Ð¹Ð»"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "Ñ„Ð°Ð¹Ð»Ð¸"
 
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 4899683a1780343a04ae04c52c8de46d546b60ba..e101895485d109d354ed7023e2c10485a9aa8130 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 6ffbba01d307defce2e78e97fe9137ab3969d738..e5332acadba86340826cd48cfaf3a6ba768afa39 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Soul Kim <warlock.rf@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-01 01:55-0400\n"
+"PO-Revision-Date: 2013-08-01 03:10+0000\n"
+"Last-Translator: Soul Kim <warlock.rf@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Language: uk\n"
 "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);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
 msgid "Access granted"
 msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾"
 
@@ -25,7 +26,7 @@ msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾"
 msgid "Error configuring Dropbox storage"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ– ÑÑ…Ð¾Ð²Ð¸Ñ‰Ð° Dropbox"
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
 msgid "Grant access"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
@@ -33,29 +34,29 @@ msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð½Ð°Ð´Ð°Ð¹Ñ‚Ðµ Ð´Ñ–Ð¹ÑÐ½Ð¸Ð¹ ÐºÐ»ÑŽÑ‡ Ñ‚Ð° Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Dropbox."
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
 msgid "Error configuring Google Drive storage"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ– ÑÑ…Ð¾Ð²Ð¸Ñ‰Ð° Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:448
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ:</b> ÐšÐ»Ñ–Ñ”Ð½Ñ‚ \"smbclient\" Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾. ÐŸÑ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ CIFS/SMB Ñ‚ÐµÐº Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾. ÐŸÐ¾Ð¿Ñ€Ð¾Ñ…Ð°Ð¹Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾."
 
-#: lib/config.php:434
+#: lib/config.php:451
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ:</b> ÐŸÑ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ° FTP Ð² PHP Ð½Ðµ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð° Ñ‡Ð¸ Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°. ÐŸÑ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ FTP Ñ‚ÐµÐº Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾. ÐŸÐ¾Ð¿Ñ€Ð¾Ñ…Ð°Ð¹Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ—Ñ—."
 
-#: lib/config.php:437
+#: lib/config.php:454
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr ""
+msgstr "<b>ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ:</b> ÐŸÑ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ° CURL Ð² PHP Ð½Ðµ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð° Ñ‡Ð¸ Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°. ÐŸÑ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð°Ñ‚Ð¸ÑÑ OwnCloud / WebDav Ð°Ð±Ð¾ Google Drive Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ. ÐŸÐ¾Ð¿Ñ€Ð¾Ñ…Ð°Ð¹Ñ‚Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ—Ñ—."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index bf08b74ab61f424ceeefc6909c6a6f426197c512..4c747b05e0fb329dfc75a640e2e1f585233f9f15 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 msgid "Submit"
 msgstr "ÐŸÐµÑ€ÐµÐ´Ð°Ñ‚Ð¸"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ %s Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² Ñ„Ð°Ð¹Ð» %s Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Ð’Ð¸Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð´Ð»Ñ"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 9e2ed7e6da968f48fd22070271106de359eff9b0..617e1276bfd7cb1e4910b3cfd74f44661af71491 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Soul Kim <warlock.rf@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +28,47 @@ msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸"
 msgid "Couldn't restore %s"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–ÑŽ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "Ð†Ð¼'Ñ"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 Ñ„Ð°Ð¹Ð»"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð²"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr "Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 7fb44a00e8b084ee0d5b914e1d5ede9f2891db50..a24eb68f6b5e4a948324bda72557b5af738aa58d 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: uk\n"
 "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);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "Ð¤Ð°Ð¹Ð» %s Ð±ÑƒÐ² Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð´Ð¾ Ð²ÐµÑ€ÑÑ–Ñ— %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "Ð½ÐµÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "Ð¤Ð°Ð¹Ð» %s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð´Ð¾ Ð²ÐµÑ€ÑÑ–Ñ— %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "Ð’ÐµÑ€ÑÑ–Ñ—"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "Ð¡Ñ‚Ð°Ñ€Ñ– Ð²ÐµÑ€ÑÑ–Ñ— Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "Ð¨Ð»ÑÑ… Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÑ–Ñ—"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ„Ð°Ð¹Ð» Ð½Ð° Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŽ Ð²ÐµÑ€ÑÑ–ÑŽ, Ð½Ð°Ñ‚Ð¸ÑÐ½ÑƒÐ²ÑˆÐ¸ Ð½Ð° ÐºÐ½Ð¾Ð¿ÐºÑƒ Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 70a9c84becf99a64119b82b60ef34b6d574b3b61..7c870f656c199b40d8b58e7929d61a56e3d9d001 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¸"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ñ–Ð½"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ð¿Ñ–Ð´ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ– Ð’Ð°Ð¼ Ð²ÐµÐ±-ÑÐµÑ€Ð²Ñ–ÑÐ¸"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð±ÑƒÑ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ– Ð¿Ð¾ÑÐ»Ñ–Ð´Ð¾Ð²Ð½Ð¾."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "ÐŸÐ¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ Ð´Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Ð’Ð¸Ð±Ñ€Ð°Ð½Ñ– Ñ„Ð°Ð»Ð¸ Ð·Ð°Ð²ÐµÐ»Ð¸ÐºÑ– Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ zip Ñ„Ð°Ð¹Ð»Ñƒ."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾"
 
@@ -170,77 +182,81 @@ msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð°, Ñ‰Ð¾ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ð»Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ: \"%s\", Ñ–Ð¼'
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ñ‚Ð°/Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð´Ñ–Ð¹ÑÐ½Ñ–"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ñ–Ð¼'Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°."
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ñ–Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°."
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’Ð°Ñˆ Web-ÑÐµÑ€Ð²ÐµÑ€ Ñ‰Ðµ Ð½Ðµ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ‡Ð¸Ð½Ð¾Ð¼ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–ÑŽ Ñ„Ð°Ð¹Ð»Ñ–Ð², Ñ‡ÐµÑ€ÐµÐ· Ñ‚Ðµ Ñ‰Ð¾ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, Ð·Ð´Ð°Ñ”Ñ‚ÑŒÑÑ, Ð·Ð»Ð°Ð¼Ð°Ð½Ð¸Ð¹."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ <a href='%s'>Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð¿Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑŽ</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 Ð³Ð¾Ð´Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d Ð³Ð¾Ð´Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ"
-
-#: template.php:118
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: template/functions.php:83
 msgid "today"
 msgstr "ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "Ð²Ñ‡Ð¾Ñ€Ð°"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d Ð´Ð½Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ð¼Ñ–ÑÑÑ†Ñ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d Ð¼Ñ–ÑÑÑ†Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index ebb7376eda8518b5239b77d8915e6723ed334d50..4daa482adfd51204d2f9689bbd784bec3abdd1ca 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr "ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ð·Ð°Ð´Ð°Ñ‚Ð¸ Ð²Ñ–Ñ€Ð½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 msgid "__language_name__"
 msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÐºÑƒ"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "Ð’Ð°Ñˆ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð· Ð´Ð°Ð½Ð¸Ð¼Ð¸ Ñ‚Ð° Ð’Ð°ÑˆÑ– Ñ„Ð°Ð¹Ð»Ð¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ– Ð· Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ. Ð¤Ð°Ð¹Ð» .htaccess, Ð½Ð°Ð´Ð°Ð½Ð¸Ð¹ Ð· ownCloud, Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”. ÐœÐ¸ Ð½Ð°Ð¿Ð¾Ð»ÐµÐ³Ð»Ð¸Ð²Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ Ð’Ð°Ð¼ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ²Ñ–Ð¹ Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¸Ð¼ Ñ‡Ð¸Ð½Ð¾Ð¼, Ñ‰Ð¾Ð± ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ data Ð±Ñ–Ð»ÑŒÑˆÐµ Ð½Ðµ Ð±ÑƒÐ² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹, Ð°Ð±Ð¾ Ð¿ÐµÑ€ÐµÐ¼Ñ–ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ data Ð·Ð° Ð¼ÐµÐ¶Ñ– ÐºÐ¾Ñ€ÐµÐ½ÐµÐ²Ð¾Ð³Ð¾ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€Ð°."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ–"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ð’Ð°Ñˆ Web-ÑÐµÑ€Ð²ÐµÑ€ Ñ‰Ðµ Ð½Ðµ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ‡Ð¸Ð½Ð¾Ð¼ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–ÑŽ Ñ„Ð°Ð¹Ð»Ñ–Ð², Ñ‡ÐµÑ€ÐµÐ· Ñ‚Ðµ Ñ‰Ð¾ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, Ð·Ð´Ð°Ñ”Ñ‚ÑŒÑÑ, Ð·Ð»Ð°Ð¼Ð°Ð½Ð¸Ð¹."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ <a href='%s'>Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð¿Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑŽ</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "ÐœÐ¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–Ð¹"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP Ð¼Ð¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–Ð¹. ÐœÐ¸ Ð½Ð°Ð¿Ð¾Ð»ÐµÐ³Ð»Ð¸Ð²Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ñ†ÐµÐ¹ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ, Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ÐºÑ€Ð°Ñ‰Ñ– Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¸ Ð²Ð¸ÑÐ²Ð»ÐµÐ½Ð½Ñ– MIME-Ñ‚Ð¸Ð¿Ñ–Ð²."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "Ð›Ð¾ÐºÐ°Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "Ð¦ÐµÐ¹ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¼Ð¾Ð²Ñƒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¸ %s. Ð¦Ðµ Ð¾Ð·Ð½Ð°Ñ‡Ð°Ñ”, Ñ‰Ð¾ Ð¼Ð¾Ð¶ÑƒÑ‚ÑŒ Ð±ÑƒÑ‚Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð· Ð´ÐµÑÐºÐ¸Ð¼Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼Ð¸ Ð² Ñ–Ð¼ÐµÐ½Ð°Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð². ÐœÐ¸ Ð½Ð°Ð¿Ð¾Ð»ÐµÐ³Ð»Ð¸Ð²Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ñ– Ð¿Ð°ÐºÐµÑ‚Ð¸ Ñƒ Ð²Ð°ÑˆÑ–Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ– Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸ %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "Ð¦ÐµÐ¹ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¼Ð°Ñ” Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ. Ð¦Ðµ Ð¾Ð·Ð½Ð°Ñ‡Ð°Ñ”, Ñ‰Ð¾ Ð´ÐµÑÐºÑ– Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ—, Ñ‚Ð°ÐºÑ– ÑÐº Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ–Ñ… Ð½Ð°ÐºÐ¾Ð¿Ð¸Ñ‡ÑƒÐ²Ð°Ñ‡Ñ–Ð², Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ñ–Ð¶Ð½Ð¸Ñ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑŽÑ‚ÑŒ. Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð² â€‹â€‹Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾ Ñ‚Ð° Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²ÐºÐ° Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾ÑŽ Ð¿Ð¾ÑˆÑ‚Ð¾ÑŽ Ñ‚Ð°ÐºÐ¾Ð¶ Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ñ‚Ð¸. ÐœÐ¸ Ð¿Ñ€Ð¾Ð¿Ð¾Ð½ÑƒÑ”Ð¼Ð¾ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ Ð´Ð»Ñ Ð´Ð°Ð½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°, ÑÐºÑ‰Ð¾ Ð²Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð¼Ð°Ñ‚Ð¸ Ð²ÑÑ– Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑ‚Ñ– ownCloud."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Ð’Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð¾Ð´Ð½Ðµ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ñ— Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾Ñ— ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÐ¸ "
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php Ð·Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð² ÑÐ»ÑƒÐ¶Ð±Ñ– webcron. Ð’Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ” cron.php ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ Ð² ÐºÐ¾Ñ€ÐµÐ½ÐµÐ²Ð¾Ð¼Ñƒ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð·Ñ– owncloud ÐºÐ¾Ð¶Ð½Ñƒ Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ð¿Ð¾ http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¸Ð¹ cron ÑÐµÑ€Ð²Ñ–Ñ. Ð’Ð¸ÐºÐ»Ð¸Ðº cron.php Ñ„Ð°Ð¹Ð»Ð° Ð· owncloud Ñ‚ÐµÐºÐ¸ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ cronjob Ñ€Ð°Ð· Ð½Ð° Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Ð¡Ð¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ API ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ð¼ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ API ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼ Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ–Ð² Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½ÑŒ"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼ Ð·Ð½Ð¾Ð²Ñƒ Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ–Ð², ÑÐºÑ– Ð²Ð¶Ðµ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ– Ð´Ð»Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼ Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð»Ñ Ð²ÑÑ–Ñ…"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼ Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ð· Ñ—Ñ…Ð½ÑŒÐ¾Ñ— Ð³Ñ€ÑƒÐ¿Ð¸"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "Ð‘ÐµÐ·Ð¿ÐµÐºÐ°"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "ÐŸÑ€Ð¸Ð¼ÑƒÑÐ¾Ð²Ðµ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ²Ð°Ð½Ð½Ñ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Ð—Ð¾Ð±Ð¾Ð²'ÑÐ·Ð°Ñ‚Ð¸ ÐºÐ»Ñ–Ñ”Ð½Ñ‚Ñ–Ð² Ð¿Ñ–Ð´'Ñ”Ð´Ð½ÑƒÐ²Ð°Ñ‚Ð¸ÑÑŒ Ð´Ð¾ ownCloud Ñ‡ÐµÑ€ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ðµ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð¹Ñ‚ÐµÑÑŒ Ð´Ð¾ Ñ†ÑŒÐ¾Ð³Ð¾ ownCloud Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ HTTPS, Ñ‰Ð¾Ð± ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð°Ð±Ð¾ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "Ð Ñ–Ð²ÐµÐ½ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»ÑŽÐ²Ð°Ð½Ð½Ñ"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "Ð‘Ñ–Ð»ÑŒÑˆÐµ"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "ÐœÐµÐ½ÑˆÐµ"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "Ð’ÐµÑ€ÑÑ–Ñ"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "Ð‘Ð°Ð³Ð¢Ñ€ÐµÐºÐµÑ€"
 msgid "Commercial Support"
 msgstr "ÐšÐ¾Ð¼ÐµÑ€Ñ†Ñ–Ð¹Ð½Ð° Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ°"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ÐžÑ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¸ Ð´Ð»Ñ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ— Ð²Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð²"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ ÐœÐ°Ð¹ÑÑ‚ÐµÑ€ ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½ÑŒ Ð·Ð½Ð¾Ð²Ñƒ"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ð’Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð»Ð¸ <strong>%s</strong> Ñ–Ð· Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ñ… <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Ð’Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¾"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð’Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "ÐÐ¾Ð²Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð†Ð¼'Ñ"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Ð•Ð».Ð¿Ð¾ÑˆÑ‚Ð°"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Ð’Ð°ÑˆÐ° Ð°Ð´Ñ€ÐµÑÐ° ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑÑƒ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸ Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "ÐœÐ¾Ð²Ð°"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ‚Ð¸ Ð· Ð¿ÐµÑ€ÐµÐºÐ»Ð°Ð´Ð¾Ð¼"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index dce6e632e191f80547b5fb25486ffe5d1d268ef3..7b824bf2f9d2ca1c8c194102aa81d57314203c32 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ñ–Ñ‚ÑŒ Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>Ð£Ð²Ð°Ð³Ð°:</b> Ð—Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÐ¸ user_ldap Ñ‚Ð° user_webdavauth Ð½Ðµ ÑÑƒÐ¼Ñ–ÑÐ½Ñ–. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ñ–Ñ‚ÐºÐ½ÑƒÑ‚Ð¸ÑÑ Ð· Ð½ÐµÑÐ¿Ð¾Ð´Ñ–Ð²Ð°Ð½Ð¾ÑŽ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¾ÑŽ. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð·Ð²ÐµÑ€Ð½Ñ–Ñ‚ÑŒÑÑ Ð´Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°, Ñ‰Ð¾Ð± Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ Ð¾Ð´Ð½Ñƒ Ð· Ð½Ð¸Ñ…."
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -221,8 +221,8 @@ msgid "Disable Main Server"
 msgstr "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð“Ð¾Ð»Ð¾Ð²Ð½Ð¸Ð¹ Ð¡ÐµÑ€Ð²ÐµÑ€"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "ÐšÐ¾Ð»Ð¸ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¾, ownCloud  Ð±ÑƒÐ´Ðµ Ð¿Ñ€Ð¸Ñ”Ð´Ð½ÑƒÐ²Ð°Ñ‚Ð¸ÑÑŒ Ð»Ð¸ÑˆÐµ Ð´Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð· Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ð¼Ð¸ ÐºÐ¾Ð¿Ñ–ÑÐ¼Ð¸."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÑƒ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð°."
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Ð¯ÐºÑ‰Ð¾ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ñ†ÑŽÑ” Ð»Ð¸ÑˆÐµ Ð· Ñ†Ñ–Ñ”ÑŽ Ð¾Ð¿Ñ†Ñ–Ñ”ÑŽ, Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ¹Ñ‚Ðµ SSL ÑÐµÑ€Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚ LDAP ÑÐµÑ€Ð²ÐµÑ€Ð° Ñƒ Ð²Ð°ÑˆÐ¸Ð¹ ownCloud ÑÐµÑ€Ð²ÐµÑ€."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "ÐŸÐ¾Ð»Ðµ, ÑÐºÐµ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ” Ð†Ð¼'Ñ ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ–Ð¼ÐµÐ½ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "ÐŸÐ¾Ð»Ðµ, ÑÐºÐµ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ” Ð†Ð¼'Ñ Ð“Ñ€ÑƒÐ¿Ð¸"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ÐÑ‚Ñ€Ð¸Ð±ÑƒÑ‚ LDAP, ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— Ñ–Ð¼ÐµÐ½ Ð³Ñ€ÑƒÐ¿ ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index 36cc099000a5894b424b40f26b9ca45703fe4050..b4c80edd14eed51962e97feaf726d6a7aa60adac 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgid "WebDAV Authentication"
 msgstr "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud Ð½Ð°Ð´Ñ–ÑˆÐ»Ðµ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ– Ð½Ð° Ñ†ÐµÐ¹ URL. Ð¦ÐµÐ¹ Ð¿Ð»Ð°Ð³Ñ–Ð½ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚ÑŒ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´ÑŒ Ñ– Ð±ÑƒÐ´Ðµ Ñ–Ð½Ñ‚ÐµÑ€Ð¿Ñ€ÐµÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ HTTP ÐºÐ¾Ð´Ð¸ 401 Ñ– 403 ÑÐº Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð½ÐµÐ´Ñ–Ð¹ÑÐ½Ñ– Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ, Ð° Ñ€ÐµÑˆÑ‚Ñƒ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´ÐµÐ¹ ÑÐº Ð´Ñ–Ð¹ÑÐ½Ñ– Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ–."
+msgstr ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index a9bfd2eebc8d16844a355cf655472bfc3cd5139a..4555d21ef8f9a4e9a03375e790d9266ad5a3e7d8 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "Ù†ÙˆÙ…Ø¨Ø±"
 msgid "December"
 msgstr "Ø¯Ø³Ù…Ø¨Ø±"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "Ø³ÛŒÙ¹ÛŒÙ†Ú¯Ø²"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr ""
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Ø§ÛŒØ±Ø±"
 
@@ -246,140 +246,141 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±Ù†Û’  Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Ø§Ø®ØªÛŒØ§Ø±Ø§Øª Ú©Ùˆ ØªØ¨Ø¯ÛŒÙ„ Ú©Ø±Ù†Û’ Ú©Û’ Ø¯ÙˆØ±Ø§Ù† Ø§ÛŒØ±Ø±"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Ø§Ø³ Ú©Û’ Ø³Ø§ØªÚ¾ Ø´Ø¦ÛŒØ± Ú©Ø±ÛŒÚº"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Ù„Ù†Ú© Ú©Û’ Ø³Ø§ØªÚ¾ Ø´Ø¦ÛŒØ± Ú©Ø±ÛŒÚº"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ Ø³Û’ Ù…ØÙÙˆØ¸ Ú©Ø±ÛŒÚº"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr ""
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "ØªØ§Ø±ÛŒØ® Ù…Ø¹ÛŒØ§Ø¯ Ø³ÛŒÙ¹ Ú©Ø±ÛŒÚº"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "ØªØ§Ø±ÛŒØ® Ù…Ø¹ÛŒØ§Ø¯"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "Ú©ÙˆØ¦ÛŒ Ù„ÙˆÚ¯ Ù†ÛÛŒÚº Ù…Ù„Û’Û”"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Ø¯ÙˆØ¨Ø§Ø±Û Ø´Ø¦ÛŒØ± Ú©Ø±Ù†Û’ Ú©ÛŒ Ø§Ø¬Ø§Ø²Øª Ù†ÛÛŒÚº"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "Ø§ÛŒÚˆÙ¹ Ú©Ø± Ø³Ú©Û’"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "Ø§Ø³ÛŒØ³ Ú©Ù†Ù¹Ø±ÙˆÙ„"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "Ù†ÛŒØ§ Ø¨Ù†Ø§Ø¦ÛŒÚº"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "Ø§Ù¾ ÚˆÛŒÙ¹"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "Ø´Ø¦ÛŒØ± Ú©Ø±ÛŒÚº"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ Ø³Û’ Ù…ØÙÙˆØ¸ Ú©ÛŒØ§ Ú¯ÛŒØ§ ÛÛ’"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr ""
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ø§ÙˆÙ† Ú©Ù„Ø§Ø¤Úˆ Ù¾Ø§Ø³ÙˆØ±Úˆ Ø±ÛŒ Ø³ÛŒÙ¹"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,7 +401,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ø¢Ù¾ Ø§ÛŒ Ù…ÛŒÙ„ Ú©Û’ Ø°Ø±ÛŒØ¹Û’ Ø§Ù¾Ù†Û’ Ù¾Ø§Ø³ÙˆØ±Úˆ Ø±ÛŒ Ø³ÛŒÙ¹ Ú©Ø§ Ù„Ù†Ú© Ù…ÙˆØµÙˆÙ„ Ú©Ø±ÛŒÚº Ú¯Û’"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ÛŒÙˆØ²Ø± Ù†ÛŒÙ…"
@@ -461,11 +462,11 @@ msgstr "Ù…Ø¯Ø¯"
 msgid "Access forbidden"
 msgstr "Ù¾ÛÙ†Ú† Ú©ÛŒ Ø§Ø¬Ø§Ø²Øª Ù†ÛÛŒÚº"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "Ù†ÛÛŒÚº Ù…Ù„ Ø³Ú©Ø§"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +495,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +517,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ø§ÛŒÚ©<strong> Ø§ÛŒÚˆÙ…Ù† Ø§Ú©Ø§Ø¤Ù†Ù¹</strong> Ø¨Ù†Ø§Ø¦ÛŒÚº"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "Ø§ÛŒÚˆÙˆØ§Ù†Ø³Úˆ"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "ÚˆÛŒÙ¹Ø§ ÙÙˆÙ„ÚˆØ±"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "ÚˆÛŒÙ¹Ø§ Ø¨ÛŒØ³ Ú©ÙˆÙ†ÙÚ¯Ø± Ú©Ø±ÛŒÚº"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ø§Ø³ØªØ¹Ù…Ø§Ù„ ÛÙˆ Ú¯Ø§"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ ÛŒÙˆØ²Ø±"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ Ù¾Ø§Ø³ÙˆØ±Úˆ"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ Ú©Ø§ Ù†Ø§Ù…"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ Ù¹ÛŒØ¨Ù„ Ø³Ù¾ÛŒØ³"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "ÚˆÛŒÙ¹Ø§Ø¨ÛŒØ³ ÛÙˆØ³Ù¹"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "Ø³ÛŒÙ¹ Ø§Ù¾ Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "Ù„Ø§Ú¯ Ø¢Ø¤Ù¹"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
@@ -607,7 +613,7 @@ msgstr "Ù„Ø§Ú¯ Ø§Ù†"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 7e537d8772024002a0631d7bba56e08dd0bdd2fe..398838a0f1fb1ed25ee454e4faccc02391a4e1a7 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr ""
 
@@ -128,43 +128,45 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +202,29 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr ""
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +283,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Ø´Ø¦ÛŒØ±Ù†Ú¯ Ø®ØªÙ… Ú©Ø±ÛŒÚº"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index b082d1236b975cd90b9acdc4243aae248b260f8f..9bf9cd875cb94d39206d43f0208e53f00782f028 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 119e4cb853ffdf8473f2804d9d49b9860cbbf36a..6880222c4ce145a89ba35099537beb0eab24af9f 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:13+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"PO-Revision-Date: 2013-08-04 05:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ"
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:86
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:44
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr ""
 
-#: templates/public.php:54
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:83
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 1e5fc5815b6b38edc25f971a13a5c5f341e87aeb..7ccb9117fbdffe29bada7ac2d2200a1395ae53bd 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,44 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Ø§ÛŒØ±Ø±"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index 87f26d3039d1a65d364c2879b0d870f9f9ed8765..1c1c879f126c3f1a6e72a79787aa109abc0f6329 100644
--- a/l10n/ur_PK/files_versions.po
+++ b/l10n/ur_PK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:7
+msgid "Versions"
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 0935352b0b4a247a4efb4cf20697f7dd1e770ddc..4c170b1074a9396dc976603eb4f26d3116abe1ea 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "ÛŒÙˆØ²Ø±Ø²"
 
 #: app.php:409
-msgid "Apps"
-msgstr "Ø§ÛŒÙ¾Ø²"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Ø§ÛŒÚˆÙ…Ù†"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "Ø¢Ù¾ Ú©Û’ Ø§Ø®ØªÛŒØ§Ø± Ù…ÛŒÚº ÙˆÛŒØ¨ Ø³Ø±ÙˆØ³ÛŒØ²"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,77 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr ""
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr ""
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr ""
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 6942b8d0da04416ba1dc020f842429c0c8b67b92..921b8e1edf3bc10f44630187fd0a02f9e31d39d5 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Ù¾Ø§Ø³ÙˆØ±Úˆ"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Ù†ÛŒØ§ Ù¾Ø§Ø³ÙˆØ±Úˆ"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 8d4caab2d2529128a5e864c5c3e9144a09c3e85f..fdfea6be1d58c7db1097d8be93be2a39c83efbc9 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
index d401530efb3108c444338d1aaf49ff0a547bb8e3..7640ed8ba9dc71dc3bbf97cc9c6e7e881294005c 100644
--- a/l10n/ur_PK/user_webdavauth.po
+++ b/l10n/ur_PK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 4bb82da9156142d40db3e80a7a011841e16e291e..b8bfc91292b1cd310734aaa8f9703d3bd1cfea14 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -138,59 +138,55 @@ msgstr "ThÃ¡ng 11"
 msgid "December"
 msgstr "ThÃ¡ng 12"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "CÃ i Ä‘áº·t"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "vÃ i giÃ¢y trÆ°á»›c"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 phÃºt trÆ°á»›c"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} phÃºt trÆ°á»›c"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 giá» trÆ°á»›c"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} giá» trÆ°á»›c"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "hÃ´m nay"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "hÃ´m qua"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} ngÃ y trÆ°á»›c"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} thÃ¡ng trÆ°á»›c"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "nÄƒm trÆ°á»›c"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "nÄƒm trÆ°á»›c"
 
@@ -226,8 +222,8 @@ msgstr "Loáº¡i Ä‘á»‘i tÆ°á»£ng khÃ´ng Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh."
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -247,140 +243,141 @@ msgstr "ÄÆ°á»£c chia sáº»"
 msgid "Share"
 msgstr "Chia sáº»"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh chia sáº»"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh gá»¡ chia sáº»"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh phÃ¢n quyá»n"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ vá»›i báº¡n vÃ  nhÃ³m {group} bá»Ÿi {owner}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ bá»Ÿi {owner}"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "Chia sáº» vá»›i"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "Chia sáº» vá»›i liÃªn káº¿t"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "Máºt kháº©u báº£o vá»‡"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "Máºt kháº©u"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "LiÃªn káº¿t email tá»›i cÃ¡ nhÃ¢n"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "Gá»Ÿi"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "Äáº·t ngÃ y káº¿t thÃºc"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "NgÃ y káº¿t thÃºc"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "Chia sáº» thÃ´ng qua email"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "KhÃ´ng tÃ¬m tháº¥y ngÆ°á»i nÃ o"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "Chia sáº» láº¡i khÃ´ng Ä‘Æ°á»£c cho phÃ©p"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ trong {item} vá»›i {user}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "Bá» chia sáº»"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "cÃ³ thá»ƒ chá»‰nh sá»a"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "quáº£n lÃ½ truy cáºp"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "táº¡o"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "cáºp nháºt"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "xÃ³a"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "chia sáº»"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "Máºt kháº©u báº£o vá»‡"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "Lá»—i khÃ´ng thiáº¿t láºp ngÃ y káº¿t thÃºc"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "Lá»—i cáº¥u hÃ¬nh ngÃ y káº¿t thÃºc"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "Äang gá»Ÿi ..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email Ä‘Ã£ Ä‘Æ°á»£c gá»i"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "Cáºp nháºt khÃ´ng thÃ nh cÃ´ng . Vui lÃ²ng thÃ´ng bÃ¡o Ä‘áº¿n <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cá»™ng Ä‘á»“ng ownCloud </a>."
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Cáºp nháºt thÃ nh cÃ´ng .Há»‡ thá»‘ng sáº½ Ä‘Æ°a báº¡n tá»›i ownCloud."
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "KhÃ´i phá»¥c máºt kháº©u Owncloud "
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -401,7 +398,7 @@ msgstr "YÃªu cáº§u tháº¥t báº¡i!<br>Báº¡n cÃ³ cháº¯c lÃ  email/tÃªn Ä‘Äƒng nháº
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vui lÃ²ng kiá»ƒm tra Email Ä‘á»ƒ khÃ´i phá»¥c láº¡i máºt kháº©u."
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "TÃªn Ä‘Äƒng nháºp"
@@ -462,11 +459,11 @@ msgstr "GiÃºp Ä‘á»¡"
 msgid "Access forbidden"
 msgstr "Truy cáºp bá»‹ cáº¥m"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "KhÃ´ng tÃ¬m tháº¥y Clound"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -495,8 +492,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "PhiÃªn báº£n PHP cá»§a báº¡n cÃ³ lá»— há»•ng NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Vui lÃ²ng cáºp nháºt báº£n cÃ i Ä‘áº·t PHP Ä‘á»ƒ sá» dá»¥ng ownCloud má»™t cÃ¡ch an toÃ n."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -516,68 +514,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "ThÆ° má»¥c vÃ  file dá»¯ liá»‡u cá»§a báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c truy cáºp tá»« internet bá»Ÿi vÃ¬ file .htaccess khÃ´ng hoáº¡t Ä‘á»™ng"
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "Äá»ƒ biáº¿t thÃªm cÃ¡ch cáº¥u hÃ¬nh mÃ¡y chá»§ cá»§a báº¡n, xin xem <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">tÃ i liá»‡u</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "Táº¡o má»™t <strong>tÃ i khoáº£n quáº£n trá»‹</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "NÃ¢ng cao"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "ThÆ° má»¥c dá»¯ liá»‡u"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "Cáº¥u hÃ¬nh cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "Ä‘Æ°á»£c sá» dá»¥ng"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "NgÆ°á»i dÃ¹ng cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "Máºt kháº©u cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "TÃªn cÆ¡ sá»Ÿ dá»¯ liá»‡u"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "CÆ¡ sá»Ÿ dá»¯ liá»‡u tablespace"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "CÃ i Ä‘áº·t hoÃ n táº¥t"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s cÃ²n trá»‘ng. Xem thÃªm thÃ´ng tin cÃ¡ch cáºp nháºt."
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ÄÄƒng xuáº¥t"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Tá»± Ä‘á»™ng Ä‘Äƒng nháºp Ä‘Ã£ bá»‹ tá»« chá»‘i !"
@@ -608,7 +610,7 @@ msgstr "ÄÄƒng nháºp"
 msgid "Alternative Logins"
 msgstr "ÄÄƒng nháºp khÃ¡c"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index a6683b708f939bd409bc3eb0f3bb64fc490f3d00..7772001408e67ee4682d6925919f3954f3f00f35 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgstr "Chia sáº»"
 msgid "Delete permanently"
 msgstr "XÃ³a vÄ©nh vá»…n"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "XÃ³a"
 
@@ -129,43 +129,44 @@ msgstr "XÃ³a"
 msgid "Rename"
 msgstr "Sá»a tÃªn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "Äang chá»"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} Ä‘Ã£ tá»“n táº¡i"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "thay tháº¿"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "tÃªn gá»£i Ã½"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "há»§y"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ä‘Ã£ thay tháº¿ {new_name} báº±ng {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "lÃ¹i láº¡i"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "thá»±c hiá»‡n viá»‡c xÃ³a"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 tá»‡p tin Ä‘ang Ä‘Æ°á»£c táº£i lÃªn"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "tá»‡p tin Ä‘ang Ä‘Æ°á»£c táº£i lÃªn"
 
@@ -201,33 +202,27 @@ msgstr "Your download is being prepared. This might take some time if the files
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "TÃªn"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "KÃch cá»¡"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "Thay Ä‘á»•i"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 thÆ° má»¥c"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} thÆ° má»¥c"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 táºp tin"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} táºp tin"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -286,61 +281,61 @@ msgstr "ThÆ° má»¥c"
 msgid "From link"
 msgstr "Tá»« liÃªn káº¿t"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "File Ä‘Ã£ bá»‹ xÃ³a"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Há»§y upload"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "Báº¡n khÃ´ng cÃ³ quyá»n ghi vÃ o Ä‘Ã¢y."
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "KhÃ´ng cÃ³ gÃ¬ á»Ÿ Ä‘Ã¢y .HÃ£y táº£i lÃªn má»™t cÃ¡i gÃ¬ Ä‘Ã³ !"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "Táº£i vá»"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "Bá» chia sáº»"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "Táºp tin táº£i lÃªn quÃ¡ lá»›n"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "CÃ¡c táºp tin báº¡n Ä‘ang táº£i lÃªn vÆ°á»£t quÃ¡ kÃch thÆ°á»›c tá»‘i Ä‘a cho phÃ©p trÃªn mÃ¡y chá»§ ."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "Táºp tin Ä‘ang Ä‘Æ°á»£c quÃ©t ,vui lÃ²ng chá»."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "Hiá»‡n táº¡i Ä‘ang quÃ©t"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "file"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "files"
 
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index d075fbbae3b579b1967753bd3248f92ef6e7d6dd..f50c77440eb3bf1209d11934b1f568ddedec3cf0 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -68,9 +68,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 5d3bff70a128e43512ed07b93774448165022263..66d06e79b22243323c3d736c3cebe4ed4b77adc1 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: xtdv <truong.tx8@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "Xin vui lÃ²ng cung cáº¥p má»™t á»©ng dá»¥ng Dropbox há»£p lá»‡ vÃ  mÃ£ b
 msgid "Error configuring Google Drive storage"
 msgstr "Lá»—i cáº¥u hÃ¬nh lÆ°u trá»¯ Google Drive"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Cáº£nh bÃ¡o:</b> \"smbclient\" chÆ°a Ä‘Æ°á»£c cÃ i Ä‘áº·t. Mount CIFS/SMB shares lÃ  khÃ´ng thá»ƒ thá»±c hiá»‡n Ä‘Æ°á»£c. HÃ£y há»i ngÆ°á»i quáº£n trá»‹ há»‡ thá»‘ng Ä‘á»ƒ cÃ i Ä‘áº·t nÃ³."
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Cáº£nh bÃ¡o:</b> FTP trong PHP chÆ°a Ä‘Æ°á»£c cÃ i Ä‘áº·t hoáº·c chÆ°a Ä‘Æ°á»£c  má»Ÿ. Mount FTP shares lÃ  khÃ´ng thá»ƒ. Xin hÃ£y yÃªu cáº§u quáº£n trá»‹ há»‡ thá»‘ng cá»§a báº¡n cÃ i Ä‘áº·t nÃ³."
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index b92a9cbf765f40a6755a038ff3db637edb758f96..47ce6adaf751122865ebb0979ae64fc3092d0c66 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "Máºt kháº©u"
 msgid "Submit"
 msgstr "XÃ¡c nháºn"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s Ä‘Ã£ chia sáº» thÆ° má»¥c %s vá»›i báº¡n"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s Ä‘Ã£ chia sáº» táºp tin %s vá»›i báº¡n"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "Táº£i vá»"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "Táº£i lÃªn"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "Há»§y upload"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "KhÃ´ng cÃ³ xem trÆ°á»›c cho"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index cb7171d101b8c7ecadb0553f554dd6406160521a..c0a3d67ec4a82e0744553f9e65ca18300a599d82 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr "KhÃ´ng thá»ƒ Ã³a %s vÄ©nh viá»…n"
 msgid "Couldn't restore %s"
 msgstr "KhÃ´ng thá»ƒ khÃ´i phá»¥c %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "thá»±c hiá»‡n phá»¥c há»“i"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "Lá»—i"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "xÃ³a file vÄ©nh viá»…n"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "XÃ³a vÄ©nh vá»…n"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "TÃªn"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "ÄÃ£ xÃ³a"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 thÆ° má»¥c"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} thÆ° má»¥c"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 táºp tin"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} táºp tin"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index ddb86932e17190f540ffd72a503e907f19a1e2e3..502dfac96b1d8bd8b04878db1947296019e805e6 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "KhÃ´ng thá»ƒ khÃ´i phá»¥c: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "thÃ nh cÃ´ng"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "File %s Ä‘Ã£ Ä‘Æ°á»£c khÃ´i phá»¥c vá» phiÃªn báº£n %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "Tháº¥t báº¡i"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "File %s khÃ´ng thá»ƒ khÃ´i phá»¥c vá» phiÃªn báº£n %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "PhiÃªn báº£n"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "KhÃ´ng cÃ³ phiÃªn báº£n cÅ© nÃ o"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "KhÃ´ng chá»‰ ra Ä‘Æ°á»ng dáº«n rÃµ rÃ ng"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "PhiÃªn báº£n"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "KhÃ´i phá»¥c má»™t file vá» phiÃªn báº£n trÆ°á»›c Ä‘Ã³ báº±ng cÃ¡ch click vÃ o nÃºt KhÃ´i phá»¥c tÆ°Æ¡ng á»©ng"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "KhÃ´i phá»¥c"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index de445cb25f7c8e10bf3a9169616a571b80c61aa6..e7c2745b8dd769524ec14f85cfddb97e35cf1ddf 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "NgÆ°á»i dÃ¹ng"
 
 #: app.php:409
-msgid "Apps"
-msgstr "á»¨ng dá»¥ng"
-
-#: app.php:417
 msgid "Admin"
 msgstr "Quáº£n trá»‹"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "dá»‹ch vá»¥ web dÆ°á»›i sá»± kiá»ƒm soÃ¡t cá»§a báº¡n"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "Táº£i vá» ZIP Ä‘Ã£ bá»‹ táº¯t."
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "Táºp tin cáº§n pháº£i Ä‘Æ°á»£c táº£i vá» tá»«ng ngÆ°á»i má»™t."
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "Trá»Ÿ láº¡i táºp tin"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "Táºp tin Ä‘Æ°á»£c chá»n quÃ¡ lá»›n Ä‘á»ƒ táº¡o táºp tin ZIP."
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "khÃ´ng thá»ƒ phÃ¡t hiá»‡n Ä‘Æ°á»£c"
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "vÃ i giÃ¢y trÆ°á»›c"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 phÃºt trÆ°á»›c"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d phÃºt trÆ°á»›c"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 giá» trÆ°á»›c"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d giá» trÆ°á»›c"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "hÃ´m nay"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "hÃ´m qua"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d ngÃ y trÆ°á»›c"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d thÃ¡ng trÆ°á»›c"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "nÄƒm trÆ°á»›c"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "nÄƒm trÆ°á»›c"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 520d54cb68f2a6ac047a73a60db7365334e27a20..e0da3b1861681a7112081c155a84edb3b273dbcd 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr "__NgÃ´n ngá»¯___"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "Cáº£nh báº£o báº£o máºt"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "ThÆ° má»¥c dá»¯ liá»‡u vÃ  nhá»¯ng táºp tin cá»§a báº¡n cÃ³ thá»ƒ dá»… dÃ ng bá»‹ truy cáºp tá»« máº¡ng. Táºp tin .htaccess do ownCloud cung cáº¥p khÃ´ng hoáº¡t Ä‘á»™ng. ChÃºng tÃ´i Ä‘á» nghá»‹ báº¡n nÃªn cáº¥u hÃ¬nh láº¡i mÃ¡y chá»§ web Ä‘á»ƒ thÆ° má»¥c dá»¯ liá»‡u khÃ´ng cÃ²n bá»‹ truy cáºp hoáº·c báº¡n nÃªn di chuyá»ƒn thÆ° má»¥c dá»¯ liá»‡u ra bÃªn ngoÃ i thÆ° má»¥c gá»‘c cá»§a mÃ¡y chá»§."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "Thá»±c thi tÃ¡c vá»¥ má»—i khi trang Ä‘Æ°á»£c táº£i"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php Ä‘Ã£ Ä‘Æ°á»£c Ä‘Äƒng kÃ½ táº¡i má»™t dá»‹ch vá»¥ webcron. Gá»i trang cron.php má»—i phÃºt má»™t láº§n thÃ´ng qua giao thá»©c http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "Sá» dá»¥ng dá»‹ch vá»¥ cron cá»§a há»‡ thá»‘ng. Gá»i tá»‡p tin cron.php má»—i phÃºt má»™t láº§n."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "Chia sáº»"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "Báºt chia sáº» API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "Cho phÃ©p cÃ¡c á»©ng dá»¥ng sá» dá»¥ng chia sáº» API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "Cho phÃ©p liÃªn káº¿t"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "Cho phÃ©p ngÆ°á»i dÃ¹ng chia sáº» cÃ´ng khai cÃ¡c má»¥c báº±ng cÃ¡c liÃªn káº¿t"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "Cho phÃ©p chia sáº» láº¡i"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "Cho phÃ©p ngÆ°á»i dÃ¹ng chia sáº» láº¡i nhá»¯ng má»¥c Ä‘Ã£ Ä‘Æ°á»£c chia sáº»"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "Cho phÃ©p ngÆ°á»i dÃ¹ng chia sáº» vá»›i báº¥t cá»© ai"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "Chá»‰ cho phÃ©p ngÆ°á»i dÃ¹ng chia sáº» vá»›i nhá»¯ng ngÆ°á»i dÃ¹ng trong nhÃ³m cá»§a há»"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "hÆ¡n"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "Ãt"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "PhiÃªn báº£n"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr "Há»‡ ghi nháºn lá»—i"
 msgid "Commercial Support"
 msgstr "Há»— trá»£ cÃ³ phÃ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "Nháºn á»©ng dá»¥ng Ä‘á»ƒ Ä‘á»“ng bá»™ file cá»§a báº¡n"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "Hiá»‡n láº¡i viá»‡c cháº¡y Ä‘á»“ thuáºt khá»Ÿi Ä‘áº§u"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Báº¡n Ä‘Ã£ sá» dá»¥ng <strong>%s </ strong> cÃ³ sáºµn <strong> %s </ strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Máºt kháº©u"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "Máºt kháº©u cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c thay Ä‘á»•i."
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "KhÃ´ng thá»ƒ Ä‘á»•i máºt kháº©u"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "Máºt kháº©u cÅ©"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "Máºt kháº©u má»›i"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "Äá»•i máºt kháº©u"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "TÃªn hiá»ƒn thá»‹"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "Email cá»§a báº¡n"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "Nháºp Ä‘á»‹a chá»‰ email cá»§a báº¡n Ä‘á»ƒ khÃ´i phá»¥c láº¡i máºt kháº©u"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "NgÃ´n ngá»¯"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "Há»— trá»£ dá»‹ch thuáºt"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 6873fdea21ce862cf00e6d0e9f6a60b3fa6f6981..abf722d3609cba919b81dba2bec4c054aacbf7bf 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,8 +221,8 @@ msgid "Disable Main Server"
 msgstr "Táº¯t mÃ¡y chá»§ chÃnh"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "Táº¯t xÃ¡c thá»±c chá»©ng nháºn SSL"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "Náº¿u káº¿t ná»‘i chá»‰ hoáº¡t Ä‘á»™ng vá»›i tÃ¹y chá»n nÃ y, vui lÃ²ng import LDAP certificate SSL  trong mÃ¡y chá»§ ownCloud cá»§a báº¡n."
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "Hiá»ƒn thá»‹ tÃªn ngÆ°á»i sá» dá»¥ng"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "CÃ¡c thuá»™c tÃnh LDAP sá» dá»¥ng Ä‘á»ƒ táº¡o tÃªn ngÆ°á»i dÃ¹ng ownCloud."
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "Hiá»ƒn thá»‹ tÃªn nhÃ³m"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "CÃ¡c thuá»™c tÃnh LDAP sá» dá»¥ng Ä‘á»ƒ táº¡o cÃ¡c nhÃ³m ownCloud."
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index bbcb7346fe5259dd5b3334718d4a92b7a458e9f9..a4491d6020ce5c7be2e7f8eb89e35596cacd698b 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgid "WebDAV Authentication"
 msgstr "XÃ¡c thá»±c WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud sáº½ gá»i chá»©ng thÆ° ngÆ°á»i dÃ¹ng tá»›i URL nÃ y. TÃnh nÄƒng nÃ y kiá»ƒm tra tráº£ lá»i vÃ  sáº½ hiá»ƒu mÃ£ 401 vÃ  403 cá»§a giao thá»©c HTTP lÃ  chá»©ng thÆ° khÃ´ng há»£p lá»‡, vÃ  má»i tráº£ lá»i khÃ¡c Ä‘Æ°á»£c coi lÃ  há»£p lá»‡."
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index b82955cfedce60ca72ea547fe9a2872d88706d4e..d49b821a1b4b5d05b7469e75025ef40588596d13 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # fkj <fengkaijia@gmail.com>, 2013
+# Martin Liu <liuzh66@gmail.com>, 2013
 # hyy0591 <yangyu.huang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr ""
+msgstr "%s ä¸Žæ‚¨å…±äº«äº† Â»%sÂ« "
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -47,7 +48,7 @@ msgstr "æœªé€‰æ‹©å¯¹è±¡ç±»åž‹ã€‚"
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s æ²¡æœ‰æä¾› ID"
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
@@ -139,59 +140,55 @@ msgstr "åä¸€æœˆ"
 msgid "December"
 msgstr "åäºŒæœˆ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 åˆ†é’Ÿå‰"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} åˆ†é’Ÿå‰"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1å°æ—¶å‰"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours}å°æ—¶å‰"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} å¤©å‰"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "ä¸Šä¸ªæœˆ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months}æœˆå‰"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "å¹´å‰"
 
@@ -205,7 +202,7 @@ msgstr "å–æ¶ˆ"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "åŠ è½½æ–‡ä»¶é€‰å–æ¨¡æ¿å‡ºé”™"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -227,8 +224,8 @@ msgstr "æœªæŒ‡å®šå¯¹è±¡ç±»åž‹ã€‚"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "å‡ºé”™"
 
@@ -248,140 +245,141 @@ msgstr "å·²åˆ†äº«"
 msgid "Share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "åˆ†äº«å‡ºé”™"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆåˆ†äº«å‡ºé”™"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "å˜æ›´æƒé™å‡ºé”™"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ç”± {owner} ä¸Žæ‚¨å’Œ {group} ç¾¤ç»„åˆ†äº«"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "ç”± {owner} ä¸Žæ‚¨åˆ†äº«"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "åˆ†äº«"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "åˆ†äº«é“¾æŽ¥"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "å¯†ç "
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "å…è®¸å…¬ä¼—ä¸Šä¼ "
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "é¢å‘ä¸ªäººçš„ç”µåé‚®ä»¶é“¾æŽ¥"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "å‘é€"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "è®¾ç½®å¤±æ•ˆæ—¥æœŸ"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "å¤±æ•ˆæ—¥æœŸ"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "é€šè¿‡ç”µåé‚®ä»¶åˆ†äº«ï¼š"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "æŸ¥æ— æ¤äºº"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è®¸é‡å¤åˆ†äº«"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "å·²ç»ä¸Ž {user} åœ¨ {item} ä¸åˆ†äº«"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "å–æ¶ˆåˆ†äº«"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "å¯ç¼–è¾‘"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "è®¿é—®æŽ§åˆ¶"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "åˆ›å»º"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "åˆ é™¤"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "å–æ¶ˆè®¾ç½®å¤±æ•ˆæ—¥æœŸå‡ºé”™"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "è®¾ç½®å¤±æ•ˆæ—¥æœŸå‡ºé”™"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "å‘é€ä¸â€¦â€¦"
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "ç”µåé‚®ä»¶å·²å‘é€"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "å‡çº§å¤±è´¥ã€‚è¯·å‘<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloudç¤¾åŒº</a>æŠ¥å‘Šæ¤é—®é¢˜ã€‚"
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "å‡çº§æˆåŠŸã€‚çŽ°åœ¨ä¸ºæ‚¨è·³è½¬åˆ°ownCloudã€‚"
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ç§æœ‰äº‘å¯†ç é‡ç½®"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -392,17 +390,17 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "é‡ç½®å¯†ç çš„è¿žæŽ¥å·²ç»é€šè¿‡é‚®ä»¶åˆ°æ‚¨çš„é‚®ç®±ã€‚<br> å¦‚æžœä½ æ²¡æœ‰æ”¶åˆ°é‚®ä»¶ï¼Œå¯èƒ½æ˜¯ç”±äºŽè¦å†ç‰ä¸€ä¸‹ï¼Œæˆ–è€…æ£€æŸ¥ä¸€ä¸‹æ‚¨çš„åžƒåœ¾é‚®ä»¶å¤¹ã€‚<br> å¦‚æžœè¿˜æ˜¯æ²¡æœ‰æ”¶åˆ°ï¼Œè¯·è”ç³»æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜ã€‚"
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "è¯·æ±‚å¤±è´¥ï¼<br> ä½ ç¡®å®šä½ çš„é‚®ä»¶åœ°å€/ç”¨æˆ·åæ˜¯æ£ç¡®çš„ï¼Ÿ"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
 msgstr "ä½ å°†ä¼šæ”¶åˆ°ä¸€ä¸ªé‡ç½®å¯†ç çš„é“¾æŽ¥"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ç”¨æˆ·å"
@@ -413,11 +411,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "æ‚¨çš„æ–‡ä»¶æ˜¯åŠ å¯†çš„ã€‚å¦‚æžœæ‚¨è¿˜æ²¡æœ‰å¯ç”¨æ¢å¤å¯†é’¥ï¼Œåœ¨é‡ç½®äº†å¯†ç åŽï¼Œæ‚¨çš„æ•°æ®è®²æ— æ³•æ¢å¤å›žæ¥ã€‚å¦‚æžœæ‚¨ä¸ç¡®å®šæ˜¯å¦è¿™ä¹ˆåšï¼Œè¯·è”ç³»æ‚¨çš„ç®¡ç†å‘˜åœ¨ç»§ç»è¿™ä¸ªæ“ä½œã€‚ä½ å´æ˜¯æƒ³ç»§ç»ä¹ˆï¼Ÿ"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "æ˜¯çš„ï¼Œæˆ‘æƒ³çŽ°åœ¨é‡ç½®å¯†ç ã€‚"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
@@ -463,11 +461,11 @@ msgstr "å¸®åŠ©"
 msgid "Access forbidden"
 msgstr "ç¦æ¢è®¿é—®"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "äº‘ æ²¡æœ‰è¢«æ‰¾åˆ°"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -476,7 +474,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "ä½ å¥½ï¼âŽ\nâŽ\næ¸©é¦¨æç¤ºï¼š %s ä¸Žæ‚¨å…±äº«äº† %s ã€‚âŽ\næŸ¥çœ‹ï¼š %sâŽ\nâŽ\nç¥é¡ºåˆ©ï¼"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -493,11 +491,12 @@ msgstr "å®‰å…¨è¦å‘Š"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "æ‚¨çš„PHPç‰ˆæœ¬æ˜¯ä¼šå—åˆ°NULLå—èŠ‚æ¼æ´žæ”»å‡»çš„(CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "è¯·å‡çº§æ‚¨çš„PHPç‰ˆæœ¬ä»¥ç¨³å®šè¿è¡ŒownCloudã€‚"
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "è¯·å®‰å…¨åœ°å‡çº§æ‚¨çš„PHPç‰ˆæœ¬åˆ° %s ã€‚"
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +516,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "å› ä¸º.htaccessæ–‡ä»¶æ— æ•ˆï¼Œæ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹åŠæ–‡ä»¶å¯èƒ½å¯ä»¥åœ¨äº’è”ç½‘ä¸Šè®¿é—®ã€‚"
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "è¦èŽ·å¾—å¤§æ¦‚å¦‚ä½•é…ç½®æ‚¨çš„æœåŠ¡å™¨çš„ç›¸å…³ä¿¡æ¯ï¼Œå‚è§<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">è¯´æ˜Žæ–‡æ¡£</a>ã€‚"
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "æœ‰å…³å¦‚ä½•æ£ç¡®åœ°é…ç½®æ‚¨çš„æœåŠ¡å™¨ï¼Œè¯·æŸ¥çœ‹ <a href=\"%s\" target=\"_blank\">æ–‡æ¡£</a>ã€‚"
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "å»ºç«‹ä¸€ä¸ª <strong>ç®¡ç†å¸æˆ·</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "è¿›é˜¶"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "æ•°æ®å˜æ”¾æ–‡ä»¶å¤¹"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "é…ç½®æ•°æ®åº“"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "å°†ä¼šä½¿ç”¨"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "æ•°æ®åº“ç”¨æˆ·"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "æ•°æ®åº“å¯†ç "
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "æ•°æ®åº“ç”¨æˆ·å"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "æ•°æ®åº“è¡¨æ ¼ç©ºé—´"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "æ•°æ®åº“ä¸»æœº"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "å®Œæˆå®‰è£…"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s æ˜¯å¯ç”¨çš„ã€‚èŽ·å–æ›´å¤šå…³äºŽå‡çº§çš„ä¿¡æ¯ã€‚"
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "æ³¨é”€"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "è‡ªåŠ¨ç™»å½•è¢«æ‹’ç»ï¼"
@@ -609,12 +612,12 @@ msgstr "ç™»é™†"
 msgid "Alternative Logins"
 msgstr "å¤‡é€‰ç™»å½•"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "ä½ å¥½ï¼<br><br>æ¸©é¦¨æç¤ºï¼š %s ä¸Žæ‚¨å…±äº«äº† %s ã€‚<br><br>\næŸ¥çœ‹ï¼š %s <br><br> ç¥é¡ºåˆ©ï¼"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 0bdf138ae937dcbe58636a6a77541778a423ad46..a137dd4b15246b6be3e72d408295ec5202c2bd4c 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# hlx98007 <hlx98007@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -20,20 +21,20 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "æ— æ³•ç§»åŠ¨ %s - å˜åœ¨åŒåæ–‡ä»¶"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "æ— æ³•ç§»åŠ¨ %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "æ— æ³•è®¾ç½®ä¸Šä¼ æ–‡ä»¶å¤¹"
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "éžæ³•Token"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -46,7 +47,7 @@ msgstr "æ–‡ä»¶ä¸Šä¼ æˆåŠŸ"
 #: ajax/upload.php:67
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†php.iniæŒ‡å®šçš„upload_max_filesize"
 
 #: ajax/upload.php:69
 msgid ""
@@ -72,11 +73,11 @@ msgstr "å†™ç£ç›˜å¤±è´¥"
 
 #: ajax/upload.php:91
 msgid "Not enough storage available"
-msgstr ""
+msgstr "å®¹é‡ä¸è¶³"
 
 #: ajax/upload.php:123
 msgid "Invalid directory."
-msgstr ""
+msgstr "æ— æ•ˆæ–‡ä»¶å¤¹"
 
 #: appinfo/app.php:12
 msgid "Files"
@@ -88,7 +89,7 @@ msgstr "ä¸èƒ½ä¸Šä¼ æ‚¨çš„æ–‡ä»¶ï¼Œç”±äºŽå®ƒæ˜¯æ–‡ä»¶å¤¹æˆ–è€…ä¸ºç©ºæ–‡ä»¶"
 
 #: js/file-upload.js:24
 msgid "Not enough space available"
-msgstr ""
+msgstr "å®¹é‡ä¸è¶³"
 
 #: js/file-upload.js:64
 msgid "Upload cancelled."
@@ -105,7 +106,7 @@ msgstr "ç½‘å€ä¸èƒ½ä¸ºç©ºã€‚"
 
 #: js/file-upload.js:238 lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "æ— æ•ˆæ–‡ä»¶å¤¹åã€‚â€œSharedâ€å·²ç»è¢«ç³»ç»Ÿä¿ç•™ã€‚"
 
 #: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
 #: js/files.js:693 js/files.js:731
@@ -118,9 +119,9 @@ msgstr "åˆ†äº«"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "æ°¸ä¹…åˆ é™¤"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "åˆ é™¤"
 
@@ -128,110 +129,105 @@ msgstr "åˆ é™¤"
 msgid "Rename"
 msgstr "é‡å‘½å"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ç‰å¾…ä¸"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²å˜åœ¨"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "æ›¿æ¢"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "æŽ¨èåç§°"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "å·²ç”¨ {old_name} æ›¿æ¢ {new_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
-msgstr ""
+msgstr "æ‰§è¡Œåˆ é™¤"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ "
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ "
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' æ–‡ä»¶åä¸æ£ç¡®"
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "æ–‡ä»¶åä¸èƒ½ä¸ºç©º"
 
 #: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "æ–‡ä»¶åå†…ä¸èƒ½åŒ…å«ä»¥ä¸‹ç¬¦å·ï¼š\\ / < > : \" | ?å’Œ *"
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "å®¹é‡å·²æ»¡ï¼Œä¸èƒ½å†åŒæ¥/ä¸Šä¼ æ–‡ä»¶äº†ï¼"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "ä½ çš„ç©ºé—´å¿«ç”¨æ»¡äº† ({usedSpacePercent}%)"
 
 #: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "æ£åœ¨ä¸‹è½½ï¼Œå¯èƒ½ä¼šèŠ±ç‚¹æ—¶é—´ï¼Œè·Ÿæ–‡ä»¶å¤§å°æœ‰å…³"
 
 #: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "ä¸æ£ç¡®æ–‡ä»¶å¤¹åã€‚Sharedæ˜¯ä¿ç•™åï¼Œä¸èƒ½ä½¿ç”¨ã€‚"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "åç§°"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ä¿®æ”¹æ—¥æœŸ"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 ä¸ªæ–‡ä»¶å¤¹"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 ä¸ªæ–‡ä»¶"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} ä¸ªæ–‡ä»¶"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "ä¸èƒ½é‡å‘½å %s"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -285,64 +281,64 @@ msgstr "æ–‡ä»¶å¤¹"
 msgid "From link"
 msgstr "æ¥è‡ªé“¾æŽ¥"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
-msgstr ""
+msgstr "å·²åˆ é™¤çš„æ–‡ä»¶"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
-msgstr ""
+msgstr "æ‚¨æ²¡æœ‰å†™å…¥æƒé™ã€‚"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "è¿™é‡Œæ²¡æœ‰ä¸œè¥¿.ä¸Šä¼ ç‚¹ä»€ä¹ˆ!"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "å–æ¶ˆåˆ†äº«"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "ä¸Šä¼ è¿‡å¤§"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ä½ æ£åœ¨è¯•å›¾ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†æ¤æœåŠ¡å™¨æ”¯æŒçš„æœ€å¤§çš„æ–‡ä»¶å¤§å°."
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "æ£åœ¨æ‰«ææ–‡ä»¶,è¯·ç¨å€™."
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "æ£åœ¨æ‰«æ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "æ–‡ä»¶å¤¹"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "æ–‡ä»¶å¤¹"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "æ–‡ä»¶"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "æ–‡ä»¶"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "å‡çº§ç³»ç»Ÿç¼“å˜..."
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index ea02882e9b7a1b197042d6910c32c42b39fdacb6..3521b46141c011746eb80e5b96160ded760ff17b 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 80d625bd0398883fa480c9fbc5af705656d0b5b3..b9c2d6f3ae66aa5fecc674add200f57c2b2ab740 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "è¯·æä¾›ä¸€ä¸ªæœ‰æ•ˆçš„ Dropbox app key å’Œ secretã€‚"
 msgid "Error configuring Google Drive storage"
 msgstr "é…ç½® Google Drive å˜å‚¨å¤±è´¥"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>æ³¨æ„ï¼š</b>â€œSMBå®¢æˆ·ç«¯â€æœªå®‰è£…ã€‚CIFS/SMBåˆ†äº«ä¸å¯ç”¨ã€‚è¯·å‘æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜è¯·æ±‚å®‰è£…è¯¥å®¢æˆ·ç«¯ã€‚"
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>æ³¨æ„ï¼š</b>PHPçš„FTPæ”¯æŒå°šæœªå¯ç”¨æˆ–æœªå®‰è£…ã€‚FTPåˆ†äº«ä¸å¯ç”¨ã€‚è¯·å‘æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜è¯·æ±‚å®‰è£…ã€‚"
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index d3937b1bc4591fec7c25e66c4c07da7c81832e07..3305b7fbbbde69afedc91da74e589d13f64f7229 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "å¯†ç "
 msgid "Submit"
 msgstr "æäº¤"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ä¸Žæ‚¨åˆ†äº«äº†æ–‡ä»¶å¤¹ %s"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ä¸Žæ‚¨åˆ†äº«äº†æ–‡ä»¶ %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ä¸Šä¼ "
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "æ²¡æœ‰é¢„è§ˆå¯ç”¨äºŽ"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index af9e71fbd00ff44c82a81b34d3f512ab9daa3305..2de2aefb281902e444984a53d5766c7b505e9d7e 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "å‡ºé”™"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
-msgstr ""
+msgstr "æ°¸ä¹…åˆ é™¤"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "åç§°"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 ä¸ªæ–‡ä»¶å¤¹"
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 ä¸ªæ–‡ä»¶"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} ä¸ªæ–‡ä»¶"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index c1ffcfb75c3dab5151c2d431feb2c4d8a1131d9d..209fa8559365e2afd53abf2424d223ff9ce6fb73 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "æ— æ³•æ¢å¤ï¼š%s"
 
-#: history.php:40
-msgid "success"
-msgstr "æˆåŠŸ"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "æ–‡ä»¶ %s å·²è¢«æ¢å¤ä¸º %s çš„ç‰ˆæœ¬"
-
-#: history.php:49
-msgid "failure"
-msgstr "å¤±è´¥"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "æ–‡ä»¶ %s æ— æ³•æ¢å¤ä¸º %s çš„ç‰ˆæœ¬"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ç‰ˆæœ¬"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "æ²¡æœ‰å¯ç”¨çš„æ—§ç‰ˆæœ¬"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "æœªæŒ‡å®šè·¯å¾„"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ç‰ˆæœ¬"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "è¯·ç‚¹å‡»â€œæ¢å¤â€æŒ‰é’®æŠŠæ–‡ä»¶æ¢å¤åˆ°æ—©å‰çš„ç‰ˆæœ¬"
+#: js/versions.js:149
+msgid "Restore"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 102195c499857afff28fb5a97aa1ae82d0ad07c5..7778e2a7cf9e59b0cdba0e13edc98a3573531a4b 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "ç”¨æˆ·"
 
 #: app.php:409
-msgid "Apps"
-msgstr "ç¨‹åº"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ç®¡ç†å‘˜"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "æ‚¨æŽ§åˆ¶çš„ç½‘ç»œæœåŠ¡"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è½½å·²å…³é—"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "éœ€è¦é€ä¸ªä¸‹è½½æ–‡ä»¶ã€‚"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "è¿”å›žåˆ°æ–‡ä»¶"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "é€‰æ‹©çš„æ–‡ä»¶å¤ªå¤§è€Œä¸èƒ½ç”Ÿæˆ zip æ–‡ä»¶ã€‚"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "å› WebDAVæŽ¥å£æ•…éšœï¼Œæ‚¨çš„ç½‘ç»œæœåŠ¡å™¨å¥½åƒå¹¶æœªå…è®¸æ–‡ä»¶åŒæ¥ã€‚"
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "è¯·åŒå‡»<a href='%s'>å®‰è£…å‘å¯¼</a>ã€‚"
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 åˆ†é’Ÿå‰"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d åˆ†é’Ÿå‰"
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1å°æ—¶å‰"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d å¤©å‰"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "ä¸Šä¸ªæœˆ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "å¹´å‰"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index ef962d5433acfee08fbd29ed29c88090d48cd83d..fe15fef6a9965ae3f5940aec30777c3008e686e5 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# hlx98007 <hlx98007@gmail.com>, 2013
+# Martin Liu <liuzh66@gmail.com>, 2013
 # hyy0591 <yangyu.huang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: Martin Liu <liuzh66@gmail.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,166 +172,173 @@ msgstr "è¯·å¡«å†™æœ‰æ•ˆå¯†ç "
 msgid "__language_name__"
 msgstr "Chinese"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "å®‰å…¨è¦å‘Š"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ‚¨çš„æ–‡ä»¶æˆ–è®¸èƒ½å¤Ÿä»Žäº’è”ç½‘è®¿é—®ã€‚ownCloud æä¾›çš„ .htaccesss æ–‡ä»¶æœªå…¶ä½œç”¨ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‚¨é…ç½®ç½‘ç»œæœåŠ¡å™¨ä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸èƒ½ä»Žäº’è”ç½‘è®¿é—®ï¼Œæˆ–å°†ç§»åŠ¨æ•°æ®æ–‡ä»¶å¤¹ç§»å‡ºç½‘ç»œæœåŠ¡å™¨æ–‡æ¡£æ ¹ç›®å½•ã€‚"
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "é…ç½®æ³¨æ„"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "å› WebDAVæŽ¥å£æ•…éšœï¼Œæ‚¨çš„ç½‘ç»œæœåŠ¡å™¨å¥½åƒå¹¶æœªå…è®¸æ–‡ä»¶åŒæ¥ã€‚"
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "è¯·åŒå‡»<a href='%s'>å®‰è£…å‘å¯¼</a>ã€‚"
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "æ¨¡å—â€œfileinfoâ€ä¸¢å¤±ã€‚"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHP æ¨¡å—â€œfileinfoâ€ä¸¢å¤±ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‰“å¼€æ¤æ¨¡å—æ¥èŽ·å¾— mine ç±»åž‹æ£€æµ‹çš„æœ€ä½³ç»“æžœã€‚"
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "åŒºåŸŸè®¾ç½®æœªè¿ä½œ"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "ownCloud æœåŠ¡å™¨ä¸èƒ½æŠŠç³»ç»ŸåŒºåŸŸè®¾ç½®åˆ° %sã€‚è¿™æ„å‘³ç€æ–‡ä»¶åå¯å†…å¯èƒ½å«æœ‰æŸäº›å¼•èµ·é—®é¢˜çš„å—ç¬¦ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨æ‚¨çš„ç³»ç»Ÿä¸Šå®‰è£…å¿…è¦çš„åŒ…æ¥æ”¯æŒâ€œ%sâ€ã€‚"
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr "ownCloud æœåŠ¡å™¨ä¸èƒ½æŠŠç³»ç»ŸåŒºåŸŸè®¾ç½®ä¸º %sã€‚è¿™æ„å‘³ç€æ–‡ä»¶åå¯å†…å¯èƒ½å«æœ‰æŸäº›å¼•èµ·é—®é¢˜çš„å—ç¬¦ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨æ‚¨çš„ç³»ç»Ÿä¸Šå®‰è£…å¿…è¦çš„åŒºåŸŸ/è¯è¨€æ”¯æŒåŒ…æ¥æ”¯æŒ â€œ%sâ€ ã€‚"
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "äº’è”ç½‘è¿žæŽ¥æœªè¿ä½œ"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr ""
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr "æœåŠ¡å™¨æ²¡æœ‰å¯ç”¨çš„Internetè¿žæŽ¥ã€‚è¿™æ„å‘³ç€åƒæŒ‚è½½å¤–éƒ¨å‚¨å˜ã€ç‰ˆæœ¬æ›´æ–°æç¤ºå’Œå®‰è£…ç¬¬ä¸‰æ–¹æ’ä»¶ç‰åŠŸèƒ½ä¼šå¤±æ•ˆã€‚è¿œç¨‹è®¿é—®æ–‡ä»¶å’Œå‘é€é‚®ä»¶æé†’ä¹Ÿå¯èƒ½ä¼šå¤±æ•ˆã€‚å¦‚æžœæ‚¨éœ€è¦è¿™äº›åŠŸèƒ½ï¼Œå»ºè®®å¼€å¯æœåŠ¡å™¨çš„è‹±ç‰¹ç½‘è¿žæŽ¥ã€‚"
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "åœ¨æ¯ä¸ªé¡µé¢è½½å…¥æ—¶æ‰§è¡Œä¸€é¡¹ä»»åŠ¡"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php å·²ä½œä¸º webcron æœåŠ¡æ³¨å†Œã€‚owncloud æ ¹ç”¨æˆ·å°†é€šè¿‡ http åè®®æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ cron.phpã€‚"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php å·²ä½œä¸º webcron æœåŠ¡æ³¨å†Œã€‚owncloud å°†é€šè¿‡ http åè®®æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ cron.phpã€‚"
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr "ä½¿ç”¨ç³»ç»Ÿ cron æœåŠ¡ã€‚é€šè¿‡ç³»ç»Ÿ cronjob æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ owncloud æ–‡ä»¶å¤¹ä¸‹çš„ cron.php"
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "åˆ†äº«"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "å¼€å¯åˆ†äº«API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "å…è®¸åº”ç”¨ä½¿ç”¨åˆ†äº«API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "å…è®¸é“¾æŽ¥"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "å…è®¸ç”¨æˆ·é€šè¿‡é“¾æŽ¥å…±äº«å†…å®¹"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "å…è®¸å…¬ä¼—è´¦æˆ·ä¸Šä¼ "
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "å…è®¸å…¶å®ƒäººå‘ç”¨æˆ·çš„å…¬ä¼—å…±äº«æ–‡ä»¶å¤¹é‡Œä¸Šä¼ æ–‡ä»¶"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "å…è®¸è½¬å¸–"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "å…è®¸ç”¨æˆ·å†æ¬¡å…±äº«å·²å…±äº«çš„å†…å®¹"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "å…è®¸ç”¨æˆ·å‘ä»»ä½•äººåˆ†äº«"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "åªå…è®¸ç”¨æˆ·å‘æ‰€åœ¨ç¾¤ç»„ä¸çš„å…¶ä»–ç”¨æˆ·åˆ†äº«"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "å®‰å…¨"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "å¼ºåˆ¶HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥ä¸ŽownCloudè¿žæŽ¥"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥ä¸Ž%sè¿žæŽ¥"
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "è¯·é€šè¿‡HTTPSåè®®è¿žæŽ¥åˆ° %sï¼Œéœ€è¦å¯ç”¨æˆ–è€…ç¦æ¢å¼ºåˆ¶SSLçš„å¼€å…³ã€‚"
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "æ—¥å¿—"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
-msgstr ""
+msgstr "æ—¥å¿—ç‰çº§"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "æ›´å¤š"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "ç‰ˆæœ¬"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -387,77 +396,77 @@ msgstr "Bugè¿½è¸ªè€…"
 msgid "Commercial Support"
 msgstr "å•†ä¸šæ”¯æŒ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "èŽ·å–åº”ç”¨å¹¶åŒæ¥æ‚¨çš„æ–‡ä»¶"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "å†æ¬¡æ˜¾ç¤ºé¦–æ¬¡è¿è¡Œå‘å¯¼"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "æ‚¨å·²ä½¿ç”¨<strong>%s</strong>/<strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "å¯†ç "
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "æ‚¨çš„å¯†ç ä»¥å˜æ›´"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ä¸èƒ½æ”¹å˜ä½ çš„å¯†ç "
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "çŽ°åœ¨çš„å¯†ç "
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "æ–°å¯†ç "
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "æ”¹å˜å¯†ç "
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "æ˜¾ç¤ºåç§°"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "ç”µåé‚®ä»¶"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "ä½ çš„emailåœ°å€"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "è¾“å…¥ä¸€ä¸ªé‚®ç®±åœ°å€ä»¥æ¿€æ´»å¯†ç æ¢å¤åŠŸèƒ½"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "è¯è¨€"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "å¸®åŠ©ç¿»è¯‘"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "è®¿é—®WebDAVè¯·ç‚¹å‡» <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">æ¤å¤„</a>"
 
 #: templates/users.php:21
 msgid "Login Name"
@@ -469,13 +478,13 @@ msgstr "æ–°å»º"
 
 #: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "ç®¡ç†å‘˜æ¢å¤å¯†ç "
 
 #: templates/users.php:37 templates/users.php:38
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "åœ¨æ¢å¤å¯†ç çš„è¿‡ç¨‹ä¸è¯·è¾“å…¥æ¢å¤å¯†é’¥æ¥æ¢å¤ç”¨æˆ·æ•°æ®"
 
 #: templates/users.php:42
 msgid "Default Storage"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 41be1e402feed50f9cc654ce05ebd4801ee84b17..004d02f98a0a0866b924af06861851b72898fee6 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,10 +241,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "å…³é— SSL è¯ä¹¦æ ¡éªŒã€‚"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "å¦‚æžœåªæœ‰ä½¿ç”¨æ¤é€‰é¡¹æ‰èƒ½è¿žæŽ¥ï¼Œè¯·å¯¼å…¥ LDAP æœåŠ¡å™¨çš„ SSL è¯ä¹¦åˆ°æ‚¨çš„ ownCloud æœåŠ¡å™¨ã€‚"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -267,8 +268,8 @@ msgid "User Display Name Field"
 msgstr "ç”¨æˆ·æ˜¾ç¤ºåç§°å—æ®µ"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ç”¨äºŽç”Ÿæˆç”¨æˆ·çš„ ownCloud åç§°çš„ LDAP å±žæ€§ã€‚"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -291,8 +292,8 @@ msgid "Group Display Name Field"
 msgstr "ç¾¤ç»„æ˜¾ç¤ºåç§°å—æ®µ"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ç”¨äºŽç”Ÿæˆç¾¤ç»„çš„ ownCloud åç§°çš„ LDAP å±žæ€§ã€‚"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 0956f14fc261c1b22098e394d31bee65640a3dd8..042d9edc6b1fe179ee179e7f61b78c8aeeae2262 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index c7712f8ea80ce51b147ac6356c0d700259c437b0..e77bfe2828edba62ff0136fe493ec2f3ef6c5e21 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -139,59 +139,55 @@ msgstr "åä¸€æœˆ"
 msgid "December"
 msgstr "åäºŒæœˆ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "ä¸€åˆ†é’Ÿå‰"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} åˆ†é’Ÿå‰"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1å°æ—¶å‰"
-
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} å°æ—¶å‰"
-
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} å¤©å‰"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "ä¸Šæœˆ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} æœˆå‰"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "å¹´å‰"
 
@@ -227,8 +223,8 @@ msgstr "æœªæŒ‡å®šå¯¹è±¡ç±»åž‹ã€‚"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "é”™è¯¯"
 
@@ -248,140 +244,141 @@ msgstr "å·²å…±äº«"
 msgid "Share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "å…±äº«æ—¶å‡ºé”™"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆå…±äº«æ—¶å‡ºé”™"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "ä¿®æ”¹æƒé™æ—¶å‡ºé”™"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} å…±äº«ç»™æ‚¨åŠ {group} ç»„"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} ä¸Žæ‚¨å…±äº«"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "åˆ†äº«ä¹‹"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "å…±äº«é“¾æŽ¥"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "å¯†ç "
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr "å…è®¸å…¬å¼€ä¸Šä¼ "
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "å‘é€é“¾æŽ¥åˆ°ä¸ªäºº"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "å‘é€"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "è®¾ç½®è¿‡æœŸæ—¥æœŸ"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "è¿‡æœŸæ—¥æœŸ"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "é€šè¿‡Emailå…±äº«"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "æœªæ‰¾åˆ°æ¤äºº"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è®¸äºŒæ¬¡å…±äº«"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "åœ¨ {item} ä¸Ž {user} å…±äº«ã€‚"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "å¯ä»¥ä¿®æ”¹"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "è®¿é—®æŽ§åˆ¶"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "åˆ›å»º"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "åˆ é™¤"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "å…±äº«"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "å¯†ç å·²å—ä¿æŠ¤"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "å–æ¶ˆè®¾ç½®è¿‡æœŸæ—¥æœŸæ—¶å‡ºé”™"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "è®¾ç½®è¿‡æœŸæ—¥æœŸæ—¶å‡ºé”™"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "æ£åœ¨å‘é€..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "é‚®ä»¶å·²å‘é€"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "æ›´æ–°ä¸æˆåŠŸã€‚è¯·æ±‡æŠ¥å°†æ¤é—®é¢˜æ±‡æŠ¥ç»™  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ç¤¾åŒº</a>ã€‚"
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "æ›´æ–°æˆåŠŸã€‚æ£åœ¨é‡å®šå‘è‡³ ownCloudã€‚"
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "é‡ç½® ownCloud å¯†ç "
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -402,7 +399,7 @@ msgstr "è¯·æ±‚å¤±è´¥<br>æ‚¨ç¡®å®šæ‚¨çš„é‚®ç®±/ç”¨æˆ·åæ˜¯æ£ç¡®çš„ï¼Ÿ"
 msgid "You will receive a link to reset your password via Email."
 msgstr "æ‚¨å°†ä¼šæ”¶åˆ°åŒ…å«å¯ä»¥é‡ç½®å¯†ç é“¾æŽ¥çš„é‚®ä»¶ã€‚"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ç”¨æˆ·å"
@@ -463,11 +460,11 @@ msgstr "å¸®åŠ©"
 msgid "Access forbidden"
 msgstr "è®¿é—®ç¦æ¢"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "æœªæ‰¾åˆ°äº‘"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -496,8 +493,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "ä½ çš„PHPç‰ˆæœ¬å®¹æ˜“å—åˆ°ç©ºå—èŠ‚æ”»å‡» (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "ä¸ºä¿è¯å®‰å…¨ä½¿ç”¨ ownCloud è¯·æ›´æ–°æ‚¨çš„PHPã€‚"
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +515,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "æ‚¨çš„æ•°æ®ç›®å½•å’Œæ–‡ä»¶å¯èƒ½å¯ä»¥ç›´æŽ¥è¢«äº’è”ç½‘è®¿é—®ï¼Œå› ä¸º .htaccess å¹¶æœªæ£å¸¸å·¥ä½œã€‚"
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "å…³äºŽå¦‚ä½•é…ç½®æœåŠ¡å™¨ï¼Œè¯·å‚è§ <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">æ¤æ–‡æ¡£</a>ã€‚"
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "åˆ›å»º<strong>ç®¡ç†å‘˜è´¦å·</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "é«˜çº§"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "æ•°æ®ç›®å½•"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "é…ç½®æ•°æ®åº“"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "å°†è¢«ä½¿ç”¨"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "æ•°æ®åº“ç”¨æˆ·"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "æ•°æ®åº“å¯†ç "
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "æ•°æ®åº“å"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "æ•°æ®åº“è¡¨ç©ºé—´"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "æ•°æ®åº“ä¸»æœº"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "å®‰è£…å®Œæˆ"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s å¯ç”¨ã€‚èŽ·å–æ›´å¤šå…³äºŽå¦‚ä½•å‡çº§çš„ä¿¡æ¯ã€‚"
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "æ³¨é”€"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "è‡ªåŠ¨ç™»å½•è¢«æ‹’ç»ï¼"
@@ -609,7 +611,7 @@ msgstr "ç™»å½•"
 msgid "Alternative Logins"
 msgstr "å…¶ä»–ç™»å½•æ–¹å¼"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 3369dd9261ecaf4a8a050c47a19d33f58c146129..f4150ed72cea44a5c05ff487b04bfcbc4ea82403 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -123,7 +123,7 @@ msgstr "åˆ†äº«"
 msgid "Delete permanently"
 msgstr "æ°¸ä¹…åˆ é™¤"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "åˆ é™¤"
 
@@ -131,43 +131,44 @@ msgstr "åˆ é™¤"
 msgid "Rename"
 msgstr "é‡å‘½å"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ç‰å¾…"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²å˜åœ¨"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "æ›¿æ¢"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "å»ºè®®åç§°"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "å·²å°† {old_name}æ›¿æ¢æˆ {new_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "è¿›è¡Œåˆ é™¤æ“ä½œ"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "æ–‡ä»¶ä¸Šä¼ ä¸"
 
@@ -203,33 +204,27 @@ msgstr "ä¸‹è½½æ£åœ¨å‡†å¤‡ä¸ã€‚å¦‚æžœæ–‡ä»¶è¾ƒå¤§å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "æ— æ•ˆæ–‡ä»¶å¤¹åã€‚'å…±äº«' æ˜¯ Owncloud é¢„ç•™çš„æ–‡ä»¶å¤¹åã€‚"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "åç§°"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ä¿®æ”¹æ—¥æœŸ"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1ä¸ªæ–‡ä»¶å¤¹"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 ä¸ªæ–‡ä»¶"
-
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} ä¸ªæ–‡ä»¶"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -288,61 +283,61 @@ msgstr "æ–‡ä»¶å¤¹"
 msgid "From link"
 msgstr "æ¥è‡ªé“¾æŽ¥"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "å·²åˆ é™¤æ–‡ä»¶"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "æ‚¨æ²¡æœ‰å†™æƒé™"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "ä¸Šä¼ æ–‡ä»¶è¿‡å¤§"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "æ‚¨æ£å°è¯•ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†æ¤æœåŠ¡å™¨å¯ä»¥ä¸Šä¼ çš„æœ€å¤§å®¹é‡é™åˆ¶"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "æ–‡ä»¶æ£åœ¨è¢«æ‰«æï¼Œè¯·ç¨å€™ã€‚"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "å½“å‰æ‰«æ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr "æ–‡ä»¶"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr "æ–‡ä»¶"
 
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 08588336e19018a604d6cdff64fcc09147a876bb..14f2685c7bdb765730cc4a19fac5bb7646d4637a 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -70,9 +70,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index ecd6e75ec781b069b9d270b3cfea634bc4bb2254..10f2bcf69e32dbcb43470990e2a5cc2ab6d28676 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr "è¯·æä¾›æœ‰æ•ˆçš„Dropboxåº”ç”¨keyå’Œsecret"
 msgid "Error configuring Google Drive storage"
 msgstr "é…ç½®Google Driveå˜å‚¨æ—¶å‡ºé”™"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>è¦å‘Šï¼š</b>â€œsmbclientâ€ å°šæœªå®‰è£…ã€‚CIFS/SMB åˆ†äº«æŒ‚è½½æ— æ³•å®žçŽ°ã€‚è¯·å’¨è¯¢ç³»ç»Ÿç®¡ç†å‘˜è¿›è¡Œå®‰è£…ã€‚"
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>è¦å‘Šï¼š</b>PHPä¸å°šæœªå¯ç”¨æˆ–å®‰è£…FTPã€‚FTP åˆ†äº«æŒ‚è½½æ— æ³•å®žçŽ°ã€‚è¯·å’¨è¯¢ç³»ç»Ÿç®¡ç†å‘˜è¿›è¡Œå®‰è£…ã€‚"
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 8d117a803de55963f97c7cbfb85168869fb76fad..013eee53c4edfc0a49c0031c575261320137b500 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "å¯†ç "
 msgid "Submit"
 msgstr "æäº¤"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sä¸Žæ‚¨å…±äº«äº†%sæ–‡ä»¶å¤¹"
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sä¸Žæ‚¨å…±äº«äº†%sæ–‡ä»¶"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ä¸Šä¼ "
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "æ²¡æœ‰é¢„è§ˆ"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 2c32c404c52fdeef99b33d3fd3c0d5cc28e95c46..9be866b5f3edded6f62e38052f36f5135db0b5fc 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr "æ— æ³•å½»åº•åˆ é™¤æ–‡ä»¶%s"
 msgid "Couldn't restore %s"
 msgstr "æ— æ³•æ¢å¤%s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "æ‰§è¡Œæ¢å¤æ“ä½œ"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "å½»åº•åˆ é™¤æ–‡ä»¶"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "æ°¸ä¹…åˆ é™¤"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "åç§°"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "å·²åˆ é™¤"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1ä¸ªæ–‡ä»¶å¤¹"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 ä¸ªæ–‡ä»¶"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} ä¸ªæ–‡ä»¶"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index cc566f1c466708570f2e8bf1464ce60bf366a428..e94009a873f3947e81801dd68b251729e0ef44e2 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "æ— æ³•æ¢å¤: %s"
 
-#: history.php:40
-msgid "success"
-msgstr "æˆåŠŸ"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "æ–‡ä»¶ %s å·²è¢«æ¢å¤åˆ°åŽ†å²ç‰ˆæœ¬ %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "å¤±è´¥"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "æ–‡ä»¶ %s æ— æ³•è¢«æ¢å¤åˆ°åŽ†å²ç‰ˆæœ¬ %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ç‰ˆæœ¬"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "è¯¥æ–‡ä»¶æ²¡æœ‰åŽ†å²ç‰ˆæœ¬"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "æœªæŒ‡å®šè·¯å¾„"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ç‰ˆæœ¬"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "ç‚¹å‡»æ¢å¤æŒ‰é’®å¯å°†æ–‡ä»¶æ¢å¤åˆ°ä¹‹å‰çš„ç‰ˆæœ¬"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "æ¢å¤"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index e963d4dbe3e4b9c0d61b4987317eb4278caeee2a..79efb5ea2f005e5687482e2c032ddac6f9f4b6b4 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "ç”¨æˆ·"
 
 #: app.php:409
-msgid "Apps"
-msgstr "åº”ç”¨"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "æ‚¨æŽ§åˆ¶çš„webæœåŠ¡"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è½½å·²ç»å…³é—"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "éœ€è¦é€ä¸€ä¸‹è½½æ–‡ä»¶"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "å›žåˆ°æ–‡ä»¶"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "é€‰æ‹©çš„æ–‡ä»¶å¤ªå¤§ï¼Œæ— æ³•ç”Ÿæˆ zip æ–‡ä»¶ã€‚"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "æ— æ³•ç¡®å®š"
 
@@ -171,77 +183,73 @@ msgstr "å†²çªå‘½ä»¤ä¸ºï¼š\"%s\"ï¼Œåç§°ï¼š%sï¼Œå¯†ç ï¼š%s"
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL æ•°æ®åº“ç”¨æˆ·åå’Œ/æˆ–å¯†ç æ— æ•ˆ"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "è¯·è®¾ç½®ä¸€ä¸ªç®¡ç†å‘˜ç”¨æˆ·åã€‚"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "è¯·è®¾ç½®ä¸€ä¸ªç®¡ç†å‘˜å¯†ç ã€‚"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "æ‚¨çš„WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…è®¸æ–‡ä»¶åŒæ¥, å› ä¸ºWebDAVçš„æŽ¥å£ä¼¼ä¹Žå·²æŸå."
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "è¯·è®¤çœŸæ£€æŸ¥<a href='%s'>å®‰è£…æŒ‡å—</a>."
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "ä¸€åˆ†é’Ÿå‰"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d åˆ†é’Ÿå‰"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1å°æ—¶å‰"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%då°æ—¶å‰"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d å¤©å‰"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "ä¸Šæœˆ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d æœˆå‰"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "å¹´å‰"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index eef9265b25c968ef724501700029c2d8a65a7b47..d196a8a788fde25785169348af36646449b431d6 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -172,166 +172,173 @@ msgstr "å¿…é¡»æä¾›åˆæ³•çš„å¯†ç "
 msgid "__language_name__"
 msgstr "ç®€ä½“ä¸æ–‡"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "å®‰å…¨è¦å‘Š"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
-msgstr "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ–‡ä»¶å¯ç”±äº’è”ç½‘è®¿é—®ã€‚OwnCloudæä¾›çš„.htaccessæ–‡ä»¶æœªç”Ÿæ•ˆã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‚¨é…ç½®æœåŠ¡å™¨ï¼Œä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸å¯è¢«è®¿é—®ï¼Œæˆ–è€…å°†æ•°æ®æ–‡ä»¶å¤¹ç§»åˆ°webæœåŠ¡å™¨æ ¹ç›®å½•ä»¥å¤–ã€‚"
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "è®¾ç½®è¦å‘Š"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "æ‚¨çš„WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…è®¸æ–‡ä»¶åŒæ¥, å› ä¸ºWebDAVçš„æŽ¥å£ä¼¼ä¹Žå·²æŸå."
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "è¯·è®¤çœŸæ£€æŸ¥<a href='%s'>å®‰è£…æŒ‡å—</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "æ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "PHPæ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±. æˆ‘ä»¬å¼ºçƒˆå»ºè®®å¯ç”¨æ¤æ¨¡å—ä»¥ä¾¿mimeç±»åž‹æ£€æµ‹å–å¾—æœ€ä½³ç»“æžœ."
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "æœ¬åœ°åŒ–æ— æ³•å·¥ä½œ"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
-msgstr "æ¤ownCloudæœåŠ¡å™¨æ— æ³•è®¾ç½®ç³»ç»Ÿæœ¬åœ°åŒ–åˆ°%s. è¿™æ„å‘³ç€å¯èƒ½æ–‡ä»¶åä¸æœ‰ä¸€äº›å—ç¬¦å¼•èµ·é—®é¢˜. æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨ä½ ç³»ç»Ÿä¸Šå®‰è£…æ‰€éœ€çš„è½¯ä»¶åŒ…æ¥æ”¯æŒ%s"
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
+msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr "å› ç‰¹ç½‘è¿žæŽ¥æ— æ³•å·¥ä½œ"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
-msgstr "æ¤ownCloudæœåŠ¡å™¨ä¸Šæ²¡æœ‰å¯ç”¨çš„å› ç‰¹ç½‘è¿žæŽ¥. è¿™æ„å‘³ç€æŸäº›ç‰¹æ€§ä¾‹å¦‚æŒ‚è½½å¤–éƒ¨å˜å‚¨å™¨, æé†’æ›´æ–°æˆ–å®‰è£…ç¬¬ä¸‰æ–¹åº”ç”¨æ— æ³•å·¥ä½œ. ä»Žè¿œç¨‹è®¿é—®æ–‡ä»¶å’Œå‘é€æé†’ç”µåé‚®ä»¶å¯èƒ½ä¹Ÿæ— æ³•å·¥ä½œ. å¦‚æžœä½ æƒ³è¦ownCloudçš„æ‰€æœ‰ç‰¹æ€§, æˆ‘ä»¬å»ºè®®å¯ç”¨æ¤æœåŠ¡å™¨çš„å› ç‰¹ç½‘è¿žæŽ¥."
-
-#: templates/admin.php:94
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:92
 msgid "Cron"
 msgstr "è®¡åˆ’ä»»åŠ¡"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "æ¯ä¸ªé¡µé¢åŠ è½½åŽæ‰§è¡Œä¸€ä¸ªä»»åŠ¡"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.phpå·²è¢«æ³¨å†Œåˆ°ç½‘ç»œå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚é€šè¿‡httpæ¯åˆ†é’Ÿè°ƒç”¨owncloudæ ¹ç›®å½•çš„cron.phpç½‘é¡µã€‚"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "ä½¿ç”¨ç³»ç»Ÿå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚æ¯åˆ†é’Ÿé€šè¿‡ç³»ç»Ÿå®šæ—¶ä»»åŠ¡è°ƒç”¨owncloudæ–‡ä»¶å¤¹ä¸çš„cron.phpæ–‡ä»¶"
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "å…±äº«"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "å¯ç”¨å…±äº«API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "å…è®¸åº”ç”¨è½¯ä»¶ä½¿ç”¨å…±äº«API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "å…è®¸é“¾æŽ¥"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr "å…è®¸ç”¨æˆ·ä½¿ç”¨è¿žæŽ¥å…¬å¼€å…±äº«é¡¹ç›®"
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "å…è®¸å†æ¬¡å…±äº«"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "å…è®¸ç”¨æˆ·å°†å…±äº«ç»™ä»–ä»¬çš„é¡¹ç›®å†æ¬¡å…±äº«"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "å…è®¸ç”¨æˆ·å‘ä»»ä½•äººå…±äº«"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "å…è®¸ç”¨æˆ·åªå‘åŒç»„ç”¨æˆ·å…±äº«"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "å®‰å…¨"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "å¼ºåˆ¶ä½¿ç”¨ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥è¿žæŽ¥åˆ° ownCloudã€‚"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "è¯·ç»ç”±HTTPSè¿žæŽ¥åˆ°è¿™ä¸ªownCloudå®žä¾‹æ¥å¯ç”¨æˆ–ç¦ç”¨å¼ºåˆ¶SSL."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "æ—¥å¿—"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "æ—¥å¿—çº§åˆ«"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "æ›´å¤š"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "ç‰ˆæœ¬"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -389,72 +396,72 @@ msgstr "é—®é¢˜è·Ÿè¸ªå™¨"
 msgid "Commercial Support"
 msgstr "å•†ä¸šæ”¯æŒ"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "å®‰è£…åº”ç”¨è¿›è¡Œæ–‡ä»¶åŒæ¥"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "å†æ¬¡æ˜¾ç¤ºé¦–æ¬¡è¿è¡Œå‘å¯¼"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "ä½ å·²ä½¿ç”¨ <strong>%s</strong>ï¼Œæœ‰æ•ˆç©ºé—´ <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "å¯†ç "
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "å¯†ç å·²ä¿®æ”¹"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "æ— æ³•ä¿®æ”¹å¯†ç "
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "å½“å‰å¯†ç "
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "æ–°å¯†ç "
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "ä¿®æ”¹å¯†ç "
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "æ˜¾ç¤ºåç§°"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "ç”µåé‚®ä»¶"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "æ‚¨çš„ç”µåé‚®ä»¶"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "å¡«å†™ç”µåé‚®ä»¶åœ°å€ä»¥å¯ç”¨å¯†ç æ¢å¤åŠŸèƒ½"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "è¯è¨€"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "å¸®åŠ©ç¿»è¯‘"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index e0cf39b20778c8194d8f56c2f8ea4ab306f87b42..97f474b31665e968558877abb1504b90f495907d 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: modokwang <modokwang@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +89,9 @@ msgstr "ç¡®è®¤åˆ é™¤"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>è¦å‘Šï¼š</b>åº”ç”¨ user_ldap å’Œ user_webdavauth ä¸å…¼å®¹ã€‚æ‚¨å¯èƒ½éé‡æœªé¢„æ–™çš„è¡Œä¸ºã€‚è¯·åž‚è¯¢æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜ç¦ç”¨å…¶ä¸ä¸€ä¸ªã€‚"
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "ç¦ç”¨ä¸»æœåŠ¡å™¨"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "å½“å¼€å¯åŽï¼ŒownCloud å°†ä»…è¿žæŽ¥åˆ°é•œåƒæœåŠ¡å™¨ã€‚"
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "å…³é—SSLè¯ä¹¦éªŒè¯"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "å¦‚æžœé“¾æŽ¥ä»…åœ¨æ¤é€‰é¡¹æ—¶å¯ç”¨ï¼Œåœ¨æ‚¨çš„ownCloudæœåŠ¡å™¨ä¸å¯¼å…¥LDAPæœåŠ¡å™¨çš„SSLè¯ä¹¦ã€‚"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "ç”¨æˆ·æ˜¾ç¤ºåç§°å—æ®µ"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ç”¨æ¥ç”Ÿæˆç”¨æˆ·çš„ownCloudåç§°çš„ LDAPå±žæ€§"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,8 +293,8 @@ msgid "Group Display Name Field"
 msgstr "ç»„æ˜¾ç¤ºåç§°å—æ®µ"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "ç”¨æ¥ç”Ÿæˆç»„çš„ownCloudåç§°çš„LDAPå±žæ€§"
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
 
 #: templates/settings.php:87
 msgid "Base Group Tree"
@@ -353,13 +354,13 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr "é»˜è®¤æƒ…å†µä¸‹å†…éƒ¨ç”¨æˆ·åå…·æœ‰å”¯ä¸€è¯†åˆ«å±žæ€§æ¥ç¡®ä¿ç”¨æˆ·åçš„å”¯ä¸€æ€§å’Œå±žæ€§ä¸ç”¨è½¬æ¢ã€‚å†…éƒ¨ç”¨æˆ·åæœ‰ä¸¥æ ¼çš„å—ç¬¦é™åˆ¶ï¼Œåªå…è®¸ä½¿ç”¨ [ a-zA-Z0-9_.@- ]ã€‚å…¶ä»–å—ç¬¦ä¼šè¢«ASCIIç å–ä»£æˆ–è€…è¢«æ´»åŠ›ã€‚å½“å†²çªæ—¶ä¼šå¢žåŠ æˆ–è€…å‡å°‘ä¸€ä¸ªæ•°å—ã€‚å†…éƒ¨ç”¨æˆ·åè¢«ç”¨äºŽå†…éƒ¨è¯†åˆ«ç”¨æˆ·ï¼ŒåŒæ—¶ä¹Ÿä½œä¸ºownCloudä¸ç”¨æˆ·æ ¹æ–‡ä»¶å¤¹çš„é»˜è®¤åã€‚ä¹Ÿä½œä¸ºè¿œç¨‹URLsçš„ä¸€éƒ¨åˆ†ï¼Œæ¯”å¦‚ä¸ºäº†æ‰€æœ‰çš„*DAVæœåŠ¡ã€‚åœ¨è¿™ç§è®¾ç½®ä¸‹ï¼Œé»˜è®¤è¡Œä¸ºå¯ä»¥è¢«è¶…è¶Šã€‚å®žçŽ°ä¸€ä¸ªç±»ä¼¼çš„è¡Œä¸ºï¼Œowncloud 5è¾“å…¥ç”¨æˆ·çš„æ˜¾ç¤ºåç§°å±žæ€§åœ¨ä»¥ä¸‹é¢†åŸŸä¹‹å‰ã€‚è®©å®ƒç©ºç€çš„é»˜è®¤è¡Œä¸ºã€‚æ›´æ”¹åªå¯¹æ–°æ˜ å°„çš„å½±å“ï¼ˆå¢žåŠ ï¼‰çš„LDAPç”¨æˆ·ã€‚"
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
@@ -371,14 +372,14 @@ msgstr "è¶…è¶ŠUUIDæ£€æµ‹"
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "é»˜è®¤ownCloudè‡ªåŠ¨æ£€æµ‹UUIDå±žæ€§ã€‚UUIDå±žæ€§ç”¨æ¥æ— è¯¯çš„è¯†åˆ«LDAPç”¨æˆ·å’Œç»„ã€‚åŒæ—¶å†…éƒ¨ç”¨æˆ·åä¹ŸåŸºäºŽUUIDåˆ›å»ºï¼Œå¦‚æžœæ²¡æœ‰ä¸Šè¿°çš„æŒ‡å®šã€‚ä¹Ÿå¯ä»¥è¶…è¶Šè®¾ç½®ç›´æŽ¥æŒ‡å®šä¸€ç§å±žæ€§ã€‚ä½†ä¸€å®šè¦ç¡®ä¿æŒ‡å®šçš„å±žæ€§å–å¾—çš„ç”¨æˆ·å’Œç»„æ˜¯å”¯ä¸€çš„ã€‚é»˜è®¤è¡Œä¸ºç©ºã€‚å˜æ›´åŸºäºŽæ–°æ˜ å°„(å¢žåŠ )LDAPç”¨æˆ·å’Œç»„æ‰ä¼šç”Ÿæ•ˆã€‚"
+msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
@@ -390,18 +391,17 @@ msgstr "ç”¨æˆ·å-LDAPç”¨æˆ·æ˜ å°„"
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr "ownCloudä½¿ç”¨ç”¨æˆ·åå˜å‚¨å’Œåˆ†é…æ•°æ®(å…ƒ)ã€‚ä¸ºäº†å‡†ç¡®åœ°è¯†åˆ«å’Œç¡®è®¤ç”¨æˆ·ï¼Œæ¯ä¸ªç”¨æˆ·éƒ½æœ‰ä¸€ä¸ªå†…éƒ¨ç”¨æˆ·åã€‚éœ€è¦ä»ŽownCloudç”¨æˆ·åæ˜ å°„åˆ°LDAPç”¨æˆ·ã€‚åˆ›å»ºçš„ç”¨æˆ·åæ˜ å°„åˆ°LDAPç”¨æˆ·çš„UUIDã€‚æ¤å¤–ï¼ŒDNæ˜¯ç¼“å˜ä»¥åŠå‡å°‘LDAPäº¤äº’ï¼Œä½†å®ƒä¸ç”¨äºŽè¯†åˆ«ã€‚å¦‚æžœDNå˜åŒ–ï¼ŒownCloudä¹Ÿä¼šå˜åŒ–ã€‚å†…éƒ¨ownCloudååœ¨ownCloudçš„å„å¤„ä½¿ç”¨ã€‚æ¸…é™¤æ˜ å°„å°†ä¸€ç‰‡æ··ä¹±ã€‚æ¸…é™¤æ˜ å°„ä¸æ˜¯å¸¸ç”¨çš„é…ç½®ï¼Œå®ƒå½±å“åˆ°æ‰€æœ‰LDAPé…ç½®ï¼åƒä¸‡ä¸è¦åœ¨æ£å¼çŽ¯å¢ƒä¸æ¸…é™¤æ˜ å°„ã€‚åªæœ‰åœ¨æµ‹è¯•æˆ–è¯•éªŒé˜¶æ®µå¯ä»¥æ¸…é™¤æ˜ å°„ã€‚"
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index 403b5b0582243009398ebe09cf9c8d941e404853..c3a8727e4b6eeec499f850ccf695f574637536f2 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-02 15:33+0200\n"
-"PO-Revision-Date: 2013-07-01 08:00+0000\n"
-"Last-Translator: modokwang <modokwang@gmail.com>\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,12 +27,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV è®¤è¯"
 
 #: templates/settings.php:4
-msgid "URL: "
-msgstr "åœ°å€ï¼š"
+msgid "Address: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud å°†ä¼šå‘é€ç”¨æˆ·çš„èº«ä»½åˆ°æ¤ URLã€‚è¿™ä¸ªæ’ä»¶æ£€æŸ¥è¿”å›žå€¼å¹¶ä¸”å°† HTTP çŠ¶æ€ç¼–ç  401 å’Œ 403 è§£é‡Šä¸ºéžæ³•èº«ä»½ï¼Œå…¶ä»–æ‰€æœ‰è¿”å›žå€¼ä¸ºåˆæ³•èº«ä»½ã€‚"
+msgstr ""
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 39165531907b7b6e762757f917e99e14bad119a2..8c3d1f0833b561e272d033ce6dc22f75b3e40a70 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "åä¸€æœˆ"
 msgid "December"
 msgstr "åäºŒæœˆ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ä»Šæ—¥"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "æ˜¨æ—¥"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "å‰ä¸€æœˆ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "å€‹æœˆä¹‹å‰"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr ""
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr ""
 
@@ -225,8 +221,8 @@ msgstr ""
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "éŒ¯èª¤"
 
@@ -246,139 +242,140 @@ msgstr "å·²åˆ†äº«"
 msgid "Share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "åˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆåˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "æ›´æ”¹æ¬Šé™æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}èˆ‡ä½ åŠç¾¤çµ„çš„åˆ†äº«"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner}èˆ‡ä½ çš„åˆ†äº«"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "åˆ†äº«"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "ä»¥é€£çµåˆ†äº«"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "å¯†ç¢¼ä¿è·"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "å‚³é€"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "è¨å®šåˆ†äº«æœŸé™"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "åˆ†äº«æœŸé™"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "ä»¥é›»éƒµåˆ†äº«"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "æ‰¾ä¸åˆ°"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "å–æ¶ˆåˆ†äº«"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr ""
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "æ–°å¢ž"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "åˆªé™¤"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "å¯†ç¢¼ä¿è·"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "å‚³é€ä¸"
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "éƒµä»¶å·²å‚³"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr ""
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "æ›´æ–°æˆåŠŸ, æ£"
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -400,7 +397,7 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "ä½ å°‡æ”¶åˆ°ä¸€å°é›»éƒµ"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ç”¨æˆ¶åç¨±"
@@ -461,11 +458,11 @@ msgstr "å¹«åŠ©"
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "æœªæ‰¾åˆ°Cloud"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -494,7 +491,8 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr ""
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
 msgstr ""
 
 #: templates/installation.php:32
@@ -515,68 +513,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "å»ºç«‹ç®¡ç†å“¡å¸³æˆ¶"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "é€²éšŽ"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "è¨å®šè³‡æ–™åº«"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "å°‡è¢«ä½¿ç”¨"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "è³‡æ–™åº«å¸³æˆ¶"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "è³‡æ–™åº«å¯†ç¢¼"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "è³‡æ–™åº«åç¨±"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ç™»å‡º"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "è‡ªå‹•ç™»å…¥è¢«æ‹’"
@@ -607,7 +609,7 @@ msgstr "ç™»å…¥"
 msgid "Alternative Logins"
 msgstr ""
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 626cb534d481a1092b3457a5ff54abbb9b21b882..32ba5c844bfcd4688ee82f76a3a6b49fd5794eed 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:14+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr "åˆ†äº«"
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "åˆªé™¤"
 
@@ -128,43 +128,44 @@ msgstr "åˆªé™¤"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr ""
 
@@ -200,33 +201,27 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "åç¨±"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr ""
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{}æ–‡ä»¶å¤¾"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr ""
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr ""
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
@@ -285,61 +280,61 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr ""
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ä¸‹è¼‰"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "å–æ¶ˆåˆ†äº«"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr ""
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
 msgstr ""
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
 msgstr ""
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
 msgstr ""
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 7a7dd9fef9c2e7adf1d73b606bfe9ae0b838deb2..11cc05eff70484ab8cfea5aa087526d94366982b 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -67,9 +67,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index c7297faf824120541d8205ece4fc22021cf77702..075e0e775319e523ceb8bb12fc8218481de8f782 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 7491130b5db5e8c749c902b7c976fcd2b6f6b359..b0da2eac01a46dc2d0d41d2081308c54294f4ce9 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,28 +29,52 @@ msgstr "å¯†ç¢¼"
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ä¸‹è¼‰"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ä¸Šå‚³"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr ""
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index c00ed63b73c46aaf79ee405df140b22047235be2..31ad547f9b1d93c9ce4c47e4098df9fa6bcad404 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,44 +27,42 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "éŒ¯èª¤"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "åç¨±"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{}æ–‡ä»¶å¤¾"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:198
-msgid "{count} files"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
 msgstr ""
 
 #: templates/index.php:9
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index dd784928453f287ac939cd41dc7326283228cbeb..bbea55ca73bf53048d639e2bbd95e5ce47d92003 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:56+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,41 +17,27 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr ""
 
-#: history.php:40
-msgid "success"
-msgstr "æˆåŠŸ"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ç‰ˆæœ¬"
 
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: history.php:49
-msgid "failure"
-msgstr "å¤±æ•—"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
+#: js/versions.js:79
+msgid "More versions..."
 msgstr ""
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "æ²’æœ‰ä»¥å¾€ç‰ˆæœ¬"
-
-#: history.php:74
-msgid "No path specified"
+#: js/versions.js:116
+msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ç‰ˆæœ¬"
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
+#: js/versions.js:149
+msgid "Restore"
 msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 0e79bd99ab316b2f52cf19c61c0e1683aecaa494..f9da45cb7cf4700e80516c8c9a63669b884b2fe7 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -34,34 +34,46 @@ msgid "Users"
 msgstr "ç”¨æˆ¶"
 
 #: app.php:409
-msgid "Apps"
-msgstr "è»Ÿä»¶"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr ""
 
@@ -170,77 +182,73 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ä»Šæ—¥"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "æ˜¨æ—¥"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "å‰ä¸€æœˆ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr ""
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr ""
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index f0a3d443e9bd7b7948fcda06793200c8938203d1..ec3fc03477f78769ac26bf0b82204d64910a6ba3 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -169,166 +169,173 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr ""
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
 msgstr ""
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
 msgstr ""
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr ""
+
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
 msgstr ""
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -386,72 +393,72 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "æ–°å¯†ç¢¼"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "é›»éƒµ"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index ef2a1b7ee6518fa79b2f905e90138ff489172b74..ab0370f6744aefc403980bdd25e22f28c348d67e 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
 msgstr ""
 
@@ -221,7 +221,7 @@ msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
+msgid "Only connect to the replica server."
 msgstr ""
 
 #: templates/settings.php:76
@@ -241,9 +241,10 @@ msgid "Turn off SSL certificate validation."
 msgstr ""
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
+"certificate in your %s server."
 msgstr ""
 
 #: templates/settings.php:78
@@ -267,7 +268,7 @@ msgid "User Display Name Field"
 msgstr ""
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
 #: templates/settings.php:84
@@ -291,7 +292,7 @@ msgid "Group Display Name Field"
 msgstr ""
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -352,12 +353,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -370,12 +371,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -389,17 +390,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 7990321325c5735ba1cbec8813d94d6cffe3a331..8751a8294aaf1d555ed4d32a5658a9dd64e7102c 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +22,12 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 072afe2219b9a65fb2512e4b2cc825f77ddfd2be..2014ec345c8604b25f21dce15f4b7802e6d9e958 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "%s shared Â»%sÂ« with you"
-msgstr ""
+msgstr "%s èˆ‡æ‚¨åˆ†äº«äº† %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -139,59 +139,55 @@ msgstr "åä¸€æœˆ"
 msgid "December"
 msgstr "åäºŒæœˆ"
 
-#: js/js.js:289
+#: js/js.js:355
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: js/js.js:721
+#: js/js.js:815
 msgid "seconds ago"
 msgstr "å¹¾ç§’å‰"
 
-#: js/js.js:722
-msgid "1 minute ago"
-msgstr "1 åˆ†é˜å‰"
-
-#: js/js.js:723
-msgid "{minutes} minutes ago"
-msgstr "{minutes} åˆ†é˜å‰"
-
-#: js/js.js:724
-msgid "1 hour ago"
-msgstr "1 å°æ™‚ä¹‹å‰"
+#: js/js.js:816
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: js/js.js:725
-msgid "{hours} hours ago"
-msgstr "{hours} å°æ™‚å‰"
+#: js/js.js:817
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: js/js.js:726
+#: js/js.js:818
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:727
+#: js/js.js:819
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:728
-msgid "{days} days ago"
-msgstr "{days} å¤©å‰"
+#: js/js.js:820
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: js/js.js:729
+#: js/js.js:821
 msgid "last month"
 msgstr "ä¸Šå€‹æœˆ"
 
-#: js/js.js:730
-msgid "{months} months ago"
-msgstr "{months} å€‹æœˆå‰"
+#: js/js.js:822
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: js/js.js:731
+#: js/js.js:823
 msgid "months ago"
 msgstr "å¹¾å€‹æœˆå‰"
 
-#: js/js.js:732
+#: js/js.js:824
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:733
+#: js/js.js:825
 msgid "years ago"
 msgstr "å¹¾å¹´å‰"
 
@@ -227,8 +223,8 @@ msgstr "æœªæŒ‡å®šç‰©ä»¶é¡žåž‹ã€‚"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:620
-#: js/share.js:632
+#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
+#: js/share.js:643 js/share.js:655
 msgid "Error"
 msgstr "éŒ¯èª¤"
 
@@ -248,140 +244,141 @@ msgstr "å·²åˆ†äº«"
 msgid "Share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:125 js/share.js:660
+#: js/share.js:131 js/share.js:683
 msgid "Error while sharing"
 msgstr "åˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:136
+#: js/share.js:142
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆåˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:143
+#: js/share.js:149
 msgid "Error while changing permissions"
 msgstr "ä¿®æ”¹æ¬Šé™æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:152
+#: js/share.js:158
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ç”± {owner} åˆ†äº«çµ¦æ‚¨å’Œ {group}"
 
-#: js/share.js:154
+#: js/share.js:160
 msgid "Shared with you by {owner}"
 msgstr "{owner} å·²ç¶“å’Œæ‚¨åˆ†äº«"
 
-#: js/share.js:172
+#: js/share.js:183
 msgid "Share with"
 msgstr "èˆ‡...åˆ†äº«"
 
-#: js/share.js:177
+#: js/share.js:188
 msgid "Share with link"
 msgstr "ä½¿ç”¨é€£çµåˆ†äº«"
 
-#: js/share.js:180
+#: js/share.js:191
 msgid "Password protect"
 msgstr "å¯†ç¢¼ä¿è·"
 
-#: js/share.js:182 templates/installation.php:54 templates/login.php:26
+#: js/share.js:193 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: js/share.js:187
+#: js/share.js:198
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "å…è¨±ä»»ä½•äººä¸Šå‚³"
 
-#: js/share.js:191
+#: js/share.js:202
 msgid "Email link to person"
 msgstr "å°‡é€£çµ email çµ¦åˆ¥äºº"
 
-#: js/share.js:192
+#: js/share.js:203
 msgid "Send"
 msgstr "å¯„å‡º"
 
-#: js/share.js:197
+#: js/share.js:208
 msgid "Set expiration date"
 msgstr "è¨ç½®åˆ°æœŸæ—¥"
 
-#: js/share.js:198
+#: js/share.js:209
 msgid "Expiration date"
 msgstr "åˆ°æœŸæ—¥"
 
-#: js/share.js:230
+#: js/share.js:241
 msgid "Share via email:"
 msgstr "é€éŽé›»åéƒµä»¶åˆ†äº«ï¼š"
 
-#: js/share.js:232
+#: js/share.js:243
 msgid "No people found"
 msgstr "æ²’æœ‰æ‰¾åˆ°ä»»ä½•äºº"
 
-#: js/share.js:270
+#: js/share.js:281
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è¨±é‡æ–°åˆ†äº«"
 
-#: js/share.js:306
+#: js/share.js:317
 msgid "Shared in {item} with {user}"
 msgstr "å·²å’Œ {user} åˆ†äº« {item}"
 
-#: js/share.js:327
+#: js/share.js:338
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/share.js:339
+#: js/share.js:350
 msgid "can edit"
 msgstr "å¯ç·¨è¼¯"
 
-#: js/share.js:341
+#: js/share.js:352
 msgid "access control"
 msgstr "å˜å–æŽ§åˆ¶"
 
-#: js/share.js:344
+#: js/share.js:355
 msgid "create"
 msgstr "å»ºç«‹"
 
-#: js/share.js:347
+#: js/share.js:358
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:350
+#: js/share.js:361
 msgid "delete"
 msgstr "åˆªé™¤"
 
-#: js/share.js:353
+#: js/share.js:364
 msgid "share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:387 js/share.js:607
+#: js/share.js:398 js/share.js:630
 msgid "Password protected"
 msgstr "å—å¯†ç¢¼ä¿è·"
 
-#: js/share.js:620
+#: js/share.js:643
 msgid "Error unsetting expiration date"
 msgstr "è§£é™¤éŽæœŸæ—¥è¨å®šå¤±æ•—"
 
-#: js/share.js:632
+#: js/share.js:655
 msgid "Error setting expiration date"
 msgstr "éŒ¯èª¤çš„åˆ°æœŸæ—¥è¨å®š"
 
-#: js/share.js:647
+#: js/share.js:670
 msgid "Sending ..."
 msgstr "æ£åœ¨å‚³é€..."
 
-#: js/share.js:658
+#: js/share.js:681
 msgid "Email sent"
 msgstr "Email å·²å¯„å‡º"
 
-#: js/update.js:14
+#: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
 msgstr "å‡ç´šå¤±æ•—ï¼Œè«‹å°‡æ¤å•é¡Œå›žå ± <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud ç¤¾ç¾¤</a>ã€‚"
 
-#: js/update.js:18
+#: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "å‡ç´šæˆåŠŸï¼Œæ£å°‡æ‚¨é‡æ–°å°Žå‘è‡³ ownCloud ã€‚"
 
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud å¯†ç¢¼é‡è¨"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -400,9 +397,9 @@ msgstr "è«‹æ±‚å¤±æ•—ï¼<br>æ‚¨ç¢ºå®šå¡«å…¥çš„é›»åéƒµä»¶åœ°å€æˆ–æ˜¯å¸³è™Ÿå
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "é‡è¨å¯†ç¢¼çš„é€£çµå°‡æœƒå¯„åˆ°ä½ çš„é›»åéƒµä»¶ä¿¡ç®±ã€‚"
+msgstr "é‡è¨å¯†ç¢¼çš„é€£çµå°‡æœƒå¯„åˆ°æ‚¨çš„é›»åéƒµä»¶ä¿¡ç®±ã€‚"
 
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
 #: templates/login.php:19
 msgid "Username"
 msgstr "ä½¿ç”¨è€…åç¨±"
@@ -413,7 +410,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "æ‚¨çš„æª”æ¡ˆå·²åŠ å¯†ï¼Œå¦‚æžœæ‚¨æ²’æœ‰è¨å®šé‚„åŽŸé‡‘é‘°ï¼Œæœªä¾†é‡è¨å¯†ç¢¼å¾Œå°‡ç„¡æ³•å–å›žæ‚¨çš„è³‡æ–™ã€‚å¦‚æžœæ‚¨ä¸ç¢ºå®šè©²æ€Žéº¼åšï¼Œè«‹æ´½è©¢ç³»çµ±ç®¡ç†å“¡å¾Œå†ç¹¼çºŒã€‚æ‚¨ç¢ºå®šè¦ç¾åœ¨ç¹¼çºŒå—Žï¼Ÿ"
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
@@ -463,11 +460,11 @@ msgstr "èªªæ˜Ž"
 msgid "Access forbidden"
 msgstr "å˜å–è¢«æ‹’"
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr "æœªç™¼ç¾é›²ç«¯"
 
-#: templates/altmail.php:4
+#: templates/altmail.php:2
 #, php-format
 msgid ""
 "Hey there,\n"
@@ -476,7 +473,7 @@ msgid ""
 "View it: %s\n"
 "\n"
 "Cheers!"
-msgstr ""
+msgstr "å—¨ï¼Œ\n\né€šçŸ¥æ‚¨ï¼Œ%s èˆ‡æ‚¨åˆ†äº«äº† %s ã€‚\nçœ‹ä¸€ä¸‹ï¼š%s"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -496,8 +493,9 @@ msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 msgstr "æ‚¨çš„ PHP ç‰ˆæœ¬ç„¡æ³•æŠµæŠ— NULL Byte æ”»æ“Š (CVE-2006-7243)"
 
 #: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "è«‹æ›´æ–°æ‚¨çš„ PHP å®‰è£ä»¥æ›´å®‰å…¨åœ°ä½¿ç”¨ ownCloud ã€‚"
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr "è«‹æ›´æ–° PHP ä»¥å®‰å…¨åœ°ä½¿ç”¨ %sã€‚"
 
 #: templates/installation.php:32
 msgid ""
@@ -517,68 +515,72 @@ msgid ""
 "because the .htaccess file does not work."
 msgstr "æ‚¨çš„è³‡æ–™ç›®éŒ„çœ‹èµ·ä¾†å¯ä»¥è¢« Internet å…¬é–‹å˜å–ï¼Œå› ç‚º .htaccess è¨å®šä¸¦æœªç”Ÿæ•ˆã€‚"
 
-#: templates/installation.php:40
+#: templates/installation.php:41
+#, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr "è«‹åƒè€ƒ<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">èªªæ˜Žæ–‡ä»¶</a>ä»¥çžè§£å¦‚ä½•æ£ç¢ºè¨å®šæ‚¨çš„ä¼ºæœå™¨ã€‚"
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr "è«‹åƒè€ƒ<a href=\"%s\" target=\"_blank\">èªªæ˜Žæ–‡ä»¶</a>ä»¥çžè§£å¦‚ä½•æ£ç¢ºè¨å®šæ‚¨çš„ä¼ºæœå™¨ã€‚"
 
-#: templates/installation.php:44
+#: templates/installation.php:47
 msgid "Create an <strong>admin account</strong>"
 msgstr "å»ºç«‹ä¸€å€‹<strong>ç®¡ç†è€…å¸³è™Ÿ</strong>"
 
-#: templates/installation.php:62
+#: templates/installation.php:65
 msgid "Advanced"
 msgstr "é€²éšŽ"
 
-#: templates/installation.php:64
+#: templates/installation.php:67
 msgid "Data folder"
 msgstr "è³‡æ–™å¤¾"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Configure the database"
 msgstr "è¨å®šè³‡æ–™åº«"
 
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
+#: templates/installation.php:82 templates/installation.php:94
+#: templates/installation.php:105 templates/installation.php:116
+#: templates/installation.php:128
 msgid "will be used"
 msgstr "å°‡æœƒä½¿ç”¨"
 
-#: templates/installation.php:137
+#: templates/installation.php:140
 msgid "Database user"
 msgstr "è³‡æ–™åº«ä½¿ç”¨è€…"
 
-#: templates/installation.php:144
+#: templates/installation.php:147
 msgid "Database password"
 msgstr "è³‡æ–™åº«å¯†ç¢¼"
 
-#: templates/installation.php:149
+#: templates/installation.php:152
 msgid "Database name"
 msgstr "è³‡æ–™åº«åç¨±"
 
-#: templates/installation.php:159
+#: templates/installation.php:160
 msgid "Database tablespace"
 msgstr "è³‡æ–™åº« tablespace"
 
-#: templates/installation.php:166
+#: templates/installation.php:167
 msgid "Database host"
 msgstr "è³‡æ–™åº«ä¸»æ©Ÿ"
 
-#: templates/installation.php:172
+#: templates/installation.php:175
 msgid "Finish setup"
 msgstr "å®Œæˆè¨å®š"
 
-#: templates/layout.user.php:43
+#: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s å·²ç¶“é‡‹å‡ºï¼Œçžè§£æ›´å¤šè³‡è¨Šä»¥é€²è¡Œæ›´æ–°ã€‚"
 
-#: templates/layout.user.php:68
+#: templates/layout.user.php:66
 msgid "Log out"
 msgstr "ç™»å‡º"
 
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "è‡ªå‹•ç™»å…¥è¢«æ‹’ï¼"
@@ -609,12 +611,12 @@ msgstr "ç™»å…¥"
 msgid "Alternative Logins"
 msgstr "æ›¿ä»£ç™»å…¥æ–¹æ³•"
 
-#: templates/mail.php:16
+#: templates/mail.php:15
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared Â»%sÂ« with you.<br><a "
 "href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
+msgstr "å—¨ï¼Œ<br><br>é€šçŸ¥æ‚¨ï¼Œ%s èˆ‡æ‚¨åˆ†äº«äº† %s ï¼Œ<br><a href=\"%s\">çœ‹ä¸€ä¸‹å§</a>"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 0d77d5269155d399259e4d9501b97b720fa6c9ee..4f96374f3f01951e31df746e898367778b95da6a 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -30,11 +30,11 @@ msgstr "ç„¡æ³•ç§»å‹• %s"
 
 #: ajax/upload.php:16 ajax/upload.php:45
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "ç„¡æ³•è¨å®šä¸Šå‚³ç›®éŒ„ã€‚"
 
 #: ajax/upload.php:22
 msgid "Invalid Token"
-msgstr ""
+msgstr "ç„¡æ•ˆçš„ token"
 
 #: ajax/upload.php:59
 msgid "No file was uploaded. Unknown error"
@@ -121,7 +121,7 @@ msgstr "åˆ†äº«"
 msgid "Delete permanently"
 msgstr "æ°¸ä¹…åˆªé™¤"
 
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
 msgid "Delete"
 msgstr "åˆªé™¤"
 
@@ -129,43 +129,44 @@ msgstr "åˆªé™¤"
 msgid "Rename"
 msgstr "é‡æ–°å‘½å"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:464
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:467
 msgid "Pending"
 msgstr "ç‰å€™ä¸"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²ç¶“å˜åœ¨"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "replace"
 msgstr "å–ä»£"
 
-#: js/filelist.js:302
+#: js/filelist.js:303
 msgid "suggest name"
 msgstr "å»ºè°æª”å"
 
-#: js/filelist.js:302 js/filelist.js:304
+#: js/filelist.js:303 js/filelist.js:305
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "replaced {new_name} with {old_name}"
 msgstr "ä½¿ç”¨ {new_name} å–ä»£ {old_name}"
 
-#: js/filelist.js:349
+#: js/filelist.js:350
 msgid "undo"
 msgstr "å¾©åŽŸ"
 
-#: js/filelist.js:374
+#: js/filelist.js:375
 msgid "perform delete operation"
 msgstr "é€²è¡Œåˆªé™¤å‹•ä½œ"
 
-#: js/filelist.js:456
-msgid "1 file uploading"
-msgstr "1 å€‹æª”æ¡ˆæ£åœ¨ä¸Šå‚³"
+#: js/filelist.js:455
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
 
-#: js/filelist.js:459 js/filelist.js:517
+#: js/filelist.js:520
 msgid "files uploading"
 msgstr "æª”æ¡ˆæ£åœ¨ä¸Šå‚³ä¸"
 
@@ -201,38 +202,32 @@ msgstr "æ£åœ¨æº–å‚™æ‚¨çš„ä¸‹è¼‰ï¼Œè‹¥æ‚¨çš„æª”æ¡ˆè¼ƒå¤§ï¼Œå°‡æœƒéœ€è¦æ›´å¤šæ™‚
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ç„¡æ•ˆçš„è³‡æ–™å¤¾åç¨±ï¼Œ'Shared' çš„ä½¿ç”¨è¢« ownCloud ä¿ç•™"
 
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:744 templates/index.php:67
 msgid "Name"
 msgstr "åç¨±"
 
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:745 templates/index.php:78
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:746 templates/index.php:80
 msgid "Modified"
 msgstr "ä¿®æ”¹"
 
-#: js/files.js:765
-msgid "1 folder"
-msgstr "1 å€‹è³‡æ–™å¤¾"
-
-#: js/files.js:767
-msgid "{count} folders"
-msgstr "{count} å€‹è³‡æ–™å¤¾"
-
-#: js/files.js:775
-msgid "1 file"
-msgstr "1 å€‹æª”æ¡ˆ"
+#: js/files.js:762
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/files.js:777
-msgid "{count} files"
-msgstr "{count} å€‹æª”æ¡ˆ"
+#: js/files.js:768
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
 #: lib/app.php:73
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "ç„¡æ³•é‡æ–°å‘½å %s"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -286,63 +281,63 @@ msgstr "è³‡æ–™å¤¾"
 msgid "From link"
 msgstr "å¾žé€£çµ"
 
-#: templates/index.php:42
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "å·²åˆªé™¤çš„æª”æ¡ˆ"
 
-#: templates/index.php:48
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šå‚³"
 
-#: templates/index.php:54
+#: templates/index.php:52
 msgid "You donâ€™t have write permissions here."
 msgstr "æ‚¨åœ¨é€™è£¡æ²’æœ‰ç·¨è¼¯æ¬Šã€‚"
 
-#: templates/index.php:61
+#: templates/index.php:59
 msgid "Nothing in here. Upload something!"
 msgstr "é€™è£¡ä»€éº¼ä¹Ÿæ²’æœ‰ï¼Œä¸Šå‚³ä¸€äº›æ±è¥¿å§ï¼"
 
-#: templates/index.php:75
+#: templates/index.php:73
 msgid "Download"
 msgstr "ä¸‹è¼‰"
 
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Upload too large"
 msgstr "ä¸Šå‚³éŽå¤§"
 
-#: templates/index.php:109
+#: templates/index.php:107
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "æ‚¨è©¦åœ–ä¸Šå‚³çš„æª”æ¡ˆå·²è¶…éŽä¼ºæœå™¨çš„æœ€å¤§æª”æ¡ˆå¤§å°é™åˆ¶ã€‚"
 
-#: templates/index.php:114
+#: templates/index.php:112
 msgid "Files are being scanned, please wait."
 msgstr "æ£åœ¨æŽƒææª”æ¡ˆï¼Œè«‹ç¨ç‰ã€‚"
 
-#: templates/index.php:117
+#: templates/index.php:115
 msgid "Current scanning"
 msgstr "ç›®å‰æŽƒæ"
 
-#: templates/part.list.php:78
+#: templates/part.list.php:74
 msgid "directory"
-msgstr ""
+msgstr "ç›®éŒ„"
 
-#: templates/part.list.php:80
+#: templates/part.list.php:76
 msgid "directories"
-msgstr ""
+msgstr "ç›®éŒ„"
 
-#: templates/part.list.php:89
+#: templates/part.list.php:85
 msgid "file"
-msgstr ""
+msgstr "æª”æ¡ˆ"
 
-#: templates/part.list.php:91
+#: templates/part.list.php:87
 msgid "files"
-msgstr ""
+msgstr "æª”æ¡ˆ"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 0ad4c062c9a9544888aa3447cd63a4e642a0c1a4..dc9c9cf7a76570db2586af0b938d574b2a82635c 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # pellaeon <nfsmwlin@gmail.com>, 2013
+# Flymok <transifex@flymok.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-05 02:12+0200\n"
-"PO-Revision-Date: 2013-07-05 00:13+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +61,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "æ‚¨çš„ç§é‘°ä¸æ£ç¢º! æ„Ÿè¦ºåƒæ˜¯å¯†ç¢¼åœ¨ ownCloud ç³»çµ±ä¹‹å¤–è¢«æ”¹è®Š(ä¾‹ï¼šæ‚¨çš„ç›®éŒ„)ã€‚ æ‚¨å¯ä»¥åœ¨å€‹äººè¨å®šä¸æ›´æ–°ç§é‘°å¯†ç¢¼å–å›žå·²åŠ å¯†çš„æª”æ¡ˆã€‚"
 
 #: hooks/hooks.php:44
 msgid "Missing requirements."
@@ -68,9 +69,13 @@ msgstr ""
 
 #: hooks/hooks.php:45
 msgid ""
-"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."
+"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."
+msgstr ""
+
+#: hooks/hooks.php:263
+msgid "Following users are not set up for encryption:"
 msgstr ""
 
 #: js/settings-admin.js:11
@@ -140,15 +145,15 @@ msgstr ""
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "å¦‚æžœæ‚¨å¿˜è¨˜èˆŠå¯†ç¢¼ï¼Œå¯ä»¥è«‹æ±‚ç®¡ç†å“¡å”åŠ©å–å›žæª”æ¡ˆã€‚"
 
 #: templates/settings-personal.php:24
 msgid "Old log-in password"
-msgstr ""
+msgstr "èˆŠç™»å…¥å¯†ç¢¼"
 
 #: templates/settings-personal.php:30
 msgid "Current log-in password"
-msgstr ""
+msgstr "ç›®å‰çš„ç™»å…¥å¯†ç¢¼"
 
 #: templates/settings-personal.php:35
 msgid "Update Private Key Password"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index f6701c79041eda0bc1daf5388d6085792cbe97af..8296c419b966e92ab33c051e8bb79bea873fdd52 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-07-23 01:55-0400\n"
+"PO-Revision-Date: 2013-07-23 05:05+0000\n"
 "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -38,20 +38,20 @@ msgstr "è«‹æä¾›æœ‰æ•ˆçš„ Dropbox app key å’Œ app secret ã€‚"
 msgid "Error configuring Google Drive storage"
 msgstr "è¨å®š Google Drive å„²å˜æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: lib/config.php:431
+#: lib/config.php:447
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>è¦å‘Š</b>ï¼šæœªå®‰è£ \"smbclient\" ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ CIFS/SMB åˆ†äº«ï¼Œè«‹æ´½æ‚¨çš„ç³»çµ±ç®¡ç†å“¡å°‡å…¶å®‰è£ã€‚"
 
-#: lib/config.php:434
+#: lib/config.php:450
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>è¦å‘Š</b>ï¼šPHP ä¸¦æœªå•“ç”¨ FTP çš„æ”¯æ´ï¼Œå› æ¤ç„¡æ³•æŽ›è¼‰ FTP åˆ†äº«ï¼Œè«‹æ´½æ‚¨çš„ç³»çµ±ç®¡ç†å“¡å°‡å…¶å®‰è£ä¸¦å•“ç”¨ã€‚"
 
-#: lib/config.php:437
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index e5f8f60c8f86fff3e0ad53db8db633279279a935..77a810102c4be1abf89c91860ba1f603e7ff7442 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"PO-Revision-Date: 2013-08-07 12:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -30,28 +30,52 @@ msgstr "å¯†ç¢¼"
 msgid "Submit"
 msgstr "é€å‡º"
 
-#: templates/public.php:17
+#: templates/part.404.php:3
+msgid "Sorry, this link doesnâ€™t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:15
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s å’Œæ‚¨åˆ†äº«äº†è³‡æ–™å¤¾ %s "
 
-#: templates/public.php:20
+#: templates/public.php:18
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s å’Œæ‚¨åˆ†äº«äº†æª”æ¡ˆ %s"
 
-#: templates/public.php:28 templates/public.php:90
+#: templates/public.php:26 templates/public.php:88
 msgid "Download"
 msgstr "ä¸‹è¼‰"
 
-#: templates/public.php:45 templates/public.php:48
+#: templates/public.php:43 templates/public.php:46
 msgid "Upload"
 msgstr "ä¸Šå‚³"
 
-#: templates/public.php:58
+#: templates/public.php:56
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šå‚³"
 
-#: templates/public.php:87
+#: templates/public.php:85
 msgid "No preview available for"
 msgstr "ç„¡æ³•é è¦½"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index cb1c0cb9712c9fa291b9853d4d3f92470e2ec5e9..f51e340bf8609dc6d4db151c910c28f569b6d334 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -27,45 +27,43 @@ msgstr "ç„¡æ³•æ°¸ä¹…åˆªé™¤ %s"
 msgid "Couldn't restore %s"
 msgstr "ç„¡æ³•å¾©åŽŸ %s"
 
-#: js/trash.js:7 js/trash.js:97
+#: js/trash.js:7 js/trash.js:100
 msgid "perform restore operation"
 msgstr "é€²è¡Œå¾©åŽŸå‹•ä½œ"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
 msgid "Error"
 msgstr "éŒ¯èª¤"
 
-#: js/trash.js:34
+#: js/trash.js:36
 msgid "delete file permanently"
 msgstr "æ°¸ä¹…åˆªé™¤æª”æ¡ˆ"
 
-#: js/trash.js:123
+#: js/trash.js:127
 msgid "Delete permanently"
 msgstr "æ°¸ä¹…åˆªé™¤"
 
-#: js/trash.js:176 templates/index.php:17
+#: js/trash.js:182 templates/index.php:17
 msgid "Name"
 msgstr "åç¨±"
 
-#: js/trash.js:177 templates/index.php:27
+#: js/trash.js:183 templates/index.php:27
 msgid "Deleted"
 msgstr "å·²åˆªé™¤"
 
-#: js/trash.js:186
-msgid "1 folder"
-msgstr "1 å€‹è³‡æ–™å¤¾"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
 
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr "{count} å€‹è³‡æ–™å¤¾"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
 
-#: js/trash.js:196
-msgid "1 file"
-msgstr "1 å€‹æª”æ¡ˆ"
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr "{count} å€‹æª”æ¡ˆ"
+#: lib/trash.php:819 lib/trash.php:821
+msgid "restored"
+msgstr ""
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index dbe4ec462d0c82a88ccf3cd897b517f37525645a..bd093d7fda8962bdae5e87e5b8c4ba1ddf1ea187 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-07-28 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 06:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,41 +18,27 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/rollbackVersion.php:15
+#: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
 msgstr "ç„¡æ³•é‚„åŽŸï¼š%s"
 
-#: history.php:40
-msgid "success"
-msgstr "æˆåŠŸ"
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr "æª”æ¡ˆ %s å·²è¢«å¾©åŽŸè‡³ç‰ˆæœ¬ %s"
-
-#: history.php:49
-msgid "failure"
-msgstr "å¤±æ•—"
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr "æª”æ¡ˆ %s ç„¡æ³•å¾©åŽŸè‡³ç‰ˆæœ¬ %s"
+#: js/versions.js:7
+msgid "Versions"
+msgstr "ç‰ˆæœ¬"
 
-#: history.php:69
-msgid "No old versions available"
-msgstr "æ²’æœ‰èˆŠçš„ç‰ˆæœ¬"
+#: js/versions.js:53
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
 
-#: history.php:74
-msgid "No path specified"
-msgstr "æ²’æœ‰æŒ‡å®šè·¯å¾‘"
+#: js/versions.js:79
+msgid "More versions..."
+msgstr ""
 
-#: js/versions.js:6
-msgid "Versions"
-msgstr "ç‰ˆæœ¬"
+#: js/versions.js:116
+msgid "No other versions available"
+msgstr ""
 
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "æŒ‰ä¸€ä¸‹å¾©åŽŸçš„æŒ‰éˆ•å³å¯æŠŠæª”æ¡ˆå¾©åŽŸè‡³ä»¥å‰çš„ç‰ˆæœ¬"
+#: js/versions.js:149
+msgid "Restore"
+msgstr "å¾©åŽŸ"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 889bbe838bc0e2050131fe7bfba271c87d07037f..9f99db8fe3c43f733024f9401869600be703c5af 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -35,34 +35,46 @@ msgid "Users"
 msgstr "ä½¿ç”¨è€…"
 
 #: app.php:409
-msgid "Apps"
-msgstr "æ‡‰ç”¨ç¨‹å¼"
-
-#: app.php:417
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: defaults.php:33
+#: app.php:836
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: defaults.php:35
 msgid "web services under your control"
 msgstr "ç”±æ‚¨æŽ§åˆ¶çš„ç¶²è·¯æœå‹™"
 
-#: files.php:210
+#: files.php:66 files.php:98
+#, php-format
+msgid "cannot open \"%s\""
+msgstr ""
+
+#: files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è¼‰å·²é—œé–‰ã€‚"
 
-#: files.php:211
+#: files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "æª”æ¡ˆéœ€è¦é€ä¸€ä¸‹è¼‰ã€‚"
 
-#: files.php:212 files.php:245
+#: files.php:228 files.php:256
 msgid "Back to Files"
 msgstr "å›žåˆ°æª”æ¡ˆåˆ—è¡¨"
 
-#: files.php:242
+#: files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "é¸æ“‡çš„æª”æ¡ˆå¤ªå¤§ä»¥è‡´æ–¼ç„¡æ³•ç”¢ç”Ÿå£“ç¸®æª”ã€‚"
 
-#: helper.php:236
+#: files.php:254
+msgid ""
+"Download the files in smaller chunks, seperately or kindly ask your "
+"administrator."
+msgstr ""
+
+#: helper.php:235
 msgid "couldn't be determined"
 msgstr "ç„¡æ³•åˆ¤æ–·"
 
@@ -171,77 +183,73 @@ msgstr "æœ‰å•é¡Œçš„æŒ‡ä»¤æ˜¯ï¼š\"%s\" ï¼Œä½¿ç”¨è€…ï¼š\"%s\"ï¼Œå¯†ç¢¼ï¼š\"%s\""
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL ç”¨æˆ¶åå’Œ/æˆ–å¯†ç¢¼ç„¡æ•ˆ"
 
-#: setup.php:42
+#: setup.php:28
 msgid "Set an admin username."
 msgstr "è¨å®šç®¡ç†å“¡å¸³è™Ÿã€‚"
 
-#: setup.php:45
+#: setup.php:31
 msgid "Set an admin password."
 msgstr "è¨å®šç®¡ç†å“¡å¯†ç¢¼ã€‚"
 
-#: setup.php:198
+#: setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "æ‚¨çš„ç¶²é ä¼ºæœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”æ¡ˆåŒæ¥ï¼Œå› ç‚ºæ‚¨çš„ WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚"
 
-#: setup.php:199
+#: setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "è«‹åƒè€ƒ<a href='%s'>å®‰è£æŒ‡å—</a>ã€‚"
 
-#: template.php:113
+#: template/functions.php:80
 msgid "seconds ago"
 msgstr "å¹¾ç§’å‰"
 
-#: template.php:114
-msgid "1 minute ago"
-msgstr "1 åˆ†é˜å‰"
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d åˆ†é˜å‰"
+#: template/functions.php:81
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
 
-#: template.php:116
-msgid "1 hour ago"
-msgstr "1 å°æ™‚ä¹‹å‰"
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr "%d å°æ™‚ä¹‹å‰"
+#: template/functions.php:82
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
 
-#: template.php:118
+#: template/functions.php:83
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: template.php:119
+#: template/functions.php:84
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr "%d å¤©å‰"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
 
-#: template.php:121
+#: template/functions.php:86
 msgid "last month"
 msgstr "ä¸Šå€‹æœˆ"
 
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr "%d å€‹æœˆä¹‹å‰"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
 
-#: template.php:123
+#: template/functions.php:88
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: template.php:124
+#: template/functions.php:89
 msgid "years ago"
 msgstr "å¹¾å¹´å‰"
 
+#: template.php:297
+msgid "Caused by:"
+msgstr ""
+
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 9842d091d6fb0f01b54b4d9e2511a8ca9f17ec25..9e38838ff4861ba7883423ccea96de36f301b4c7 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:04+0200\n"
-"PO-Revision-Date: 2013-07-09 00:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:21+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,12 +78,12 @@ msgstr "ç®¡ç†è€…å¸³è™Ÿç„¡æ³•å¾žç®¡ç†è€…ç¾¤çµ„ä¸ç§»é™¤"
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "ä½¿ç”¨è€…åŠ å…¥ç¾¤çµ„%séŒ¯èª¤"
+msgstr "ä½¿ç”¨è€…åŠ å…¥ç¾¤çµ„ %s éŒ¯èª¤"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "ä½¿ç”¨è€…ç§»å‡ºç¾¤çµ„%séŒ¯èª¤"
+msgstr "ä½¿ç”¨è€…ç§»å‡ºç¾¤çµ„ %s éŒ¯èª¤"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
@@ -144,7 +144,7 @@ msgstr "ç¾¤çµ„"
 
 #: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
-msgstr "ç¾¤çµ„ ç®¡ç†å“¡"
+msgstr "ç¾¤çµ„ç®¡ç†å“¡"
 
 #: js/users.js:115 templates/users.php:164
 msgid "Delete"
@@ -156,11 +156,11 @@ msgstr "æ–°å¢žç¾¤çµ„"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr "ä¸€å®šè¦æä¾›ä¸€å€‹æœ‰æ•ˆçš„ç”¨æˆ¶å"
+msgstr "å¿…é ˆæä¾›ä¸€å€‹æœ‰æ•ˆçš„ç”¨æˆ¶å"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr "å‰µå»ºç”¨æˆ¶æ™‚å‡ºç¾éŒ¯èª¤"
+msgstr "å»ºç«‹ç”¨æˆ¶æ™‚å‡ºç¾éŒ¯èª¤"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
@@ -168,168 +168,175 @@ msgstr "ä¸€å®šè¦æä¾›ä¸€å€‹æœ‰æ•ˆçš„å¯†ç¢¼"
 
 #: personal.php:37 personal.php:38
 msgid "__language_name__"
-msgstr "__èªžè¨€_åç¨±__"
+msgstr "__language_name__"
 
-#: templates/admin.php:17
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr "å®‰å…¨æ€§è¦å‘Š"
 
-#: templates/admin.php:20
+#: templates/admin.php:18
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr "æ‚¨çš„è³‡æ–™ç›®éŒ„ (Data Directory) å’Œæª”æ¡ˆå¯èƒ½å¯ä»¥ç”±ç¶²éš›ç¶²è·¯ä¸Šé¢å…¬é–‹å˜å–ã€‚Owncloud æ‰€æä¾›çš„ .htaccess è¨å®šæª”ä¸¦æœªç”Ÿæ•ˆï¼Œæˆ‘å€‘å¼·çƒˆå»ºè°æ‚¨è¨å®šæ‚¨çš„ç¶²é ä¼ºæœå™¨ä»¥é˜²æ¢è³‡æ–™ç›®éŒ„è¢«å…¬é–‹å˜å–ï¼Œæˆ–å°‡æ‚¨çš„è³‡æ–™ç›®éŒ„ç§»å‡ºç¶²é ä¼ºæœå™¨çš„ document root ã€‚"
 
-#: templates/admin.php:31
+#: templates/admin.php:29
 msgid "Setup Warning"
 msgstr "è¨å®šè¦å‘Š"
 
-#: templates/admin.php:34
+#: templates/admin.php:32
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "æ‚¨çš„ç¶²é ä¼ºæœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”æ¡ˆåŒæ¥ï¼Œå› ç‚ºæ‚¨çš„ WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚"
 
-#: templates/admin.php:35
+#: templates/admin.php:33
 #, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "è«‹åƒè€ƒ<a href='%s'>å®‰è£æŒ‡å—</a>ã€‚"
 
-#: templates/admin.php:46
+#: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
 msgstr "éºå¤± 'fileinfo' æ¨¡çµ„"
 
-#: templates/admin.php:49
+#: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr "æœªåµæ¸¬åˆ° PHP æ¨¡çµ„ 'fileinfo'ã€‚æˆ‘å€‘å¼·çƒˆå»ºè°å•Ÿç”¨é€™å€‹æ¨¡çµ„ä»¥å–å¾—æœ€å¥½çš„ mime-type æ”¯æ´ã€‚"
 
-#: templates/admin.php:60
+#: templates/admin.php:58
 msgid "Locale not working"
 msgstr "èªžç³»ç„¡æ³•é‹ä½œ"
 
-#: templates/admin.php:65
+#: templates/admin.php:63
 #, php-format
 msgid ""
-"This ownCloud server can't set system locale to %s. This means that there "
-"might be problems with certain characters in file names. We strongly suggest"
-" to install the required packages on your system to support %s."
+"System locale can't be set to %s. This means that there might be problems "
+"with certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support %s."
 msgstr "ownCloud ä¼ºæœå™¨ç„¡æ³•å°‡ç³»çµ±èªžç³»è¨ç‚º %s ï¼Œå¯èƒ½æœ‰ä¸€äº›æª”åä¸çš„å—å…ƒæœ‰å•é¡Œï¼Œå»ºè°æ‚¨å®‰è£æ‰€æœ‰æ‰€éœ€çš„å¥—ä»¶ä»¥æ”¯æ´ %s ã€‚"
 
-#: templates/admin.php:77
+#: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr "åŽ»é€£ç·š"
+msgstr "ç„¡ç¶²éš›ç¶²è·¯å˜å–"
 
-#: templates/admin.php:80
+#: templates/admin.php:78
 msgid ""
-"This ownCloud server has no working internet connection. This means that "
-"some of the features like mounting of external storage, notifications about "
-"updates or installation of 3rd party apps donÂ´t work. Accessing files from "
-"remote and sending of notification emails might also not work. We suggest to"
-" enable internet connection for this server if you want to have all features"
-" of ownCloud."
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps donÂ´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
 msgstr "é€™è‡º ownCloud ä¼ºæœå™¨æ²’æœ‰é€£æŽ¥åˆ°ç¶²éš›ç¶²è·¯ï¼Œå› æ¤æœ‰äº›åŠŸèƒ½åƒæ˜¯æŽ›è¼‰å¤–éƒ¨å„²å˜ç©ºé–“ã€æ›´æ–° ownCloud æˆ–æ‡‰ç”¨ç¨‹å¼çš„é€šçŸ¥æ²’æœ‰è¾¦æ³•é‹ä½œã€‚é€éŽç¶²éš›ç¶²è·¯å˜å–æª”æ¡ˆé‚„æœ‰é›»åéƒµä»¶é€šçŸ¥å¯èƒ½ä¹Ÿç„¡æ³•é‹ä½œã€‚å¦‚æžœæƒ³è¦ ownCloud å®Œæ•´çš„åŠŸèƒ½ï¼Œå»ºè°æ‚¨å°‡é€™è‡ºä¼ºæœå™¨é€£æŽ¥è‡³ç¶²éš›ç¶²è·¯ã€‚"
 
-#: templates/admin.php:94
+#: templates/admin.php:92
 msgid "Cron"
-msgstr "å®šæœŸåŸ·è¡Œ"
+msgstr "Cron"
 
-#: templates/admin.php:103
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr "ç•¶é é¢è¼‰å…¥æ™‚ï¼ŒåŸ·è¡Œ"
 
-#: templates/admin.php:113
+#: templates/admin.php:111
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr "cron.php å·²ç¶“åœ¨ webcron æœå‹™ç•¶ä¸è¨»å†Šï¼Œè«‹æ¯åˆ†é˜é€éŽ HTTP å‘¼å« ownCloud æ ¹ç›®éŒ„ç•¶ä¸çš„ cron.php ä¸€æ¬¡ã€‚"
+"cron.php is registered at a webcron service to call cron.php once a minute "
+"over http."
+msgstr "cron.php å·²ç¶“è¨»å†Š webcron æœå‹™ï¼Œwebcron æ¯åˆ†é˜æœƒå‘¼å« cron.php ä¸€æ¬¡ã€‚"
 
-#: templates/admin.php:123
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr "ä½¿ç”¨ç³»çµ±çš„ cron æœå‹™ï¼Œæ¯åˆ†é˜åŸ·è¡Œä¸€æ¬¡ owncloud è³‡æ–™å¤¾ä¸çš„ cron.php ã€‚"
+#: templates/admin.php:121
+msgid "Use systems cron service to call the cron.php file once a minute."
+msgstr "ä½¿ç”¨ç³»çµ±çš„ cron æœå‹™ä¾†å‘¼å« cron.php æ¯åˆ†é˜ä¸€æ¬¡ã€‚"
 
-#: templates/admin.php:130
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr "åˆ†äº«"
 
-#: templates/admin.php:136
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr "å•Ÿç”¨åˆ†äº« API"
 
-#: templates/admin.php:137
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr "å…è¨± apps ä½¿ç”¨åˆ†äº« API"
 
-#: templates/admin.php:144
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr "å…è¨±é€£çµ"
 
-#: templates/admin.php:145
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr "å…è¨±ä½¿ç”¨è€…é€éŽå…¬é–‹çš„é€£çµåˆ†äº«æª”æ¡ˆ"
+msgstr "å…è¨±ä½¿ç”¨è€…ä»¥çµé€£å…¬é–‹åˆ†äº«æª”æ¡ˆ"
+
+#: templates/admin.php:151
+msgid "Allow public uploads"
+msgstr "å…è¨±ä»»ä½•äººä¸Šå‚³"
 
 #: templates/admin.php:152
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr "å…è¨±ä½¿ç”¨è€…å°‡ä»–å€‘å…¬é–‹åˆ†äº«çš„è³‡æ–™å¤¾è¨å®šç‚ºã€Œä»»ä½•äººçš†å¯ä¸Šå‚³ã€"
+
+#: templates/admin.php:160
 msgid "Allow resharing"
 msgstr "å…è¨±è½‰è²¼åˆ†äº«"
 
-#: templates/admin.php:153
+#: templates/admin.php:161
 msgid "Allow users to share items shared with them again"
 msgstr "å…è¨±ä½¿ç”¨è€…åˆ†äº«å…¶ä»–ä½¿ç”¨è€…åˆ†äº«çµ¦ä»–çš„æª”æ¡ˆ"
 
-#: templates/admin.php:160
+#: templates/admin.php:168
 msgid "Allow users to share with anyone"
 msgstr "å…è¨±ä½¿ç”¨è€…èˆ‡ä»»ä½•äººåˆ†äº«æª”æ¡ˆ"
 
-#: templates/admin.php:163
+#: templates/admin.php:171
 msgid "Allow users to only share with users in their groups"
 msgstr "åƒ…å…è¨±ä½¿ç”¨è€…åœ¨ç¾¤çµ„å…§åˆ†äº«"
 
-#: templates/admin.php:170
+#: templates/admin.php:178
 msgid "Security"
 msgstr "å®‰å…¨æ€§"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "å¼·åˆ¶å•Ÿç”¨ HTTPS"
 
-#: templates/admin.php:184
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "å¼·åˆ¶æŒ‡å®šç”¨æˆ¶ç«¯ä½¿ç”¨åŠ å¯†çš„é€£ç·šé€£æŽ¥åˆ° ownCloud"
+#: templates/admin.php:193
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr "å¼·è¿«ç”¨æˆ¶ç«¯ä½¿ç”¨åŠ å¯†é€£ç·šé€£æŽ¥åˆ° %s"
 
-#: templates/admin.php:187
+#: templates/admin.php:199
+#, php-format
 msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr "è«‹ä½¿ç”¨ HTTPS é€£ç·šåˆ° ownCloudï¼Œæˆ–æ˜¯é—œé–‰å¼·åˆ¶ä½¿ç”¨ SSL çš„é¸é …ã€‚"
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr "è«‹ä½¿ç”¨ HTTPS é€£ç·šåˆ° %s ä»¥å•“ç”¨æˆ–åœç”¨å¼·åˆ¶ SSL åŠ å¯†ã€‚"
 
-#: templates/admin.php:197
+#: templates/admin.php:211
 msgid "Log"
 msgstr "ç´€éŒ„"
 
-#: templates/admin.php:198
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "ç´€éŒ„å±¤ç´š"
 
-#: templates/admin.php:229
+#: templates/admin.php:243
 msgid "More"
 msgstr "æ›´å¤š"
 
-#: templates/admin.php:230
+#: templates/admin.php:244
 msgid "Less"
-msgstr "å°‘"
+msgstr "æ›´å°‘"
 
-#: templates/admin.php:236 templates/personal.php:116
+#: templates/admin.php:250 templates/personal.php:114
 msgid "Version"
 msgstr "ç‰ˆæœ¬"
 
-#: templates/admin.php:240 templates/personal.php:119
+#: templates/admin.php:254 templates/personal.php:117
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -337,7 +344,7 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr "ç”±<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud ç¤¾å€</a>é–‹ç™¼ï¼Œ<a href=\"https://github.com/owncloud\" target=\"_blank\">æºä»£ç¢¼</a>åœ¨<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>è¨±å¯è‰ä¸‹ç™¼å¸ƒã€‚"
+msgstr "ç”± <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud ç¤¾ç¾¤</a>é–‹ç™¼ï¼Œ<a href=\"https://github.com/owncloud\" target=\"_blank\">åŽŸå§‹ç¢¼</a>åœ¨ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> è¨±å¯è‰ä¸‹ç™¼å¸ƒã€‚"
 
 #: templates/apps.php:13
 msgid "Add your App"
@@ -387,77 +394,77 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "å•†ç”¨æ”¯æ´"
 
-#: templates/personal.php:10
+#: templates/personal.php:8
 msgid "Get the apps to sync your files"
 msgstr "ä¸‹è¼‰æ‡‰ç”¨ç¨‹å¼ä¾†åŒæ¥æ‚¨çš„æª”æ¡ˆ"
 
-#: templates/personal.php:21
+#: templates/personal.php:19
 msgid "Show First Run Wizard again"
 msgstr "å†æ¬¡é¡¯ç¤ºé¦–æ¬¡ä½¿ç”¨ç²¾éˆ"
 
-#: templates/personal.php:29
+#: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "æ‚¨å·²ç¶“ä½¿ç”¨äº† <strong>%s</strong> ï¼Œç›®å‰å¯ç”¨ç©ºé–“ç‚º <strong>%s</strong>"
 
-#: templates/personal.php:41 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: templates/personal.php:42
+#: templates/personal.php:40
 msgid "Your password was changed"
 msgstr "ä½ çš„å¯†ç¢¼å·²æ›´æ”¹"
 
-#: templates/personal.php:43
+#: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "ç„¡æ³•è®Šæ›´æ‚¨çš„å¯†ç¢¼"
 
-#: templates/personal.php:44
+#: templates/personal.php:42
 msgid "Current password"
 msgstr "ç›®å‰å¯†ç¢¼"
 
-#: templates/personal.php:46
+#: templates/personal.php:44
 msgid "New password"
 msgstr "æ–°å¯†ç¢¼"
 
-#: templates/personal.php:48
+#: templates/personal.php:46
 msgid "Change password"
 msgstr "è®Šæ›´å¯†ç¢¼"
 
-#: templates/personal.php:60 templates/users.php:85
+#: templates/personal.php:58 templates/users.php:85
 msgid "Display Name"
 msgstr "é¡¯ç¤ºåç¨±"
 
-#: templates/personal.php:75
+#: templates/personal.php:73
 msgid "Email"
 msgstr "ä¿¡ç®±"
 
-#: templates/personal.php:77
+#: templates/personal.php:75
 msgid "Your email address"
 msgstr "æ‚¨çš„é›»åéƒµä»¶ä¿¡ç®±"
 
-#: templates/personal.php:78
+#: templates/personal.php:76
 msgid "Fill in an email address to enable password recovery"
 msgstr "è«‹å¡«å…¥é›»åéƒµä»¶ä¿¡ç®±ä»¥ä¾¿å›žå¾©å¯†ç¢¼"
 
-#: templates/personal.php:87 templates/personal.php:88
+#: templates/personal.php:85 templates/personal.php:86
 msgid "Language"
 msgstr "èªžè¨€"
 
-#: templates/personal.php:100
+#: templates/personal.php:98
 msgid "Help translate"
 msgstr "å¹«åŠ©ç¿»è¯"
 
-#: templates/personal.php:106
+#: templates/personal.php:104
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:108
+#: templates/personal.php:106
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
 "target=\"_blank\">access your Files via WebDAV</a>"
-msgstr ""
+msgstr "ä½¿ç”¨<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">é€™å€‹ç¶²å€</a>ä¾†é€éŽ WebDAV å˜å–æ‚¨çš„æª”æ¡ˆ"
 
 #: templates/users.php:21
 msgid "Login Name"
@@ -475,7 +482,7 @@ msgstr "ç®¡ç†è€…å¾©åŽŸå¯†ç¢¼"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "ç‚ºäº†ä¿®æ”¹å¯†ç¢¼æ™‚èƒ½å¤ å–å›žä½¿ç”¨è€…è³‡æ–™ï¼Œè«‹è¼¸å…¥å¦ä¸€çµ„é‚„åŽŸç”¨å¯†ç¢¼"
 
 #: templates/users.php:42
 msgid "Default Storage"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 15ff8cae5972129febcd59b043e93d1648479db6..27102dc70b37a78c812f0f48be72af6bad1aa95a 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-09 02:03+0200\n"
-"PO-Revision-Date: 2013-07-08 23:15+0000\n"
-"Last-Translator: chenanyeh <chnjsn1221@gmail.com>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,9 +89,9 @@ msgstr "ç¢ºèªå·²åˆªé™¤"
 #: templates/settings.php:9
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behaviour. Please ask your system administrator to "
+" experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr "<b>è¦å‘Š:</b> æ‡‰ç”¨ç¨‹å¼user_ldapå’Œuser_webdavauthäº’ä¸ç›¸å®¹ã€‚å¯èƒ½æœƒé€ æˆç„¡æ³•é æœŸçš„çµæžœã€‚è«‹è¦æ±‚æ‚¨çš„ç³»çµ±ç®¡ç†å“¡å°‡å…©è€…å…¶ä¸ä¹‹ä¸€åœç”¨ã€‚"
+msgstr ""
 
 #: templates/settings.php:12
 msgid ""
@@ -222,8 +222,8 @@ msgid "Disable Main Server"
 msgstr "åœç”¨ä¸»ä¼ºæœå™¨"
 
 #: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "ç•¶é–‹é—œæ‰“é–‹æ™‚ï¼ŒownCloudå°‡åªæœƒé€£æŽ¥è¤‡æœ¬ä¼ºæœå™¨ã€‚"
+msgid "Only connect to the replica server."
+msgstr ""
 
 #: templates/settings.php:76
 msgid "Use TLS"
@@ -242,10 +242,11 @@ msgid "Turn off SSL certificate validation."
 msgstr "é—œé–‰ SSL æ†‘è‰é©—è‰"
 
 #: templates/settings.php:78
+#, php-format
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr "è‹¥é€£ç·šåªæœ‰åœ¨æ¤é¸é …é–‹å•Ÿæ™‚é‹ä½œï¼Œè«‹åŒ¯å…¥LDAPä¼ºæœå™¨çš„SSLèªè‰åˆ°æ‚¨çš„ownCloudä¼ºæœå™¨ã€‚"
+"certificate in your %s server."
+msgstr ""
 
 #: templates/settings.php:78
 msgid "Not recommended, use for testing only."
@@ -268,8 +269,8 @@ msgid "User Display Name Field"
 msgstr "ä½¿ç”¨è€…åç¨±æ¬„ä½"
 
 #: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "ç”¨æ–¼ç”¢ç”ŸownCloudåç¨±"
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
 
 #: templates/settings.php:84
 msgid "Base User Tree"
@@ -292,7 +293,7 @@ msgid "Group Display Name Field"
 msgstr "ç¾¤çµ„é¡¯ç¤ºåç¨±æ¬„ä½"
 
 #: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
 #: templates/settings.php:87
@@ -353,12 +354,12 @@ msgid ""
 "characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
 "with their ASCII correspondence or simply omitted. On collisions a number "
 "will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
 msgstr ""
 
 #: templates/settings.php:103
@@ -371,12 +372,12 @@ msgstr ""
 
 #: templates/settings.php:105
 msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
 "username will be created based on the UUID, if not specified otherwise "
 "above. You can override the setting and pass an attribute of your choice. "
 "You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
+" users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
@@ -390,17 +391,16 @@ msgstr ""
 
 #: templates/settings.php:108
 msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
 msgstr ""
 
 #: templates/settings.php:109
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 5e8abbbb84bed55f110018468229c6360a59c366..2e684f4150b6075dbd99c393df200fe5de2ed322 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"POT-Creation-Date: 2013-07-27 01:56-0400\n"
+"PO-Revision-Date: 2013-07-27 05:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +26,12 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV èªè‰"
 
 #: templates/settings.php:4
-msgid "URL: "
+msgid "Address: "
 msgstr ""
 
 #: templates/settings.php:7
 msgid ""
-"ownCloud will send the user credentials to this URL. This plugin checks the "
+"The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr "ownCloud æœƒå°‡æŠŠç”¨æˆ¶çš„ç™»å…¥è³‡è¨Šç™¼é€åˆ°é€™å€‹ç¶²å€ä»¥å˜—è©¦ç™»å…¥ï¼Œä¸¦æª¢æŸ¥å›žæ‡‰ï¼Œ HTTP ç‹€æ…‹ç¢¼401å’Œ403è¦–ç‚ºç™»å…¥å¤±æ•—ï¼Œæ‰€æœ‰å…¶ä»–å›žæ‡‰è¦–ç‚ºç™»å…¥æˆåŠŸã€‚"
+msgstr ""
diff --git a/lib/MDB2/Driver/Datatype/sqlite3.php b/lib/MDB2/Driver/Datatype/sqlite3.php
deleted file mode 100644
index ca4c1cbceb8d3d85d651eb5656be0a1b01341fe7..0000000000000000000000000000000000000000
--- a/lib/MDB2/Driver/Datatype/sqlite3.php
+++ /dev/null
@@ -1,385 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once 'MDB2/Driver/Datatype/Common.php';
-
-/**
- * MDB2 SQLite driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Datatype_sqlite3 extends MDB2_Driver_Datatype_Common
-{
-    // {{{ _getCollationFieldDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to set the COLLATION
-     * of a field declaration to be used in statements like CREATE TABLE.
-     *
-     * @param string $collation name of the collation
-     *
-     * @return string DBMS specific SQL code portion needed to set the COLLATION
-     *                of a field declaration.
-     */
-    function _getCollationFieldDeclaration($collation)
-    {
-        return 'COLLATE '.$collation;
-    }
-
-    // }}}
-    // {{{ getTypeDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an text type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param array $field  associative array with the name of the properties
-     *      of the field being declared as array indexes. Currently, the types
-     *      of supported field properties are as follows:
-     *
-     *      length
-     *          Integer value that determines the maximum length of the text
-     *          field. If this argument is missing the field should be
-     *          declared to have the longest length allowed by the DBMS.
-     *
-     *      default
-     *          Text value to be used as default for this field.
-     *
-     *      notnull
-     *          Boolean flag that indicates whether this field is constrained
-     *          to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *      declare the specified field.
-     * @access public
-     */
-    function getTypeDeclaration($field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        switch ($field['type']) {
-        case 'text':
-            $length = !empty($field['length'])
-                ? $field['length'] : false;
-            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
-            return $fixed ? ($length ? 'CHAR('.$length.')' : 'CHAR('.$db->options['default_text_field_length'].')')
-                : ($length ? 'VARCHAR('.$length.')' : 'TEXT');
-        case 'clob':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 255) {
-                    return 'TINYTEXT';
-                } elseif ($length <= 65532) {
-                    return 'TEXT';
-                } elseif ($length <= 16777215) {
-                    return 'MEDIUMTEXT';
-                }
-            }
-            return 'LONGTEXT';
-        case 'blob':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 255) {
-                    return 'TINYBLOB';
-                } elseif ($length <= 65532) {
-                    return 'BLOB';
-                } elseif ($length <= 16777215) {
-                    return 'MEDIUMBLOB';
-                }
-            }
-            return 'LONGBLOB';
-        case 'integer':
-            if (!empty($field['length'])) {
-                $length = $field['length'];
-                if ($length <= 2) {
-                    return 'SMALLINT';
-                } elseif ($length == 3 || $length == 4) {
-                    return 'INTEGER';
-                } elseif ($length > 4) {
-                    return 'BIGINT';
-                }
-            }
-            return 'INTEGER';
-        case 'boolean':
-            return 'BOOLEAN';
-        case 'date':
-            return 'DATE';
-        case 'time':
-            return 'TIME';
-        case 'timestamp':
-            return 'DATETIME';
-        case 'float':
-            return 'DOUBLE'.($db->options['fixed_float'] ? '('.
-                ($db->options['fixed_float']+2).','.$db->options['fixed_float'].')' : '');
-        case 'decimal':
-            $length = !empty($field['length']) ? $field['length'] : 18;
-            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
-            return 'DECIMAL('.$length.','.$scale.')';
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ _getIntegerDeclaration()
-
-    /**
-     * Obtain DBMS specific SQL code portion needed to declare an integer type
-     * field to be used in statements like CREATE TABLE.
-     *
-     * @param string  $name   name the field to be declared.
-     * @param string  $field  associative array with the name of the properties
-     *                        of the field being declared as array indexes.
-     *                        Currently, the types of supported field
-     *                        properties are as follows:
-     *
-     *                       unsigned
-     *                        Boolean flag that indicates whether the field
-     *                        should be declared as unsigned integer if
-     *                        possible.
-     *
-     *                       default
-     *                        Integer value to be used as default for this
-     *                        field.
-     *
-     *                       notnull
-     *                        Boolean flag that indicates whether this field is
-     *                        constrained to not be set to null.
-     * @return string  DBMS specific SQL code portion that should be used to
-     *                 declare the specified field.
-     * @access protected
-     */
-    function _getIntegerDeclaration($name, $field)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $default = $autoinc = '';
-        if (!empty($field['autoincrement'])) {
-            $autoinc = ' PRIMARY KEY AUTOINCREMENT';
-        } elseif (array_key_exists('default', $field)) {
-            if ($field['default'] === '') {
-                $field['default'] = empty($field['notnull']) ? null : 0;
-            }
-            $default = ' DEFAULT '.$this->quote($field['default'], 'integer');
-        }
-
-        $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
-        $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
-        $name = $db->quoteIdentifier($name, true);
-        if($autoinc) {
-			return $name.' '.$this->getTypeDeclaration($field).$autoinc;
-        }else{
-			return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull.$autoinc;
-        }
-    }
-
-    // }}}
-    // {{{ matchPattern()
-
-    /**
-     * build a pattern matching string
-     *
-     * @access public
-     *
-     * @param array $pattern even keys are strings, odd are patterns (% and _)
-     * @param string $operator optional pattern operator (LIKE, ILIKE and maybe others in the future)
-     * @param string $field optional field name that is being matched against
-     *                  (might be required when emulating ILIKE)
-     *
-     * @return string SQL pattern
-     */
-    function matchPattern($pattern, $operator = null, $field = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $match = '';
-        if (!is_null($operator)) {
-            $field = is_null($field) ? '' : $field.' ';
-            $operator = strtoupper($operator);
-            switch ($operator) {
-            // case insensitive
-            case 'ILIKE':
-                $match = $field.'LIKE ';
-                break;
-            // case sensitive
-            case 'LIKE':
-                $match = $field.'LIKE ';
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'not a supported operator type:'. $operator, __FUNCTION__);
-            }
-        }
-        $match.= "'";
-        foreach ($pattern as $key => $value) {
-            if ($key % 2) {
-                $match.= $value;
-            } else {
-                $match.= $db->escapePattern($db->escape($value));
-            }
-        }
-        $match.= "'";
-        $match.= $this->patternEscapeString();
-        return $match;
-    }
-
-    // }}}
-    // {{{ _mapNativeDatatype()
-
-    /**
-     * Maps a native array description of a field to a MDB2 datatype and length
-     *
-     * @param array  $field native field description
-     * @return array containing the various possible types, length, sign, fixed
-     * @access public
-     */
-    function _mapNativeDatatype($field)
-    {
-        $db_type = strtolower($field['type']);
-        $length = !empty($field['length']) ? $field['length'] : null;
-        $unsigned = !empty($field['unsigned']) ? $field['unsigned'] : null;
-        $fixed = null;
-        $type = array();
-        switch ($db_type) {
-        case 'boolean':
-            $type[] = 'boolean';
-            break;
-        case 'tinyint':
-            $type[] = 'integer';
-            $type[] = 'boolean';
-            if (preg_match('/^(is|has)/', $field['name'])) {
-                $type = array_reverse($type);
-            }
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 1;
-            break;
-        case 'smallint':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 2;
-            break;
-        case 'mediumint':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 3;
-            break;
-        case 'int':
-        case 'integer':
-        case 'serial':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 4;
-            break;
-        case 'bigint':
-        case 'bigserial':
-            $type[] = 'integer';
-            $unsigned = preg_match('/ unsigned/i', $field['type']);
-            $length = 8;
-            break;
-        case 'clob':
-            $type[] = 'clob';
-            $fixed  = false;
-            break;
-        case 'tinytext':
-        case 'mediumtext':
-        case 'longtext':
-        case 'text':
-        case 'varchar':
-        case 'varchar2':
-            $fixed = false;
-        case 'char':
-            $type[] = 'text';
-            if ($length == '1') {
-                $type[] = 'boolean';
-                if (preg_match('/^(is|has)/', $field['name'])) {
-                    $type = array_reverse($type);
-                }
-            } elseif (strstr($db_type, 'text')) {
-                $type[] = 'clob';
-                $type = array_reverse($type);
-            }
-            if ($fixed !== false) {
-                $fixed = true;
-            }
-            break;
-        case 'date':
-            $type[] = 'date';
-            $length = null;
-            break;
-        case 'datetime':
-        case 'timestamp':
-            $type[] = 'timestamp';
-            $length = null;
-            break;
-        case 'time':
-            $type[] = 'time';
-            $length = null;
-            break;
-        case 'float':
-        case 'double':
-        case 'real':
-            $type[] = 'float';
-            break;
-        case 'decimal':
-        case 'numeric':
-            $type[] = 'decimal';
-            $length = $length.','.$field['decimal'];
-            break;
-        case 'tinyblob':
-        case 'mediumblob':
-        case 'longblob':
-        case 'blob':
-            $type[] = 'blob';
-            $length = null;
-            break;
-        case 'year':
-            $type[] = 'integer';
-            $type[] = 'date';
-            $length = null;
-            break;
-        default:
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'unknown database attribute type: '.$db_type, __FUNCTION__);
-        }
-
-        if ((int)$length <= 0) {
-            $length = null;
-        }
-
-        return array($type, $length, $unsigned, $fixed);
-    }
-
-    // }}}
-}
diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
deleted file mode 100644
index 4147a48199f54e1bdb1e1f2cc939c3f83790d75e..0000000000000000000000000000000000000000
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once 'MDB2/Driver/Function/Common.php';
-
-/**
- * MDB2 SQLite driver for the function modules
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common
-{
-    // {{{ constructor
-
-    /**
-     * Constructor
-     */
-    function __construct($db_index)
-    {
-        parent::__construct($db_index);
-        // create all sorts of UDFs
-    }
-
-    // {{{ now()
-
-    /**
-     * Return string to call a variable with the current timestamp inside an SQL statement
-     * There are three special variables for current date and time.
-     *
-     * @return string to call a variable with the current timestamp
-     * @access public
-     */
-    function now($type = 'timestamp')
-    {
-        switch ($type) {
-        case 'time':
-            return 'CURRENT_TIME';
-        case 'date':
-            return 'CURRENT_DATE';
-        case 'timestamp':
-        default:
-            return 'CURRENT_TIMESTAMP';
-        }
-    }
-
-    // }}}
-    // {{{ unixtimestamp()
-
-    /**
-     * return string to call a function to get the unix timestamp from a iso timestamp
-     *
-     * @param string $expression
-     *
-     * @return string to call a variable with the timestamp
-     * @access public
-     */
-    function unixtimestamp($expression)
-    {
-        return 'strftime("%s",'. $expression.', "utc")';
-    }
-
-    // }}}
-    // {{{ substring()
-
-    /**
-     * return string to call a function to get a substring inside an SQL statement
-     *
-     * @return string to call a function to get a substring
-     * @access public
-     */
-    function substring($value, $position = 1, $length = null)
-    {
-        if (!is_null($length)) {
-            return "substr($value, $position, $length)";
-        }
-        return "substr($value, $position, length($value))";
-    }
-
-    // }}}
-    // {{{ random()
-
-    /**
-     * return string to call a function to get random value inside an SQL statement
-     *
-     * @return return string to generate float between 0 and 1
-     * @access public
-     */
-    function random()
-    {
-        return '((RANDOM()+2147483648)/4294967296)';
-    }
-
-    // }}}
-    // {{{ replace()
-
-    /**
-     * return string to call a function to get a replacement inside an SQL statement.
-     *
-     * @return string to call a function to get a replace
-     * @access public
-     */
-    function replace($str, $from_str, $to_str)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $error =& $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'method not implemented', __FUNCTION__);
-        return $error;
-    }
-
-    // }}}
-}
diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
deleted file mode 100644
index 921153c17dd027f9c082caa4a6be73bba4ab7655..0000000000000000000000000000000000000000
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ /dev/null
@@ -1,1362 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once 'MDB2/Driver/Manager/Common.php';
-
-/**
- * MDB2 SQLite driver for the management modules
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- * @author  Lorenzo Alberton <l.alberton@quipo.it>
- */
-class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
-{
-    // {{{ createDatabase()
-
-    /**
-     * create a new database
-     *
-     * @param string $name    name of the database that should be created
-     * @param array  $options array with charset info
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createDatabase($name, $options = array())
-    {
-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $database_file = $db->_getDatabaseFile($name);
-        if (file_exists($database_file)) {
-            return $db->raiseError(MDB2_ERROR_ALREADY_EXISTS, null, null,
-                'database already exists', __FUNCTION__);
-        }
-        $php_errormsg = '';
-        $database_file="$datadir/$database_file.db";
-        $handle=new SQLite3($database_file);
-        if (!$handle) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                (isset($php_errormsg) ? $php_errormsg : 'could not create the database file'), __FUNCTION__);
-        }
-        //sqlite doesn't support the latin1 we use
-//         if (!empty($options['charset'])) {
-//             $query = 'PRAGMA encoding = ' . $db->quote($options['charset'], 'text');
-//             $handle->exec($query);
-//         }
-        $handle->close();
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dropDatabase()
-
-    /**
-     * drop an existing database
-     *
-     * @param string $name name of the database that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropDatabase($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $database_file = $db->_getDatabaseFile($name);
-        if (!@file_exists($database_file)) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_DROP, null, null,
-                'database does not exist', __FUNCTION__);
-        }
-        $result = @unlink($database_file);
-        if (!$result) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_DROP, null, null,
-                (isset($php_errormsg) ? $php_errormsg : 'could not remove the database file'), __FUNCTION__);
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ _getAdvancedFKOptions()
-
-    /**
-     * Return the FOREIGN KEY query section dealing with non-standard options
-     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
-     *
-     * @param array $definition
-     * @return string
-     * @access protected
-     */
-    function _getAdvancedFKOptions($definition)
-    {
-        $query = '';
-        if (!empty($definition['match'])) {
-            $query .= ' MATCH '.$definition['match'];
-        }
-        if (!empty($definition['onupdate']) && (strtoupper($definition['onupdate']) != 'NO ACTION')) {
-            $query .= ' ON UPDATE '.$definition['onupdate'];
-        }
-        if (!empty($definition['ondelete']) && (strtoupper($definition['ondelete']) != 'NO ACTION')) {
-            $query .= ' ON DELETE '.$definition['ondelete'];
-        }
-        if (!empty($definition['deferrable'])) {
-            $query .= ' DEFERRABLE';
-        } else {
-            $query .= ' NOT DEFERRABLE';
-        }
-        if (!empty($definition['initiallydeferred'])) {
-            $query .= ' INITIALLY DEFERRED';
-        } else {
-            $query .= ' INITIALLY IMMEDIATE';
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ _getCreateTableQuery()
-
-    /**
-     * Create a basic SQL query for a new table creation
-     * @param string $name   Name of the database that should be created
-     * @param array $fields  Associative array that contains the definition of each field of the new table
-     * @param array $options  An associative array of table options
-     * @return mixed string (the SQL query) on success, a MDB2 error on failure
-     * @see createTable()
-     */
-    function _getCreateTableQuery($name, $fields, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!$name) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                'no valid table name specified', __FUNCTION__);
-        }
-        if (empty($fields)) {
-            return $db->raiseError(MDB2_ERROR_CANNOT_CREATE, null, null,
-                'no fields specified for table "'.$name.'"', __FUNCTION__);
-        }
-        $query_fields = $this->getFieldDeclarationList($fields);
-        if (PEAR::isError($query_fields)) {
-            return $query_fields;
-        }
-        if (!empty($options['foreign_keys'])) {
-            foreach ($options['foreign_keys'] as $fkname => $fkdef) {
-                if (empty($fkdef)) {
-                    continue;
-                }
-                $query_fields.= ', CONSTRAINT '.$fkname.' FOREIGN KEY ('.implode(', ', array_keys($fkdef['fields'])).')';
-                $query_fields.= ' REFERENCES '.$fkdef['references']['table'].' ('.implode(', ', array_keys($fkdef['references']['fields'])).')';
-                $query_fields.= $this->_getAdvancedFKOptions($fkdef);
-            }
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        $result = 'CREATE ';
-        if (!empty($options['temporary'])) {
-            $result .= $this->_getTemporaryTableQuery();
-        }
-        $result .= " TABLE $name ($query_fields)";
-        return $result;
-    }
-
-    // }}}
-    // {{{ createTable()
-
-    /**
-     * create a new table
-     *
-     * @param string $name    Name of the database that should be created
-     * @param array  $fields  Associative array that contains the definition
-     *                        of each field of the new table
-     * @param array  $options An associative array of table options
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createTable($name, $fields, $options = array())
-    {
-        $result = parent::createTable($name, $fields, $options);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        // create triggers to enforce FOREIGN KEY constraints
-        if (!empty($options['foreign_keys'])) {
-            $db =$this->getDBInstance();
-            if (PEAR::isError($db)) {
-                return $db;
-            }
-            foreach ($options['foreign_keys'] as $fkname => $fkdef) {
-                if (empty($fkdef)) {
-                    continue;
-                }
-                //set actions to default if not set
-                $fkdef['onupdate'] = empty($fkdef['onupdate']) ? $db->options['default_fk_action_onupdate'] : strtoupper($fkdef['onupdate']);
-                $fkdef['ondelete'] = empty($fkdef['ondelete']) ? $db->options['default_fk_action_ondelete'] : strtoupper($fkdef['ondelete']);
-
-                $trigger_names = array(
-                    'insert'    => $fkname.'_insert_trg',
-                    'update'    => $fkname.'_update_trg',
-                    'pk_update' => $fkname.'_pk_update_trg',
-                    'pk_delete' => $fkname.'_pk_delete_trg',
-                );
-
-                //create the [insert|update] triggers on the FK table
-                $table_fields = array_keys($fkdef['fields']);
-                $referenced_fields = array_keys($fkdef['references']['fields']);
-                $query = 'CREATE TRIGGER %s BEFORE %s ON '.$name
-                        .' FOR EACH ROW BEGIN'
-                        .' SELECT RAISE(ROLLBACK, \'%s on table "'.$name.'" violates FOREIGN KEY constraint "'.$fkname.'"\')'
-                        .' WHERE  (SELECT ';
-                $aliased_fields = array();
-                foreach ($referenced_fields as $field) {
-                    $aliased_fields[] = $fkdef['references']['table'] .'.'.$field .' AS '.$field;
-                }
-                $query .= implode(',', $aliased_fields)
-                       .' FROM '.$fkdef['references']['table']
-                       .' WHERE ';
-                $conditions = array();
-                for ($i=0; $i<count($table_fields); $i++) {
-                    $conditions[] = $referenced_fields[$i] .' = NEW.'.$table_fields[$i];
-                }
-                $query .= implode(' AND ', $conditions).') IS NULL; END;';
-                $result = $db->exec(sprintf($query, $trigger_names['insert'], 'INSERT', 'insert'));
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-
-                $result = $db->exec(sprintf($query, $trigger_names['update'], 'UPDATE', 'update'));
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-
-                //create the ON [UPDATE|DELETE] triggers on the primary table
-                $restrict_action = 'SELECT RAISE(ROLLBACK, \'%s on table "'.$name.'" violates FOREIGN KEY constraint "'.$fkname.'"\')'
-                                  .' WHERE  (SELECT ';
-                $aliased_fields = array();
-                foreach ($table_fields as $field) {
-                    $aliased_fields[] = $name .'.'.$field .' AS '.$field;
-                }
-                $restrict_action .= implode(',', $aliased_fields)
-                       .' FROM '.$name
-                       .' WHERE ';
-                $conditions  = array();
-                $new_values  = array();
-                $null_values = array();
-                for ($i=0; $i<count($table_fields); $i++) {
-                    $conditions[]  = $table_fields[$i] .' = OLD.'.$referenced_fields[$i];
-                    $new_values[]  = $table_fields[$i] .' = NEW.'.$referenced_fields[$i];
-                    $null_values[] = $table_fields[$i] .' = NULL';
-                }
-                $conditions2 = array();
-                for ($i=0; $i<count($referenced_fields); $i++) {
-                    $conditions2[]  = 'NEW.'.$referenced_fields[$i] .' <> OLD.'.$referenced_fields[$i];
-                }
-                $restrict_action .= implode(' AND ', $conditions).') IS NOT NULL'
-                                 .' AND (' .implode(' OR ', $conditions2) .')';
-
-                $cascade_action_update = 'UPDATE '.$name.' SET '.implode(', ', $new_values) .' WHERE '.implode(' AND ', $conditions);
-                $cascade_action_delete = 'DELETE FROM '.$name.' WHERE '.implode(' AND ', $conditions);
-                $setnull_action        = 'UPDATE '.$name.' SET '.implode(', ', $null_values).' WHERE '.implode(' AND ', $conditions);
-
-                if ('SET DEFAULT' == $fkdef['onupdate'] || 'SET DEFAULT' == $fkdef['ondelete']) {
-                    $db->loadModule('Reverse', null, true);
-                    $default_values = array();
-                    foreach ($table_fields as $table_field) {
-                        $field_definition = $db->reverse->getTableFieldDefinition($name, $field);
-                        if (PEAR::isError($field_definition)) {
-                            return $field_definition;
-                        }
-                        $default_values[] = $table_field .' = '. $field_definition[0]['default'];
-                    }
-                    $setdefault_action = 'UPDATE '.$name.' SET '.implode(', ', $default_values).' WHERE '.implode(' AND ', $conditions);
-                }
-
-                $query = 'CREATE TRIGGER %s'
-                        .' %s ON '.$fkdef['references']['table']
-                        .' FOR EACH ROW BEGIN ';
-
-                if ('CASCADE' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'AFTER UPDATE',  'update') . $cascade_action_update. '; END;';
-                } elseif ('SET NULL' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setnull_action. '; END;';
-                } elseif ('SET DEFAULT' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . $setdefault_action. '; END;';
-                } elseif ('NO ACTION' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'AFTER UPDATE', 'update') . '; END;';
-                } elseif ('RESTRICT' == $fkdef['onupdate']) {
-                    $sql_update = sprintf($query.$restrict_action, $trigger_names['pk_update'], 'BEFORE UPDATE', 'update') . '; END;';
-                }
-                if ('CASCADE' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'AFTER DELETE',  'delete') . $cascade_action_delete. '; END;';
-                } elseif ('SET NULL' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setnull_action. '; END;';
-                } elseif ('SET DEFAULT' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . $setdefault_action. '; END;';
-                } elseif ('NO ACTION' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'AFTER DELETE', 'delete')  . '; END;';
-                } elseif ('RESTRICT' == $fkdef['ondelete']) {
-                    $sql_delete = sprintf($query.$restrict_action, $trigger_names['pk_delete'], 'BEFORE DELETE', 'delete') . '; END;';
-                }
-
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $result = $db->exec($sql_delete);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $result = $db->exec($sql_update);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-            }
-        }
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ dropTable()
-
-    /**
-     * drop an existing table
-     *
-     * @param string $name name of the table that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropTable($name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        //delete the triggers associated to existing FK constraints
-        $constraints = $this->listTableConstraints($name);
-        if (!PEAR::isError($constraints) && !empty($constraints)) {
-            $db->loadModule('Reverse', null, true);
-            foreach ($constraints as $constraint) {
-                $definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
-                if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
-                    $result = $this->_dropFKTriggers($name, $constraint, $definition['references']['table']);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        return $db->exec("DROP TABLE $name");
-    }
-
-    // }}}
-    // {{{ vacuum()
-
-    /**
-     * Optimize (vacuum) all the tables in the db (or only the specified table)
-     * and optionally run ANALYZE.
-     *
-     * @param string $table table name (all the tables if empty)
-     * @param array  $options an array with driver-specific options:
-     *               - timeout [int] (in seconds) [mssql-only]
-     *               - analyze [boolean] [pgsql and mysql]
-     *               - full [boolean] [pgsql-only]
-     *               - freeze [boolean] [pgsql-only]
-     *
-     * @return mixed MDB2_OK success, a MDB2 error on failure
-     * @access public
-     */
-    function vacuum($table = null, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = 'VACUUM';
-        if (!empty($table)) {
-            $query .= ' '.$db->quoteIdentifier($table, true);
-        }
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ alterTable()
-
-    /**
-     * alter an existing table
-     *
-     * @param string $name         name of the table that is intended to be changed.
-     * @param array $changes     associative array that contains the details of each type
-     *                             of change that is intended to be performed. The types of
-     *                             changes that are currently supported are defined as follows:
-     *
-     *                             name
-     *
-     *                                New name for the table.
-     *
-     *                            add
-     *
-     *                                Associative array with the names of fields to be added as
-     *                                 indexes of the array. The value of each entry of the array
-     *                                 should be set to another associative array with the properties
-     *                                 of the fields to be added. The properties of the fields should
-     *                                 be the same as defined by the MDB2 parser.
-     *
-     *
-     *                            remove
-     *
-     *                                Associative array with the names of fields to be removed as indexes
-     *                                 of the array. Currently the values assigned to each entry are ignored.
-     *                                 An empty array should be used for future compatibility.
-     *
-     *                            rename
-     *
-     *                                Associative array with the names of fields to be renamed as indexes
-     *                                 of the array. The value of each entry of the array should be set to
-     *                                 another associative array with the entry named name with the new
-     *                                 field name and the entry named Declaration that is expected to contain
-     *                                 the portion of the field declaration already in DBMS specific SQL code
-     *                                 as it is used in the CREATE TABLE statement.
-     *
-     *                            change
-     *
-     *                                Associative array with the names of the fields to be changed as indexes
-     *                                 of the array. Keep in mind that if it is intended to change either the
-     *                                 name of a field and any other properties, the change array entries
-     *                                 should have the new names of the fields as array indexes.
-     *
-     *                                The value of each entry of the array should be set to another associative
-     *                                 array with the properties of the fields to that are meant to be changed as
-     *                                 array entries. These entries should be assigned to the new values of the
-     *                                 respective properties. The properties of the fields should be the same
-     *                                 as defined by the MDB2 parser.
-     *
-     *                            Example
-     *                                array(
-     *                                    'name' => 'userlist',
-     *                                    'add' => array(
-     *                                        'quota' => array(
-     *                                            'type' => 'integer',
-     *                                            'unsigned' => 1
-     *                                        )
-     *                                    ),
-     *                                    'remove' => array(
-     *                                        'file_limit' => array(),
-     *                                        'time_limit' => array()
-     *                                    ),
-     *                                    'change' => array(
-     *                                        'name' => array(
-     *                                            'length' => '20',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 20,
-     *                                            ),
-     *                                        )
-     *                                    ),
-     *                                    'rename' => array(
-     *                                        'sex' => array(
-     *                                            'name' => 'gender',
-     *                                            'definition' => array(
-     *                                                'type' => 'text',
-     *                                                'length' => 1,
-     *                                                'default' => 'M',
-     *                                            ),
-     *                                        )
-     *                                    )
-     *                                )
-     *
-     * @param boolean $check     indicates whether the function should just check if the DBMS driver
-     *                             can perform the requested table alterations if the value is true or
-     *                             actually perform them otherwise.
-     * @access public
-     *
-      * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function alterTable($name, $changes, $check, $options = array())
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        foreach ($changes as $change_name => $change) {
-            switch ($change_name) {
-            case 'add':
-            case 'remove':
-            case 'change':
-            case 'name':
-            case 'rename':
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
-                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
-            }
-        }
-
-        if ($check) {
-            return MDB2_OK;
-        }
-
-        if (empty($changes['remove']) and empty($changes['rename']) and empty($changes['change']) ) {//if only rename or add changes are required, we can use ALTER TABLE
-			$query = '';
-			if (!empty($changes['name'])) {
-				$change_name = $db->quoteIdentifier($changes['name'], true);
-				$query = 'RENAME TO ' . $change_name;
-				$db->exec("ALTER TABLE $name $query");
-			}
-
-			if (!empty($changes['add']) && is_array($changes['add'])) {
-				foreach ($changes['add'] as $field_name => $field) {
-					$query= 'ADD ' . $db->getDeclaration($field['type'], $field_name, $field);
-					$db->exec("ALTER TABLE $name $query");
-				}
-			}
-			return MDB2_OK;
-        }
-
-        $db->loadModule('Reverse', null, true);
-
-        // for other operations we need to emulate them with sqlite3
-        $fields = $db->manager->listTableFields($name);
-        if (PEAR::isError($fields)) {
-            return $fields;
-        }
-
-        $fields = array_flip($fields);
-        foreach ($fields as $field => $value) {
-            $definition = $db->reverse->getTableFieldDefinition($name, $field);
-            if (PEAR::isError($definition)) {
-                return $definition;
-            }
-            $fields[$field] = $definition[0];
-        }
-
-        $indexes = $db->manager->listTableIndexes($name);
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $indexes = array_flip($indexes);
-        foreach ($indexes as $index => $value) {
-            $definition = $db->reverse->getTableIndexDefinition($name, $index);
-            if (PEAR::isError($definition)) {
-                return $definition;
-            }
-            $indexes[$index] = $definition;
-        }
-
-        $constraints = $db->manager->listTableConstraints($name);
-        if (PEAR::isError($constraints)) {
-            return $constraints;
-        }
-
-        if (!array_key_exists('foreign_keys', $options)) {
-            $options['foreign_keys'] = array();
-        }
-        $constraints = array_flip($constraints);
-        foreach ($constraints as $constraint => $value) {
-            if (!empty($definition['primary'])) {
-                if (!array_key_exists('primary', $options)) {
-                    $options['primary'] = $definition['fields'];
-                    //remove from the $constraint array, it's already handled by createTable()
-                    unset($constraints[$constraint]);
-                }
-            } else {
-                $c_definition = $db->reverse->getTableConstraintDefinition($name, $constraint);
-                if (PEAR::isError($c_definition)) {
-                    return $c_definition;
-                }
-                if (!empty($c_definition['foreign'])) {
-                    if (!array_key_exists($constraint, $options['foreign_keys'])) {
-                        $options['foreign_keys'][$constraint] = $c_definition;
-                    }
-                    //remove from the $constraint array, it's already handled by createTable()
-                    unset($constraints[$constraint]);
-                } else {
-                    $constraints[$constraint] = $c_definition;
-                }
-            }
-        }
-
-        $name_new = $name;
-        $create_order = $select_fields = array_keys($fields);
-        foreach ($changes as $change_name => $change) {
-            switch ($change_name) {
-            case 'add':
-                foreach ($change as $field_name => $field) {
-                    $fields[$field_name] = $field;
-                    $create_order[] = $field_name;
-                }
-                break;
-            case 'remove':
-                foreach ($change as $field_name => $field) {
-                    unset($fields[$field_name]);
-                    $select_fields = array_diff($select_fields, array($field_name));
-                    $create_order = array_diff($create_order, array($field_name));
-                }
-                break;
-            case 'change':
-                foreach ($change as $field_name => $field) {
-                    $fields[$field_name] = $field['definition'];
-                }
-                break;
-            case 'name':
-                $name_new = $change;
-                break;
-            case 'rename':
-                foreach ($change as $field_name => $field) {
-                    unset($fields[$field_name]);
-                    $fields[$field['name']] = $field['definition'];
-                    $create_order[array_search($field_name, $create_order)] = $field['name'];
-                }
-                break;
-            default:
-                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
-                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
-            }
-        }
-
-		//rename the old table so we can create the new one
-        $db->exec("ALTER TABLE $name RENAME TO __$name");
-        $data = null;
-
-
-        $result = $this->createTable($name_new, $fields, $options);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        //these seem to only give errors
-
-//         foreach ($indexes as $index => $definition) {
-//             $this->createIndex($name_new, $index, $definition);
-//         }
-
-//         foreach ($constraints as $constraint => $definition) {
-//             $this->createConstraint($name_new, $constraint, $definition);
-//         }
-
-        //fill the new table with data from the old one
-        if (!empty($select_fields)) {
-			$query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
-			$query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
-            $query .= ' SELECT '.implode(', ', $select_fields).' FROM '.$db->quoteIdentifier('__'.$name, true);
-            $db->exec($query);
-        }
-
-//         if (!empty($select_fields) && !empty($data)) {
-//             $query = 'INSERT INTO '.$db->quoteIdentifier($name_new, true);
-//             $query.= '('.implode(', ', array_slice(array_keys($fields), 0, count($select_fields))).')';
-//             $query.=' VALUES (?'.str_repeat(', ?', (count($select_fields) - 1)).')';
-//             $stmt =$db->prepare($query, null, MDB2_PREPARE_MANIP);
-//             if (PEAR::isError($stmt)) {
-//                 return $stmt;
-//             }
-//             foreach ($data as $row) {
-//                 $result = $stmt->execute($row);
-//                 if (PEAR::isError($result)) {
-//                     return $result;
-//                 }
-//             }
-//         }
-
-        //remove the old table
-        $result = $this->dropTable('__'.$name);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ listDatabases()
-
-    /**
-     * list all databases
-     *
-     * @return mixed array of database names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listDatabases()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'list databases is not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listUsers()
-
-    /**
-     * list all users
-     *
-     * @return mixed array of user names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listUsers()
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'list databases is not supported', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ listViews()
-
-    /**
-     * list all views in the current database
-     *
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listViews($dummy=null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='view' AND sql NOT NULL";
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableViews()
-
-    /**
-     * list the views in the database that reference a given table
-     *
-     * @param string table for which all referenced views should be found
-     * @return mixed array of view names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableViews($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name, sql FROM sqlite_master WHERE type='view' AND sql NOT NULL";
-        $views = $db->queryAll($query, array('text', 'text'), MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($views)) {
-            return $views;
-        }
-        $result = array();
-        foreach ($views as $row) {
-            if (preg_match("/^create view .* \bfrom\b\s+\b{$table}\b /i", $row['sql'])) {
-                if (!empty($row['name'])) {
-                    $result[$row['name']] = true;
-                }
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ listTables()
-
-    /**
-     * list all tables in the current database
-     *
-     * @return mixed array of table names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTables($dummy=null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL AND name!='sqlite_sequence' ORDER BY name";
-        $table_names = $db->queryCol($query);
-        if (PEAR::isError($table_names)) {
-            return $table_names;
-        }
-        $result = array();
-        foreach ($table_names as $table_name) {
-            if (!$this->_fixSequenceName($table_name, true)) {
-                $result[] = $table_name;
-            }
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ listTableFields()
-
-    /**
-     * list all fields in a table in the current database
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of field names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableFields($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $result = $db->loadModule('Reverse', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name='.$db->quote($table, 'text');
-        }
-        $sql = $db->queryOne($query);
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        $columns = $db->reverse->_getTableColumns($sql);
-        $fields = array();
-        foreach ($columns as $column) {
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $column['name'] = strtolower($column['name']);
-                } else {
-                    $column['name'] = strtoupper($column['name']);
-                }
-            } else {
-                $column = array_change_key_case($column, $db->options['field_case']);
-            }
-            $fields[] = $column['name'];
-        }
-        return $fields;
-    }
-
-    // }}}
-    // {{{ listTableTriggers()
-
-    /**
-     * list all triggers in the database that reference a given table
-     *
-     * @param string table for which all referenced triggers should be found
-     * @return mixed array of trigger names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableTriggers($table = null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='trigger' AND sql NOT NULL";
-        if (!is_null($table)) {
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $query.= ' AND LOWER(tbl_name)='.$db->quote(strtolower($table), 'text');
-            } else {
-                $query.= ' AND tbl_name='.$db->quote($table, 'text');
-            }
-        }
-        $result = $db->queryCol($query);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ createIndex()
-
-    /**
-     * Get the stucture of a field into an array
-     *
-     * @param string    $table         name of the table on which the index is to be created
-     * @param string    $name         name of the index to be created
-     * @param array     $definition        associative array that defines properties of the index to be created.
-     *                                 Currently, only one property named FIELDS is supported. This property
-     *                                 is also an associative with the names of the index fields as array
-     *                                 indexes. Each entry of this array is set to another type of associative
-     *                                 array that specifies properties of the index that are specific to
-     *                                 each field.
-     *
-     *                                Currently, only the sorting property is supported. It should be used
-     *                                 to define the sorting direction of the index. It may be set to either
-     *                                 ascending or descending.
-     *
-     *                                Not all DBMS support index sorting direction configuration. The DBMS
-     *                                 drivers of those that do not support it ignore this property. Use the
-     *                                 function support() to determine whether the DBMS driver can manage indexes.
-
-     *                                 Example
-     *                                    array(
-     *                                        'fields' => array(
-     *                                            'user_name' => array(
-     *                                                'sorting' => 'ascending'
-     *                                            ),
-     *                                            'last_login' => array()
-     *                                        )
-     *                                    )
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createIndex($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name  = $db->getIndexName($name);
-        $query = "CREATE INDEX $name ON $table";
-        $fields = array();
-        foreach ($definition['fields'] as $field_name => $field) {
-            $field_string = $field_name;
-            if (!empty($field['sorting'])) {
-                switch ($field['sorting']) {
-                case 'ascending':
-                    $field_string.= ' ASC';
-                    break;
-                case 'descending':
-                    $field_string.= ' DESC';
-                    break;
-                }
-            }
-            $fields[] = $field_string;
-        }
-        $query .= ' ('.implode(', ', $fields) . ')';
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ dropIndex()
-
-    /**
-     * drop existing index
-     *
-     * @param string    $table         name of table that should be used in method
-     * @param string    $name         name of the index to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropIndex($table, $name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->getIndexName($name);
-        return $db->exec("DROP INDEX $name");
-    }
-
-    // }}}
-    // {{{ listTableIndexes()
-
-    /**
-     * list all indexes in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of index names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableIndexes($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quote($table, 'text');
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(tbl_name)='.strtolower($table);
-        } else {
-            $query.= "tbl_name=$table";
-        }
-        $query.= " AND sql NOT NULL ORDER BY name";
-        $indexes = $db->queryCol($query, 'text');
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $result = array();
-        foreach ($indexes as $sql) {
-            if (preg_match("/^create index ([^ ]+) on /i", $sql, $tmp)) {
-                $index = $this->_fixIndexName($tmp[1]);
-                if (!empty($index)) {
-                    $result[$index] = true;
-                }
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ createConstraint()
-
-    /**
-     * create a constraint on a table
-     *
-     * @param string $table      name of the table on which the constraint is to be created
-     * @param string $name       name of the constraint to be created
-     * @param array  $definition associative array that defines properties of the constraint to be created.
-     *                           Currently, only one property named FIELDS is supported. This property
-     *                           is also an associative with the names of the constraint fields as array
-     *                           constraints. Each entry of this array is set to another type of associative
-     *                           array that specifies properties of the constraint that are specific to
-     *                           each field.
-     *
-     *                           Example
-     *                              array(
-     *                                  'fields' => array(
-     *                                      'user_name' => array(),
-     *                                      'last_login' => array()
-     *                                  )
-     *                              )
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createConstraint($table, $name, $definition)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        if (!empty($definition['primary'])) {
-            return $db->manager->alterTable($table, array(), false, array('primary' => $definition['fields']));
-        }
-
-        if (!empty($definition['foreign'])) {
-            return $db->manager->alterTable($table, array(), false, array('foreign_keys' => array($name => $definition)));
-        }
-
-        $table = $db->quoteIdentifier($table, true);
-        $name  = $db->getIndexName($name);
-        $query = "CREATE UNIQUE INDEX $name ON $table";
-        $fields = array();
-        foreach ($definition['fields'] as $field_name => $field) {
-            $field_string = $field_name;
-            if (!empty($field['sorting'])) {
-                switch ($field['sorting']) {
-                case 'ascending':
-                    $field_string.= ' ASC';
-                    break;
-                case 'descending':
-                    $field_string.= ' DESC';
-                    break;
-                }
-            }
-            $fields[] = $field_string;
-        }
-        $query .= ' ('.implode(', ', $fields) . ')';
-        return $db->exec($query);
-    }
-
-    // }}}
-    // {{{ dropConstraint()
-
-    /**
-     * drop existing constraint
-     *
-     * @param string    $table        name of table that should be used in method
-     * @param string    $name         name of the constraint to be dropped
-     * @param string    $primary      hint if the constraint is primary
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropConstraint($table, $name, $primary = false)
-    {
-        if ($primary || $name == 'PRIMARY') {
-            return $this->alterTable($table, array(), false, array('primary' => null));
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        //is it a FK constraint? If so, also delete the associated triggers
-        $db->loadModule('Reverse', null, true);
-        $definition = $db->reverse->getTableConstraintDefinition($table, $name);
-        if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
-            //first drop the FK enforcing triggers
-            $result = $this->_dropFKTriggers($table, $name, $definition['references']['table']);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            //then drop the constraint itself
-            return $this->alterTable($table, array(), false, array('foreign_keys' => array($name => null)));
-        }
-
-        $name = $db->getIndexName($name);
-        return $db->exec("DROP INDEX $name");
-    }
-
-    // }}}
-    // {{{ _dropFKTriggers()
-
-    /**
-     * Drop the triggers created to enforce the FOREIGN KEY constraint on the table
-     *
-     * @param string $table  table name
-     * @param string $fkname FOREIGN KEY constraint name
-     * @param string $referenced_table  referenced table name
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access private
-     */
-    function _dropFKTriggers($table, $fkname, $referenced_table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $triggers  = $this->listTableTriggers($table);
-        $triggers2 = $this->listTableTriggers($referenced_table);
-        if (!PEAR::isError($triggers2) && !PEAR::isError($triggers)) {
-            $triggers = array_merge($triggers, $triggers2);
-            $pattern = '/^'.$fkname.'(_pk)?_(insert|update|delete)_trg$/i';
-            foreach ($triggers as $trigger) {
-                if (preg_match($pattern, $trigger)) {
-                    $result = $db->exec('DROP TRIGGER '.$trigger);
-                    if (PEAR::isError($result)) {
-                        return $result;
-                    }
-                }
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ listTableConstraints()
-
-    /**
-     * list all constraints in a table
-     *
-     * @param string $table name of table that should be used in method
-     * @return mixed array of constraint names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listTableConstraints($table)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $table = $db->quote($table, 'text');
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(tbl_name)='.strtolower($table);
-        } else {
-            $query.= "tbl_name=$table";
-        }
-        $query.= " AND sql NOT NULL ORDER BY name";
-        $indexes = $db->queryCol($query, 'text');
-        if (PEAR::isError($indexes)) {
-            return $indexes;
-        }
-
-        $result = array();
-        foreach ($indexes as $sql) {
-            if (preg_match("/^create unique index ([^ ]+) on /i", $sql, $tmp)) {
-                $index = $this->_fixIndexName($tmp[1]);
-                if (!empty($index)) {
-                    $result[$index] = true;
-                }
-            }
-        }
-
-        // also search in table definition for PRIMARY KEYs...
-        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)='.strtolower($table);
-        } else {
-            $query.= "name=$table";
-        }
-        $query.= " AND sql NOT NULL ORDER BY name";
-        $table_def = $db->queryOne($query, 'text');
-        if (PEAR::isError($table_def)) {
-            return $table_def;
-        }
-        if (preg_match("/\bPRIMARY\s+KEY\b/i", $table_def, $tmp)) {
-            $result['primary'] = true;
-        }
-
-        // ...and for FOREIGN KEYs
-        if (preg_match_all("/\bCONSTRAINT\b\s+([^\s]+)\s+\bFOREIGN\s+KEY/imsx", $table_def, $tmp)) {
-            foreach ($tmp[1] as $fk) {
-                $result[$fk] = true;
-            }
-        }
-
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_change_key_case($result, $db->options['field_case']);
-        }
-        return array_keys($result);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * create sequence
-     *
-     * @param string    $seq_name     name of the sequence to be created
-     * @param string    $start         start value of the sequence; default is 1
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function createSequence($seq_name, $start = 1)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $seqcol_name = $db->quoteIdentifier($db->options['seqcol_name'], true);
-        $query = "CREATE TABLE $sequence_name ($seqcol_name INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)";
-        $res = $db->exec($query);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-        if ($start == 1) {
-            return MDB2_OK;
-        }
-        $res = $db->exec("INSERT INTO $sequence_name ($seqcol_name) VALUES (".($start-1).')');
-        if (!PEAR::isError($res)) {
-            return MDB2_OK;
-        }
-        // Handle error
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (PEAR::isError($result)) {
-            return $db->raiseError($result, null, null,
-                'could not drop inconsistent sequence table', __FUNCTION__);
-        }
-        return $db->raiseError($res, null, null,
-            'could not create sequence table', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * drop existing sequence
-     *
-     * @param string    $seq_name     name of the sequence to be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropSequence($seq_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        return $db->exec("DROP TABLE $sequence_name");
-    }
-
-    // }}}
-    // {{{ listSequences()
-
-    /**
-     * list all sequences in the current database
-     *
-     * @return mixed array of sequence names on success, a MDB2 error on failure
-     * @access public
-     */
-    function listSequences($dummy=null)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name";
-        $table_names = $db->queryCol($query);
-        if (PEAR::isError($table_names)) {
-            return $table_names;
-        }
-        $result = array();
-        foreach ($table_names as $table_name) {
-            if ($sqn = $this->_fixSequenceName($table_name, true)) {
-                $result[] = $sqn;
-            }
-        }
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $result = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
-        }
-        return $result;
-    }
-
-    // }}}
-}
diff --git a/lib/MDB2/Driver/Native/sqlite3.php b/lib/MDB2/Driver/Native/sqlite3.php
deleted file mode 100644
index 344d523bdf3285b38e12789f1959f9a8a41199b6..0000000000000000000000000000000000000000
--- a/lib/MDB2/Driver/Native/sqlite3.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-require_once 'MDB2/Driver/Native/Common.php';
-
-/**
- * MDB2 SQLite driver for the native module
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Native_sqlite extends MDB2_Driver_Native_Common
-{
-}
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
deleted file mode 100644
index 9703780954904d49165abd82d389f847f986f4d0..0000000000000000000000000000000000000000
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ /dev/null
@@ -1,586 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once 'MDB2/Driver/Reverse/Common.php';
-
-/**
- * MDB2 SQlite driver for the schema reverse engineering module
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
-{
-    /**
-     * Remove SQL comments from the field definition
-     *
-     * @access private
-     */
-    function _removeComments($sql) {
-        $lines = explode("\n", $sql);
-        foreach ($lines as $k => $line) {
-            $pieces = explode('--', $line);
-            if (count($pieces) > 1 && (substr_count($pieces[0], '\'') % 2) == 0) {
-                $lines[$k] = substr($line, 0, strpos($line, '--'));
-            }
-        }
-        return implode("\n", $lines);
-    }
-
-    /**
-     *
-     */
-    function _getTableColumns($sql)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-        $start_pos  = strpos($sql, '(');
-        $end_pos    = strrpos($sql, ')');
-        $column_def = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
-        // replace the decimal length-places-separator with a colon
-        $column_def = preg_replace('/(\d),(\d)/', '\1:\2', $column_def);
-        $column_def = $this->_removeComments($column_def);
-        $column_sql = explode(',', $column_def);
-        $columns    = array();
-        $count      = count($column_sql);
-        if ($count == 0) {
-            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'unexpected empty table column definition list', __FUNCTION__);
-        }
-        $regexp = '/^\s*([^\s]+) +(CHAR|VARCHAR|VARCHAR2|TEXT|BOOLEAN|SMALLINT|INT|INTEGER|DECIMAL|BIGINT|DOUBLE|FLOAT|DATETIME|DATE|TIME|LONGTEXT|LONGBLOB)( ?\(([1-9][0-9]*)(:([1-9][0-9]*))?\))?( NULL| NOT NULL)?( UNSIGNED)?( NULL| NOT NULL)?( PRIMARY KEY)?( AUTOINCREMENT)?( DEFAULT (\'[^\']*\'|[^ ]+))?( NULL| NOT NULL)?( PRIMARY KEY)?(\s*\-\-.*)?$/i';
-        $regexp2 = '/^\s*([^ ]+) +(PRIMARY|UNIQUE|CHECK)$/i';
-        for ($i=0, $j=0; $i<$count; ++$i) {
-            if (!preg_match($regexp, trim($column_sql[$i]), $matches)) {
-                if (!preg_match($regexp2, trim($column_sql[$i]))) {
-                    continue;
-                }
-                return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                    'unexpected table column SQL definition: "'.$column_sql[$i].'"', __FUNCTION__);
-            }
-            $columns[$j]['name'] = trim($matches[1], implode('', $db->identifier_quoting));
-            $columns[$j]['type'] = strtolower($matches[2]);
-            if (isset($matches[4]) && strlen($matches[4])) {
-                $columns[$j]['length'] = $matches[4];
-            }
-            if (isset($matches[6]) && strlen($matches[6])) {
-                $columns[$j]['decimal'] = $matches[6];
-            }
-            if (isset($matches[8]) && strlen($matches[8])) {
-                $columns[$j]['unsigned'] = true;
-            }
-            if (isset($matches[10]) && strlen($matches[10])) {
-                $columns[$j]['autoincrement'] = true;
-                $columns[$j]['notnull']=true;
-            }
-            if (isset($matches[10]) && strlen($matches[10])) {
-                $columns[$j]['autoincrement'] = true;
-                $columns[$j]['notnull']=true;
-            }
-            if (isset($matches[13]) && strlen($matches[13])) {
-                $default = $matches[13];
-                if (strlen($default) && $default[0]=="'") {
-                    $default = str_replace("''", "'", substr($default, 1, strlen($default)-2));
-                }
-                if ($default === 'NULL') {
-                    $default = null;
-                }
-                $columns[$j]['default'] = $default;
-            }
-            if (isset($matches[7]) && strlen($matches[7])) {
-                $columns[$j]['notnull'] = ($matches[7] === ' NOT NULL');
-            } else if (isset($matches[9]) && strlen($matches[9])) {
-                $columns[$j]['notnull'] = ($matches[9] === ' NOT NULL');
-            } else if (isset($matches[14]) && strlen($matches[14])) {
-                $columns[$j]['notnull'] = ($matches[14] === ' NOT NULL');
-            }
-            ++$j;
-        }
-        return $columns;
-    }
-
-    // {{{ getTableFieldDefinition()
-
-    /**
-     * Get the stucture of a field into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $field_name name of field that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure.
-     *          The returned array contains an array for each field definition,
-     *          with (some of) these indices:
-     *          [notnull] [nativetype] [length] [fixed] [default] [type] [mdb2type]
-     * @access public
-     */
-    function getTableFieldDefinition($table_name, $field_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $result = $db->loadModule('Datatype', null, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name='.$db->quote($table, 'text');
-        }
-        $sql = $db->queryOne($query);
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        $columns = $this->_getTableColumns($sql);
-        foreach ($columns as $column) {
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                if ($db->options['field_case'] == CASE_LOWER) {
-                    $column['name'] = strtolower($column['name']);
-                } else {
-                    $column['name'] = strtoupper($column['name']);
-                }
-            } else {
-                $column = array_change_key_case($column, $db->options['field_case']);
-            }
-            if ($field_name == $column['name']) {
-                $mapped_datatype = $db->datatype->mapNativeDatatype($column);
-                if (PEAR::isError($mapped_datatype)) {
-                    return $mapped_datatype;
-                }
-                list($types, $length, $unsigned, $fixed) = $mapped_datatype;
-                $notnull = false;
-                if (!empty($column['notnull'])) {
-                    $notnull = $column['notnull'];
-                }
-                $default = false;
-                if (array_key_exists('default', $column)) {
-                    $default = $column['default'];
-                    if (is_null($default) && $notnull) {
-                        $default = '';
-                    }
-                }
-                $autoincrement = false;
-                if (!empty($column['autoincrement'])) {
-                    $autoincrement = true;
-                }
-
-                $definition[0] = array(
-                    'notnull' => $notnull,
-                    'nativetype' => preg_replace('/^([a-z]+)[^a-z].*/i', '\\1', $column['type'])
-                );
-                if (!is_null($length)) {
-                    $definition[0]['length'] = $length;
-                }
-                if (!is_null($unsigned)) {
-                    $definition[0]['unsigned'] = $unsigned;
-                }
-                if (!is_null($fixed)) {
-                    $definition[0]['fixed'] = $fixed;
-                }
-                if ($default !== false) {
-                    $definition[0]['default'] = $default;
-                }
-                if ($autoincrement !== false) {
-                    $definition[0]['autoincrement'] = $autoincrement;
-                }
-                foreach ($types as $key => $type) {
-                    $definition[$key] = $definition[0];
-                    if ($type == 'clob' || $type == 'blob') {
-                        unset($definition[$key]['default']);
-                    }
-                    $definition[$key]['type'] = $type;
-                    $definition[$key]['mdb2type'] = $type;
-                }
-                return $definition;
-            }
-        }
-
-        return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-            'it was not specified an existing table column', __FUNCTION__);
-    }
-
-    // }}}
-    // {{{ getTableIndexDefinition()
-
-    /**
-     * Get the stucture of an index into an array
-     *
-     * @param string $table_name name of table that should be used in method
-     * @param string $index_name name of index that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableIndexDefinition($table_name, $index_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)=%s AND LOWER(tbl_name)=' . $db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name=%s AND tbl_name=' . $db->quote($table, 'text');
-        }
-        $query.= ' AND sql NOT NULL ORDER BY name';
-        $index_name_mdb2 = $db->getIndexName($index_name);
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $qry = sprintf($query, $db->quote(strtolower($index_name_mdb2), 'text'));
-        } else {
-            $qry = sprintf($query, $db->quote($index_name_mdb2, 'text'));
-        }
-        $sql = $db->queryOne($qry, 'text');
-        if (PEAR::isError($sql) || empty($sql)) {
-            // fallback to the given $index_name, without transformation
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $qry = sprintf($query, $db->quote(strtolower($index_name), 'text'));
-            } else {
-                $qry = sprintf($query, $db->quote($index_name, 'text'));
-            }
-            $sql = $db->queryOne($qry, 'text');
-        }
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        if (!$sql) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table index', __FUNCTION__);
-        }
-
-        $sql = strtolower($sql);
-        $start_pos = strpos($sql, '(');
-        $end_pos = strrpos($sql, ')');
-        $column_names = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
-        $column_names = explode(',', $column_names);
-
-        if (preg_match("/^create unique/", $sql)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table index', __FUNCTION__);
-        }
-
-        $definition = array();
-        $count = count($column_names);
-        for ($i=0; $i<$count; ++$i) {
-            $column_name = strtok($column_names[$i], ' ');
-            $collation = strtok(' ');
-            $definition['fields'][$column_name] = array(
-                'position' => $i+1
-            );
-            if (!empty($collation)) {
-                $definition['fields'][$column_name]['sorting'] =
-                    ($collation=='ASC' ? 'ascending' : 'descending');
-            }
-        }
-
-        if (empty($definition['fields'])) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing table index', __FUNCTION__);
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTableConstraintDefinition()
-
-    /**
-     * Get the stucture of a constraint into an array
-     *
-     * @param string $table_name      name of table that should be used in method
-     * @param string $constraint_name name of constraint that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTableConstraintDefinition($table_name, $constraint_name)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        list($schema, $table) = $this->splitTableSchema($table_name);
-
-        $query = "SELECT sql FROM sqlite_master WHERE type='index' AND ";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= 'LOWER(name)=%s AND LOWER(tbl_name)=' . $db->quote(strtolower($table), 'text');
-        } else {
-            $query.= 'name=%s AND tbl_name=' . $db->quote($table, 'text');
-        }
-        $query.= ' AND sql NOT NULL ORDER BY name';
-        $constraint_name_mdb2 = $db->getIndexName($constraint_name);
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $qry = sprintf($query, $db->quote(strtolower($constraint_name_mdb2), 'text'));
-        } else {
-            $qry = sprintf($query, $db->quote($constraint_name_mdb2, 'text'));
-        }
-        $sql = $db->queryOne($qry, 'text');
-        if (PEAR::isError($sql) || empty($sql)) {
-            // fallback to the given $index_name, without transformation
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $qry = sprintf($query, $db->quote(strtolower($constraint_name), 'text'));
-            } else {
-                $qry = sprintf($query, $db->quote($constraint_name, 'text'));
-            }
-            $sql = $db->queryOne($qry, 'text');
-        }
-        if (PEAR::isError($sql)) {
-            return $sql;
-        }
-        //default values, eventually overridden
-        $definition = array(
-            'primary' => false,
-            'unique'  => false,
-            'foreign' => false,
-            'check'   => false,
-            'fields'  => array(),
-            'references' => array(
-                'table'  => '',
-                'fields' => array(),
-            ),
-            'onupdate'  => '',
-            'ondelete'  => '',
-            'match'     => '',
-            'deferrable'        => false,
-            'initiallydeferred' => false,
-        );
-        if (!$sql) {
-            $query = "SELECT sql FROM sqlite_master WHERE type='table' AND ";
-            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-                $query.= 'LOWER(name)='.$db->quote(strtolower($table), 'text');
-            } else {
-                $query.= 'name='.$db->quote($table, 'text');
-            }
-            $query.= " AND sql NOT NULL ORDER BY name";
-            $sql = $db->queryOne($query, 'text');
-            if (PEAR::isError($sql)) {
-                return $sql;
-            }
-            if ($constraint_name == 'primary') {
-                // search in table definition for PRIMARY KEYs
-                if (preg_match("/\bPRIMARY\s+KEY\b\s*\(([^)]+)/i", $sql, $tmp)) {
-                    $definition['primary'] = true;
-                    $definition['fields'] = array();
-                    $column_names = explode(',', $tmp[1]);
-                    $colpos = 1;
-                    foreach ($column_names as $column_name) {
-                        $definition['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    return $definition;
-                }
-                if (preg_match("/\"([^\"]+)\"[^\,\"]+\bPRIMARY\s+KEY\b[^\,\)]*/i", $sql, $tmp)) {
-                    $definition['primary'] = true;
-                    $definition['fields'] = array();
-                    $column_names = explode(',', $tmp[1]);
-                    $colpos = 1;
-                    foreach ($column_names as $column_name) {
-                        $definition['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    return $definition;
-                }
-            } else {
-                // search in table definition for FOREIGN KEYs
-                $pattern = "/\bCONSTRAINT\b\s+%s\s+
-                    \bFOREIGN\s+KEY\b\s*\(([^\)]+)\)\s*
-                    \bREFERENCES\b\s+([^\s]+)\s*\(([^\)]+)\)\s*
-                    (?:\bMATCH\s*([^\s]+))?\s*
-                    (?:\bON\s+UPDATE\s+([^\s,\)]+))?\s*
-                    (?:\bON\s+DELETE\s+([^\s,\)]+))?\s*
-                    /imsx";
-                $found_fk = false;
-                if (preg_match(sprintf($pattern, $constraint_name_mdb2), $sql, $tmp)) {
-                    $found_fk = true;
-                } elseif (preg_match(sprintf($pattern, $constraint_name), $sql, $tmp)) {
-                    $found_fk = true;
-                }
-                if ($found_fk) {
-                    $definition['foreign'] = true;
-                    $definition['match'] = 'SIMPLE';
-                    $definition['onupdate'] = 'NO ACTION';
-                    $definition['ondelete'] = 'NO ACTION';
-                    $definition['references']['table'] = $tmp[2];
-                    $column_names = explode(',', $tmp[1]);
-                    $colpos = 1;
-                    foreach ($column_names as $column_name) {
-                        $definition['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    $referenced_cols = explode(',', $tmp[3]);
-                    $colpos = 1;
-                    foreach ($referenced_cols as $column_name) {
-                        $definition['references']['fields'][trim($column_name)] = array(
-                            'position' => $colpos++
-                        );
-                    }
-                    if (isset($tmp[4])) {
-                        $definition['match']    = $tmp[4];
-                    }
-                    if (isset($tmp[5])) {
-                        $definition['onupdate'] = $tmp[5];
-                    }
-                    if (isset($tmp[6])) {
-                        $definition['ondelete'] = $tmp[6];
-                    }
-                    return $definition;
-                }
-            }
-            $sql = false;
-        }
-        if (!$sql) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-        }
-
-        $sql = strtolower($sql);
-        $start_pos = strpos($sql, '(');
-        $end_pos   = strrpos($sql, ')');
-        $column_names = substr($sql, $start_pos+1, $end_pos-$start_pos-1);
-        $column_names = explode(',', $column_names);
-
-        if (!preg_match("/^create unique/", $sql)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-        }
-
-        $definition['unique'] = true;
-        $count = count($column_names);
-        for ($i=0; $i<$count; ++$i) {
-            $column_name = strtok($column_names[$i], " ");
-            $collation = strtok(" ");
-            $definition['fields'][$column_name] = array(
-                'position' => $i+1
-            );
-            if (!empty($collation)) {
-                $definition['fields'][$column_name]['sorting'] =
-                    ($collation=='ASC' ? 'ascending' : 'descending');
-            }
-        }
-
-        if (empty($definition['fields'])) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                $constraint_name . ' is not an existing table constraint', __FUNCTION__);
-        }
-        return $definition;
-    }
-
-    // }}}
-    // {{{ getTriggerDefinition()
-
-    /**
-     * Get the structure of a trigger into an array
-     *
-     * EXPERIMENTAL
-     *
-     * WARNING: this function is experimental and may change the returned value
-     * at any time until labelled as non-experimental
-     *
-     * @param string    $trigger    name of trigger that should be used in method
-     * @return mixed data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function getTriggerDefinition($trigger)
-    {
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $query = "SELECT name as trigger_name,
-                         tbl_name AS table_name,
-                         sql AS trigger_body,
-                         NULL AS trigger_type,
-                         NULL AS trigger_event,
-                         NULL AS trigger_comment,
-                         1 AS trigger_enabled
-                    FROM sqlite_master
-                   WHERE type='trigger'";
-        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $query.= ' AND LOWER(name)='.$db->quote(strtolower($trigger), 'text');
-        } else {
-            $query.= ' AND name='.$db->quote($trigger, 'text');
-        }
-        $types = array(
-            'trigger_name'    => 'text',
-            'table_name'      => 'text',
-            'trigger_body'    => 'text',
-            'trigger_type'    => 'text',
-            'trigger_event'   => 'text',
-            'trigger_comment' => 'text',
-            'trigger_enabled' => 'boolean',
-        );
-        $def = $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($def)) {
-            return $def;
-        }
-        if (empty($def)) {
-            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'it was not specified an existing trigger', __FUNCTION__);
-        }
-        if (preg_match("/^create\s+(?:temp|temporary)?trigger\s+(?:if\s+not\s+exists\s+)?.*(before|after)?\s+(insert|update|delete)/Uims", $def['trigger_body'], $tmp)) {
-            $def['trigger_type'] = strtoupper($tmp[1]);
-            $def['trigger_event'] = strtoupper($tmp[2]);
-        }
-        return $def;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table
-     *
-     * @param string         $result  a string containing the name of a table
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A MDB2_Error object on failure.
-     *
-     * @see MDB2_Driver_Common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-           return parent::tableInfo($result, $mode);
-        }
-
-        $db =$this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        return $db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
-           'This DBMS can not obtain tableInfo from result sets', __FUNCTION__);
-    }
-}
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
deleted file mode 100644
index 693ceffa01c0d22b9ef49ce5e3a6ddb5557d908d..0000000000000000000000000000000000000000
--- a/lib/MDB2/Driver/sqlite3.php
+++ /dev/null
@@ -1,1332 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * MDB2 SQLite3 driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
-{
-    // {{{ properties
-    public $string_quoting = array('start' => "'", 'end' => "'", 'escape' => "'", 'escape_pattern' => false);
-
-    public $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
-
-    public $_lasterror = '';
-
-    public $fix_assoc_fields_names = false;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        parent::__construct();
-
-        $this->phptype = 'sqlite3';
-        $this->dbsyntax = 'sqlite';
-
-        $this->supported['sequences'] = 'emulated';
-        $this->supported['indexes'] = true;
-        $this->supported['affected_rows'] = true;
-        $this->supported['summary_functions'] = true;
-        $this->supported['order_by_text'] = true;
-        $this->supported['current_id'] = 'emulated';
-        $this->supported['limit_queries'] = true;
-        $this->supported['LOBs'] = true;
-        $this->supported['replace'] = true;
-        $this->supported['transactions'] = false;
-        $this->supported['savepoints'] = false;
-        $this->supported['sub_selects'] = true;
-        $this->supported['triggers'] = true;
-        $this->supported['auto_increment'] = true;
-        $this->supported['primary_key'] = false; // requires alter table implementation
-        $this->supported['result_introspection'] = false; // not implemented
-        $this->supported['prepared_statements'] = true;
-        $this->supported['identifier_quoting'] = true;
-        $this->supported['pattern_escaping'] = false;
-        $this->supported['new_link'] = false;
-
-        $this->options['DBA_username'] = false;
-        $this->options['DBA_password'] = false;
-        $this->options['base_transaction_name'] = '___php_MDB2_sqlite_auto_commit_off';
-        $this->options['fixed_float'] = 0;
-        $this->options['database_path'] = '';
-        $this->options['database_extension'] = '';
-        $this->options['server_version'] = '';
-        $this->options['max_identifiers_length'] = 128; //no real limit
-    }
-
-    // }}}
-    // {{{ errorInfo()
-
-    /**
-     * This method is used to collect information about an error
-     *
-     * @param integer $error
-     * @return array
-     * @access public
-     */
-    function errorInfo($error = null)
-    {
-        $native_code = null;
-        if ($this->connection) {
-            $native_code = $this->connection->lastErrorCode();
-        }
-	$native_msg = html_entity_decode($this->_lasterror);
-
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $native_msg = preg_replace('/^sqlite[a-z_]+\(\)[^:]*: /', '', $native_msg);
-
-        if (is_null($error)) {
-            static $error_regexps;
-            if (empty($error_regexps)) {
-                $error_regexps = array(
-                    '/^no such table:/' => MDB2_ERROR_NOSUCHTABLE,
-                    '/^no such index:/' => MDB2_ERROR_NOT_FOUND,
-                    '/^(table|index) .* already exists$/' => MDB2_ERROR_ALREADY_EXISTS,
-                    '/PRIMARY KEY must be unique/i' => MDB2_ERROR_CONSTRAINT,
-                    '/is not unique/' => MDB2_ERROR_CONSTRAINT,
-                    '/columns .* are not unique/i' => MDB2_ERROR_CONSTRAINT,
-                    '/uniqueness constraint failed/' => MDB2_ERROR_CONSTRAINT,
-                    '/may not be NULL/' => MDB2_ERROR_CONSTRAINT_NOT_NULL,
-                    '/^no such column:/' => MDB2_ERROR_NOSUCHFIELD,
-                    '/no column named/' => MDB2_ERROR_NOSUCHFIELD,
-                    '/column not present in both tables/i' => MDB2_ERROR_NOSUCHFIELD,
-                    '/^near ".*": syntax error$/' => MDB2_ERROR_SYNTAX,
-                    '/[0-9]+ values for [0-9]+ columns/i' => MDB2_ERROR_VALUE_COUNT_ON_ROW,
-                 );
-            }
-            foreach ($error_regexps as $regexp => $code) {
-                if (preg_match($regexp, $native_msg)) {
-                    $error = $code;
-                    break;
-                }
-            }
-        }
-        return array($error, $native_code, $native_msg);
-    }
-
-    // }}}
-    // {{{ escape()
-
-    /**
-     * Quotes a string so it can be safely used in a query. It will quote
-     * the text so it can safely be used within a query.
-     *
-     * @param   string  the input string to quote
-     * @param   bool    escape wildcards
-     *
-     * @return  string  quoted string
-     *
-     * @access  public
-     */
-    public function escape($text, $escape_wildcards = false)
-    {
-		if($this->connection) {
-			return $this->connection->escapeString($text);
-		}else{
-			return str_replace("'", "''", $text);//TODO; more
-		}
-    }
-
-    // }}}
-    // {{{ beginTransaction()
-
-    /**
-     * Start a transaction or set a savepoint.
-     *
-     * @param   string  name of a savepoint to set
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function beginTransaction($savepoint = null)
-    {
-        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!is_null($savepoint)) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'savepoints are not supported', __FUNCTION__);
-        } elseif ($this->in_transaction) {
-            return MDB2_OK;  //nothing to do
-        }
-        if (!$this->destructor_registered && $this->opened_persistent) {
-            $this->destructor_registered = true;
-            register_shutdown_function('MDB2_closeOpenTransactions');
-        }
-        $query = 'BEGIN TRANSACTION '.$this->options['base_transaction_name'];
-        $result =$this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = true;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commit the database changes done during a transaction that is in
-     * progress or release a savepoint. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after committing the pending changes.
-     *
-     * @param   string  name of a savepoint to release
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function commit($savepoint = null)
-    {
-        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'savepoints are not supported', __FUNCTION__);
-        }
-
-        $query = 'COMMIT TRANSACTION '.$this->options['base_transaction_name'];
-        $result =$this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{
-
-    /**
-     * Cancel any database changes done during a transaction or since a specific
-     * savepoint that is in progress. This function may only be called when
-     * auto-committing is disabled, otherwise it will fail. Therefore, a new
-     * transaction is implicitly started after canceling the pending changes.
-     *
-     * @param   string  name of a savepoint to rollback to
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function rollback($savepoint = null)
-    {
-        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
-        if (!$this->in_transaction) {
-            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                'rollback cannot be done changes are auto committed', __FUNCTION__);
-        }
-        if (!is_null($savepoint)) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'savepoints are not supported', __FUNCTION__);
-        }
-
-        $query = 'ROLLBACK TRANSACTION '.$this->options['base_transaction_name'];
-        $result =$this->_doQuery($query, true);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        $this->in_transaction = false;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function setTransactionIsolation()
-
-    /**
-     * Set the transacton isolation level.
-     *
-     * @param   string  standard isolation level
-     *                  READ UNCOMMITTED (allows dirty reads)
-     *                  READ COMMITTED (prevents dirty reads)
-     *                  REPEATABLE READ (prevents nonrepeatable reads)
-     *                  SERIALIZABLE (prevents phantom reads)
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @since   2.1.1
-     */
-    function setTransactionIsolation($isolation, $options=array())
-    {
-        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
-        switch ($isolation) {
-        case 'READ UNCOMMITTED':
-            $isolation = 0;
-            break;
-        case 'READ COMMITTED':
-        case 'REPEATABLE READ':
-        case 'SERIALIZABLE':
-            $isolation = 1;
-            break;
-        default:
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'isolation level is not supported: '.$isolation, __FUNCTION__);
-        }
-
-        $query = "PRAGMA read_uncommitted=$isolation";
-        return $this->_doQuery($query, true);
-    }
-
-    // }}}
-    // {{{ getDatabaseFile()
-
-    /**
-     * Builds the string with path+dbname+extension
-     *
-     * @return string full database path+file
-     * @access protected
-     */
-    function _getDatabaseFile($database_name)
-    {
-        if ($database_name === '' || $database_name === ':memory:') {
-            return $database_name;
-        }
-        return $this->options['database_path'].$database_name.$this->options['database_extension'];
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database
-     *
-     * @return true on success, MDB2 Error Object on failure
-     **/
-    function connect()
-    {
-		if($this->connection instanceof SQLite3) {
-			return MDB2_OK;
-		}
-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-        $database_file = $this->_getDatabaseFile($this->database_name);
-        if (is_resource($this->connection)) {
-            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
-            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
-                && $this->connected_database_name == $database_file
-                && $this->opened_persistent == $this->options['persistent']
-            ) {
-                return MDB2_OK;
-            }
-            $this->disconnect(false);
-        }
-
-        if (!PEAR::loadExtension($this->phptype)) {
-            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
-        }
-
-        if (empty($this->database_name)) {
-            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
-            'unable to establish a connection', __FUNCTION__);
-        }
-
-        if ($database_file !== ':memory:') {
-			if(!strpos($database_file, '.db')) {
-				$database_file="$datadir/$database_file.db";
-			}
-            if (!file_exists($database_file)) {
-                if (!touch($database_file)) {
-                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Could not create database file', __FUNCTION__);
-                }
-                if (!isset($this->dsn['mode'])
-                    || !is_numeric($this->dsn['mode'])
-                ) {
-                    $mode = 0644;
-                } else {
-                    $mode = octdec($this->dsn['mode']);
-                }
-                if (!chmod($database_file, $mode)) {
-                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Could not be chmodded database file', __FUNCTION__);
-                }
-                if (!file_exists($database_file)) {
-                    return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'Could not be found database file', __FUNCTION__);
-                }
-            }
-            if (!is_file($database_file)) {
-                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
-                        'Database is a directory name', __FUNCTION__);
-            }
-            if (!is_readable($database_file)) {
-                return $this->raiseError(MDB2_ERROR_ACCESS_VIOLATION, null, null,
-                        'Could not read database file', __FUNCTION__);
-            }
-        }
-
-        $php_errormsg = '';
-		$this->connection = new SQLite3($database_file);
-		if(is_callable(array($this->connection, 'busyTimeout'))) {//busy timout is only available in php>=5.3
-			$this->connection->busyTimeout(60000);
-		}
-        $this->_lasterror = $this->connection->lastErrorMsg();
-        if (!$this->connection) {
-            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
-            'unable to establish a connection', __FUNCTION__);
-        }
-
-        if ($this->fix_assoc_fields_names ||
-            $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES) {
-            $this->connection->exec("PRAGMA short_column_names = 1");
-            $this->fix_assoc_fields_names = true;
-        }
-
-        $this->connected_dsn = $this->dsn;
-        $this->connected_database_name = $database_file;
-        $this->opened_persistent = $this->getoption('persistent');
-        $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
-
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ databaseExists()
-
-    /**
-     * check if given database name is exists?
-     *
-     * @param string $name    name of the database that should be checked
-     *
-     * @return mixed true/false on success, a MDB2 error on failure
-     * @access public
-     */
-    function databaseExists($name)
-    {
-        $database_file = $this->_getDatabaseFile($name);
-        $result = file_exists($database_file);
-        return $result;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Log out and disconnect from the database.
-     *
-     * @param  boolean $force if the disconnect should be forced even if the
-     *                        connection is opened persistently
-     * @return mixed true on success, false if not connected and error
-     *                object on error
-     * @access public
-     */
-    function disconnect($force = true)
-    {
-        if ($this->connection instanceof  SQLite3) {
-            if ($this->in_transaction) {
-                $dsn = $this->dsn;
-                $database_name = $this->database_name;
-                $persistent = $this->options['persistent'];
-                $this->dsn = $this->connected_dsn;
-                $this->database_name = $this->connected_database_name;
-                $this->options['persistent'] = $this->opened_persistent;
-                $this->rollback();
-                $this->dsn = $dsn;
-                $this->database_name = $database_name;
-                $this->options['persistent'] = $persistent;
-            }
-
-            if (!$this->opened_persistent || $force) {
-                $this->connection->close();
-            }
-        } else {
-            return false;
-        }
-        return parent::disconnect($force);
-    }
-
-    // }}}
-    // {{{ _doQuery()
-
-    /**
-     * Execute a query
-     * @param string $query  query
-     * @param boolean $is_manip  if the query is a manipulation query
-     * @param resource $connection
-     * @param string $database_name
-     * @return result or error object
-     * @access protected
-     */
-    function _doQuery($query, $is_manip = false, $connection = null, $database_name = null)
-    {
-        $this->last_query = $query;
-        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        if ($this->options['disable_query']) {
-            $result = $is_manip ? 0 : null;
-            return $result;
-        }
-		$result=$this->connection->query($query.';');
-        $this->_lasterror = $this->connection->lastErrorMsg();
-
-        if (!$result) {
-            $err =$this->raiseError(null, null, null,
-                'Could not execute statement', __FUNCTION__);
-            return $err;
-        }
-
-        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
-        return $result;
-    }
-
-    // }}}
-    // {{{ _affectedRows()
-
-    /**
-     * Returns the number of rows affected
-     *
-     * @param resource $result
-     * @param resource $connection
-     * @return mixed MDB2 Error Object or the number of rows affected
-     * @access private
-     */
-    function _affectedRows($connection, $result = null)
-    {
-        return $this->connection->changes();
-    }
-
-    // }}}
-    // {{{ _modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * @param string $query  query to modify
-     * @param boolean $is_manip  if it is a DML query
-     * @param integer $limit  limit the number of rows
-     * @param integer $offset  start reading from given offset
-     * @return string modified query
-     * @access protected
-     */
-    function _modifyQuery($query, $is_manip, $limit, $offset)
-    {
-        if ($this->options['portability'] & MDB2_PORTABILITY_DELETE_COUNT) {
-            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
-                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
-                                      'DELETE FROM \1 WHERE 1=1', $query);
-            }
-        }
-        if ($limit > 0
-            && !preg_match('/LIMIT\s*\d(?:\s*(?:,|OFFSET)\s*\d+)?(?:[^\)]*)?$/i', $query)
-        ) {
-            $query = rtrim($query);
-            if (substr($query, -1) == ';') {
-                $query = substr($query, 0, -1);
-            }
-            if ($is_manip) {
-                $query.= " LIMIT $limit";
-            } else {
-                $query.= " LIMIT $offset,$limit";
-            }
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ getServerVersion()
-
-    /**
-     * return version information about the server
-     *
-     * @param bool   $native  determines if the raw version string should be returned
-     * @return mixed array/string with version information or MDB2 error object
-     * @access public
-     */
-    function getServerVersion($native = false)
-    {
-        $server_info = false;
-        if ($this->connected_server_info) {
-            $server_info = $this->connected_server_info;
-        } elseif ($this->options['server_version']) {
-            $server_info = $this->options['server_version'];
-        } elseif (function_exists('sqlite_libversion')) {
-            $server_info = @sqlite_libversion();
-        }
-        if (!$server_info) {
-            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-                'Requires either the "server_version" option or the sqlite_libversion() function', __FUNCTION__);
-        }
-        // cache server_info
-        $this->connected_server_info = $server_info;
-        if (!$native) {
-            $tmp = explode('.', $server_info, 3);
-            $server_info = array(
-                'major' => isset($tmp[0]) ? $tmp[0] : null,
-                'minor' => isset($tmp[1]) ? $tmp[1] : null,
-                'patch' => isset($tmp[2]) ? $tmp[2] : null,
-                'extra' => null,
-                'native' => $server_info,
-            );
-        }
-        return $server_info;
-    }
-
-    // }}}
-    // {{{ replace()
-
-    /**
-     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
-     * query, except that if there is already a row in the table with the same
-     * key field values, the old row is deleted before the new row is inserted.
-     *
-     * The REPLACE type of query does not make part of the SQL standards. Since
-     * practically only SQLite implements it natively, this type of query is
-     * emulated through this method for other DBMS using standard types of
-     * queries inside a transaction to assure the atomicity of the operation.
-     *
-     * @access public
-     *
-     * @param string $table name of the table on which the REPLACE query will
-     *  be executed.
-     * @param array $fields associative array that describes the fields and the
-     *  values that will be inserted or updated in the specified table. The
-     *  indexes of the array are the names of all the fields of the table. The
-     *  values of the array are also associative arrays that describe the
-     *  values and other properties of the table fields.
-     *
-     *  Here follows a list of field properties that need to be specified:
-     *
-     *    value:
-     *          Value to be assigned to the specified field. This value may be
-     *          of specified in database independent type format as this
-     *          function can perform the necessary datatype conversions.
-     *
-     *    Default:
-     *          this property is required unless the Null property
-     *          is set to 1.
-     *
-     *    type
-     *          Name of the type of the field. Currently, all types Metabase
-     *          are supported except for clob and blob.
-     *
-     *    Default: no type conversion
-     *
-     *    null
-     *          Boolean property that indicates that the value for this field
-     *          should be set to null.
-     *
-     *          The default value for fields missing in INSERT queries may be
-     *          specified the definition of a table. Often, the default value
-     *          is already null, but since the REPLACE may be emulated using
-     *          an UPDATE query, make sure that all fields of the table are
-     *          listed in this function argument array.
-     *
-     *    Default: 0
-     *
-     *    key
-     *          Boolean property that indicates that this field should be
-     *          handled as a primary key or at least as part of the compound
-     *          unique index of the table that will determine the row that will
-     *          updated if it exists or inserted a new row otherwise.
-     *
-     *          This function will fail if no key field is specified or if the
-     *          value of a key field is set to null because fields that are
-     *          part of unique index they may not be null.
-     *
-     *    Default: 0
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     */
-    function replace($table, $fields)
-    {
-        $count = count($fields);
-        $query = $values = '';
-        $keys = $colnum = 0;
-        for (reset($fields); $colnum < $count; next($fields), $colnum++) {
-            $name = key($fields);
-            if ($colnum > 0) {
-                $query .= ',';
-                $values.= ',';
-            }
-            $query.= $this->quoteIdentifier($name, true);
-            if (isset($fields[$name]['null']) && $fields[$name]['null']) {
-                $value = 'NULL';
-            } else {
-                $type = isset($fields[$name]['type']) ? $fields[$name]['type'] : null;
-                $value = $this->quote($fields[$name]['value'], $type);
-                if (PEAR::isError($value)) {
-                    return $value;
-                }
-            }
-            $values.= $value;
-            if (isset($fields[$name]['key']) && $fields[$name]['key']) {
-                if ($value === 'NULL') {
-                    return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                        'key value '.$name.' may not be NULL', __FUNCTION__);
-                }
-                $keys++;
-            }
-        }
-        if ($keys == 0) {
-            return $this->raiseError(MDB2_ERROR_CANNOT_REPLACE, null, null,
-                'not specified which fields are keys', __FUNCTION__);
-        }
-
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $table = $this->quoteIdentifier($table, true);
-        $query = "REPLACE INTO $table ($query) VALUES ($values)";
-        $result =$this->_doQuery($query, true, $connection);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return $this->_affectedRows($connection, $result);
-    }
-
-    // }}}
-    // {{{ nextID()
-
-    /**
-     * Returns the next free id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @param boolean $ondemand when true the sequence is
-     *                          automatic created, if it
-     *                          not exists
-     *
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function nextID($seq_name, $ondemand = true)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        $seqcol_name = $this->options['seqcol_name'];
-        $query = "INSERT INTO $sequence_name ($seqcol_name) VALUES (NULL)";
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
-        $result =$this->_doQuery($query, true);
-        $this->popExpect();
-        $this->popErrorHandling();
-        if (PEAR::isError($result)) {
-            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
-                $this->loadModule('Manager', null, true);
-                $result = $this->manager->createSequence($seq_name);
-                if (PEAR::isError($result)) {
-                    return $this->raiseError($result, null, null,
-                        'on demand sequence '.$seq_name.' could not be created', __FUNCTION__);
-                } else {
-                    return $this->nextID($seq_name, false);
-                }
-            }
-            return $result;
-        }
-        $value = $this->lastInsertID();
-        if (is_numeric($value)) {
-            $query = "DELETE FROM $sequence_name WHERE $seqcol_name < $value";
-            $result =$this->_doQuery($query, true);
-            if (PEAR::isError($result)) {
-                $this->warnings[] = 'nextID: could not delete previous sequence table values from '.$seq_name;
-            }
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ lastInsertID()
-
-    /**
-     * Returns the autoincrement ID if supported or $id or fetches the current
-     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
-     *
-     * @param string $table name of the table into which a new row was inserted
-     * @param string $field name of the field into which a new row was inserted
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function lastInsertID($table = null, $field = null)
-    {
-        return $this->connection->lastInsertRowID();
-    }
-
-    // }}}
-    // {{{ currID()
-
-    /**
-     * Returns the current id of a sequence
-     *
-     * @param string $seq_name name of the sequence
-     * @return mixed MDB2 Error Object or id
-     * @access public
-     */
-    function currID($seq_name)
-    {
-        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
-        $seqcol_name = $this->quoteIdentifier($this->options['seqcol_name'], true);
-        $query = "SELECT MAX($seqcol_name) FROM $sequence_name";
-        return $this->queryOne($query, 'integer');
-    }
-
-    /**
-     * Prepares a query for multiple execution with execute().
-     * With some database backends, this is emulated.
-     * prepare() requires a generic query as string like
-     * 'INSERT INTO numbers VALUES(?,?)' or
-     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
-     * The ? and :name and are placeholders which can be set using
-     * bindParam() and the query can be sent off using the execute() method.
-     * The allowed format for :name can be set with the 'bindname_format' option.
-     *
-     * @param string $query the query to prepare
-     * @param mixed   $types  array that contains the types of the placeholders
-     * @param mixed   $result_types  array that contains the types of the columns in
-     *                        the result set or MDB2_PREPARE_RESULT, if set to
-     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
-     * @param mixed   $lobs   key (field) value (parameter) pair for all lob placeholders
-     * @return mixed resource handle for the prepared query on success, a MDB2
-     *        error on failure
-     * @access public
-     * @see bindParam, execute
-     */
-    function prepare($query, $types = null, $result_types = null, $lobs = array())
-    {
-        if ($this->options['emulate_prepared']
-            || $this->supported['prepared_statements'] !== true
-        ) {
-            $obj =& parent::prepare($query, $types, $result_types, $lobs);
-            return $obj;
-        }
-        $this->last_query = $query;
-        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
-        $offset = $this->offset;
-        $limit = $this->limit;
-        $this->offset = $this->limit = 0;
-        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
-        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
-        if ($result) {
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-            $query = $result;
-        }
-        $placeholder_type_guess = $placeholder_type = null;
-        $question = '?';
-        $colon = ':';
-        $positions = array();
-        $position = 0;
-        while ($position < strlen($query)) {
-            $q_position = strpos($query, $question, $position);
-            $c_position = strpos($query, $colon, $position);
-            if ($q_position && $c_position) {
-                $p_position = min($q_position, $c_position);
-            } elseif ($q_position) {
-                $p_position = $q_position;
-            } elseif ($c_position) {
-                $p_position = $c_position;
-            } else {
-                break;
-            }
-            if (is_null($placeholder_type)) {
-                $placeholder_type_guess = $query[$p_position];
-            }
-
-            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
-            if (PEAR::isError($new_pos)) {
-                return $new_pos;
-            }
-            if ($new_pos != $position) {
-                $position = $new_pos;
-                continue; //evaluate again starting from the new position
-            }
-
-
-            if ($query[$position] == $placeholder_type_guess) {
-                if (is_null($placeholder_type)) {
-                    $placeholder_type = $query[$p_position];
-                    $question = $colon = $placeholder_type;
-                }
-                if ($placeholder_type == ':') {
-                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
-                    $parameter = preg_replace($regexp, '\\1', $query);
-                    if ($parameter === '') {
-                        $err =& $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
-                            'named parameter name must match "bindname_format" option', __FUNCTION__);
-                        return $err;
-                    }
-                    $positions[$p_position] = $parameter;
-                    $query = substr_replace($query, '?', $position, strlen($parameter)+1);
-                } else {
-                    $positions[$p_position] = count($positions);
-                }
-                $position = $p_position + 1;
-            } else {
-                $position = $p_position;
-            }
-        }
-        $connection = $this->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-        $statement =$this->connection->prepare($query);
-        if (!$statement) {
-            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
-                        'unable to prepare statement: '.$query);
-        }
-
-        $class_name = 'MDB2_Statement_'.$this->phptype;
-        $obj = new $class_name($this, $statement, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
-        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
-        return $obj;
-    }
-}
-
-/**
- * MDB2 SQLite result driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Result_sqlite3 extends MDB2_Result_Common
-{
-    // }}}
-    // {{{ fetchRow()
-
-    /**
-     * Fetch a row and insert the data into an existing array.
-     *
-     * @param int       $fetchmode  how the array data should be indexed
-     * @param int    $rownum    number of the row where the data can be found
-     * @return int data array on success, a MDB2 error on failure
-     * @access public
-     */
-    function fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if (!is_null($rownum)) {
-            $seek = $this->seek($rownum);
-            if (PEAR::isError($seek)) {
-                return $seek;
-            }
-        }
-        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->db->fetchmode;
-        }
-        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
-            //$row = @sqlite_fetch_array($this->result, SQLITE_ASSOC);
-            $row=$this->result->fetchArray(SQLITE3_ASSOC);
-            if (is_array($row)
-                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
-            ) {
-                $row = array_change_key_case($row, $this->db->options['field_case']);
-            }
-        } else {
-           $row=$this->result->fetchArray(SQLITE3_NUM);
-        }
-        if (!$row) {
-            if ($this->result === false) {
-                $err =$this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'resultset has already been freed', __FUNCTION__);
-                return $err;
-            }
-            $null = null;
-            return $null;
-        }
-        $mode = $this->db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL;
-        $rtrim = false;
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
-            if (empty($this->types)) {
-                $mode += MDB2_PORTABILITY_RTRIM;
-            } else {
-                $rtrim = true;
-            }
-        }
-        if ($mode) {
-            $this->db->_fixResultArrayValues($row, $mode);
-        }
-        if (!empty($this->types)) {
-            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        }
-        if (!empty($this->values)) {
-            $this->_assignBindColumns($row);
-        }
-        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
-            $object_class = $this->db->options['fetch_class'];
-            if ($object_class == 'stdClass') {
-                $row = (object) $row;
-            } else {
-                $row = new $object_class($row);
-            }
-        }
-        ++$this->rownum;
-        return $row;
-    }
-
-    // }}}
-    // {{{ _getColumnNames()
-
-    /**
-     * Retrieve the names of columns returned by the DBMS in a query result.
-     *
-     * @return  mixed   Array variable that holds the names of columns as keys
-     *                  or an MDB2 error on failure.
-     *                  Some DBMS may not return any columns when the result set
-     *                  does not contain any rows.
-     * @access private
-     */
-    function _getColumnNames()
-    {
-        $columns = array();
-        $numcols = $this->numCols();
-        if (PEAR::isError($numcols)) {
-            return $numcols;
-        }
-        for ($column = 0; $column < $numcols; $column++) {
-            $column_name = $this->result->getColumnName($column);
-            $columns[$column_name] = $column;
-        }
-        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
-            $columns = array_change_key_case($columns, $this->db->options['field_case']);
-        }
-        return $columns;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Count the number of columns returned by the DBMS in a query result.
-     *
-     * @access public
-     * @return mixed integer value with the number of columns, a MDB2 error
-     *                       on failure
-     */
-    function numCols()
-    {
-        $this->result->numColumns();
-    }
-}
-
-/**
- * MDB2 SQLite buffered result driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_BufferedResult_sqlite3 extends MDB2_Result_sqlite3
-{
-    // {{{ seek()
-
-    /**
-     * Seek to a specific row in a result set
-     *
-     * @param int    $rownum    number of the row where the data can be found
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function seek($rownum = 0)
-    {
-		$this->result->reset();
-		for($i=0;$i<$rownum;$i++) {
-			$this->result->fetchArray();
-		}
-        $this->rownum = $rownum - 1;
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ valid()
-
-    /**
-     * Check if the end of the result set has been reached
-     *
-     * @return mixed true or false on sucess, a MDB2 error on failure
-     * @access public
-     */
-    function valid()
-    {
-        $numrows = $this->numRows();
-        if (PEAR::isError($numrows)) {
-            return $numrows;
-        }
-        return $this->rownum < ($numrows - 1);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Returns the number of rows in a result object
-     *
-     * @return mixed MDB2 Error Object or the number of rows
-     * @access public
-     */
-    function numRows()
-    {
-        $rows = 0;
-        $this->result->reset();
-        while($this->result->fetchArray()) {
-			$rows++;
-        }
-        $this->result->reset();
-        return $rows;
-    }
-}
-
-/**
- * MDB2 SQLite statement driver
- *
- * @package MDB2
- * @category Database
- * @author  Lukas Smith <smith@pooteeweet.org>
- */
-class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
-{
-	// }}}
-    // {{{ function bindValue($parameter, &$value, $type = null)
-
-	private function getParamType($type) {
-		switch(strtolower($type)) {
-			case 'text':
-				return SQLITE3_TEXT;
-			case 'boolean':
-			case 'integer':
-				return SQLITE3_INTEGER;
-			case 'float':
-				return SQLITE3_FLOAT;
-			case 'blob':
-				return SQLITE3_BLOB;
-		}
-	}
-    /**
-     * Set the value of a parameter of a prepared query.
-     *
-     * @param   int     the order number of the parameter in the query
-     *       statement. The order number of the first parameter is 1.
-     * @param   mixed   value that is meant to be assigned to specified
-     *       parameter. The type of the value depends on the $type argument.
-     * @param   string  specifies the type of the field
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function bindValue($parameter, $value, $type = null) {
-		if($type) {
-			$type=$this->getParamType($type);
-			$this->statement->bindValue($parameter, $value, $type);
-		}else{
-			$this->statement->bindValue($parameter, $value);
-		}
-		return MDB2_OK;
-    }
-
-	/**
-     * Bind a variable to a parameter of a prepared query.
-     *
-     * @param   int     the order number of the parameter in the query
-     *       statement. The order number of the first parameter is 1.
-     * @param   mixed   variable that is meant to be bound to specified
-     *       parameter. The type of the value depends on the $type argument.
-     * @param   string  specifies the type of the field
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     */
-    function bindParam($parameter, &$value, $type = null) {
-        if($type) {
-			$type=$this->getParamType($type);
-			$this->statement->bindParam($parameter, $value, $type);
-		}else{
-			$this->statement->bindParam($parameter, $value);
-		}
-        return MDB2_OK;
-    }
-
-    /**
-     * Release resources allocated for the specified prepared query.
-     *
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function free()
-	{
-		$this->statement->close();
-    }
-
-    /**
-     * Execute a prepared query statement helper method.
-     *
-     * @param mixed $result_class string which specifies which result class to use
-     * @param mixed $result_wrap_class string which specifies which class to wrap results in
-     *
-     * @return mixed MDB2_Result or integer (affected rows) on success,
-     *               a MDB2 error on failure
-     * @access private
-     */
-    function _execute($result_class = true, $result_wrap_class = false) {
-		if (is_null($this->statement)) {
-            $result =& parent::_execute($result_class, $result_wrap_class);
-            return $result;
-        }
-        $this->db->last_query = $this->query;
-        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'pre', 'parameters' => $this->values));
-        if ($this->db->getOption('disable_query')) {
-            $result = $this->is_manip ? 0 : null;
-            return $result;
-        }
-
-        $connection = $this->db->getConnection();
-        if (PEAR::isError($connection)) {
-            return $connection;
-        }
-
-        $result = $this->statement->execute();
-        if ($result==false) {
-            $err =$this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
-                    'cant execute statement', __FUNCTION__);
-        }
-
-        if ($this->is_manip) {
-            $affected_rows = $this->db->_affectedRows($connection, $result);
-            return $affected_rows;
-        }
-
-        $result = $this->db->_wrapResult($result, $this->result_types,
-            $result_class, $result_wrap_class, $this->limit, $this->offset);
-        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'post', 'result' => $result));
-        return $result;
-    }
-
-    /**
-     * Set the values of multiple a parameter of a prepared query in bulk.
-     *
-     * @param   array   specifies all necessary information
-     *       for bindValue() the array elements must use keys corresponding to
-     *       the number of the position of the parameter.
-     * @param   array   specifies the types of the fields
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @see     bindParam()
-     */
-    function bindValueArray($values, $types = null)
-    {
-        $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
-        $parameters = array_keys($values);
-        foreach ($parameters as $key => $parameter) {
-            $this->db->pushErrorHandling(PEAR_ERROR_RETURN);
-            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-            $err = $this->bindValue($parameter+1, $values[$parameter], $types[$key]);
-            $this->db->popExpect();
-            $this->db->popErrorHandling();
-            if (PEAR::isError($err)) {
-                if ($err->getCode() == MDB2_ERROR_NOT_FOUND) {
-                    //ignore (extra value for missing placeholder)
-                    continue;
-                }
-                return $err;
-            }
-        }
-        return MDB2_OK;
-    }
-    // }}}
-    // {{{ function bindParamArray(&$values, $types = null)
-
-    /**
-     * Bind the variables of multiple a parameter of a prepared query in bulk.
-     *
-     * @param   array   specifies all necessary information
-     *       for bindParam() the array elements must use keys corresponding to
-     *       the number of the position of the parameter.
-     * @param   array   specifies the types of the fields
-     *
-     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
-     *
-     * @access  public
-     * @see     bindParam()
-     */
-    function bindParamArray(&$values, $types = null)
-    {
-        $types = is_array($types) ? array_values($types) : array_fill(0, count($values), null);
-        $parameters = array_keys($values);
-        foreach ($parameters as $key => $parameter) {
-            $err = $this->bindParam($parameter+1, $values[$parameter], $types[$key]);
-            if (PEAR::isError($err)) {
-                return $err;
-            }
-        }
-        return MDB2_OK;
-    }
-
-    // }}}
-    // {{{ function &execute($values = null, $result_class = true, $result_wrap_class = false)
-
-    /**
-     * Execute a prepared query statement.
-     *
-     * @param array specifies all necessary information
-     *              for bindParam() the array elements must use keys corresponding
-     *              to the number of the position of the parameter.
-     * @param mixed specifies which result class to use
-     * @param mixed specifies which class to wrap results in
-     *
-     * @return mixed MDB2_Result or integer (affected rows) on success,
-     *               a MDB2 error on failure
-     * @access public
-     */
-    function execute($values = null, $result_class = true, $result_wrap_class = false)
-    {
-        if (is_null($this->positions)) {
-            return $this->db->raiseError(MDB2_ERROR, null, null,
-                'Prepared statement has already been freed', __FUNCTION__);
-        }
-        $values = (array)$values;
-        if (!empty($values)) {
-			if(count($this->types)) {
-				$types=$this->types;
-			}else{
-				$types=null;
-			}
-            $err = $this->bindValueArray($values, $types);
-            if (PEAR::isError($err)) {
-                return $this->db->raiseError(MDB2_ERROR, null, null,
-                                            'Binding Values failed with message: ' . $err->getMessage(), __FUNCTION__);
-            }
-        }
-        $result =$this->_execute($result_class, $result_wrap_class);
-        return $result;
-    }
-
-    function __destruct() {
-		$this->free();
-    }
-}
diff --git a/lib/app.php b/lib/app.php
index f9b1c5ca7b55c21c065568ce135d2a6e2fd3f7f9..5fa650044f3c46c6db179282c271b986c276dfad 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -401,15 +401,7 @@ class OC_App{
 
 			// if the user is an admin
 			if(OC_User::isAdminUser(OC_User::getUser())) {
-				// admin apps menu
-				$settings[] = array(
-					"id" => "core_apps",
-					"order" => 3,
-					"href" => OC_Helper::linkToRoute( "settings_apps" ).'?installed',
-					"name" => $l->t("Apps"),
-					"icon" => OC_Helper::imagePath( "settings", "apps.svg" )
-				);
-
+				// admin settings
 				$settings[]=array(
 					"id" => "admin",
 					"order" => 1000,
@@ -424,7 +416,7 @@ class OC_App{
 		return $navigation;
 	}
 
-	/// This is private as well. It simply works, so don't ask for more details
+	// This is private as well. It simply works, so don't ask for more details
 	private static function proceedNavigation( $list ) {
 		foreach( $list as &$naventry ) {
 			if( $naventry['id'] == self::$activeapp ) {
@@ -473,7 +465,7 @@ class OC_App{
 	}
 	/**
 	* Get the directory for the given app.
-	* If the app is defined in multiple directory, the first one is taken. (false if not found)
+	* If the app is defined in multiple directories, the first one is taken. (false if not found)
 	*/
 	public static function getAppPath($appid) {
 		if( ($dir = self::findAppInDirectories($appid)) != false) {
@@ -484,7 +476,7 @@ class OC_App{
 
 	/**
 	* Get the path for the given app on the access
-	* If the app is defined in multiple directory, the first one is taken. (false if not found)
+	* If the app is defined in multiple directories, the first one is taken. (false if not found)
 	*/
 	public static function getAppWebPath($appid) {
 		if( ($dir = self::findAppInDirectories($appid)) != false) {
@@ -818,7 +810,7 @@ class OC_App{
 	}
 
 	/**
-	 * check if the app need updating and update when needed
+	 * check if the app needs updating and update when needed
 	 */
 	public static function checkUpgrade($app) {
 		if (in_array($app, self::$checkedApps)) {
@@ -839,9 +831,9 @@ class OC_App{
 					OC_Hook::emit('update', 'success', 'Updated '.$info['name'].' app');
 				}
 				catch (Exception $e) {
-					echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"';
 					OC_Hook::emit('update', 'failure', 'Failed to update '.$info['name'].' app: '.$e->getMessage());
-					die;
+					$l = OC_L10N::get('lib');
+					throw new RuntimeException($l->t('Failed to upgrade "%s".', array($app)), 0, $e);
 				}
 				OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
 			}
diff --git a/lib/archive.php b/lib/archive.php
index 61239c82076bb3394b6466aa80363e5807e31ef1..70615db714e40e8bc230ad19c8e882feaf5c5f18 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -8,7 +8,7 @@
 
 abstract class OC_Archive{
 	/**
-	 * open any of the supporeted archive types
+	 * open any of the supported archive types
 	 * @param string path
 	 * @return OC_Archive
 	 */
@@ -69,7 +69,7 @@ abstract class OC_Archive{
 	 */
 	abstract function getFolder($path);
 	/**
-	 *get all files in the archive
+	 * get all files in the archive
 	 * @return array
 	 */
 	abstract function getFiles();
@@ -113,7 +113,7 @@ abstract class OC_Archive{
 	 */
 	abstract function getStream($path, $mode);
 	/**
-	 * add a folder and all it's content
+	 * add a folder and all its content
 	 * @param string $path
 	 * @param string source
 	 * @return bool
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index e7c81389619a8f2d00cb94aea7cb3b275895cb46..a1c0535b1c3e49a71b706d64632fec92d96478f8 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -182,7 +182,7 @@ class OC_Archive_TAR extends OC_Archive{
 		return $folderContent;
 	}
 	/**
-	 *get all files in the archive
+	 * get all files in the archive
 	 * @return array
 	 */
 	function getFiles() {
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 8e31795ded1512c02cdadd667c1175dc2263c949..8a866716a7949f7442611bb40ae8090fbba153c5 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -94,7 +94,7 @@ class OC_Archive_ZIP extends OC_Archive{
 		return $folderContent;
 	}
 	/**
-	 *get all files in the archive
+	 * get all files in the archive
 	 * @return array
 	 */
 	function getFiles() {
diff --git a/lib/base.php b/lib/base.php
index d1279a46337e6a37b5a209d1d7ed72a9a303fd94..eaee84246512ec137417a313773a6e43a4e0727e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -124,10 +124,9 @@ class OC {
 			OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
 			OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
 		} else {
-			echo('3rdparty directory not found! Please put the ownCloud 3rdparty'
+			throw new Exception('3rdparty directory not found! Please put the ownCloud 3rdparty'
 				.' folder in the ownCloud folder or the folder above.'
 				.' You can also configure the location in the config.php file.');
-			exit;
 		}
 		// search the apps folder
 		$config_paths = OC_Config::getValue('apps_paths', array());
@@ -150,9 +149,8 @@ class OC {
 		}
 
 		if (empty(OC::$APPSROOTS)) {
-			echo('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
+			throw new Exception('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
 				.' or the folder above. You can also configure the location in the config.php file.');
-			exit;
 		}
 		$paths = array();
 		foreach (OC::$APPSROOTS as $path) {
@@ -174,14 +172,11 @@ class OC {
 		if (file_exists(OC::$SERVERROOT . "/config/config.php")
 			and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
 			$defaults = new OC_Defaults();
-			$tmpl = new OC_Template('', 'error', 'guest');
-			$tmpl->assign('errors', array(1 => array(
-				'error' => "Can't write into config directory 'config'",
-				'hint' => 'This can usually be fixed by '
+			OC_Template::printErrorPage(
+				"Can't write into config directory!",
+				'This can usually be fixed by '
 					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
-			)));
-			$tmpl->printPage();
-			exit();
+			);
 		}
 	}
 
@@ -223,10 +218,7 @@ class OC {
 			header('Retry-After: 120');
 
 			// render error page
-			$tmpl = new OC_Template('', 'error', 'guest');
-			$tmpl->assign('errors', array(1 => array('error' => 'ownCloud is in maintenance mode')));
-			$tmpl->printPage();
-			exit();
+			OC_Template::printErrorPage('ownCloud is in maintenance mode');
 		}
 	}
 
@@ -305,11 +297,7 @@ class OC {
 			$error = 'Session could not be initialized. Please contact your ';
 			$error .= 'system administrator';
 
-			$tmpl = new OC_Template('', 'error', 'guest');
-			$tmpl->assign('errors', array(1 => array('error' => $error)));
-			$tmpl->printPage();
-
-			exit();
+			OC_Template::printErrorPage($error);
 		}
 
 		$sessionLifeTime = self::getSessionLifeTime();
@@ -370,6 +358,7 @@ class OC {
 		self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
 		self::$loader->registerPrefix('Sabre\\VObject', '3rdparty');
 		self::$loader->registerPrefix('Sabre_', '3rdparty');
+		self::$loader->registerPrefix('Patchwork', '3rdparty');
 		spl_autoload_register(array(self::$loader, 'load'));
 
 		// set some stuff
@@ -433,10 +422,13 @@ class OC {
 			}
 		}
 
-		if (!defined('PHPUNIT_RUN') and !(defined('DEBUG') and DEBUG)) {
-			register_shutdown_function(array('OC_Log', 'onShutdown'));
-			set_error_handler(array('OC_Log', 'onError'));
-			set_exception_handler(array('OC_Log', 'onException'));
+		if (!defined('PHPUNIT_RUN')) {
+			if (defined('DEBUG') and DEBUG) {
+				set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
+			} else {
+				OC\Log\ErrorHandler::register();
+				OC\Log\ErrorHandler::setLogger(OC_Log::$object);
+			}
 		}
 
 		// register the stream wrappers
@@ -598,6 +590,9 @@ class OC {
 			self::checkUpgrade();
 		}
 
+		// Test it the user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+		OC::tryBasicAuthLogin();
+
 		if (!self::$CLI) {
 			try {
 				if (!OC_Config::getValue('maintenance', false)) {
@@ -699,15 +694,11 @@ class OC {
 		// remember was checked after last login
 		if (OC::tryRememberLogin()) {
 			$error[] = 'invalidcookie';
-
 			// Someone wants to log in :
 		} elseif (OC::tryFormLogin()) {
 			$error[] = 'invalidpassword';
-
-			// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-		} elseif (OC::tryBasicAuthLogin()) {
-			$error[] = 'invalidpassword';
 		}
+
 		OC_Util::displayLoginPage(array_unique($error));
 	}
 
@@ -805,8 +796,7 @@ class OC {
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
 			//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
 			OC_User::unsetMagicInCookie();
-			$_REQUEST['redirect_url'] = OC_Request::requestUri();
-			OC_Util::redirectToDefaultPage();
+			$_SERVER['HTTP_REQUESTTOKEN'] = OC_Util::callRegister();
 		}
 		return true;
 	}
@@ -836,3 +826,4 @@ if (!function_exists('get_temp_dir')) {
 }
 
 OC::init();
+
diff --git a/lib/cache.php b/lib/cache.php
index bc74ed83f8bf150b7c596b306a4df6de38867aaf..48b9964ba9d19dd0713f3b5d188e0daa9b20e4e0 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -15,41 +15,14 @@ class OC_Cache {
 	 * @var OC_Cache $global_cache
 	 */
 	static protected $global_cache;
-	/**
-	 * @var OC_Cache $global_cache_fast
-	 */
-	static protected $global_cache_fast;
-	/**
-	 * @var OC_Cache $user_cache_fast
-	 */
-	static protected $user_cache_fast;
-	static protected $isFast=null;
 
 	/**
 	 * get the global cache
 	 * @return OC_Cache
 	 */
-	static public function getGlobalCache($fast=false) {
+	static public function getGlobalCache() {
 		if (!self::$global_cache) {
-			self::$global_cache_fast = null;
-			if (!self::$global_cache_fast && function_exists('xcache_set')) {
-				self::$global_cache_fast = new OC_Cache_XCache(true);
-			}
-			if (!self::$global_cache_fast && function_exists('apc_store')) {
-				self::$global_cache_fast = new OC_Cache_APC(true);
-			}
-
 			self::$global_cache = new OC_Cache_FileGlobal();
-			if (self::$global_cache_fast) {
-				self::$global_cache = new OC_Cache_Broker(self::$global_cache_fast, self::$global_cache);
-			}
-		}
-		if($fast) {
-			if(self::$global_cache_fast) {
-				return self::$global_cache_fast;
-			}else{
-				return false;
-			}
 		}
 		return self::$global_cache;
 	}
@@ -58,34 +31,16 @@ class OC_Cache {
 	 * get the user cache
 	 * @return OC_Cache
 	 */
-	static public function getUserCache($fast=false) {
+	static public function getUserCache() {
 		if (!self::$user_cache) {
-			self::$user_cache_fast = null;
-			if (!self::$user_cache_fast && function_exists('xcache_set')) {
-				self::$user_cache_fast = new OC_Cache_XCache();
-			}
-			if (!self::$user_cache_fast && function_exists('apc_store')) {
-				self::$user_cache_fast = new OC_Cache_APC();
-			}
-
 			self::$user_cache = new OC_Cache_File();
-			if (self::$user_cache_fast) {
-				self::$user_cache = new OC_Cache_Broker(self::$user_cache_fast, self::$user_cache);
-			}
-		}
-
-		if($fast) {
-			if(self::$user_cache_fast) {
-				return self::$user_cache_fast;
-			}else{
-				return false;
-			}
 		}
 		return self::$user_cache;
 	}
 
 	/**
 	 * get a value from the user cache
+	 * @param string $key
 	 * @return mixed
 	 */
 	static public function get($key) {
@@ -95,6 +50,9 @@ class OC_Cache {
 
 	/**
 	 * set a value in the user cache
+	 * @param string $key
+	 * @param mixed $value
+	 * @param int $ttl
 	 * @return bool
 	 */
 	static public function set($key, $value, $ttl=0) {
@@ -107,6 +65,7 @@ class OC_Cache {
 
 	/**
 	 * check if a value is set in the user cache
+	 * @param string $key
 	 * @return bool
 	 */
 	static public function hasKey($key) {
@@ -116,6 +75,7 @@ class OC_Cache {
 
 	/**
 	 * remove an item from the user cache
+	 * @param string $key
 	 * @return bool
 	 */
 	static public function remove($key) {
@@ -133,17 +93,6 @@ class OC_Cache {
 		return $user_cache->clear($prefix);
 	}
 
-	/**
-	 * check if a fast memory based cache is available
-	 * @return true
-	 */
-	static public function isFast() {
-		if(is_null(self::$isFast)) {
-			self::$isFast=function_exists('xcache_set') || function_exists('apc_store');
-		}
-		return self::$isFast;
-	}
-
 	static public function generateCacheKeyFromFiles($files) {
 		$key = '';
 		sort($files);
diff --git a/lib/cache/apc.php b/lib/cache/apc.php
deleted file mode 100644
index 895d307ea26bd9c5d9a2fc6529660568e912642d..0000000000000000000000000000000000000000
--- a/lib/cache/apc.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Cache_APC {
-	protected $prefix;
-
-	public function __construct($global = false) {
-		$this->prefix = OC_Util::getInstanceId().'/';
-		if (!$global) {
-			$this->prefix .= OC_User::getUser().'/';
-		}
-	}
-
-	/**
-	 * entries in APC gets namespaced to prevent collisions between owncloud instances and users
-	 */
-	protected function getNameSpace() {
-		return $this->prefix;
-	}
-
-	public function get($key) {
-		$result = apc_fetch($this->getNamespace().$key, $success);
-		if (!$success) {
-			return null;
-		}
-		return $result;
-	}
-
-	public function set($key, $value, $ttl=0) {
-		return apc_store($this->getNamespace().$key, $value, $ttl);
-	}
-
-	public function hasKey($key) {
-		return apc_exists($this->getNamespace().$key);
-	}
-
-	public function remove($key) {
-		return apc_delete($this->getNamespace().$key);
-	}
-
-	public function clear($prefix='') {
-		$ns = $this->getNamespace().$prefix;
-		$cache = apc_cache_info('user');
-		foreach($cache['cache_list'] as $entry) {
-			if (strpos($entry['info'], $ns) === 0) {
-				apc_delete($entry['info']);
-			}
-		}
-		return true;
-	}
-}
-if(!function_exists('apc_exists')) {
-	function apc_exists($keys)
-	{
-		$result=false;
-		apc_fetch($keys, $result);
-		return $result;
-	}
-}
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 531e1d50f40490aa370d14a297cf3bb552cdf450..ba3dedaf8f3c16404fba969cf6e874ea04bc8563 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -29,22 +29,30 @@ class OC_Cache_File{
 	}
 
 	public function get($key) {
+		$result = null;
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
 		if ($this->hasKey($key)) {
 			$storage = $this->getStorage();
-			return $storage->file_get_contents($key);
+			$result = $storage->file_get_contents($key);
 		}
-		return null;
+		\OC_FileProxy::$enabled = $proxyStatus;
+		return $result;
 	}
 
 	public function set($key, $value, $ttl=0) {
 		$storage = $this->getStorage();
+		$result = false;
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
 		if ($storage and $storage->file_put_contents($key, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
 			}
-			return $storage->touch($key, time() + $ttl);
+			$result = $storage->touch($key, time() + $ttl);
 		}
-		return false;
+		\OC_FileProxy::$enabled = $proxyStatus;
+		return $result;
 	}
 
 	public function hasKey($key) {
diff --git a/lib/config.php b/lib/config.php
index 7dd596fcea57d3582d4aea9fc005c593efadebab..e773e6e2eb0254a311efbba6176ecf835cf38047 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -34,16 +34,34 @@
  *
  */
 
+namespace OC;
+
 /**
  * This class is responsible for reading and writing config.php, the very basic
- * configuration file of owncloud.
+ * configuration file of ownCloud.
  */
-class OC_Config{
+class Config {
 	// associative array key => value
-	private static $cache = array();
+	protected $cache = array();
+
+	protected $configDir;
+	protected $configFilename;
 
-	// Is the cache filled?
-	private static $init = false;
+	protected $debugMode;
+
+	/**
+	 * @param $configDir path to the config dir, needs to end with '/'
+	 */
+	public function __construct($configDir) {
+		$this->configDir = $configDir;
+		$this->configFilename = $this->configDir.'config.php';
+		$this->readData();
+		$this->setDebugMode(defined('DEBUG') && DEBUG);
+	}
+
+	public function setDebugMode($enable) {
+		$this->debugMode = $enable;
+	}
 
 	/**
 	 * @brief Lists all available config keys
@@ -52,10 +70,8 @@ class OC_Config{
 	 * This function returns all keys saved in config.php. Please note that it
 	 * does not return the values.
 	 */
-	public static function getKeys() {
-		self::readData();
-
-		return array_keys( self::$cache );
+	public function getKeys() {
+		return array_keys($this->cache);
 	}
 
 	/**
@@ -67,11 +83,9 @@ class OC_Config{
 	 * This function gets the value from config.php. If it does not exist,
 	 * $default will be returned.
 	 */
-	public static function getValue( $key, $default = null ) {
-		self::readData();
-
-		if( array_key_exists( $key, self::$cache )) {
-			return self::$cache[$key];
+	public function getValue($key, $default = null) {
+		if (isset($this->cache[$key])) {
+			return $this->cache[$key];
 		}
 
 		return $default;
@@ -81,117 +95,92 @@ class OC_Config{
 	 * @brief Sets a value
 	 * @param string $key key
 	 * @param string $value value
-	 * @return bool
 	 *
-	 * This function sets the value and writes the config.php. If the file can
-	 * not be written, false will be returned.
+	 * This function sets the value and writes the config.php.
+	 *
 	 */
-	public static function setValue( $key, $value ) {
-		self::readData();
-
+	public function setValue($key, $value) {
 		// Add change
-		self::$cache[$key] = $value;
+		$this->cache[$key] = $value;
 
 		// Write changes
-		self::writeData();
-		return true;
+		$this->writeData();
 	}
 
 	/**
 	 * @brief Removes a key from the config
 	 * @param string $key key
-	 * @return bool
 	 *
-	 * This function removes a key from the config.php. If owncloud has no
-	 * write access to config.php, the function will return false.
+	 * This function removes a key from the config.php.
+	 *
 	 */
-	public static function deleteKey( $key ) {
-		self::readData();
-
-		if( array_key_exists( $key, self::$cache )) {
+	public function deleteKey($key) {
+		if (isset($this->cache[$key])) {
 			// Delete key from cache
-			unset( self::$cache[$key] );
+			unset($this->cache[$key]);
 
 			// Write changes
-			self::writeData();
+			$this->writeData();
 		}
-
-		return true;
 	}
 
 	/**
 	 * @brief Loads the config file
-	 * @return bool
 	 *
 	 * Reads the config file and saves it to the cache
 	 */
-	private static function readData() {
-		if( self::$init ) {
-			return true;
-		}
-
-		// read all file in config dir ending by config.php
-		$config_files = glob( OC::$SERVERROOT."/config/*.config.php");
-		if (!is_array($config_files)) {
-			$config_files = array();
+	private function readData() {
+		// Default config
+		$configFiles = array($this->configFilename);
+		// Add all files in the config dir ending with config.php
+		$extra = glob($this->configDir.'*.config.php');
+		if (is_array($extra)) {
+			natsort($extra);
+			$configFiles = array_merge($configFiles, $extra);
 		}
-
-		//Filter only regular files
-		$config_files = array_filter($config_files, 'is_file');
-
-		//Sort array naturally :
-		natsort($config_files);
-
-		// Add default config
-		array_unshift($config_files,OC::$SERVERROOT."/config/config.php");
-
-		//Include file and merge config
-		foreach($config_files as $file){
+		// Include file and merge config
+		foreach ($configFiles as $file) {
+			if (!file_exists($file)) {
+				continue;
+			}
+			unset($CONFIG);
+			// ignore errors on include, this can happen when doing a fresh install
 			@include $file;
-			if( isset( $CONFIG ) && is_array( $CONFIG )) {
-				self::$cache = array_merge(self::$cache, $CONFIG);
+			if (isset($CONFIG) && is_array($CONFIG)) {
+				$this->cache = array_merge($this->cache, $CONFIG);
 			}
 		}
-
-		// We cached everything
-		self::$init = true;
-
-		return true;
 	}
 
 	/**
 	 * @brief Writes the config file
-	 * @return bool
 	 *
 	 * Saves the config to the config file.
 	 *
 	 */
-	public static function writeData() {
+	private function writeData() {
 		// Create a php file ...
-		$defaults = new OC_Defaults;
-		$content = "<?php\n ";
-		if (defined('DEBUG') && DEBUG) {
+		$defaults = new \OC_Defaults;
+		$content = "<?php\n";
+		if ($this->debugMode) {
 			$content .= "define('DEBUG',true);\n";
 		}
-		$content .= "\$CONFIG = ";
-		$content .= var_export(self::$cache, true);
+		$content .= '$CONFIG = ';
+		$content .= var_export($this->cache, true);
 		$content .= ";\n";
 
-		$filename = OC::$SERVERROOT."/config/config.php";
 		// Write the file
-		$result=@file_put_contents( $filename, $content );
-		if(!$result) {
-			$tmpl = new OC_Template( '', 'error', 'guest' );
-			$tmpl->assign('errors', array(1=>array(
-				'error'=>"Can't write into config directory 'config'",
-				'hint'=>'This can usually be fixed by '
-					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.')));
-			$tmpl->printPage();
-			exit;
+		$result = @file_put_contents($this->configFilename, $content);
+		if (!$result) {
+			$url = $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions';
+			throw new HintException(
+				"Can't write into config directory!",
+				'This can usually be fixed by '
+					.'<a href="' . $url . '" target="_blank">giving the webserver write access to the config directory</a>.');
 		}
 		// Prevent others not to read the config
-		@chmod($filename, 0640);
-		OC_Util::clearOpcodeCache();
-		return true;
+		@chmod($this->configFilename, 0640);
+		\OC_Util::clearOpcodeCache();
 	}
 }
+
diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 6990d928cffee9d462e08cb8d2c6de2c615fc571..bf3a49593cbc23419ed2dd404f589bb5b1dd24e8 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -60,4 +60,25 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 		}
 		return $user;
 	}
+
+	/**
+	  * Override function here. We want to cache authentication cookies
+	  * in the syncing client to avoid HTTP-401 roundtrips.
+	  * If the sync client supplies the cookies, then OC_User::isLoggedIn()
+	  * will return true and we can see this WebDAV request as already authenticated,
+	  * even if there are no HTTP Basic Auth headers.
+	  * In other case, just fallback to the parent implementation.
+	  *
+	  * @return bool
+	  */
+	public function authenticate(Sabre_DAV_Server $server, $realm) {
+		if (OC_User::isLoggedIn()) {
+			$user = OC_User::getUser();
+			OC_Util::setupFS($user);
+			$this->currentUser = $user;
+			return true;
+		}
+
+		return parent::authenticate($server, $realm);
+    }
 }
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 3d15a2a584d4acca517a9089e45f30902d2aeaac..ed8d085462d552ef5b3b6cf315d4647e808a8dcc 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -222,7 +222,6 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 			throw new \Sabre_DAV_Exception_Forbidden();
 		}
 		if ($this->path != "/Shared") {
-			foreach($this->getChildren() as $child) $child->delete();
 			\OC\Files\Filesystem::rmdir($this->path);
 		}
 
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 438d9871c228ef83851f87bf2497112b35528d46..06ab73e3e4d11c95d9dd1e2f9958e3da24739e60 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -115,8 +115,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 */
 	public function getSize() {
 		$this->getFileinfoCache();
-		return $this->fileinfo_cache['size'];
-
+		if ($this->fileinfo_cache['size'] > -1) {
+			return $this->fileinfo_cache['size'];
+		} else {
+			return null;
+		}
 	}
 
 	/**
diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4ddcbecbb86e3f0ae6b0019f0d1ae5a52e259c1
--- /dev/null
+++ b/lib/connector/sabre/objecttree.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Connector\Sabre;
+
+use OC\Files\Filesystem;
+
+class ObjectTree extends \Sabre_DAV_ObjectTree {
+	/**
+	 * Returns the INode object for the requested path
+	 *
+	 * @param string $path
+	 * @throws \Sabre_DAV_Exception_NotFound
+	 * @return \Sabre_DAV_INode
+	 */
+	public function getNodeForPath($path) {
+
+		$path = trim($path, '/');
+		if (isset($this->cache[$path])) return $this->cache[$path];
+
+		// Is it the root node?
+		if (!strlen($path)) {
+			return $this->rootNode;
+		}
+
+		$info = Filesystem::getFileInfo($path);
+
+		if (!$info) {
+			throw new \Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
+		}
+
+		if ($info['mimetype'] === 'httpd/unix-directory') {
+			$node = new \OC_Connector_Sabre_Directory($path);
+		} else {
+			$node = new \OC_Connector_Sabre_File($path);
+		}
+
+		$node->setFileinfoCache($info);
+
+		$this->cache[$path] = $node;
+		return $node;
+
+	}
+
+	/**
+	 * Moves a file from one location to another
+	 *
+	 * @param string $sourcePath The path to the file which should be moved
+	 * @param string $destinationPath The full destination path, so not just the destination parent node
+	 * @throws \Sabre_DAV_Exception_Forbidden
+	 * @return int
+	 */
+	public function move($sourcePath, $destinationPath) {
+
+		$sourceNode = $this->getNodeForPath($sourcePath);
+		if ($sourceNode instanceof \Sabre_DAV_ICollection and $this->nodeExists($destinationPath)) {
+			throw new \Sabre_DAV_Exception_Forbidden('Could not copy directory ' . $sourceNode . ', target exists');
+		}
+		list($sourceDir,) = \Sabre_DAV_URLUtil::splitPath($sourcePath);
+		list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destinationPath);
+
+		Filesystem::rename($sourcePath, $destinationPath);
+
+		$this->markDirty($sourceDir);
+		$this->markDirty($destinationDir);
+
+	}
+
+	/**
+	 * Copies a file or directory.
+	 *
+	 * This method must work recursively and delete the destination
+	 * if it exists
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @return void
+	 */
+	public function copy($source, $destination) {
+
+		if (Filesystem::is_file($source)) {
+			Filesystem::copy($source, $destination);
+		} else {
+			Filesystem::mkdir($destination);
+			$dh = Filesystem::opendir($source);
+			while ($subnode = readdir($dh)) {
+
+				if ($subnode == '.' || $subnode == '..') continue;
+				$this->copy($source . '/' . $subnode, $destination . '/' . $subnode);
+
+			}
+		}
+
+		list($destinationDir,) = \Sabre_DAV_URLUtil::splitPath($destination);
+		$this->markDirty($destinationDir);
+	}
+}
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 04be410ac85ea44875ea9ad87226d96853a95d4d..16c88b96ea6fc4dbcf8b9f941eee48c38836c52e 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -121,6 +121,6 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	}
 
 	function searchPrincipals($prefixPath, array $searchProperties) {
-		return 0;
+		return array();
 	}
 }
diff --git a/lib/db.php b/lib/db.php
index 6fec60e53ce85d3c364419a0d745550acbd81ead..ebd012c72f812f29cfed7e6da469471bb762aedb 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -20,7 +20,9 @@
  *
  */
 
-class DatabaseException extends Exception{
+define('MDB2_SCHEMA_DUMP_STRUCTURE', '1');
+
+class DatabaseException extends Exception {
 	private $query;
 
 	//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
@@ -29,103 +31,35 @@ class DatabaseException extends Exception{
 		$this->query = $query;
 	}
 
-	public function getQuery(){
+	public function getQuery() {
 		return $this->query;
 	}
 }
 
 /**
  * This class manages the access to the database. It basically is a wrapper for
- * MDB2 with some adaptions.
+ * Doctrine with some adaptions.
  */
 class OC_DB {
-	const BACKEND_PDO=0;
-	const BACKEND_MDB2=1;
-
-	static private $preparedQueries = array();
-	static private $cachingEnabled = true;
-
 	/**
-	 * @var MDB2_Driver_Common
+	 * @var \OC\DB\Connection $connection
 	 */
-	static private $connection; //the prefered connection to use, either PDO or MDB2
-	static private $backend=null;
-	/**
-	 * @var MDB2_Driver_Common
-	 */
-	static private $MDB2=null;
-	/**
-	 * @var PDO
-	 */
-	static private $PDO=null;
-	/**
-	 * @var MDB2_Schema
-	 */
-	static private $schema=null;
-	static private $inTransaction=false;
+	static private $connection; //the prefered connection to use, only Doctrine
+
 	static private $prefix=null;
 	static private $type=null;
 
-	/**
-	 * check which backend we should use
-	 * @return int BACKEND_MDB2 or BACKEND_PDO
-	 */
-	private static function getDBBackend() {
-		//check if we can use PDO, else use MDB2 (installation always needs to be done my mdb2)
-		if(class_exists('PDO') && OC_Config::getValue('installed', false)) {
-			$type = OC_Config::getValue( "dbtype", "sqlite" );
-			if($type=='oci') { //oracle also always needs mdb2
-				return self::BACKEND_MDB2;
-			}
-			if($type=='sqlite3') $type='sqlite';
-			$drivers=PDO::getAvailableDrivers();
-			if(array_search($type, $drivers)!==false) {
-				return self::BACKEND_PDO;
-			}
-		}
-		return self::BACKEND_MDB2;
-	}
-
 	/**
 	 * @brief connects to the database
-	 * @param int $backend
 	 * @return bool true if connection can be established or false on error
 	 *
 	 * Connects to the database as specified in config.php
 	 */
-	public static function connect($backend=null) {
+	public static function connect() {
 		if(self::$connection) {
 			return true;
 		}
-		if(is_null($backend)) {
-			$backend=self::getDBBackend();
-		}
-		if($backend==self::BACKEND_PDO) {
-			$success = self::connectPDO();
-			self::$connection=self::$PDO;
-			self::$backend=self::BACKEND_PDO;
-		}else{
-			$success = self::connectMDB2();
-			self::$connection=self::$MDB2;
-			self::$backend=self::BACKEND_MDB2;
-		}
-		return $success;
-	}
 
-	/**
-	 * connect to the database using pdo
-	 *
-	 * @return bool
-	 */
-	public static function connectPDO() {
-		if(self::$connection) {
-			if(self::$backend==self::BACKEND_MDB2) {
-				self::disconnect();
-			}else{
-				return true;
-			}
-		}
-		self::$preparedQueries = array();
 		// The global data we need
 		$name = OC_Config::getValue( "dbname", "owncloud" );
 		$host = OC_Config::getValue( "dbhost", "" );
@@ -134,218 +68,130 @@ class OC_DB {
 		$type = OC_Config::getValue( "dbtype", "sqlite" );
 		if(strpos($host, ':')) {
 			list($host, $port)=explode(':', $host, 2);
-		}else{
+		} else {
 			$port=false;
 		}
-		$opts = array();
-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
-
-		// do nothing if the connection already has been established
-		if(!self::$PDO) {
-			// Add the dsn according to the database type
-			switch($type) {
-				case 'sqlite':
-					$dsn='sqlite2:'.$datadir.'/'.$name.'.db';
-					break;
-				case 'sqlite3':
-					$dsn='sqlite:'.$datadir.'/'.$name.'.db';
-					break;
-				case 'mysql':
-					if($port) {
-						$dsn='mysql:dbname='.$name.';host='.$host.';port='.$port;
-					}else{
-						$dsn='mysql:dbname='.$name.';host='.$host;
-					}
-					$opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'";
-					break;
-				case 'pgsql':
-					if($port) {
-						$dsn='pgsql:dbname='.$name.';host='.$host.';port='.$port;
-					}else{
-						$dsn='pgsql:dbname='.$name.';host='.$host;
-					}
-					/**
-					* Ugly fix for pg connections pbm when password use spaces
-					*/
-					$e_user = addslashes($user);
-					$e_password = addslashes($pass);
-					$pass = $user = null;
-					$dsn .= ";user='$e_user';password='$e_password'";
-					/** END OF FIX***/
-					break;
-				case 'oci': // Oracle with PDO is unsupported
-					if ($port) {
-							$dsn = 'oci:dbname=//' . $host . ':' . $port . '/' . $name;
-					} else {
-							$dsn = 'oci:dbname=//' . $host . '/' . $name;
-					}
-					break;
-				case 'mssql':
-					if ($port) {
-							$dsn='sqlsrv:Server='.$host.','.$port.';Database='.$name;
-					} else {
-							$dsn='sqlsrv:Server='.$host.';Database='.$name;
-					}
-					break;
-				default:
-					return false;
-			}
-			self::$PDO=new PDO($dsn, $user, $pass, $opts);
-			
-			// We always, really always want associative arrays
-			self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
-			self::$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-		}
-		return true;
-	}
-
-	/**
-	 * connect to the database using mdb2
-	 */
-	public static function connectMDB2() {
-		if(self::$connection) {
-			if(self::$backend==self::BACKEND_PDO) {
-				self::disconnect();
-			}else{
-				return true;
-			}
-		}
-		self::$preparedQueries = array();
-		// The global data we need
-		$name = OC_Config::getValue( "dbname", "owncloud" );
-		$host = OC_Config::getValue( "dbhost", "" );
-		$user = OC_Config::getValue( "dbuser", "" );
-		$pass = OC_Config::getValue( "dbpassword", "" );
-		$type = OC_Config::getValue( "dbtype", "sqlite" );
-		$SERVERROOT=OC::$SERVERROOT;
-		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
 
 		// do nothing if the connection already has been established
-		if(!self::$MDB2) {
-			// Require MDB2.php (not required in the head of the file so we only load it when needed)
-			require_once 'MDB2.php';
-
-			// Prepare options array
-			$options = array(
-					'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE,
-					'log_line_break' => '<br>',
-					'idxname_format' => '%s',
-					'debug' => true,
-					'quote_identifier' => true
-					);
-
-			// Add the dsn according to the database type
+		if (!self::$connection) {
+			$config = new \Doctrine\DBAL\Configuration();
 			switch($type) {
 				case 'sqlite':
 				case 'sqlite3':
-					$dsn = array(
-						'phptype'  => $type,
-						'database' => "$datadir/$name.db",
-						'mode' => '0644'
+					$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
+					$connectionParams = array(
+							'user' => $user,
+							'password' => $pass,
+							'path' => $datadir.'/'.$name.'.db',
+							'driver' => 'pdo_sqlite',
 					);
+					$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
 					break;
 				case 'mysql':
-					$dsn = array(
-						'phptype'  => 'mysql',
-						'username' => $user,
-						'password' => $pass,
-						'hostspec' => $host,
-						'database' => $name
+					$connectionParams = array(
+							'user' => $user,
+							'password' => $pass,
+							'host' => $host,
+							'port' => $port,
+							'dbname' => $name,
+							'charset' => 'UTF8',
+							'driver' => 'pdo_mysql',
 					);
+					$connectionParams['adapter'] = '\OC\DB\Adapter';
 					break;
 				case 'pgsql':
-					$dsn = array(
-						'phptype'  => 'pgsql',
-						'username' => $user,
-						'password' => $pass,
-						'hostspec' => $host,
-						'database' => $name
+					$connectionParams = array(
+							'user' => $user,
+							'password' => $pass,
+							'host' => $host,
+							'port' => $port,
+							'dbname' => $name,
+							'driver' => 'pdo_pgsql',
 					);
+					$connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
 					break;
 				case 'oci':
-					$dsn = array(
-						'phptype'  => 'oci8',
-						'username' => $user,
-						'password' => $pass,
-						'service'  => $name,
-						'hostspec' => $host,
-						'charset' => 'AL32UTF8',
+					$connectionParams = array(
+							'user' => $user,
+							'password' => $pass,
+							'host' => $host,
+							'dbname' => $name,
+							'charset' => 'AL32UTF8',
+							'driver' => 'oci8',
 					);
+					if (!empty($port)) {
+						$connectionParams['port'] = $port;
+					}
+					$connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
 					break;
 				case 'mssql':
-					$dsn = array(
-						'phptype' => 'sqlsrv',
-						'username' => $user,
-						'password' => $pass,
-						'hostspec' => $host,
-						'database' => $name,
-						'charset' => 'UTF-8'
+					$connectionParams = array(
+							'user' => $user,
+							'password' => $pass,
+							'host' => $host,
+							'port' => $port,
+							'dbname' => $name,
+							'charset' => 'UTF8',
+							'driver' => 'pdo_sqlsrv',
 					);
-					$options['portability'] = $options['portability'] - MDB2_PORTABILITY_EMPTY_TO_NULL;
+					$connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
 					break;
 				default:
 					return false;
 			}
+			$connectionParams['wrapperClass'] = 'OC\DB\Connection';
+			$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
+			try {
+				self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
+				if ($type === 'sqlite' || $type === 'sqlite3') {
+					// Sqlite doesn't handle query caching and schema changes
+					// TODO: find a better way to handle this
+					self::$connection->disableQueryStatementCaching();
+				}
+			} catch(\Doctrine\DBAL\DBALException $e) {
+				OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
+				OC_User::setUserId(null);
 
-			// Try to establish connection
-			self::$MDB2 = MDB2::factory( $dsn, $options );
-			
-			self::raiseExceptionOnError( self::$MDB2 );
-
-			// We always, really always want associative arrays
-			self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC);
+				// send http status 503
+				header('HTTP/1.1 503 Service Temporarily Unavailable');
+				header('Status: 503 Service Temporarily Unavailable');
+				OC_Template::printErrorPage('Failed to connect to database');
+				die();
+			}
 		}
-
-		// we are done. great!
 		return true;
 	}
 
+	/**
+	 * @return \OC\DB\Connection
+	 */
+	static public function getConnection() {
+		self::connect();
+		return self::$connection;
+	}
+
+	/**
+	 * get MDB2 schema manager
+	 *
+	 * @return \OC\DB\MDB2SchemaManager
+	 */
+	private static function getMDB2SchemaManager()
+	{
+		return new \OC\DB\MDB2SchemaManager(self::getConnection());
+	}
+
 	/**
 	 * @brief Prepare a SQL query
 	 * @param string $query Query string
 	 * @param int $limit
 	 * @param int $offset
 	 * @param bool $isManipulation
-	 * @return MDB2_Statement_Common prepared SQL query
+	 * @throws DatabaseException
+	 * @return \Doctrine\DBAL\Statement prepared SQL query
 	 *
-	 * SQL query via MDB2 prepare(), needs to be execute()'d!
+	 * SQL query via Doctrine prepare(), needs to be execute()'d!
 	 */
 	static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
-
-		if (!is_null($limit) && $limit != -1) {
-			if (self::$backend == self::BACKEND_MDB2) {
-				//MDB2 uses or emulates limits & offset internally
-				self::$MDB2->setLimit($limit, $offset);
-			} else {
-				//PDO does not handle limit and offset.
-				//FIXME: check limit notation for other dbs
-				//the following sql thus might needs to take into account db ways of representing it
-				//(oracle has no LIMIT / OFFSET)
-				$limit = (int)$limit;
-				$limitsql = ' LIMIT ' . $limit;
-				if (!is_null($offset)) {
-					$offset = (int)$offset;
-					$limitsql .= ' OFFSET ' . $offset;
-				}
-				//insert limitsql
-				if (substr($query, -1) == ';') { //if query ends with ;
-					$query = substr($query, 0, -1) . $limitsql . ';';
-				} else {
-					$query.=$limitsql;
-				}
-			}
-		} else {
-			if (isset(self::$preparedQueries[$query]) and self::$cachingEnabled) {
-				return self::$preparedQueries[$query];
-			}
-		}
-		$rawQuery = $query;
-
-		// Optimize the query
-		$query = self::processQuery( $query );
-		if(OC_Config::getValue( "log_query", false)) {
-			OC_Log::write('core', 'DB prepare : '.$query, OC_Log::DEBUG);
-		}
 		self::connect();
 		
 		if ($isManipulation === null) {
@@ -354,57 +200,38 @@ class OC_DB {
 		}
 		
 		// return the result
-		if(self::$backend==self::BACKEND_MDB2) {
-			// differentiate between query and manipulation
-			if ($isManipulation) {
-				$result = self::$connection->prepare( $query, null, MDB2_PREPARE_MANIP );
-			} else {
-				$result = self::$connection->prepare( $query, null, MDB2_PREPARE_RESULT );
-			}
-
-			// Die if we have an error (error means: bad query, not 0 results!)
-			if( self::isError($result)) {
-				throw new DatabaseException($result->getMessage(), $query);
-			}
-		}else{
-			try{
-				$result=self::$connection->prepare($query);
-			}catch(PDOException $e) {
-				throw new DatabaseException($e->getMessage(), $query);
-			}
-			// differentiate between query and manipulation
-			$result = new PDOStatementWrapper($result, $isManipulation);
-		}
-		if ((is_null($limit) || $limit == -1) and self::$cachingEnabled ) {
-			$type = OC_Config::getValue( "dbtype", "sqlite" );
-			if( $type != 'sqlite' && $type != 'sqlite3' ) {
-				self::$preparedQueries[$rawQuery] = $result;
-			}
+		try {
+			$result = self::$connection->prepare($query, $limit, $offset);
+		} catch (\Doctrine\DBAL\DBALException $e) {
+			throw new \DatabaseException($e->getMessage(), $query);
 		}
+		// differentiate between query and manipulation
+		$result = new OC_DB_StatementWrapper($result, $isManipulation);
 		return $result;
 	}
-	
+
 	/**
 	 * tries to guess the type of statement based on the first 10 characters
 	 * the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
 	 * 
 	 * @param string $sql
+	 * @return bool
 	 */
 	static public function isManipulation( $sql ) {
-		$selectOccurence = stripos ($sql, "SELECT");
-		if ($selectOccurence !== false && $selectOccurence < 10) {
+		$selectOccurrence = stripos($sql, 'SELECT');
+		if ($selectOccurrence !== false && $selectOccurrence < 10) {
 			return false;
 		}
-		$insertOccurence = stripos ($sql, "INSERT");
-		if ($insertOccurence !== false && $insertOccurence < 10) {
+		$insertOccurrence = stripos($sql, 'INSERT');
+		if ($insertOccurrence !== false && $insertOccurrence < 10) {
 			return true;
 		}
-		$updateOccurence = stripos ($sql, "UPDATE");
-		if ($updateOccurence !== false && $updateOccurence < 10) {
+		$updateOccurrence = stripos($sql, 'UPDATE');
+		if ($updateOccurrence !== false && $updateOccurrence < 10) {
 			return true;
 		}
-		$deleteOccurance = stripos ($sql, "DELETE");
-		if ($deleteOccurance !== false && $deleteOccurance < 10) {
+		$deleteOccurrence = stripos($sql, 'DELETE');
+		if ($deleteOccurrence !== false && $deleteOccurrence < 10) {
 			return true;
 		}
 		return false;
@@ -412,7 +239,7 @@ class OC_DB {
 	
 	/**
 	 * @brief execute a prepared statement, on error write log and throw exception
-	 * @param mixed $stmt PDOStatementWrapper | MDB2_Statement_Common ,
+	 * @param mixed $stmt OC_DB_StatementWrapper,
 	 *					  an array with 'sql' and optionally 'limit' and 'offset' keys
 	 *					.. or a simple sql query string
 	 * @param array $parameters
@@ -422,7 +249,7 @@ class OC_DB {
 	static public function executeAudited( $stmt, array $parameters = null) {
 		if (is_string($stmt)) {
 			// convert to an array with 'sql'
-			if (stripos($stmt,'LIMIT') !== false) { //OFFSET requires LIMIT, se we only neet to check for LIMIT
+			if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT
 				// TODO try to convert LIMIT OFFSET notation to parameters, see fixLimitClauseForMSSQL
 				$message = 'LIMIT and OFFSET are forbidden for portability reasons,'
 						 . ' pass an array with \'limit\' and \'offset\' instead';
@@ -430,7 +257,7 @@ class OC_DB {
 			}
 			$stmt = array('sql' => $stmt, 'limit' => null, 'offset' => null);
 		}
-		if (is_array($stmt)){
+		if (is_array($stmt)) {
 			// convert to prepared statement
 			if ( ! array_key_exists('sql', $stmt) ) {
 				$message = 'statement array must at least contain key \'sql\'';
@@ -445,7 +272,7 @@ class OC_DB {
 			$stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']);
 		}
 		self::raiseExceptionOnError($stmt, 'Could not prepare statement');
-		if ($stmt instanceof PDOStatementWrapper || $stmt instanceof MDB2_Statement_Common) {
+		if ($stmt instanceof OC_DB_StatementWrapper) {
 			$result = $stmt->execute($parameters);
 			self::raiseExceptionOnError($result, 'Could not execute statement');
 		} else {
@@ -465,78 +292,66 @@ class OC_DB {
 	 * @return int id
 	 * @throws DatabaseException
 	 *
-	 * MDB2 lastInsertID()
+	 * \Doctrine\DBAL\Connection lastInsertId
 	 *
 	 * Call this method right after the insert command or other functions may
 	 * cause trouble!
 	 */
 	public static function insertid($table=null) {
 		self::connect();
-		$type = OC_Config::getValue( "dbtype", "sqlite" );
-		if( $type === 'pgsql' ) {
-			$result = self::executeAudited('SELECT lastval() AS id');
-			$row = $result->fetchRow();
-			self::raiseExceptionOnError($row, 'fetching row for insertid failed');
-			return $row['id'];
-		} else if( $type === 'mssql' || $type === 'oci') {
-			if($table !== null) {
-				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
-				$table = str_replace( '*PREFIX*', $prefix, $table );
-			}
-			$result = self::$connection->lastInsertId($table);
-		} else {
-			if($table !== null) {
-				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
-				$suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" );
-				$table = str_replace( '*PREFIX*', $prefix, $table ).$suffix;
-			}
-			$result = self::$connection->lastInsertId($table);
-		}
-		self::raiseExceptionOnError($result, 'insertid failed');
-		return $result;
+		return self::$connection->lastInsertId($table);
+	}
+
+	/**
+	 * @brief Insert a row if a matching row doesn't exists.
+	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
+	 * @param array $input. An array of fieldname/value pairs
+	 * @return int number of updated rows
+	 */
+	public static function insertIfNotExist($table, $input) {
+		self::connect();
+		return self::$connection->insertIfNotExist($table, $input);
+	}
+
+	/**
+	 * Start a transaction
+	 */
+	public static function beginTransaction() {
+		self::connect();
+		self::$connection->beginTransaction();
+	}
+
+	/**
+	 * Commit the database changes done during a transaction that is in progress
+	 */
+	public static function commit() {
+		self::connect();
+		self::$connection->commit();
 	}
 
 	/**
 	 * @brief Disconnect
-	 * @return bool
 	 *
 	 * This is good bye, good bye, yeah!
 	 */
 	public static function disconnect() {
 		// Cut connection if required
 		if(self::$connection) {
-			if(self::$backend==self::BACKEND_MDB2) {
-				self::$connection->disconnect();
-			}
-			self::$connection=false;
-			self::$MDB2=false;
-			self::$PDO=false;
+			self::$connection->close();
 		}
-
-		return true;
 	}
 
 	/**
-	 * @brief saves database scheme to xml file
+	 * @brief saves database schema to xml file
 	 * @param string $file name of file
 	 * @param int $mode
 	 * @return bool
 	 *
 	 * TODO: write more documentation
 	 */
-	public static function getDbStructure( $file, $mode=MDB2_SCHEMA_DUMP_STRUCTURE) {
-		self::connectScheme();
-
-		// write the scheme
-		$definition = self::$schema->getDefinitionFromDatabase();
-		$dump_options = array(
-			'output_mode' => 'file',
-			'output' => $file,
-			'end_of_line' => "\n"
-		);
-		self::$schema->dumpDatabase( $definition, $dump_options, $mode );
-
-		return true;
+	public static function getDbStructure( $file, $mode = 0) {
+		$schemaManager = self::getMDB2SchemaManager();
+		return $schemaManager->getDbStructure($file);
 	}
 
 	/**
@@ -547,310 +362,35 @@ class OC_DB {
 	 * TODO: write more documentation
 	 */
 	public static function createDbFromStructure( $file ) {
-		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
-		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
-		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
-
-		// cleanup the cached queries
-		self::$preparedQueries = array();
-
-		self::connectScheme();
-
-		// read file
-		$content = file_get_contents( $file );
-
-		// Make changes and save them to an in-memory file
-		$file2 = 'static://db_scheme';
-		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
-		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
-		/* FIXME: use CURRENT_TIMESTAMP for all databases. mysql supports it as a default for DATETIME since 5.6.5 [1]
-		 * as a fallback we could use <default>0000-01-01 00:00:00</default> everywhere
-		 * [1] http://bugs.mysql.com/bug.php?id=27645
-		 * http://dev.mysql.com/doc/refman/5.0/en/timestamp-initialization.html
-		 * http://www.postgresql.org/docs/8.1/static/functions-datetime.html
-		 * http://www.sqlite.org/lang_createtable.html
-		 * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
-		 */
-		if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
-			$content = str_replace( '<default>0000-00-00 00:00:00</default>',
-				'<default>CURRENT_TIMESTAMP</default>', $content );
-		}
-
-		file_put_contents( $file2, $content );
-
-		// Try to create tables
-		$definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-
-		//clean up memory
-		unlink( $file2 );
-		
-		self::raiseExceptionOnError($definition,'Failed to parse the database definition');
-
-		if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
-			unset($definition['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
-			$oldname = $definition['name'];
-			$definition['name']=OC_Config::getValue( "dbuser", $oldname );
-		}
-
-		// we should never drop a database
-		$definition['overwrite'] = false;
-
-		$ret=self::$schema->createDatabase( $definition );
-
-		self::raiseExceptionOnError($ret,'Failed to create the database structure');
-
-		return true;
+		$schemaManager = self::getMDB2SchemaManager();
+		$result = $schemaManager->createDbFromStructure($file);
+		return $result;
 	}
 
 	/**
-	 * @brief update the database scheme
+	 * @brief update the database schema
 	 * @param string $file file to read structure from
+	 * @throws Exception
 	 * @return bool
 	 */
 	public static function updateDbFromStructure($file) {
-		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
-		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
-
-		self::connectScheme();
-		
-		if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
-			//set dbname, it is unset because oci uses 'service' to connect
-			self::$schema->db->database_name=self::$schema->db->dsn['username'];
-		}
-
-		// read file
-		$content = file_get_contents( $file );
-
-		$previousSchema = self::$schema->getDefinitionFromDatabase();
-		self::raiseExceptionOnError($previousSchema,'Failed to get existing database structure for updating');
-
-		// Make changes and save them to an in-memory file
-		$file2 = 'static://db_scheme';
-		$content = str_replace( '*dbname*', $previousSchema['name'], $content );
-		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
-		/* FIXME: use CURRENT_TIMESTAMP for all databases. mysql supports it as a default for DATETIME since 5.6.5 [1]
-		 * as a fallback we could use <default>0000-01-01 00:00:00</default> everywhere
-		 * [1] http://bugs.mysql.com/bug.php?id=27645
-		 * http://dev.mysql.com/doc/refman/5.0/en/timestamp-initialization.html
-		 * http://www.postgresql.org/docs/8.1/static/functions-datetime.html
-		 * http://www.sqlite.org/lang_createtable.html
-		 * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
-		 */
-		if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
-			$content = str_replace( '<default>0000-00-00 00:00:00</default>',
-				'<default>CURRENT_TIMESTAMP</default>', $content );
-		}
-		if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
-			unset($previousSchema['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
-			$oldname = $previousSchema['name'];
-			$previousSchema['name']=OC_Config::getValue( "dbuser", $oldname );
-			//TODO check identifiers are at most 30 chars long
-		}
-		file_put_contents( $file2, $content );
-		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
-
-		//clean up memory
-		unlink( $file2 );
-
-		self::raiseExceptionOnError($op,'Failed to update database structure');
-		return true;
-	}
-
-	/**
-	 * @brief connects to a MDB2 database scheme
-	 * @returns bool
-	 *
-	 * Connects to a MDB2 database scheme
-	 */
-	private static function connectScheme() {
-		// We need a mdb2 database connection
-		self::connectMDB2();
-		self::$MDB2->loadModule('Manager');
-		self::$MDB2->loadModule('Reverse');
-
-		// Connect if this did not happen before
-		if(!self::$schema) {
-			require_once 'MDB2/Schema.php';
-			self::$schema=MDB2_Schema::factory(self::$MDB2);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @brief Insert a row if a matching row doesn't exists.
-	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
-	 * @param array $input. An array of fieldname/value pairs
-	 * @returns int number of updated rows
-	 */
-	public static function insertIfNotExist($table, $input) {
-		self::connect();
-		$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
-		$table = str_replace( '*PREFIX*', $prefix, $table );
-
-		if(is_null(self::$type)) {
-			self::$type=OC_Config::getValue( "dbtype", "sqlite" );
-		}
-		$type = self::$type;
-
-		$query = '';
-		$inserts = array_values($input);
-		// differences in escaping of table names ('`' for mysql) and getting the current timestamp
-		if( $type == 'sqlite' || $type == 'sqlite3' ) {
-			// NOTE: For SQLite we have to use this clumsy approach
-			// otherwise all fieldnames used must have a unique key.
-			$query = 'SELECT * FROM `' . $table . '` WHERE ';
-			foreach($input as $key => $value) {
-				$query .= '`' . $key . '` = ? AND ';
-			}
-			$query = substr($query, 0, strlen($query) - 5);
-			try {
-				$result = self::executeAudited($query, $inserts);
-			} catch(DatabaseException $e) {
-				OC_Template::printExceptionErrorPage( $e );
-			}
-
-			if((int)$result->numRows() === 0) {
-				$query = 'INSERT INTO `' . $table . '` (`'
-					. implode('`,`', array_keys($input)) . '`) VALUES('
-					. str_repeat('?,', count($input)-1).'? ' . ')';
-			} else {
-				return 0; //no rows updated
-			}
-		} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
-			$query = 'INSERT INTO `' .$table . '` (`'
-				. implode('`,`', array_keys($input)) . '`) SELECT '
-				. str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
-				. 'FROM `' . $table . '` WHERE ';
-
-			foreach($input as $key => $value) {
-				$query .= '`' . $key . '` = ? AND ';
-			}
-			$query = substr($query, 0, strlen($query) - 5);
-			$query .= ' HAVING COUNT(*) = 0';
-			$inserts = array_merge($inserts, $inserts);
-		}
-
+		$schemaManager = self::getMDB2SchemaManager();
 		try {
-			$result = self::executeAudited($query, $inserts);
-		} catch(PDOException $e) {
-			OC_Template::printExceptionErrorPage( $e );
+			$result = $schemaManager->updateDbFromStructure($file);
+		} catch (Exception $e) {
+			OC_Log::write('core', 'Failed to update database structure ('.$e.')', OC_Log::FATAL);
+			throw $e;
 		}
-
 		return $result;
 	}
 
-	/**
-	 * @brief does minor changes to query
-	 * @param string $query Query string
-	 * @return string corrected query string
-	 *
-	 * This function replaces *PREFIX* with the value of $CONFIG_DBTABLEPREFIX
-	 * and replaces the ` with ' or " according to the database driver.
-	 */
-	private static function processQuery( $query ) {
-		self::connect();
-		// We need Database type and table prefix
-		if(is_null(self::$type)) {
-			self::$type=OC_Config::getValue( "dbtype", "sqlite" );
-		}
-		$type = self::$type;
-		if(is_null(self::$prefix)) {
-			self::$prefix=OC_Config::getValue( "dbtableprefix", "oc_" );
-		}
-		$prefix = self::$prefix;
-
-		// differences in escaping of table names ('`' for mysql) and getting the current timestamp
-		if( $type == 'sqlite' || $type == 'sqlite3' ) {
-			$query = str_replace( '`', '"', $query );
-			$query = str_ireplace( 'NOW()', 'datetime(\'now\')', $query );
-			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
-		}elseif( $type == 'pgsql' ) {
-			$query = str_replace( '`', '"', $query );
-			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)',
-				$query );
-		}elseif( $type == 'oci'  ) {
-			$query = str_replace( '`', '"', $query );
-			$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
-			$query = str_ireplace( 'UNIX_TIMESTAMP()', '((CAST(SYS_EXTRACT_UTC(systimestamp) AS DATE))-TO_DATE(\'1970101000000\',\'YYYYMMDDHH24MiSS\'))*24*3600', $query );
-		}elseif( $type == 'mssql' ) {
-			$query = preg_replace( "/\`(.*?)`/", "[$1]", $query );
-			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
-			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
-			$query = str_replace( 'LENGTH(', 'LEN(', $query );
-			$query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query );
-
-			$query = self::fixLimitClauseForMSSQL($query);
-		}
-
-		// replace table name prefix
-		$query = str_replace( '*PREFIX*', $prefix, $query );
-
-		return $query;
-	}
-
-	private static function fixLimitClauseForMSSQL($query) {
-		$limitLocation = stripos ($query, "LIMIT");
-
-		if ( $limitLocation === false ) {
-			return $query;
-		} 
-
-		// total == 0 means all results - not zero results
-		//
-		// First number is either total or offset, locate it by first space
-		//
-		$offset = substr ($query, $limitLocation + 5);
-		$offset = substr ($offset, 0, stripos ($offset, ' '));
-		$offset = trim ($offset);
-
-		// check for another parameter
-		if (stripos ($offset, ',') === false) {
-			// no more parameters
-			$offset = 0;
-			$total = intval ($offset);
-		} else {
-			// found another parameter
-			$offset = intval ($offset);
-
-			$total = substr ($query, $limitLocation + 5);
-			$total = substr ($total, stripos ($total, ','));
-
-			$total = substr ($total, 0, stripos ($total, ' '));
-			$total = intval ($total);
-		}
-
-		$query = trim (substr ($query, 0, $limitLocation));
-
-		if ($offset == 0 && $total !== 0) {
-			if (strpos($query, "SELECT") === false) {
-				$query = "TOP {$total} " . $query;
-			} else {
-				$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
-			}
-		} else if ($offset > 0) {
-			$query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
-			$query = 'SELECT *
-					FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
-					FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
-
-			if ($total > 0) {
-				$query .= ' WHERE line3 BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total);
-			} else {
-				$query .= ' WHERE line3 > ' . $offset;
-			}
-		}
-		return $query;
-	}
-
 	/**
 	 * @brief drop a table
 	 * @param string $tableName the table to drop
 	 */
 	public static function dropTable($tableName) {
-		self::connectMDB2();
-		self::$MDB2->loadModule('Manager');
-		self::$MDB2->dropTable($tableName);
+		$schemaManager = self::getMDB2SchemaManager();
+		$schemaManager->dropTable($tableName);
 	}
 
 	/**
@@ -858,99 +398,30 @@ class OC_DB {
 	 * @param string $file the xml file describing the tables
 	 */
 	public static function removeDBStructure($file) {
-		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
-		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
-		self::connectScheme();
-
-		// read file
-		$content = file_get_contents( $file );
-
-		// Make changes and save them to a temporary file
-		$file2 = tempnam( get_temp_dir(), 'oc_db_scheme_' );
-		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
-		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
-		file_put_contents( $file2, $content );
-
-		// get the tables
-		$definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-
-		// Delete our temporary file
-		unlink( $file2 );
-		$tables=array_keys($definition['tables']);
-		foreach($tables as $table) {
-			self::dropTable($table);
-		}
+		$schemaManager = self::getMDB2SchemaManager();
+		$schemaManager->removeDBStructure($file);
 	}
 
 	/**
-	 * @brief replaces the owncloud tables with a new set
+	 * @brief replaces the ownCloud tables with a new set
 	 * @param $file string path to the MDB2 xml db export file
 	 */
 	public static function replaceDB( $file ) {
-		$apps = OC_App::getAllApps();
-		self::beginTransaction();
-		// Delete the old tables
-		self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
-
-		foreach($apps as $app) {
-			$path = OC_App::getAppPath($app).'/appinfo/database.xml';
-			if(file_exists($path)) {
-				self::removeDBStructure( $path );
-			}
-		}
-
-		// Create new tables
-		self::createDBFromStructure( $file );
-		self::commit();
-	}
-
-	/**
-	 * Start a transaction
-	 * @return bool
-	 */
-	public static function beginTransaction() {
-		self::connect();
-		if (self::$backend==self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
-			return false;
-		}
-		self::$connection->beginTransaction();
-		self::$inTransaction=true;
-		return true;
+		$schemaManager = self::getMDB2SchemaManager();
+		$schemaManager->replaceDB($file);
 	}
 
 	/**
-	 * Commit the database changes done during a transaction that is in progress
-	 * @return bool
-	 */
-	public static function commit() {
-		self::connect();
-		if(!self::$inTransaction) {
-			return false;
-		}
-		self::$connection->commit();
-		self::$inTransaction=false;
-		return true;
-	}
-
-	/**
-	 * check if a result is an error, works with MDB2 and PDOException
+	 * check if a result is an error, works with Doctrine
 	 * @param mixed $result
 	 * @return bool
 	 */
 	public static function isError($result) {
-		//MDB2 returns an MDB2_Error object
-		if (class_exists('PEAR') === true && PEAR::isError($result)) {
-			return true;
-		}
-		//PDO returns false on error (and throws an exception)
-		if (self::$backend===self::BACKEND_PDO and $result === false) {
-			return true;
-		}
-
-		return false;
+		//Doctrine returns false on error (and throws an exception)
+		return $result === false;
 	}
 	/**
-	 * check if a result is an error and throws an exception, works with MDB2 and PDOException
+	 * check if a result is an error and throws an exception, works with \Doctrine\DBAL\DBALException
 	 * @param mixed $result
 	 * @param string $message
 	 * @return void
@@ -968,40 +439,19 @@ class OC_DB {
 	}
 
 	public static function getErrorCode($error) {
-		if ( class_exists('PEAR') === true && PEAR::isError($error) ) {
-			/** @var $error PEAR_Error */
-			return $error->getCode();
-		}
-		if ( self::$backend==self::BACKEND_PDO and self::$PDO ) {
-			return self::$PDO->errorCode();
-		}
-
-		return -1;
+		$code = self::$connection->errorCode();
+		return $code;
 	}
 	/**
 	 * returns the error code and message as a string for logging
-	 * works with MDB2 and PDOException
+	 * works with DoctrineException
 	 * @param mixed $error
 	 * @return string
 	 */
 	public static function getErrorMessage($error) {
-		if ( class_exists('PEAR') === true && PEAR::isError($error) ) {
-			$msg = $error->getCode() . ': ' . $error->getMessage();
-			$msg .= ' (' . $error->getDebugInfo() . ')';
-
-			return $msg;
+		if (self::$connection) {
+			return self::$connection->getError();
 		}
-		if (self::$backend==self::BACKEND_PDO and self::$PDO) {
-			$msg = self::$PDO->errorCode() . ': ';
-			$errorInfo = self::$PDO->errorInfo();
-			if (is_array($errorInfo)) {
-				$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-				$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
-				$msg .= 'Driver Message = '.$errorInfo[2];
-			}
-			return $msg;
-		}
-
 		return '';
 	}
 
@@ -1009,186 +459,10 @@ class OC_DB {
 	 * @param bool $enabled
 	 */
 	static public function enableCaching($enabled) {
-		if (!$enabled) {
-			self::$preparedQueries = array();
-		}
-		self::$cachingEnabled = $enabled;
-	}
-}
-
-/**
- * small wrapper around PDOStatement to make it behave ,more like an MDB2 Statement
- */
-class PDOStatementWrapper{
-	/**
-	 * @var PDOStatement
-	 */
-	private $statement = null;
-	private $isManipulation = false;
-	private $lastArguments = array();
-
-	public function __construct($statement, $isManipulation = false) {
-		$this->statement = $statement;
-		$this->isManipulation = $isManipulation;
-	}
-
-	/**
-	 * make execute return the result or updated row count instead of a bool
-	 */
-	public function execute($input=array()) {
-		if(OC_Config::getValue( "log_query", false)) {
-			$params_str = str_replace("\n"," ",var_export($input,true));
-			OC_Log::write('core', 'DB execute with arguments : '.$params_str, OC_Log::DEBUG);
-		}
-		$this->lastArguments = $input;
-		if (count($input) > 0) {
-
-			if (!isset($type)) {
-				$type = OC_Config::getValue( "dbtype", "sqlite" );
-			}
-
-			if ($type == 'mssql') {
-				$input = $this->tryFixSubstringLastArgumentDataForMSSQL($input);
-			}
-
-			$result = $this->statement->execute($input);
+		if ($enabled) {
+			self::$connection->enableQueryStatementCaching();
 		} else {
-			$result = $this->statement->execute();
-		}
-		
-		if ($result === false) {
-			return false;
+			self::$connection->disableQueryStatementCaching();
 		}
-		if ($this->isManipulation) {
-			return $this->statement->rowCount();
-		} else {
-			return $this;
-		}
-	}
-
-	private function tryFixSubstringLastArgumentDataForMSSQL($input) {
-		$query = $this->statement->queryString;
-		$pos = stripos ($query, 'SUBSTRING');
-
-		if ( $pos === false) {
-			return;
-		}
-
-		try {
-			$newQuery = '';
-
-			$cArg = 0;
-
-			$inSubstring = false;
-
-			// Create new query
-			for ($i = 0; $i < strlen ($query); $i++) {
-				if ($inSubstring == false) {
-					// Defines when we should start inserting values
-					if (substr ($query, $i, 9) == 'SUBSTRING') {
-						$inSubstring = true;
-					}
-				} else {
-					// Defines when we should stop inserting values
-					if (substr ($query, $i, 1) == ')') {
-						$inSubstring = false;
-					}
-				}
-
-				if (substr ($query, $i, 1) == '?') {
-					// We found a question mark
-					if ($inSubstring) {
-						$newQuery .= $input[$cArg];
-
-						//
-						// Remove from input array
-						//
-						array_splice ($input, $cArg, 1);
-					} else {
-						$newQuery .= substr ($query, $i, 1);
-						$cArg++;
-					}
-				} else {
-					$newQuery .= substr ($query, $i, 1);
-				}
-			}
-
-			// The global data we need
-			$name = OC_Config::getValue( "dbname", "owncloud" );
-			$host = OC_Config::getValue( "dbhost", "" );
-			$user = OC_Config::getValue( "dbuser", "" );
-			$pass = OC_Config::getValue( "dbpassword", "" );
-			if (strpos($host,':')) {
-				list($host, $port) = explode(':', $host, 2);
-			} else {
-				$port = false;
-			}
-			$opts = array();
-
-			if ($port) {
-				$dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name;
-			} else {
-				$dsn = 'sqlsrv:Server='.$host.';Database='.$name;
-			}
-
-			$PDO = new PDO($dsn, $user, $pass, $opts);
-			$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
-			$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-			$this->statement = $PDO->prepare($newQuery);
-
-			$this->lastArguments = $input;
-
-			return $input;
-		} catch (PDOException $e){
-			$entry = 'PDO DB Error: "'.$e->getMessage().'"<br />';
-			$entry .= 'Offending command was: '.$this->statement->queryString .'<br />';
-			$entry .= 'Input parameters: ' .print_r($input, true).'<br />';
-			$entry .= 'Stack trace: ' .$e->getTraceAsString().'<br />';
-			OC_Log::write('core', $entry, OC_Log::FATAL);
-			OC_User::setUserId(null);
-
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			OC_Template::printErrorPage('Failed to connect to database');
-			die ($entry);
-		}
-	}
-
-	/**
-	 * provide numRows
-	 */
-	public function numRows() {
-		$regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i';
-		if (preg_match($regex, $this->statement->queryString, $output) > 0) {
-			$query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}");
-			return $query->execute($this->lastArguments)->fetchColumn();
-		}else{
-			return $this->statement->rowCount();
-		}
-	}
-
-	/**
-	 * provide an alias for fetch
-	 */
-	public function fetchRow() {
-		return $this->statement->fetch();
-	}
-
-	/**
-	 * pass all other function directly to the PDOStatement
-	 */
-	public function __call($name, $arguments) {
-		return call_user_func_array(array($this->statement, $name), $arguments);
-	}
-
-	/**
-	 * Provide a simple fetchOne.
-	 * fetch single column from the next row
-	 * @param int $colnum the column number to fetch
-	 */
-	public function fetchOne($colnum = 0) {
-		return $this->statement->fetchColumn($colnum);
 	}
 }
diff --git a/lib/db/adapter.php b/lib/db/adapter.php
new file mode 100644
index 0000000000000000000000000000000000000000..6b31f37dd988333a4375d56e31e5a679b0fdf6b3
--- /dev/null
+++ b/lib/db/adapter.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+/**
+ * This handles the way we use to write queries, into something that can be
+ * handled by the database abstraction layer.
+ */
+class Adapter {
+
+	/**
+	 * @var \OC\DB\Connection $conn
+	 */
+	protected $conn;
+
+	public function __construct($conn) {
+		$this->conn = $conn;
+	}
+
+	/**
+	 * @param string $table name
+	 * @return int id of last insert statement
+	 */
+	public function lastInsertId($table) {
+		return $this->conn->realLastInsertId($table);
+	}
+
+	/**
+	 * @param string $statement that needs to be changed so the db can handle it
+	 * @return string changed statement
+	 */
+	public function fixupStatement($statement) {
+		return $statement;
+	}
+
+	/**
+	 * @brief insert the @input values when they do not exist yet
+	 * @param string $table name
+	 * @param array $input key->value pairs
+	 * @return int count of inserted rows
+	 */
+	public function insertIfNotExist($table, $input) {
+		$query = 'INSERT INTO `' .$table . '` (`'
+			. implode('`,`', array_keys($input)) . '`) SELECT '
+			. str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
+			. 'FROM `' . $table . '` WHERE ';
+
+		foreach($input as $key => $value) {
+			$query .= '`' . $key . '` = ? AND ';
+		}
+		$query = substr($query, 0, strlen($query) - 5);
+		$query .= ' HAVING COUNT(*) = 0';
+		$inserts = array_values($input);
+		$inserts = array_merge($inserts, $inserts);
+
+		try {
+			return $this->conn->executeUpdate($query, $inserts);
+		} catch(\Doctrine\DBAL\DBALException $e) {
+			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+			$entry .= 'Offending command was: ' . $query.'<br />';
+			\OC_Log::write('core', $entry, \OC_Log::FATAL);
+			error_log('DB error: ' . $entry);
+			\OC_Template::printErrorPage( $entry );
+		}
+	}
+}
diff --git a/lib/db/adapteroci8.php b/lib/db/adapteroci8.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc226e979eceae7a4a9463a7e6eb9029b44e71d0
--- /dev/null
+++ b/lib/db/adapteroci8.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterOCI8 extends Adapter {
+	public function lastInsertId($table) {
+		if($table !== null) {
+			$suffix = '_SEQ';
+			$table = '"'.$table.$suffix.'"';
+		}
+		return $this->conn->realLastInsertId($table);
+	}
+
+	const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
+	public function fixupStatement($statement) {
+		$statement = str_replace( '`', '"', $statement );
+		$statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement );
+		$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+		return $statement;
+	}
+}
diff --git a/lib/db/adapterpgsql.php b/lib/db/adapterpgsql.php
new file mode 100644
index 0000000000000000000000000000000000000000..990d71c9f29ff0df3727537e4d3927ee26704f24
--- /dev/null
+++ b/lib/db/adapterpgsql.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterPgSql extends Adapter {
+	public function lastInsertId($table) {
+		return $this->conn->fetchColumn('SELECT lastval()');
+	}
+
+	const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
+	public function fixupStatement($statement) {
+		$statement = str_replace( '`', '"', $statement );
+		$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+		return $statement;
+	}
+}
diff --git a/lib/db/adaptersqlite.php b/lib/db/adaptersqlite.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa6d308ae328c85d73c2ac1ff16485797aa1c09f
--- /dev/null
+++ b/lib/db/adaptersqlite.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterSqlite extends Adapter {
+	public function fixupStatement($statement) {
+		$statement = str_replace( '`', '"', $statement );
+		$statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement );
+		$statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement );
+		return $statement;
+	}
+
+	public function insertIfNotExist($table, $input) {
+		// NOTE: For SQLite we have to use this clumsy approach
+		// otherwise all fieldnames used must have a unique key.
+		$query = 'SELECT COUNT(*) FROM `' . $table . '` WHERE ';
+		foreach($input as $key => $value) {
+			$query .= '`' . $key . '` = ? AND ';
+		}
+		$query = substr($query, 0, strlen($query) - 5);
+		try {
+			$stmt = $this->conn->prepare($query);
+			$result = $stmt->execute(array_values($input));
+		} catch(\Doctrine\DBAL\DBALException $e) {
+			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+			$entry .= 'Offending command was: ' . $query . '<br />';
+			\OC_Log::write('core', $entry, \OC_Log::FATAL);
+			error_log('DB error: '.$entry);
+			\OC_Template::printErrorPage( $entry );
+		}
+
+		if ($stmt->fetchColumn() === '0') {
+			$query = 'INSERT INTO `' . $table . '` (`'
+				. implode('`,`', array_keys($input)) . '`) VALUES('
+				. str_repeat('?,', count($input)-1).'? ' . ')';
+		} else {
+			return 0; //no rows updated
+		}
+
+		try {
+			$statement = $this->conn->prepare($query);
+			$result = $statement->execute(array_values($input));
+		} catch(\Doctrine\DBAL\DBALException $e) {
+			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+			$entry .= 'Offending command was: ' . $query.'<br />';
+			\OC_Log::write('core', $entry, \OC_Log::FATAL);
+			error_log('DB error: ' . $entry);
+			\OC_Template::printErrorPage( $entry );
+		}
+
+		return $result;
+	}
+}
diff --git a/lib/db/adaptersqlsrv.php b/lib/db/adaptersqlsrv.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0a67af28a7a65b83481e7939264966c5b326ced
--- /dev/null
+++ b/lib/db/adaptersqlsrv.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterSQLSrv extends Adapter {
+	public function lastInsertId($table) {
+		if($table !== null) {
+			$table = $this->conn->replaceTablePrefix( $table );
+		}
+		return $this->conn->lastInsertId($table);
+	}
+
+	public function fixupStatement($statement) {
+		$statement = preg_replace( "/\`(.*?)`/", "[$1]", $statement );
+		$statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement );
+		$statement = str_replace( 'LENGTH(', 'LEN(', $statement );
+		$statement = str_replace( 'SUBSTR(', 'SUBSTRING(', $statement );
+		$statement = str_ireplace( 'UNIX_TIMESTAMP()', 'DATEDIFF(second,{d \'1970-01-01\'},GETDATE())', $statement );
+		return $statement;
+	}
+}
diff --git a/lib/db/connection.php b/lib/db/connection.php
new file mode 100644
index 0000000000000000000000000000000000000000..2581969dbd0a34a7a1ab3d61e381f49810943095
--- /dev/null
+++ b/lib/db/connection.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Configuration;
+use Doctrine\DBAL\Cache\QueryCacheProfile;
+use Doctrine\Common\EventManager;
+
+class Connection extends \Doctrine\DBAL\Connection {
+	/**
+	 * @var string $tablePrefix
+	 */
+	protected $tablePrefix;
+
+	/**
+	 * @var \OC\DB\Adapter $adapter
+	 */
+	protected $adapter;
+
+	/**
+	 * @var \Doctrine\DBAL\Driver\Statement[] $preparedQueries
+	 */
+	protected $preparedQueries = array();
+
+	protected $cachingQueryStatementEnabled = true;
+
+	/**
+	 * Initializes a new instance of the Connection class.
+	 *
+	 * @param array $params  The connection parameters.
+	 * @param \Doctrine\DBAL\Driver $driver
+	 * @param \Doctrine\DBAL\Configuration $config
+	 * @param \Doctrine\Common\EventManager $eventManager
+	 * @throws \Exception
+	 */
+	public function __construct(array $params, Driver $driver, Configuration $config = null,
+		EventManager $eventManager = null)
+	{
+		if (!isset($params['adapter'])) {
+			throw new \Exception('adapter not set');
+		}
+		if (!isset($params['tablePrefix'])) {
+			throw new \Exception('tablePrefix not set');
+		}
+		parent::__construct($params, $driver, $config, $eventManager);
+		$this->adapter = new $params['adapter']($this);
+		$this->tablePrefix = $params['tablePrefix'];
+	}
+
+	/**
+	 * Prepares an SQL statement.
+	 *
+	 * @param string $statement The SQL statement to prepare.
+	 * @param int $limit
+	 * @param int $offset
+	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
+	 */
+	public function prepare( $statement, $limit=null, $offset=null ) {
+		if ($limit === -1) {
+			$limit = null;
+		}
+		if (!is_null($limit)) {
+			$platform = $this->getDatabasePlatform();
+			$statement = $platform->modifyLimitQuery($statement, $limit, $offset);
+		} else {
+			if (isset($this->preparedQueries[$statement]) && $this->cachingQueryStatementEnabled) {
+				return $this->preparedQueries[$statement];
+			}
+			$origStatement = $statement;
+		}
+		$statement = $this->replaceTablePrefix($statement);
+		$statement = $this->adapter->fixupStatement($statement);
+
+		if(\OC_Config::getValue( 'log_query', false)) {
+			\OC_Log::write('core', 'DB prepare : '.$statement, \OC_Log::DEBUG);
+		}
+		$result = parent::prepare($statement);
+		if (is_null($limit) && $this->cachingQueryStatementEnabled) {
+			$this->preparedQueries[$origStatement] = $result;
+		}
+		return $result;
+	}
+
+	/**
+	 * Executes an, optionally parameterized, SQL query.
+	 *
+	 * If the query is parameterized, a prepared statement is used.
+	 * If an SQLLogger is configured, the execution is logged.
+	 *
+	 * @param string $query The SQL query to execute.
+	 * @param array $params The parameters to bind to the query, if any.
+	 * @param array $types The types the previous parameters are in.
+	 * @param QueryCacheProfile $qcp
+	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+	 * @internal PERF: Directly prepares a driver statement, not a wrapper.
+	 */
+	public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
+	{
+		$query = $this->replaceTablePrefix($query);
+		$query = $this->adapter->fixupStatement($query);
+		return parent::executeQuery($query, $params, $types, $qcp);
+	}
+
+	/**
+	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+	 * and returns the number of affected rows.
+	 *
+	 * This method supports PDO binding types as well as DBAL mapping types.
+	 *
+	 * @param string $query The SQL query.
+	 * @param array $params The query parameters.
+	 * @param array $types The parameter types.
+	 * @return integer The number of affected rows.
+	 * @internal PERF: Directly prepares a driver statement, not a wrapper.
+	 */
+	public function executeUpdate($query, array $params = array(), array $types = array())
+	{
+		$query = $this->replaceTablePrefix($query);
+		$query = $this->adapter->fixupStatement($query);
+		return parent::executeUpdate($query, $params, $types);
+	}
+
+	/**
+	 * Returns the ID of the last inserted row, or the last value from a sequence object,
+	 * depending on the underlying driver.
+	 *
+	 * Note: This method may not return a meaningful or consistent result across different drivers,
+	 * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
+	 * columns or sequences.
+	 *
+	 * @param string $seqName Name of the sequence object from which the ID should be returned.
+	 * @return string A string representation of the last inserted ID.
+	 */
+	public function lastInsertId($seqName = null)
+	{
+		if ($seqName) {
+			$seqName = $this->replaceTablePrefix($seqName);
+		}
+		return $this->adapter->lastInsertId($seqName);
+	}
+
+	// internal use
+	public function realLastInsertId($seqName = null)
+	{
+		return parent::lastInsertId($seqName);
+	}
+
+	/**
+	 * @brief Insert a row if a matching row doesn't exists.
+	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
+	 * @param array $input. An array of fieldname/value pairs
+	 * @return bool The return value from execute()
+	 */
+	public function insertIfNotExist($table, $input) {
+		return $this->adapter->insertIfNotExist($table, $input);
+	}
+
+	/**
+	 * returns the error code and message as a string for logging
+	 * works with DoctrineException
+	 * @return string
+	 */
+	public function getError() {
+		$msg = $this->errorCode() . ': ';
+		$errorInfo = $this->errorInfo();
+		if (is_array($errorInfo)) {
+			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+			$msg .= 'Driver Message = '.$errorInfo[2];
+		}
+		return $msg;
+	}
+
+	// internal use
+	/**
+	 * @param string $statement
+	 * @return string
+	 */
+	protected function replaceTablePrefix($statement) {
+		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+	}
+
+	public function enableQueryStatementCaching() {
+		$this->cachingQueryStatementEnabled = true;
+	}
+
+	public function disableQueryStatementCaching() {
+		$this->cachingQueryStatementEnabled = false;
+		$this->preparedQueries = array();
+	}
+}
diff --git a/lib/db/mdb2schemamanager.php b/lib/db/mdb2schemamanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e76f46c78fba481265e22a8cab6c92204ae5382
--- /dev/null
+++ b/lib/db/mdb2schemamanager.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+class MDB2SchemaManager {
+	/**
+	 * @var \OC\DB\Connection $conn
+	 */
+	protected $conn;
+
+	/**
+	 * @param \OC\DB\Connection $conn
+	 */
+	public function __construct($conn) {
+		$this->conn = $conn;
+	}
+
+	/**
+	 * @brief saves database scheme to xml file
+	 * @param string $file name of file
+	 * @param int|string $mode
+	 * @return bool
+	 *
+	 * TODO: write more documentation
+	 */
+	public function getDbStructure( $file, $mode = MDB2_SCHEMA_DUMP_STRUCTURE) {
+		$sm = $this->conn->getSchemaManager();
+
+		return \OC_DB_MDB2SchemaWriter::saveSchemaToFile($file, $sm);
+	}
+
+	/**
+	 * @brief Creates tables from XML file
+	 * @param string $file file to read structure from
+	 * @return bool
+	 *
+	 * TODO: write more documentation
+	 */
+	public function createDbFromStructure( $file ) {
+		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+		$toSchema = $schemaReader->loadSchemaFromFile($file);
+		return $this->executeSchemaChange($toSchema);
+	}
+
+	/**
+	 * @brief update the database scheme
+	 * @param string $file file to read structure from
+	 * @return bool
+	 */
+	public function updateDbFromStructure($file) {
+		$sm = $this->conn->getSchemaManager();
+		$fromSchema = $sm->createSchema();
+
+		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+		$toSchema = $schemaReader->loadSchemaFromFile($file);
+
+		// remove tables we don't know about
+		foreach($fromSchema->getTables() as $table) {
+			if (!$toSchema->hasTable($table->getName())) {
+				$fromSchema->dropTable($table->getName());
+			}
+		}
+		// remove sequences we don't know about
+		foreach($fromSchema->getSequences() as $table) {
+			if (!$toSchema->hasSequence($table->getName())) {
+				$fromSchema->dropSequence($table->getName());
+			}
+		}
+
+		$comparator = new \Doctrine\DBAL\Schema\Comparator();
+		$schemaDiff = $comparator->compare($fromSchema, $toSchema);
+
+		$platform = $this->conn->getDatabasePlatform();
+		$tables = $schemaDiff->newTables + $schemaDiff->changedTables + $schemaDiff->removedTables;
+		foreach($tables as $tableDiff) {
+			$tableDiff->name = $platform->quoteIdentifier($tableDiff->name);
+		}
+
+		return $this->executeSchemaChange($schemaDiff);
+	}
+
+	/**
+	 * @brief drop a table
+	 * @param string $tableName the table to drop
+	 */
+	public function dropTable($tableName) {
+		$sm = $this->conn->getSchemaManager();
+		$fromSchema = $sm->createSchema();
+		$toSchema = clone $fromSchema;
+		$toSchema->dropTable($tableName);
+		$sql = $fromSchema->getMigrateToSql($toSchema, $this->conn->getDatabasePlatform());
+		$this->conn->executeQuery($sql);
+	}
+
+	/**
+	 * remove all tables defined in a database structure xml file
+	 * @param string $file the xml file describing the tables
+	 */
+	public function removeDBStructure($file) {
+		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+		$fromSchema = $schemaReader->loadSchemaFromFile($file);
+		$toSchema = clone $fromSchema;
+		foreach($toSchema->getTables() as $table) {
+			$toSchema->dropTable($table->getName());
+		}
+		$comparator = new \Doctrine\DBAL\Schema\Comparator();
+		$schemaDiff = $comparator->compare($fromSchema, $toSchema);
+		$this->executeSchemaChange($schemaDiff);
+	}
+
+	/**
+	 * @brief replaces the ownCloud tables with a new set
+	 * @param $file string path to the MDB2 xml db export file
+	 */
+	public function replaceDB( $file ) {
+		$apps = \OC_App::getAllApps();
+		$this->conn->beginTransaction();
+		// Delete the old tables
+		$this->removeDBStructure( \OC::$SERVERROOT . '/db_structure.xml' );
+
+		foreach($apps as $app) {
+			$path = \OC_App::getAppPath($app).'/appinfo/database.xml';
+			if(file_exists($path)) {
+				$this->removeDBStructure( $path );
+			}
+		}
+
+		// Create new tables
+		$this->conn->commit();
+	}
+
+	/**
+	 * @param \Doctrine\DBAL\Schema\Schema $schema
+	 * @return bool
+	 */
+	private function executeSchemaChange($schema) {
+		$this->conn->beginTransaction();
+		foreach($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
+			$this->conn->query($sql);
+		}
+		$this->conn->commit();
+		return true;
+	}
+}
diff --git a/lib/db/mdb2schemareader.php b/lib/db/mdb2schemareader.php
new file mode 100644
index 0000000000000000000000000000000000000000..b7128a2f176bedce181c0a88b0ea6cd7329f8210
--- /dev/null
+++ b/lib/db/mdb2schemareader.php
@@ -0,0 +1,305 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+class MDB2SchemaReader {
+	/**
+	 * @var string $DBNAME
+	 */
+	protected $DBNAME;
+
+	/**
+	 * @var string $DBTABLEPREFIX
+	 */
+	protected $DBTABLEPREFIX;
+
+	/**
+	 * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+	 */
+	protected $platform;
+
+	/**
+	 * @param \OC\Config $config
+	 * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+	 */
+	public function __construct($config, $platform) {
+		$this->platform = $platform;
+		$this->DBNAME = $config->getValue('dbname', 'owncloud');
+		$this->DBTABLEPREFIX = $config->getValue('dbtableprefix', 'oc_');
+	}
+
+	/**
+	 * @param string $file
+	 * @return \Doctrine\DBAL\Schema\Schema
+	 * @throws \DomainException
+	 */
+	public function loadSchemaFromFile($file) {
+		$schema = new \Doctrine\DBAL\Schema\Schema();
+		$xml = simplexml_load_file($file);
+		foreach ($xml->children() as $child) {
+			/**
+			 * @var \SimpleXMLElement $child
+			 */
+			switch ($child->getName()) {
+				case 'name':
+				case 'create':
+				case 'overwrite':
+				case 'charset':
+					break;
+				case 'table':
+					$this->loadTable($schema, $child);
+					break;
+				default:
+					throw new \DomainException('Unknown element: ' . $child->getName());
+
+			}
+		}
+		return $schema;
+	}
+
+	/**
+	 * @param\Doctrine\DBAL\Schema\Schema $schema
+	 * @param \SimpleXMLElement $xml
+	 * @throws \DomainException
+	 */
+	private function loadTable($schema, $xml) {
+		$table = null;
+		foreach ($xml->children() as $child) {
+			/**
+			 * @var \SimpleXMLElement $child
+			 */
+			switch ($child->getName()) {
+				case 'name':
+					$name = (string)$child;
+					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
+					$name = $this->platform->quoteIdentifier($name);
+					$table = $schema->createTable($name);
+					break;
+				case 'create':
+				case 'overwrite':
+				case 'charset':
+					break;
+				case 'declaration':
+					if (is_null($table)) {
+						throw new \DomainException('Table declaration before table name');
+					}
+					$this->loadDeclaration($table, $child);
+					break;
+				default:
+					throw new \DomainException('Unknown element: ' . $child->getName());
+
+			}
+		}
+	}
+
+	/**
+	 * @param \Doctrine\DBAL\Schema\Table $table
+	 * @param \SimpleXMLElement $xml
+	 * @throws \DomainException
+	 */
+	private function loadDeclaration($table, $xml) {
+		foreach ($xml->children() as $child) {
+			/**
+			 * @var \SimpleXMLElement $child
+			 */
+			switch ($child->getName()) {
+				case 'field':
+					$this->loadField($table, $child);
+					break;
+				case 'index':
+					$this->loadIndex($table, $child);
+					break;
+				default:
+					throw new \DomainException('Unknown element: ' . $child->getName());
+
+			}
+		}
+	}
+
+	/**
+	 * @param \Doctrine\DBAL\Schema\Table $table
+	 * @param \SimpleXMLElement $xml
+	 * @throws \DomainException
+	 */
+	private function loadField($table, $xml) {
+		$options = array();
+		foreach ($xml->children() as $child) {
+			/**
+			 * @var \SimpleXMLElement $child
+			 */
+			switch ($child->getName()) {
+				case 'name':
+					$name = (string)$child;
+					$name = $this->platform->quoteIdentifier($name);
+					break;
+				case 'type':
+					$type = (string)$child;
+					switch ($type) {
+						case 'text':
+							$type = 'string';
+							break;
+						case 'clob':
+							$type = 'text';
+							break;
+						case 'timestamp':
+							$type = 'datetime';
+							break;
+					}
+					break;
+				case 'length':
+					$length = (string)$child;
+					$options['length'] = $length;
+					break;
+				case 'unsigned':
+					$unsigned = $this->asBool($child);
+					$options['unsigned'] = $unsigned;
+					break;
+				case 'notnull':
+					$notnull = $this->asBool($child);
+					$options['notnull'] = $notnull;
+					break;
+				case 'autoincrement':
+					$autoincrement = $this->asBool($child);
+					$options['autoincrement'] = $autoincrement;
+					break;
+				case 'default':
+					$default = (string)$child;
+					$options['default'] = $default;
+					break;
+				case 'comments':
+					$comment = (string)$child;
+					$options['comment'] = $comment;
+					break;
+				case 'primary':
+					$primary = $this->asBool($child);
+					$options['primary'] = $primary;
+					break;
+				default:
+					throw new \DomainException('Unknown element: ' . $child->getName());
+
+			}
+		}
+		if (isset($name) && isset($type)) {
+			if (empty($options['default'])) {
+				if (empty($options['notnull']) || !$options['notnull']) {
+					unset($options['default']);
+					$options['notnull'] = false;
+				} else {
+					$options['default'] = '';
+				}
+				if ($type == 'integer') {
+					$options['default'] = 0;
+				} elseif ($type == 'boolean') {
+					$options['default'] = false;
+				}
+				if (!empty($options['autoincrement']) && $options['autoincrement']) {
+					unset($options['default']);
+				}
+			}
+			if ($type === 'integer' && isset($options['default'])) {
+				$options['default'] = (int)$options['default'];
+			}
+			if ($type === 'integer' && isset($options['length'])) {
+				$length = $options['length'];
+				if ($length < 4) {
+					$type = 'smallint';
+				} else if ($length > 4) {
+					$type = 'bigint';
+				}
+			}
+			if ($type === 'boolean' && isset($options['default'])) {
+				$options['default'] = $this->asBool($options['default']);
+			}
+			if (!empty($options['autoincrement'])
+				&& !empty($options['notnull'])
+			) {
+				$options['primary'] = true;
+			}
+			$table->addColumn($name, $type, $options);
+			if (!empty($options['primary']) && $options['primary']) {
+				$table->setPrimaryKey(array($name));
+			}
+		}
+	}
+
+	/**
+	 * @param \Doctrine\DBAL\Schema\Table $table
+	 * @param \SimpleXMLElement $xml
+	 * @throws \DomainException
+	 */
+	private function loadIndex($table, $xml) {
+		$name = null;
+		$fields = array();
+		foreach ($xml->children() as $child) {
+			/**
+			 * @var \SimpleXMLElement $child
+			 */
+			switch ($child->getName()) {
+				case 'name':
+					$name = (string)$child;
+					break;
+				case 'primary':
+					$primary = $this->asBool($child);
+					break;
+				case 'unique':
+					$unique = $this->asBool($child);
+					break;
+				case 'field':
+					foreach ($child->children() as $field) {
+						/**
+						 * @var \SimpleXMLElement $field
+						 */
+						switch ($field->getName()) {
+							case 'name':
+								$field_name = (string)$field;
+								$field_name = $this->platform->quoteIdentifier($field_name);
+								$fields[] = $field_name;
+								break;
+							case 'sorting':
+								break;
+							default:
+								throw new \DomainException('Unknown element: ' . $field->getName());
+
+						}
+					}
+					break;
+				default:
+					throw new \DomainException('Unknown element: ' . $child->getName());
+
+			}
+		}
+		if (!empty($fields)) {
+			if (isset($primary) && $primary) {
+				$table->setPrimaryKey($fields, $name);
+			} else
+				if (isset($unique) && $unique) {
+					$table->addUniqueIndex($fields, $name);
+				} else {
+					$table->addIndex($fields, $name);
+				}
+		} else {
+			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
+		}
+	}
+
+	/**
+	 * @param \SimpleXMLElement | string $xml
+	 * @return bool
+	 */
+	private function asBool($xml) {
+		$result = (string)$xml;
+		if ($result == 'true') {
+			$result = true;
+		} elseif ($result == 'false') {
+			$result = false;
+		}
+		return (bool)$result;
+	}
+
+}
diff --git a/lib/db/mdb2schemawriter.php b/lib/db/mdb2schemawriter.php
new file mode 100644
index 0000000000000000000000000000000000000000..21b43cbfe806849279729a6c22a1cc99dd9fc520
--- /dev/null
+++ b/lib/db/mdb2schemawriter.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_DB_MDB2SchemaWriter {
+
+	/**
+	 * @param $file
+	 * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $sm
+	 * @return bool
+	 */
+	static public function saveSchemaToFile($file, $sm) {
+		$xml = new SimpleXMLElement('<database/>');
+		$xml->addChild('name', OC_Config::getValue( "dbname", "owncloud" ));
+		$xml->addChild('create', 'true');
+		$xml->addChild('overwrite', 'false');
+		$xml->addChild('charset', 'utf8');
+		foreach ($sm->listTables() as $table) {
+			self::saveTable($table, $xml->addChild('table'));
+		}
+		file_put_contents($file, $xml->asXML());
+		return true;
+	}
+
+	private static function saveTable($table, $xml) {
+		$xml->addChild('name', $table->getName());
+		$declaration = $xml->addChild('declaration');
+		foreach($table->getColumns() as $column) {
+			self::saveColumn($column, $declaration->addChild('field'));
+		}
+		foreach($table->getIndexes() as $index) {
+			if ($index->getName() == 'PRIMARY') {
+				$autoincrement = false;
+				foreach($index->getColumns() as $column) {
+					if ($table->getColumn($column)->getAutoincrement()) {
+						$autoincrement = true;
+					}
+				}
+				if ($autoincrement) {
+					continue;
+				}
+			}
+			self::saveIndex($index, $declaration->addChild('index'));
+		}
+	}
+
+	private static function saveColumn($column, $xml) {
+		$xml->addChild('name', $column->getName());
+		switch($column->getType()) {
+			case 'SmallInt':
+			case 'Integer':
+			case 'BigInt':
+				$xml->addChild('type', 'integer');
+				$default = $column->getDefault();
+				if (is_null($default) && $column->getAutoincrement()) {
+					$default = '0';
+				}
+				$xml->addChild('default', $default);
+				$xml->addChild('notnull', self::toBool($column->getNotnull()));
+				if ($column->getAutoincrement()) {
+					$xml->addChild('autoincrement', '1');
+				}
+				if ($column->getUnsigned()) {
+					$xml->addChild('unsigned', 'true');
+				}
+				$length = '4';
+				if ($column->getType() == 'SmallInt') {
+					$length = '2';
+				}
+				elseif ($column->getType() == 'BigInt') {
+					$length = '8';
+				}
+				$xml->addChild('length', $length);
+				break;
+			case 'String':
+				$xml->addChild('type', 'text');
+				$default = trim($column->getDefault());
+				if ($default === '') {
+					$default = false;
+				}
+				$xml->addChild('default', $default);
+				$xml->addChild('notnull', self::toBool($column->getNotnull()));
+				$xml->addChild('length', $column->getLength());
+				break;
+			case 'Text':
+				$xml->addChild('type', 'clob');
+				$xml->addChild('notnull', self::toBool($column->getNotnull()));
+				break;
+			case 'Decimal':
+				$xml->addChild('type', 'decimal');
+				$xml->addChild('default', $column->getDefault());
+				$xml->addChild('notnull', self::toBool($column->getNotnull()));
+				$xml->addChild('length', '15');
+				break;
+			case 'Boolean':
+				$xml->addChild('type', 'integer');
+				$xml->addChild('default', $column->getDefault());
+				$xml->addChild('notnull', self::toBool($column->getNotnull()));
+				$xml->addChild('length', '1');
+				break;
+			case 'DateTime':
+				$xml->addChild('type', 'timestamp');
+				$xml->addChild('default', $column->getDefault());
+				$xml->addChild('notnull', self::toBool($column->getNotnull()));
+				break;
+
+		}
+	}
+
+	private static function saveIndex($index, $xml) {
+		$xml->addChild('name', $index->getName());
+		if ($index->isPrimary()) {
+			$xml->addChild('primary', 'true');
+		}
+		elseif ($index->isUnique()) {
+			$xml->addChild('unique', 'true');
+		}
+		foreach($index->getColumns() as $column) {
+			$field = $xml->addChild('field');
+			$field->addChild('name', $column);
+			$field->addChild('sorting', 'ascending');
+			
+		}
+	}
+
+	private static function toBool($bool) {
+		return $bool ? 'true' : 'false';
+	}
+}
diff --git a/lib/db/statementwrapper.php b/lib/db/statementwrapper.php
new file mode 100644
index 0000000000000000000000000000000000000000..b8da1afc0e5c5bcb84c1b2f7a28c0e78a87593e2
--- /dev/null
+++ b/lib/db/statementwrapper.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * small wrapper around \Doctrine\DBAL\Driver\Statement to make it behave, more like an MDB2 Statement
+ */
+class OC_DB_StatementWrapper {
+	/**
+	 * @var \Doctrine\DBAL\Driver\Statement
+	 */
+	private $statement = null;
+	private $isManipulation = false;
+	private $lastArguments = array();
+
+	public function __construct($statement, $isManipulation) {
+		$this->statement = $statement;
+		$this->isManipulation = $isManipulation;
+	}
+
+	/**
+	 * pass all other function directly to the \Doctrine\DBAL\Driver\Statement
+	 */
+	public function __call($name,$arguments) {
+		return call_user_func_array(array($this->statement,$name), $arguments);
+	}
+
+	/**
+	 * provide numRows
+	 */
+	public function numRows() {
+		$type = OC_Config::getValue( "dbtype", "sqlite" );
+		if ($type == 'oci') {
+			// OCI doesn't have a queryString, just do a rowCount for now
+			return $this->statement->rowCount();
+		}
+		$regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i';
+		$queryString = $this->statement->getWrappedStatement()->queryString;
+		if (preg_match($regex, $queryString, $output) > 0) {
+			$query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}");
+			return $query->execute($this->lastArguments)->fetchColumn();
+		}else{
+			return $this->statement->rowCount();
+		}
+	}
+
+	/**
+	 * make execute return the result instead of a bool
+	 */
+	public function execute($input=array()) {
+		if(OC_Config::getValue( "log_query", false)) {
+			$params_str = str_replace("\n", " ", var_export($input, true));
+			OC_Log::write('core', 'DB execute with arguments : '.$params_str, OC_Log::DEBUG);
+		}
+		$this->lastArguments = $input;
+		if (count($input) > 0) {
+
+			if (!isset($type)) {
+				$type = OC_Config::getValue( "dbtype", "sqlite" );
+			}
+
+			if ($type == 'mssql') {
+				$input = $this->tryFixSubstringLastArgumentDataForMSSQL($input);
+			}
+
+			$result = $this->statement->execute($input);
+		} else {
+			$result = $this->statement->execute();
+		}
+		
+		if ($result === false) {
+			return false;
+		}
+		if ($this->isManipulation) {
+			return $this->statement->rowCount();
+		} else {
+			return $this;
+		}
+	}
+
+	private function tryFixSubstringLastArgumentDataForMSSQL($input) {
+		$query = $this->statement->getWrappedStatement()->queryString;
+		$pos = stripos ($query, 'SUBSTRING');
+
+		if ( $pos === false) {
+			return $input;
+		}
+
+		try {
+			$newQuery = '';
+
+			$cArg = 0;
+
+			$inSubstring = false;
+
+			// Create new query
+			for ($i = 0; $i < strlen ($query); $i++) {
+				if ($inSubstring == false) {
+					// Defines when we should start inserting values
+					if (substr ($query, $i, 9) == 'SUBSTRING') {
+						$inSubstring = true;
+					}
+				} else {
+					// Defines when we should stop inserting values
+					if (substr ($query, $i, 1) == ')') {
+						$inSubstring = false;
+					}
+				}
+
+				if (substr ($query, $i, 1) == '?') {
+					// We found a question mark
+					if ($inSubstring) {
+						$newQuery .= $input[$cArg];
+
+						//
+						// Remove from input array
+						//
+						array_splice ($input, $cArg, 1);
+					} else {
+						$newQuery .= substr ($query, $i, 1);
+						$cArg++;
+					}
+				} else {
+					$newQuery .= substr ($query, $i, 1);
+				}
+			}
+
+			// The global data we need
+			$name = OC_Config::getValue( "dbname", "owncloud" );
+			$host = OC_Config::getValue( "dbhost", "" );
+			$user = OC_Config::getValue( "dbuser", "" );
+			$pass = OC_Config::getValue( "dbpassword", "" );
+			if (strpos($host, ':')) {
+				list($host, $port) = explode(':', $host, 2);
+			} else {
+				$port = false;
+			}
+			$opts = array();
+
+			if ($port) {
+				$dsn = 'sqlsrv:Server='.$host.','.$port.';Database='.$name;
+			} else {
+				$dsn = 'sqlsrv:Server='.$host.';Database='.$name;
+			}
+
+			$PDO = new PDO($dsn, $user, $pass, $opts);
+			$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+			$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+			$this->statement = $PDO->prepare($newQuery);
+
+			$this->lastArguments = $input;
+
+			return $input;
+		} catch (PDOException $e){
+			$entry = 'PDO DB Error: "'.$e->getMessage().'"<br />';
+			$entry .= 'Offending command was: '.$this->statement->queryString .'<br />';
+			$entry .= 'Input parameters: ' .print_r($input, true).'<br />';
+			$entry .= 'Stack trace: ' .$e->getTraceAsString().'<br />';
+			OC_Log::write('core', $entry, OC_Log::FATAL);
+			OC_User::setUserId(null);
+
+			// send http status 503
+			header('HTTP/1.1 503 Service Temporarily Unavailable');
+			header('Status: 503 Service Temporarily Unavailable');
+			OC_Template::printErrorPage('Failed to connect to database');
+			die ($entry);
+		}
+	}
+    
+	/**
+	 * provide an alias for fetch
+	 */
+	public function fetchRow() {
+		return $this->statement->fetch();
+	}
+
+	/**
+	 * Provide a simple fetchOne.
+	 * fetch single column from the next row
+	 * @param int $colnum the column number to fetch
+	 * @return string
+	 */
+	public function fetchOne($colnum = 0) {
+		return $this->statement->fetchColumn($colnum);
+	}
+}
diff --git a/lib/defaults.php b/lib/defaults.php
index 196bb5cf14df4ed9ea97e0dac533d4db550f43bd..10813a3e8d88d3eba151bb95f06f671c110374d4 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -16,6 +16,7 @@ class OC_Defaults {
 
 	private $defaultEntity;
 	private $defaultName;
+	private $defaultTitle;
 	private $defaultBaseUrl;
 	private $defaultSyncClientUrl;
 	private $defaultDocBaseUrl;
@@ -25,8 +26,9 @@ class OC_Defaults {
 	function __construct() {
 		$l = OC_L10N::get('core');
 
-		$this->defaultEntity = "ownCloud";
-		$this->defaultName = "ownCloud";
+		$this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */
+		$this->defaultName = "ownCloud"; /* short name, used when referring to the software */
+		$this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */
 		$this->defaultBaseUrl = "http://owncloud.org";
 		$this->defaultSyncClientUrl = " http://owncloud.org/sync-clients/";
 		$this->defaultDocBaseUrl = "http://doc.owncloud.org";
@@ -69,6 +71,14 @@ class OC_Defaults {
 		}
 	}
 
+	public function getTitle() {
+		if ($this->themeExist('getTitle')) {
+			return $this->theme->getTitle();
+		} else {
+			return $this->defaultTitle;
+		}
+	}
+
 	public function getName() {
 		if ($this->themeExist('getName')) {
 			return $this->theme->getName();
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 63f197925293d97a6ae5bba8bbc605bb08b6b435..a83084d92514af6276d6ac4c7cfd8c64d1d8612c 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -25,7 +25,7 @@
  * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events)
  * includes a fallback for older browsers and IE
  *
- * use server side events with causion, to many open requests can hang the server
+ * use server side events with caution, to many open requests can hang the server
  */
 class OC_EventSource{
 	private $fallback;
@@ -43,6 +43,7 @@ class OC_EventSource{
 			header("Content-Type: text/event-stream");
 		}
 		if( !OC_Util::isCallRegistered()) {
+			$this->send('error', 'Possible CSRF attack. Connection will be closed.');
 			exit();
 		}
 		flush();
@@ -51,10 +52,10 @@ class OC_EventSource{
 
 	/**
 	 * send a message to the client
-	 * @param string type
-	 * @param object data
+	 * @param string $type
+	 * @param mixed $data
 	 *
-	 * if only one paramater is given, a typeless message will be send with that paramater as data
+	 * if only one parameter is given, a typeless message will be send with that parameter as data
 	 */
 	public function send($type, $data=null) {
 		if(is_null($data)) {
diff --git a/lib/files.php b/lib/files.php
index f5dffd970d2ca13b817cd96c5c3a65c63dd3a9ab..c705d2adb1a20f7c0dcbc09871792a0b9a093b6f 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -62,7 +62,8 @@ class OC_Files {
 			$zip = new ZipArchive();
 			$filename = OC_Helper::tmpFile('.zip');
 			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
-				exit("cannot open <$filename>\n");
+				$l = OC_L10N::get('lib');
+				throw new Exception($l->t('cannot open "%s"', array($filename)));
 			}
 			foreach ($files as $file) {
 				$file = $dir . '/' . $file;
@@ -93,7 +94,8 @@ class OC_Files {
 			$zip = new ZipArchive();
 			$filename = OC_Helper::tmpFile('.zip');
 			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
-				exit("cannot open <$filename>\n");
+				$l = OC_L10N::get('lib');
+				throw new Exception($l->t('cannot open "%s"', array($filename)));
 			}
 			$file = $dir . '/' . $files;
 			self::zipAddDir($file, $zip);
@@ -220,16 +222,11 @@ class OC_Files {
 		if (!OC_Config::getValue('allowZipDownload', true)) {
 			$l = OC_L10N::get('lib');
 			header("HTTP/1.0 409 Conflict");
-			$tmpl = new OC_Template('', 'error', 'user');
-			$errors = array(
-				array(
-					'error' => $l->t('ZIP download is turned off.'),
-					'hint' => $l->t('Files need to be downloaded one by one.')
-						. '<br/><a href="javascript:history.back()">' . $l->t('Back to Files') . '</a>',
-				)
+			OC_Template::printErrorPage(
+					$l->t('ZIP download is turned off.'),
+					$l->t('Files need to be downloaded one by one.')
+						. '<br/><a href="javascript:history.back()">' . $l->t('Back to Files') . '</a>'
 			);
-			$tmpl->assign('errors', $errors);
-			$tmpl->printPage();
 			exit;
 		}
 
@@ -252,17 +249,12 @@ class OC_Files {
 			if ($totalsize > $zipLimit) {
 				$l = OC_L10N::get('lib');
 				header("HTTP/1.0 409 Conflict");
-				$tmpl = new OC_Template('', 'error', 'user');
-				$errors = array(
-					array(
-						'error' => $l->t('Selected files too large to generate zip file.'),
-						'hint' => 'Download the files in smaller chunks, seperately'
-							.' or kindly ask your administrator.<br/><a href="javascript:history.back()">'
-							. $l->t('Back to Files') . '</a>',
-					)
+				OC_Template::printErrorPage(
+						$l->t('Selected files too large to generate zip file.'),
+						$l->t('Download the files in smaller chunks, seperately or kindly ask your administrator.')
+						.'<br/><a href="javascript:history.back()">'
+						. $l->t('Back to Files') . '</a>'
 				);
-				$tmpl->assign('errors', $errors);
-				$tmpl->printPage();
 				exit;
 			}
 		}
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 3818fdbd84065fb43b7ed2d9f731dddcd3e74674..39e36684b7ba1a4bc878e6253cb61081fd2a7e30 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -200,7 +200,7 @@ class Cache {
 
 			$data['path'] = $file;
 			$data['parent'] = $this->getParentId($file);
-			$data['name'] = basename($file);
+			$data['name'] = \OC_Util::basename($file);
 			$data['encrypted'] = isset($data['encrypted']) ? ((int)$data['encrypted']) : 0;
 
 			list($queryParts, $params) = $this->buildParts($data);
@@ -485,28 +485,28 @@ class Cache {
 	 * @return int
 	 */
 	public function calculateFolderSize($path) {
-		$id = $this->getId($path);
-		if ($id === -1) {
-			return 0;
-		}
-		$sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?';
-		$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 		$totalSize = 0;
-		$hasChilds = 0;
-		while ($row = $result->fetchRow()) {
-			$hasChilds = true;
-			$size = (int)$row['size'];
-			if ($size === -1) {
-				$totalSize = -1;
-				break;
-			} else {
-				$totalSize += $size;
+		$entry = $this->get($path);
+		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
+			$id = $entry['fileid'];
+			$sql = 'SELECT SUM(`size`), MIN(`size`) FROM `*PREFIX*filecache` '.
+				'WHERE `parent` = ? AND `storage` = ?';
+			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
+			if ($row = $result->fetchRow()) {
+				list($sum, $min) = array_values($row);
+				$sum = (int)$sum;
+				$min = (int)$min;
+				if ($min === -1) {
+					$totalSize = $min;
+				} else {
+					$totalSize = $sum;
+				}
+				if ($entry['size'] !== $totalSize) {
+					$this->update($id, array('size' => $totalSize));
+				}
+				
 			}
 		}
-
-		if ($hasChilds) {
-			$this->update($id, array('size' => $totalSize));
-		}
 		return $totalSize;
 	}
 
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 9b94a24f48123e3e6e20eb1c531cb2ab23f6cfd1..597eabecf54532c2db0667478b082f37fa89de35 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -9,8 +9,18 @@
 namespace OC\Files\Cache;
 
 use OC\Files\Filesystem;
+use OC\Hooks\BasicEmitter;
 
-class Scanner {
+/**
+ * Class Scanner
+ *
+ * Hooks available in scope \OC\Files\Cache\Scanner:
+ *  - scanFile(string $path, string $storageId)
+ *  - scanFolder(string $path, string $storageId)
+ *
+ * @package OC\Files\Cache
+ */
+class Scanner extends BasicEmitter {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
 	 */
@@ -65,16 +75,18 @@ class Scanner {
 	 *
 	 * @param string $file
 	 * @param int $reuseExisting
+	 * @param bool $parentExistsInCache
 	 * @return array with metadata of the scanned file
 	 */
-	public function scanFile($file, $reuseExisting = 0) {
+	public function scanFile($file, $reuseExisting = 0, $parentExistsInCache = false) {
 		if (!self::isPartialFile($file)
 			and !Filesystem::isFileBlacklisted($file)
 		) {
+			$this->emit('\OC\Files\Cache\Scanner', 'scanFile', array($file, $this->storageId));
 			\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
 			$data = $this->getData($file);
 			if ($data) {
-				if ($file) {
+				if ($file and !$parentExistsInCache) {
 					$parent = dirname($file);
 					if ($parent === '.' or $parent === '/') {
 						$parent = '';
@@ -86,7 +98,7 @@ class Scanner {
 				$newData = $data;
 				if ($reuseExisting and $cacheData = $this->cache->get($file)) {
 					// only reuse data if the file hasn't explicitly changed
-					if ($data['mtime'] === $cacheData['mtime']) {
+					if (isset($data['mtime']) && isset($cacheData['mtime']) && $data['mtime'] === $cacheData['mtime']) {
 						if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
 							$data['size'] = $cacheData['size'];
 						}
@@ -97,9 +109,9 @@ class Scanner {
 					// Only update metadata that has changed
 					$newData = array_diff($data, $cacheData);
 				}
-			}
-			if (!empty($newData)) {
-				$this->cache->put($file, $newData);
+				if (!empty($newData)) {
+					$this->cache->put($file, $newData);
+				}
 			}
 			return $data;
 		}
@@ -134,7 +146,7 @@ class Scanner {
 		if ($reuse === -1) {
 			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0;
 		}
-		\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
+		$this->emit('\OC\Files\Cache\Scanner', 'scanFolder', array($path, $this->storageId));
 		$size = 0;
 		$childQueue = array();
 		$existingChildren = array();
@@ -151,7 +163,7 @@ class Scanner {
 				$child = ($path) ? $path . '/' . $file : $file;
 				if (!Filesystem::isIgnoredDir($file)) {
 					$newChildren[] = $file;
-					$data = $this->scanFile($child, $reuse);
+					$data = $this->scanFile($child, $reuse, true);
 					if ($data) {
 						if ($data['size'] === -1) {
 							if ($recursive === self::SCAN_RECURSIVE) {
@@ -172,7 +184,7 @@ class Scanner {
 			}
 			\OC_DB::commit();
 			foreach ($childQueue as $child) {
-				$childSize = $this->scanChildren($child, self::SCAN_RECURSIVE);
+				$childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse);
 				if ($childSize === -1) {
 					$size = -1;
 				} else {
diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php
index 87c33a313a482ebb755ef0bbdfc3ac56bfbb37ec..1f30173a8f8b18d1a1741e4171217d45813bb3b0 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -26,7 +26,7 @@ class Updater {
 	}
 
 	/**
-	 * preform a write update
+	 * perform a write update
 	 *
 	 * @param string $path the relative path of the file
 	 */
@@ -46,7 +46,7 @@ class Updater {
 	}
 
 	/**
-	 * preform a delete update
+	 * perform a delete update
 	 *
 	 * @param string $path the relative path of the file
 	 */
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 3d7d5abf8fe49463107cb329cd8179c7a68da183..d6ebe7d629a6d90e00332e7179f242de678c1f79 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -8,7 +8,7 @@
 
 /**
  * Class for abstraction of filesystem functions
- * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
+ * This class won't call any filesystem functions for itself but will pass them to the correct OC_Filestorage object
  * this class should also handle all the file permission related stuff
  *
  * Hooks provided:
@@ -148,13 +148,20 @@ class Filesystem {
 	 */
 	private static $loader;
 
-	public static function getLoader(){
+	public static function getLoader() {
 		if (!self::$loader) {
 			self::$loader = new Loader();
 		}
 		return self::$loader;
 	}
 
+	public static function getMountManager() {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		return self::$mounts;
+	}
+
 	/**
 	 * get the mountpoint of the storage object for a path
 	 * ( note: because a storage is not always mounted inside the fakeroot, the
@@ -717,7 +724,7 @@ class Filesystem {
 	/**
 	 * Get the path of a file by id
 	 *
-	 * Note that the resulting path is not guarantied to be unique for the id, multiple paths can point to the same file
+	 * Note that the resulting path is not guaranteed to be unique for the id, multiple paths can point to the same file
 	 *
 	 * @param int $id
 	 * @return string
diff --git a/lib/files/utils/scanner.php b/lib/files/utils/scanner.php
new file mode 100644
index 0000000000000000000000000000000000000000..f0dc41ffad3fe040190338e83383e4d97f5707fa
--- /dev/null
+++ b/lib/files/utils/scanner.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Utils;
+
+use OC\Files\Filesystem;
+use OC\Hooks\PublicEmitter;
+
+/**
+ * Class Scanner
+ *
+ * Hooks available in scope \OC\Utils\Scanner
+ *  - scanFile(string $absolutePath)
+ *  - scanFolder(string $absolutePath)
+ *
+ * @package OC\Files\Utils
+ */
+class Scanner extends PublicEmitter {
+	/**
+	 * @var string $user
+	 */
+	private $user;
+
+	/**
+	 * @param string $user
+	 */
+	public function __construct($user) {
+		$this->user = $user;
+	}
+
+	/**
+	 * get all storages for $dir
+	 *
+	 * @param string $dir
+	 * @return \OC\Files\Mount\Mount[]
+	 */
+	protected function getMounts($dir) {
+		//TODO: move to the node based fileapi once that's done
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($this->user);
+		$absolutePath = Filesystem::getView()->getAbsolutePath($dir);
+
+		$mountManager = Filesystem::getMountManager();
+		$mounts = $mountManager->findIn($absolutePath);
+		$mounts[] = $mountManager->find($absolutePath);
+		$mounts = array_reverse($mounts); //start with the mount of $dir
+
+		return $mounts;
+	}
+
+	/**
+	 * attach listeners to the scanner
+	 *
+	 * @param \OC\Files\Mount\Mount $mount
+	 */
+	protected function attachListener($mount) {
+		$scanner = $mount->getStorage()->getScanner();
+		$emitter = $this;
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFile', function ($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFile', array($mount->getMountPoint() . $path));
+		});
+		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
+		});
+	}
+
+	public function backgroundScan($dir) {
+		$mounts = $this->getMounts($dir);
+		foreach ($mounts as $mount) {
+			$scanner = $mount->getStorage()->getScanner();
+			$this->attachListener($mount);
+			$scanner->backgroundScan();
+		}
+	}
+
+	public function scan($dir) {
+		$mounts = $this->getMounts($dir);
+		foreach ($mounts as $mount) {
+			$scanner = $mount->getStorage()->getScanner();
+			$this->attachListener($mount);
+			$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
+		}
+	}
+}
+
diff --git a/lib/group.php b/lib/group.php
index d1a830730b755a18398e0c052281bad2482730b6..ba93dc129a11f09c3972446246af9f94f235ca3d 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -34,28 +34,43 @@
  *   post_removeFromGroup(uid, gid)
  */
 class OC_Group {
-	// The backend used for group management
 	/**
-	 * @var OC_Group_Interface[]
+	 * @var \OC\Group\Manager $manager
 	 */
-	private static $_usedBackends = array();
+	private static $manager;
+
+	/**
+	 * @var \OC\User\Manager
+	 */
+	private static $userManager;
+
+	/**
+	 * @return \OC\Group\Manager
+	 */
+	public static function getManager() {
+		if (self::$manager) {
+			return self::$manager;
+		}
+		self::$userManager = \OC_User::getManager();
+		self::$manager = new \OC\Group\Manager(self::$userManager);
+		return self::$manager;
+	}
 
 	/**
 	 * @brief set the group backend
-	 * @param  string  $backend  The backend to use for user managment
+	 * @param  \OC_Group_Backend $backend  The backend to use for user managment
 	 * @return bool
 	 */
-	public static function useBackend( $backend ) {
-		if($backend instanceof OC_Group_Interface) {
-			self::$_usedBackends[]=$backend;
-		}
+	public static function useBackend($backend) {
+		self::getManager()->addBackend($backend);
+		return true;
 	}
 
 	/**
 	 * remove all used backends
 	 */
 	public static function clearBackends() {
-		self::$_usedBackends=array();
+		self::getManager()->clearBackends();
 	}
 
 	/**
@@ -66,32 +81,13 @@ class OC_Group {
 	 * Tries to create a new group. If the group name already exists, false will
 	 * be returned. Basic checking of Group name
 	 */
-	public static function createGroup( $gid ) {
-		// No empty group names!
-		if( !$gid ) {
-			return false;
-		}
-		// No duplicate group names
-		if( in_array( $gid, self::getGroups())) {
-			return false;
-		}
-
-		$run = true;
-		OC_Hook::emit( "OC_Group", "pre_createGroup", array( "run" => &$run, "gid" => $gid ));
-
-		if($run) {
-			//create the group in the first backend that supports creating groups
-			foreach(self::$_usedBackends as $backend) {
-				if(!$backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP))
-					continue;
+	public static function createGroup($gid) {
+		OC_Hook::emit("OC_Group", "pre_createGroup", array("run" => true, "gid" => $gid));
 
-				$backend->createGroup($gid);
-				OC_Hook::emit( "OC_User", "post_createGroup", array( "gid" => $gid ));
-
-				return true;
-			}
-			return false;
-		}else{
+		if (self::getManager()->createGroup($gid)) {
+			OC_Hook::emit("OC_User", "post_createGroup", array("gid" => $gid));
+			return true;
+		} else {
 			return false;
 		}
 	}
@@ -103,30 +99,22 @@ class OC_Group {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public static function deleteGroup( $gid ) {
+	public static function deleteGroup($gid) {
 		// Prevent users from deleting group admin
-		if( $gid == "admin" ) {
+		if ($gid == "admin") {
 			return false;
 		}
 
-		$run = true;
-		OC_Hook::emit( "OC_Group", "pre_deleteGroup", array( "run" => &$run, "gid" => $gid ));
-
-		if($run) {
-			//delete the group from all backends
-			foreach(self::$_usedBackends as $backend) {
-				if(!$backend->implementsActions(OC_GROUP_BACKEND_DELETE_GROUP))
-					continue;
-
-				$backend->deleteGroup($gid);
-				OC_Hook::emit( "OC_User", "post_deleteGroup", array( "gid" => $gid ));
+		OC_Hook::emit("OC_Group", "pre_deleteGroup", array("run" => true, "gid" => $gid));
 
+		$group = self::getManager()->get($gid);
+		if ($group) {
+			if ($group->delete()) {
+				OC_Hook::emit("OC_User", "post_deleteGroup", array("gid" => $gid));
 				return true;
 			}
-			return false;
-		}else{
-			return false;
 		}
+		return false;
 	}
 
 	/**
@@ -137,11 +125,11 @@ class OC_Group {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public static function inGroup( $uid, $gid ) {
-		foreach(self::$_usedBackends as $backend) {
-			if($backend->inGroup($uid, $gid)) {
-				return true;
-			}
+	public static function inGroup($uid, $gid) {
+		$group = self::getManager()->get($gid);
+		$user = self::$userManager->get($uid);
+		if ($group and $user) {
+			return $group->inGroup($user);
 		}
 		return false;
 	}
@@ -154,33 +142,15 @@ class OC_Group {
 	 *
 	 * Adds a user to a group.
 	 */
-	public static function addToGroup( $uid, $gid ) {
-		// Does the group exist?
-		if( !OC_Group::groupExists($gid)) {
-			return false;
-		}
-
-		// Go go go
-		$run = true;
-		OC_Hook::emit( "OC_Group", "pre_addToGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
-
-		if($run) {
-			$success=false;
-
-			//add the user to the all backends that have the group
-			foreach(self::$_usedBackends as $backend) {
-				if(!$backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP))
-					continue;
-
-				if($backend->groupExists($gid)) {
-					$success|=$backend->addToGroup($uid, $gid);
-				}
-			}
-			if($success) {
-				OC_Hook::emit( "OC_User", "post_addToGroup", array( "uid" => $uid, "gid" => $gid ));
-			}
-			return $success;
-		}else{
+	public static function addToGroup($uid, $gid) {
+		$group = self::getManager()->get($gid);
+		$user = self::$userManager->get($uid);
+		if ($group and $user) {
+			OC_Hook::emit("OC_Group", "pre_addToGroup", array("run" => true, "uid" => $uid, "gid" => $gid));
+			$group->addUser($user);
+			OC_Hook::emit("OC_User", "post_addToGroup", array("uid" => $uid, "gid" => $gid));
+			return true;
+		} else {
 			return false;
 		}
 	}
@@ -193,21 +163,15 @@ class OC_Group {
 	 *
 	 * removes the user from a group.
 	 */
-	public static function removeFromGroup( $uid, $gid ) {
-		$run = true;
-		OC_Hook::emit( "OC_Group", "pre_removeFromGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
-
-		if($run) {
-			//remove the user from the all backends that have the group
-			foreach(self::$_usedBackends as $backend) {
-				if(!$backend->implementsActions(OC_GROUP_BACKEND_REMOVE_FROM_GOUP))
-					continue;
-
-				$backend->removeFromGroup($uid, $gid);
-				OC_Hook::emit( "OC_User", "post_removeFromGroup", array( "uid" => $uid, "gid" => $gid ));
-			}
+	public static function removeFromGroup($uid, $gid) {
+		$group = self::getManager()->get($gid);
+		$user = self::$userManager->get($uid);
+		if ($group and $user) {
+			OC_Hook::emit("OC_Group", "pre_removeFromGroup", array("run" => true, "uid" => $uid, "gid" => $gid));
+			$group->removeUser($user);
+			OC_Hook::emit("OC_User", "post_removeFromGroup", array("uid" => $uid, "gid" => $gid));
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -220,13 +184,18 @@ class OC_Group {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public static function getUserGroups( $uid ) {
-		$groups=array();
-		foreach(self::$_usedBackends as $backend) {
-			$groups=array_merge($backend->getUserGroups($uid), $groups);
+	public static function getUserGroups($uid) {
+		$user = self::$userManager->get($uid);
+		if ($user) {
+			$groups = self::getManager()->getUserGroups($user);
+			$groupIds = array();
+			foreach ($groups as $group) {
+				$groupIds[] = $group->getGID();
+			}
+			return $groupIds;
+		} else {
+			return array();
 		}
-		asort($groups);
-		return $groups;
 	}
 
 	/**
@@ -235,27 +204,23 @@ class OC_Group {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups($search = '', $limit = -1, $offset = 0) {
-		$groups = array();
-		foreach (self::$_usedBackends as $backend) {
-			$groups = array_merge($backend->getGroups($search, $limit, $offset), $groups);
+	public static function getGroups($search = '', $limit = null, $offset = null) {
+		$groups = self::getManager()->search($search, $limit, $offset);
+		$groupIds = array();
+		foreach ($groups as $group) {
+			$groupIds[] = $group->getGID();
 		}
-		asort($groups);
-		return $groups;
+		return $groupIds;
 	}
 
 	/**
 	 * check if a group exists
+	 *
 	 * @param string $gid
 	 * @return bool
 	 */
 	public static function groupExists($gid) {
-		foreach(self::$_usedBackends as $backend) {
-			if ($backend->groupExists($gid)) {
-				return true;
-			}
-		}
-		return false;
+		return self::getManager()->groupExists($gid);
 	}
 
 	/**
@@ -263,11 +228,17 @@ class OC_Group {
 	 * @returns array with user ids
 	 */
 	public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$users=array();
-		foreach(self::$_usedBackends as $backend) {
-			$users = array_merge($backend->usersInGroup($gid, $search, $limit, $offset), $users);
+		$group = self::getManager()->get($gid);
+		if ($group) {
+			$users = $group->searchUsers($search, $limit, $offset);
+			$userIds = array();
+			foreach ($users as $user) {
+				$userIds[] = $user->getUID();
+			}
+			return $userIds;
+		} else {
+			return array();
 		}
-		return $users;
 	}
 
 	/**
@@ -292,17 +263,17 @@ class OC_Group {
 	 * @returns array with display names (value) and user ids(key)
 	 */
 	public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		$displayNames=array();
-		foreach(self::$_usedBackends as $backend) {
-			if($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) {
-				$displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames);
-			} else {
-				$users = $backend->usersInGroup($gid, $search, $limit, $offset);
-				$names = array_combine($users, $users);
-				$displayNames = array_merge($names, $displayNames);
+		$group = self::getManager()->get($gid);
+		if ($group) {
+			$users = $group->searchDisplayName($search . $limit, $offset);
+			$displayNames = array();
+			foreach ($users as $user) {
+				$displayNames[] = $user->getDisplayName();
 			}
+			return $displayNames;
+		} else {
+			return array();
 		}
-		return $displayNames;
 	}
 
 	/**
diff --git a/lib/group/group.php b/lib/group/group.php
new file mode 100644
index 0000000000000000000000000000000000000000..a752c4311c1f0ffbdfd97d589dd5c69dc0984c71
--- /dev/null
+++ b/lib/group/group.php
@@ -0,0 +1,238 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Group;
+
+class Group {
+	/**
+	 * @var string $id
+	 */
+	private $gid;
+
+	/**
+	 * @var \OC\User\User[] $users
+	 */
+	private $users;
+
+	/**
+	 * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend
+	 */
+	private $backends;
+
+	/**
+	 * @var \OC\Hooks\PublicEmitter $emitter;
+	 */
+	private $emitter;
+
+	/**
+	 * @var \OC\User\Manager $userManager
+	 */
+	private $userManager;
+
+	/**
+	 * @param string $gid
+	 * @param \OC_Group_Backend[] $backends
+	 * @param \OC\User\Manager $userManager
+	 * @param \OC\Hooks\PublicEmitter $emitter
+	 */
+	public function __construct($gid, $backends, $userManager, $emitter = null) {
+		$this->gid = $gid;
+		$this->backends = $backends;
+		$this->userManager = $userManager;
+		$this->emitter = $emitter;
+	}
+
+	public function getGID() {
+		return $this->gid;
+	}
+
+	/**
+	 * get all users in the group
+	 *
+	 * @return \OC\User\User[]
+	 */
+	public function getUsers() {
+		if ($this->users) {
+			return $this->users;
+		}
+
+		$users = array();
+		$userIds = array();
+		foreach ($this->backends as $backend) {
+			$diff = array_diff(
+				$backend->usersInGroup($this->gid),
+				$userIds
+			);
+			if ($diff) {
+				$userIds = array_merge($userIds, $diff);
+			}
+		}
+
+		foreach ($userIds as $userId) {
+			$users[] = $this->userManager->get($userId);
+		}
+		$this->users = $users;
+		return $users;
+	}
+
+	/**
+	 * check if a user is in the group
+	 *
+	 * @param \OC\User\User $user
+	 * @return bool
+	 */
+	public function inGroup($user) {
+		foreach ($this->backends as $backend) {
+			if ($backend->inGroup($user->getUID(), $this->gid)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * add a user to the group
+	 *
+	 * @param \OC\User\User $user
+	 */
+	public function addUser($user) {
+		if ($this->inGroup($user)) {
+			return;
+		}
+
+		if ($this->emitter) {
+			$this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user));
+		}
+		foreach ($this->backends as $backend) {
+			if ($backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP)) {
+				$backend->addToGroup($user->getUID(), $this->gid);
+				if ($this->users) {
+					$this->users[] = $user;
+				}
+				if ($this->emitter) {
+					$this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user));
+				}
+				return;
+			}
+		}
+	}
+
+	/**
+	 * remove a user from the group
+	 *
+	 * @param \OC\User\User $user
+	 */
+	public function removeUser($user) {
+		$result = false;
+		if ($this->emitter) {
+			$this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user));
+		}
+		foreach ($this->backends as $backend) {
+			if ($backend->implementsActions(OC_GROUP_BACKEND_REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) {
+				$backend->removeFromGroup($user->getUID(), $this->gid);
+				$result = true;
+			}
+		}
+		if ($result) {
+			if ($this->emitter) {
+				$this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user));
+			}
+			if ($this->users) {
+				foreach ($this->users as $index => $groupUser) {
+					if ($groupUser->getUID() === $user->getUID()) {
+						unset($this->users[$index]);
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * search for users in the group by userid
+	 *
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return \OC\User\User[]
+	 */
+	public function searchUsers($search, $limit = null, $offset = null) {
+		$users = array();
+		foreach ($this->backends as $backend) {
+			$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
+			if (!is_null($limit)) {
+				$limit -= count($userIds);
+			}
+			if (!is_null($offset)) {
+				$offset -= count($userIds);
+			}
+			foreach ($userIds as $userId) {
+				$users[$userId] = $this->userManager->get($userId);
+			}
+			if (!is_null($limit) and $limit <= 0) {
+				return array_values($users);
+			}
+		}
+		return array_values($users);
+	}
+
+	/**
+	 * search for users in the group by displayname
+	 *
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return \OC\User\User[]
+	 */
+	public function searchDisplayName($search, $limit = null, $offset = null) {
+		$users = array();
+		foreach ($this->backends as $backend) {
+			if ($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) {
+				$userIds = array_keys($backend->displayNamesInGroup($this->gid, $search, $limit, $offset));
+			} else {
+				$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
+			}
+			if (!is_null($limit)) {
+				$limit -= count($userIds);
+			}
+			if (!is_null($offset)) {
+				$offset -= count($userIds);
+			}
+			foreach ($userIds as $userId) {
+				$users[$userId] = $this->userManager->get($userId);
+			}
+			if (!is_null($limit) and $limit <= 0) {
+				return array_values($users);
+			}
+		}
+		return array_values($users);
+	}
+
+	/**
+	 * delete the group
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+		$result = false;
+		if ($this->emitter) {
+			$this->emitter->emit('\OC\Group', 'preDelete', array($this));
+		}
+		foreach ($this->backends as $backend) {
+			if ($backend->implementsActions(OC_GROUP_BACKEND_DELETE_GROUP)) {
+				$result = true;
+				$backend->deleteGroup($this->gid);
+			}
+		}
+		if ($result and $this->emitter) {
+			$this->emitter->emit('\OC\Group', 'postDelete', array($this));
+		}
+		return $result;
+	}
+}
diff --git a/lib/group/manager.php b/lib/group/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..bf469d51d1248713aa06f5e1a69bcddbe8a0a07f
--- /dev/null
+++ b/lib/group/manager.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Group;
+
+use OC\Hooks\PublicEmitter;
+
+/**
+ * Class Manager
+ *
+ * Hooks available in scope \OC\Group:
+ * - preAddUser(\OC\Group\Group $group, \OC\User\User $user)
+ * - postAddUser(\OC\Group\Group $group, \OC\User\User $user)
+ * - preRemoveUser(\OC\Group\Group $group, \OC\User\User $user)
+ * - postRemoveUser(\OC\Group\Group $group, \OC\User\User $user)
+ * - preDelete(\OC\Group\Group $group)
+ * - postDelete(\OC\Group\Group $group)
+ * - preCreate(string $groupId)
+ * - postCreate(\OC\Group\Group $group)
+ *
+ * @package OC\Group
+ */
+class Manager extends PublicEmitter {
+	/**
+	 * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends
+	 */
+	private $backends = array();
+
+	/**
+	 * @var \OC\User\Manager $userManager
+	 */
+	private $userManager;
+
+	/**
+	 * @var \OC\Group\Group[]
+	 */
+	private $cachedGroups;
+
+	/**
+	 * @param \OC\User\Manager $userManager
+	 */
+	public function __construct($userManager) {
+		$this->userManager = $userManager;
+		$cache = & $this->cachedGroups;
+		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cache) {
+			/**
+			 * @var \OC\Group\Group $group
+			 */
+			unset($cache[$group->getGID()]);
+		});
+	}
+
+	/**
+	 * @param \OC_Group_Backend $backend
+	 */
+	public function addBackend($backend) {
+		$this->backends[] = $backend;
+	}
+
+	public function clearBackends() {
+		$this->backends = array();
+		$this->cachedGroups = array();
+	}
+
+	/**
+	 * @param string $gid
+	 * @return \OC\Group\Group
+	 */
+	public function get($gid) {
+		if (isset($this->cachedGroups[$gid])) {
+			return $this->cachedGroups[$gid];
+		}
+		foreach ($this->backends as $backend) {
+			if ($backend->groupExists($gid)) {
+				return $this->getGroupObject($gid);
+			}
+		}
+		return null;
+	}
+
+	protected function getGroupObject($gid) {
+		$backends = array();
+		foreach ($this->backends as $backend) {
+			if ($backend->groupExists($gid)) {
+				$backends[] = $backend;
+			}
+		}
+		$this->cachedGroups[$gid] = new Group($gid, $backends, $this->userManager, $this);
+		return $this->cachedGroups[$gid];
+	}
+
+	/**
+	 * @param string $gid
+	 * @return bool
+	 */
+	public function groupExists($gid) {
+		return !is_null($this->get($gid));
+	}
+
+	/**
+	 * @param string $gid
+	 * @return \OC\Group\Group
+	 */
+	public function createGroup($gid) {
+		if (!$gid) {
+			return false;
+		} else if ($this->groupExists($gid)) {
+			return $this->get($gid);
+		} else {
+			$this->emit('\OC\Group', 'preCreate', array($gid));
+			foreach ($this->backends as $backend) {
+				if ($backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP)) {
+					$backend->createGroup($gid);
+					$group = $this->getGroupObject($gid);
+					$this->emit('\OC\Group', 'postCreate', array($group));
+					return $group;
+				}
+			}
+			return null;
+		}
+	}
+
+	/**
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return \OC\Group\Group[]
+	 */
+	public function search($search, $limit = null, $offset = null) {
+		$groups = array();
+		foreach ($this->backends as $backend) {
+			$groupIds = $backend->getGroups($search, $limit, $offset);
+			if (!is_null($limit)) {
+				$limit -= count($groupIds);
+			}
+			if (!is_null($offset)) {
+				$offset -= count($groupIds);
+			}
+			foreach ($groupIds as $groupId) {
+				$groups[$groupId] = $this->getGroupObject($groupId);
+			}
+			if (!is_null($limit) and $limit <= 0) {
+				return array_values($groups);
+			}
+		}
+		return array_values($groups);
+	}
+
+	/**
+	 * @param \OC\User\User $user
+	 * @return \OC\Group\Group[]
+	 */
+	public function getUserGroups($user) {
+		$groups = array();
+		foreach ($this->backends as $backend) {
+			$groupIds = $backend->getUserGroups($user->getUID());
+			foreach ($groupIds as $groupId) {
+				$groups[$groupId] = $this->getGroupObject($groupId);
+			}
+		}
+		return array_values($groups);
+	}
+}
diff --git a/lib/helper.php b/lib/helper.php
index 1860a55fc8fd7a3515341d5ad8ebbc534ed8bacf..ca508e1d9334dd5ad85a308babbd5977ab5b9253 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -176,8 +176,7 @@ class OC_Helper {
 		}elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )) {
 			return OC::$WEBROOT."/core/img/$image";
 		}else{
-			echo('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-			die();
+			throw new RuntimeException('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 		}
 	}
 
@@ -636,6 +635,18 @@ class OC_Helper {
 	* @return string
 	*/
 	public static function buildNotExistingFileName($path, $filename) {
+		$view = \OC\Files\Filesystem::getView();
+		return self::buildNotExistingFileNameForView($path, $filename, $view);
+	}
+
+	/**
+	* Adds a suffix to the name in case the file exists
+	*
+	* @param $path
+	* @param $filename
+	* @return string
+	*/
+	public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
 		if($path==='/') {
 			$path='';
 		}
@@ -648,11 +659,27 @@ class OC_Helper {
 		}
 
 		$newpath = $path . '/' . $filename;
-		$counter = 2;
-		while (\OC\Files\Filesystem::file_exists($newpath)) {
-			$newname = $name . ' (' . $counter . ')' . $ext;
-			$newpath = $path . '/' . $newname;
-			$counter++;
+		if ($view->file_exists($newpath)) {
+			if(preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
+				//Replace the last "(number)" with "(number+1)" 
+				$last_match = count($matches[0])-1;
+				$counter = $matches[1][$last_match][0]+1;
+				$offset = $matches[0][$last_match][1];
+				$match_length = strlen($matches[0][$last_match][0]);
+			} else {
+				$counter = 2;
+				$offset = false;
+			}
+			do {
+				if($offset) {
+					//Replace the last "(number)" with "(number+1)" 
+					$newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
+				} else {
+					$newname = $name . ' (' . $counter . ')';
+				}
+				$newpath = $path . '/' . $newname . $ext;
+				$counter++;
+			} while ($view->file_exists($newpath));
 		}
 
 		return $newpath;
diff --git a/lib/hintexception.php b/lib/hintexception.php
new file mode 100644
index 0000000000000000000000000000000000000000..3934ae2a4c238b2e4e36867051b14efd4a102bf0
--- /dev/null
+++ b/lib/hintexception.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class HintException extends \Exception {
+
+	private $hint;
+
+	public function __construct($message, $hint = '', $code = 0, Exception $previous = null) {
+		$this->hint = $hint;
+		parent::__construct($message, $code, $previous);
+	}
+
+	public function __toString() {
+		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+	}
+
+	public function getHint() {
+		return $this->hint;
+	}
+}
diff --git a/lib/hooks/basicemitter.php b/lib/hooks/basicemitter.php
index e615a58cfe846c3fde3d4aaf1d6ffdaf2b8a65c9..9ffe1af23144f6aae36841e3fbc3c689f5c272a9 100644
--- a/lib/hooks/basicemitter.php
+++ b/lib/hooks/basicemitter.php
@@ -13,7 +13,7 @@ abstract class BasicEmitter implements Emitter {
 	/**
 	 * @var (callable[])[] $listeners
 	 */
-	private $listeners = array();
+	protected $listeners = array();
 
 	/**
 	 * @param string $scope
diff --git a/lib/hooks/forwardingemitter.php b/lib/hooks/forwardingemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..1aacc4012e0014cb933af81f56a2d5f5e88da362
--- /dev/null
+++ b/lib/hooks/forwardingemitter.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+/**
+ * Class ForwardingEmitter
+ *
+ * allows forwarding all listen calls to other emitters
+ *
+ * @package OC\Hooks
+ */
+abstract class ForwardingEmitter extends BasicEmitter {
+	/**
+	 * @var \OC\Hooks\Emitter[] array
+	 */
+	private $forwardEmitters = array();
+
+	/**
+	 * @param string $scope
+	 * @param string $method
+	 * @param callable $callback
+	 */
+	public function listen($scope, $method, $callback) {
+		parent::listen($scope, $method, $callback);
+		foreach ($this->forwardEmitters as $emitter) {
+			$emitter->listen($scope, $method, $callback);
+		}
+	}
+
+	/**
+	 * @param \OC\Hooks\Emitter $emitter
+	 */
+	protected function forward($emitter) {
+		$this->forwardEmitters[] = $emitter;
+
+		//forward all previously connected hooks
+		foreach ($this->listeners as $key => $listeners) {
+			list($scope, $method) = explode('::', $key, 2);
+			foreach ($listeners as $listener) {
+				$emitter->listen($scope, $method, $listener);
+			}
+		}
+	}
+}
diff --git a/lib/image.php b/lib/image.php
index c1b187608a6e1662f4ede1cc7855a6cb51500655..4bc38e20e56898f751d9463e13072653dd9aa767 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -392,7 +392,7 @@ class OC_Image {
 	*/
 	public function loadFromFile($imagepath=false) {
 		// exif_imagetype throws "read error!" if file is less than 12 byte
-		if(!is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) {
+		if(!@is_file($imagepath) || !file_exists($imagepath) || filesize($imagepath) < 12 || !is_readable($imagepath)) {
 			// Debug output disabled because this method is tried before loadFromBase64?
 			OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: '.$imagepath, OC_Log::DEBUG);
 			return false;
diff --git a/lib/installer.php b/lib/installer.php
index 49ba44926323c8eb6054c8cdf58ceacd911db7d1..dcd29f9e1ade6571e44f49f62c0aa1f14df1da7d 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -436,10 +436,30 @@ class OC_Installer{
 
 		$blacklist=array(
 			'exec(',
-			'eval('
+			'eval(',
 			// more evil pattern will go here later
-			// will will also check if an app is using private api once the public api is in place
 
+			// classes replaced by the public api
+			'OC_API::',
+			'OC_App::',
+			'OC_AppConfig::',
+			'OC_BackgroundJob::',
+			'OC_Config::',
+			'OC_DB::',
+			'OC_Files::',
+			'OC_Helper::',
+			'OC_Hook::',
+			'OC_Image::',
+			'OC_JSON::',
+			'OC_L10N::',
+			'OC_Log::',
+			'OC_Mail::',
+			'OC_Preferences::',
+			'OC_Request::',
+			'OC_Response::',
+			'OC_Template::',
+			'OC_User::',
+			'OC_Util::',
 		);
 
 		// is the code checker enabled?
diff --git a/lib/l10n.php b/lib/l10n.php
index d35ce5fed14f4b19b3007f9e8b71c919b6ef4780..f93443b886a52e1794e2f39c5a14e13c2f588d7a 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -2,8 +2,10 @@
 /**
  * ownCloud
  *
+ * @author Frank Karlitschek
  * @author Jakob Sack
  * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ * @copyright 2013 Jakob Sack
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -23,7 +25,7 @@
 /**
  * This class is for i18n and l10n
  */
-class OC_L10N{
+class OC_L10N {
 	/**
 	 * cached instances
 	 */
@@ -54,6 +56,16 @@ class OC_L10N{
 	 */
 	private $translations = array();
 
+	/**
+	 * Plural forms (string)
+	 */
+	private $plural_form_string = 'nplurals=2; plural=(n != 1);';
+
+	/**
+	 * Plural forms (function)
+	 */
+	private $plural_form_function = null;
+
 	/**
 	 * Localization
 	 */
@@ -66,6 +78,8 @@ class OC_L10N{
 
 	/**
 	 * get an L10N instance
+	 * @param $app string
+	 * @param $lang string|null
 	 * @return OC_L10N
 	 */
 	public static function get($app, $lang=null) {
@@ -81,8 +95,8 @@ class OC_L10N{
 
 	/**
 	 * @brief The constructor
-	 * @param $app the app requesting l10n
-	 * @param $lang default: null Language
+	 * @param $app string app requesting l10n
+	 * @param $lang string default: null Language
 	 * @returns OC_L10N-Object
 	 *
 	 * If language is not set, the constructor tries to find the right
@@ -93,6 +107,17 @@ class OC_L10N{
 		$this->lang = $lang;
 	}
 
+	public function load($transFile) {
+		$this->app = true;
+		include $transFile;
+		if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
+			$this->translations = $TRANSLATIONS;
+		}
+		if(isset($PLURAL_FORMS)) {
+			$this->plural_form_string = $PLURAL_FORMS;
+		}
+	}
+
 	protected function init() {
 		if ($this->app === true) {
 			return;
@@ -138,6 +163,9 @@ class OC_L10N{
 						}
 					}
 				}
+				if(isset($PLURAL_FORMS)) {
+					$this->plural_form_string = $PLURAL_FORMS;
+				}
 			}
 
 			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) {
@@ -153,6 +181,65 @@ class OC_L10N{
 		}
 	}
 
+	/**
+	 * @brief Creates a function that The constructor
+	 *
+	 * If language is not set, the constructor tries to find the right
+	 * language.
+	 *
+	 * Parts of the code is copied from Habari:
+	 * https://github.com/habari/system/blob/master/classes/locale.php
+	 * @param $string string
+	 * @return string
+	 */
+	protected function createPluralFormFunction($string){
+		if(preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
+			// sanitize
+			$nplurals = preg_replace( '/[^0-9]/', '', $matches[1] );
+			$plural = preg_replace( '#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2] );
+
+			$body = str_replace(
+				array( 'plural', 'n', '$n$plurals', ),
+				array( '$plural', '$n', '$nplurals', ),
+				'nplurals='. $nplurals . '; plural=' . $plural
+			);
+
+			// add parents
+			// important since PHP's ternary evaluates from left to right
+			$body .= ';';
+			$res = '';
+			$p = 0;
+			for($i = 0; $i < strlen($body); $i++) {
+				$ch = $body[$i];
+				switch ( $ch ) {
+				case '?':
+					$res .= ' ? (';
+					$p++;
+					break;
+				case ':':
+					$res .= ') : (';
+					break;
+				case ';':
+					$res .= str_repeat( ')', $p ) . ';';
+					$p = 0;
+					break;
+				default:
+					$res .= $ch;
+				}
+			}
+
+			$body = $res . 'return ($plural>=$nplurals?$nplurals-1:$plural);';
+			return create_function('$n', $body);
+		}
+		else {
+			// default: one plural form for all cases but n==1 (english)
+			return create_function(
+				'$n',
+				'$nplurals=2;$plural=($n==1?0:1);return ($plural>=$nplurals?$nplurals-1:$plural);'
+			);
+		}
+	}
+
 	/**
 	 * @brief Translating
 	 * @param $text String The text we need a translation for
@@ -166,6 +253,37 @@ class OC_L10N{
 		return new OC_L10N_String($this, $text, $parameters);
 	}
 
+	/**
+	 * @brief Translating
+	 * @param $text_singular String the string to translate for exactly one object
+	 * @param $text_plural String the string to translate for n objects
+	 * @param $count Integer Number of objects
+	 * @param array $parameters default:array() Parameters for sprintf
+	 * @return \OC_L10N_String Translation or the same text
+	 *
+	 * Returns the translation. If no translation is found, $text will be
+	 * returned. %n will be replaced with the number of objects.
+	 *
+	 * The correct plural is determined by the plural_forms-function
+	 * provided by the po file.
+	 *
+	 */
+	public function n($text_singular, $text_plural, $count, $parameters = array()) {
+		$this->init();
+		$identifier = "_${text_singular}__${text_plural}_";
+		if( array_key_exists($identifier, $this->translations)) {
+			return new OC_L10N_String( $this, $identifier, $parameters, $count );
+		}
+		else{
+			if($count === 1) {
+				return new OC_L10N_String($this, $text_singular, $parameters, $count);
+			}
+			else{
+				return new OC_L10N_String($this, $text_plural, $parameters, $count);
+			}
+		}
+	}
+
 	/**
 	 * @brief Translating
 	 * @param $textArray The text array we need a translation for
@@ -200,6 +318,42 @@ class OC_L10N{
 		return $this->translations;
 	}
 
+	/**
+	 * @brief getPluralFormString
+	 * @returns string containing the gettext "Plural-Forms"-string
+	 *
+	 * Returns a string like "nplurals=2; plural=(n != 1);"
+	 */
+	public function getPluralFormString() {
+		$this->init();
+		return $this->plural_form_string;
+	}
+
+	/**
+	 * @brief getPluralFormFunction
+	 * @returns string the plural form function
+	 *
+	 * returned function accepts the argument $n
+	 */
+	public function getPluralFormFunction() {
+		$this->init();
+		if(is_null($this->plural_form_function)) {
+			$this->plural_form_function = $this->createPluralFormFunction($this->plural_form_string);
+		}
+		return $this->plural_form_function;
+	}
+
+	/**
+	 * @brief get localizations
+	 * @returns Fetch all localizations
+	 *
+	 * Returns an associative array with all localizations
+	 */
+	public function getLocalizations() {
+		$this->init();
+		return $this->localizations;
+	}
+
 	/**
 	 * @brief Localization
 	 * @param $type Type of localization
@@ -230,8 +384,11 @@ class OC_L10N{
 			case 'date':
 			case 'datetime':
 			case 'time':
-				if($data instanceof DateTime) return $data->format($this->localizations[$type]);
-				elseif(is_string($data)) $data = strtotime($data);
+				if($data instanceof DateTime) {
+					return $data->format($this->localizations[$type]);
+				} elseif(is_string($data) && !is_numeric($data)) {
+					$data = strtotime($data);
+				}
 				$locales = array(self::findLanguage());
 				if (strlen($locales[0]) == 2) {
 					$locales[] = $locales[0].'_'.strtoupper($locales[0]);
@@ -298,6 +455,12 @@ class OC_L10N{
 			}
 		}
 
+    $default_language = OC_Config::getValue('default_language', false);
+
+    if($default_language !== false) {
+      return $default_language;
+    }
+
 		if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 			$accepted_languages = preg_split('/,\s*/', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']));
 			if(is_array($app)) {
diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php
index de32778026fbad9c6158e0fc0496e3b35a21b40c..d6bf5771e8dbaf0fa09969eccc848ca5901622a7 100644
--- a/lib/l10n/af_ZA.php
+++ b/lib/l10n/af_ZA.php
@@ -1,9 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Hulp",
 "Personal" => "Persoonlik",
 "Settings" => "Instellings",
 "Users" => "Gebruikers",
-"Apps" => "Toepassings",
 "Admin" => "Admin",
-"web services under your control" => "webdienste onder jou beheer"
+"web services under your control" => "webdienste onder jou beheer",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 107b27a1fc861333ac41c7a863e2dad3551f7f04..2e95f28841e54362aa4efb18bf7b8d97c29a4b6c 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©",
 "Personal" => "Ø´Ø®ØµÙŠ",
 "Settings" => "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª",
 "Users" => "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†",
-"Apps" => "Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª",
 "Admin" => "Ø§Ù„Ù…Ø¯ÙŠØ±",
 "web services under your control" => "Ø®Ø¯Ù…Ø§Øª Ø§Ù„Ø´Ø¨ÙƒØ© ØªØØª Ø³ÙŠØ·Ø±ØªÙƒ",
 "ZIP download is turned off." => "ØªØÙ…ÙŠÙ„ Ù…Ù„ÙØ§Øª ZIP Ù…ØªÙˆÙ‚Ù",
@@ -37,16 +37,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø®Ø§Ø¯Ù…Ùƒ ØºÙŠØ± ØµØÙŠØØ© Ø¨Ø´ÙƒÙ„ ØªØ³Ù…Ø Ù„Ùƒ Ø¨Ù…Ø²Ø§Ù…Ù†Ø© Ù…Ù„ÙØ§ØªÙƒ ÙˆØ°Ù„Ùƒ Ø¨Ø³Ø¨Ø¨ Ø£Ù† ÙˆØ§Ø¬Ù‡Ø© WebDAV ØªØ¨Ø¯Ùˆ Ù…Ø¹Ø·Ù„Ø©",
 "Please double check the <a href='%s'>installation guides</a>." => "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† <a href='%s'>Ø¯Ù„ÙŠÙ„ Ø§Ù„ØªÙ†ØµÙŠØ¨</a>.",
 "seconds ago" => "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ",
-"1 minute ago" => "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©",
-"%d minutes ago" => "%d Ø¯Ù‚ÙŠÙ‚Ø© Ù…Ø¶Øª",
-"1 hour ago" => "Ù‚Ø¨Ù„ Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
-"%d hours ago" => "%d Ø³Ø§Ø¹Ø© Ù…Ø¶Øª",
+"_%n minute ago_::_%n minutes ago_" => array("","","","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","","","",""),
 "today" => "Ø§Ù„ÙŠÙˆÙ…",
 "yesterday" => "ÙŠÙˆÙ… Ø£Ù…Ø³",
-"%d days ago" => "%d ÙŠÙˆÙ… Ù…Ø¶Ù‰",
+"_%n day go_::_%n days ago_" => array("","","","","",""),
 "last month" => "Ø§Ù„Ø´Ù‡Ø± Ø§Ù„Ù…Ø§Ø¶ÙŠ",
-"%d months ago" => "%d Ø´Ù‡Ø± Ù…Ø¶Øª",
+"_%n month ago_::_%n months ago_" => array("","","","","",""),
 "last year" => "Ø§Ù„Ø³Ù†Ø©Ø§Ù„Ù…Ø§Ø¶ÙŠØ©",
 "years ago" => "Ø³Ù†Ø© Ù…Ø¶Øª",
 "Could not find category \"%s\"" => "ØªØ¹Ø°Ø± Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø§Ù„Ù…Ø¬Ù„Ø¯ \"%s\""
 );
+$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;";
diff --git a/lib/l10n/be.php b/lib/l10n/be.php
new file mode 100644
index 0000000000000000000000000000000000000000..1570411eb8630b92fbeaef1c55fe0a5183d450ad
--- /dev/null
+++ b/lib/l10n/be.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
+"_%n day go_::_%n days ago_" => array("","","",""),
+"_%n month ago_::_%n months ago_" => array("","","","")
+);
+$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index e23112c83025bf73744d7c9bf53049786404db9d..10d3bb610afd0137e198b6585f432f6260a6f04e 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñ‰",
 "Personal" => "Ð›Ð¸Ñ‡Ð½Ð¸",
 "Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
 "Users" => "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸",
-"Apps" => "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
 "Admin" => "ÐÐ´Ð¼Ð¸Ð½",
 "web services under your control" => "ÑƒÐµÐ± ÑƒÑÐ»ÑƒÐ³Ð¸ Ð¿Ð¾Ð´ Ð’Ð°Ñˆ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»",
 "ZIP download is turned off." => "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½ÐµÑ‚Ð¾ ÐºÐ°Ñ‚Ð¾ ZIP Ðµ Ð¸Ð·ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾.",
@@ -38,16 +38,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’Ð°ÑˆÐ¸ÑÑ‚ web ÑÑŠÑ€Ð²ÑŠÑ€ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ ÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð´Ð° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐ²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ, Ð·Ð°Ñ‰Ð¾Ñ‚Ð¾ WebDAV Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÑŠÑ‚ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸.",
 "Please double check the <a href='%s'>installation guides</a>." => "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð° ÑÐ¿Ñ€Ð°Ð²ÐºÐ° Ñ <a href='%s'>Ñ€ÑŠÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾Ñ‚Ð¾ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ</a>.",
 "seconds ago" => "Ð¿Ñ€ÐµÐ´Ð¸ ÑÐµÐºÑƒÐ½Ð´Ð¸",
-"1 minute ago" => "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
-"%d minutes ago" => "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð¸",
-"1 hour ago" => "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ñ‡Ð°Ñ",
-"%d hours ago" => "Ð¿Ñ€ÐµÐ´Ð¸ %d Ñ‡Ð°ÑÐ°",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Ð´Ð½ÐµÑ",
 "yesterday" => "Ð²Ñ‡ÐµÑ€Ð°",
-"%d days ago" => "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð´Ð½Ð¸",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†",
-"%d months ago" => "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð¼ÐµÑÐµÑ†Ð°",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°",
 "years ago" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸",
 "Could not find category \"%s\"" => "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚ÐºÑ€Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸ÑÑ‚Ð° \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php
index ab1d9b94d0dc1471ba7db57034fa680de38d9ccf..a42435a2a4729d3ba359401d25b0fad11707f834 100644
--- a/lib/l10n/bn_BD.php
+++ b/lib/l10n/bn_BD.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "à¦¸à¦¹à¦¾à§Ÿà¦¿à¦•à¦¾",
 "Personal" => "à¦¬à§à¦¯à¦•à§à¦¤à¦¿à¦—à¦¤",
 "Settings" => "à¦¨à¦¿à§Ÿà¦¾à¦®à¦•à¦¸à¦®à§‚à¦¹",
 "Users" => "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€",
-"Apps" => "à¦…à§à¦¯à¦¾à¦ª",
 "Admin" => "à¦ªà§à¦°à¦¶à¦¾à¦¸à¦¨",
 "web services under your control" => "à¦“à§Ÿà§‡à¦¬ à¦¸à¦¾à¦°à§à¦à¦¿à¦¸ à¦†à¦ªà¦¨à¦¾à¦° à¦¹à¦¾à¦¤à§‡à¦° à¦®à§à¦ à§‹à§Ÿ",
 "ZIP download is turned off." => "ZIP à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦¬à¦¨à§à¦§ à¦•à¦°à¦¾ à¦†à¦›à§‡à¥¤",
@@ -16,13 +16,14 @@
 "Files" => "à¦«à¦¾à¦‡à¦²",
 "Text" => "à¦Ÿà§‡à¦•à§à¦¸à¦Ÿ",
 "seconds ago" => "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡",
-"1 minute ago" => "à§§ à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡",
-"%d minutes ago" => "%d à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡",
-"1 hour ago" => "1 à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à¦†à¦œ",
 "yesterday" => "à¦—à¦¤à¦•à¦¾à¦²",
-"%d days ago" => "%d  à¦¦à¦¿à¦¨ à¦ªà§‚à¦°à§à¦¬à§‡",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "à¦—à¦¤ à¦®à¦¾à¦¸",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "à¦—à¦¤ à¦¬à¦›à¦°",
 "years ago" => "à¦¬à¦›à¦° à¦ªà§‚à¦°à§à¦¬à§‡"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bs.php b/lib/l10n/bs.php
new file mode 100644
index 0000000000000000000000000000000000000000..3cb98906e623a59a4dc0ee42739b3e245c8a1470
--- /dev/null
+++ b/lib/l10n/bs.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
+);
+$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);";
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 93f7fa5f7bc456516f72740777f8aaece7b94414..95faed498cd2638ce6eb522d31d3dacc07ca82ec 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ajuda",
 "Personal" => "Personal",
 "Settings" => "ConfiguraciÃ³",
 "Users" => "Usuaris",
-"Apps" => "Aplicacions",
 "Admin" => "AdministraciÃ³",
+"Failed to upgrade \"%s\"." => "Ha fallat l'actualitzaciÃ³ \"%s\".",
 "web services under your control" => "controleu els vostres serveis web",
+"cannot open \"%s\"" => "no es pot obrir \"%s\"",
 "ZIP download is turned off." => "La baixada en ZIP estÃ  desactivada.",
 "Files need to be downloaded one by one." => "Els fitxers s'han de baixar d'un en un.",
 "Back to Files" => "Torna a Fitxers",
 "Selected files too large to generate zip file." => "Els fitxers seleccionats son massa grans per generar un fitxer zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador.",
 "couldn't be determined" => "no s'ha pogut determinar",
 "Application is not enabled" => "L'aplicaciÃ³ no estÃ  habilitada",
 "Authentication error" => "Error d'autenticaciÃ³",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no estÃ  configurat correctament per permetre la sincronitzaciÃ³ de fitxers perquÃ¨ la interfÃcie WebDAV sembla no funcionar correctament.",
 "Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instalÂ·laciÃ³</a>.",
 "seconds ago" => "segons enrere",
-"1 minute ago" => "fa 1 minut",
-"%d minutes ago" => "fa %d minuts",
-"1 hour ago" => "fa 1 hora",
-"%d hours ago" => "fa %d hores",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "avui",
 "yesterday" => "ahir",
-"%d days ago" => "fa %d dies",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "el mes passat",
-"%d months ago" => "fa %d mesos",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "l'any passat",
 "years ago" => "anys enrere",
+"Caused by:" => "Provocat per:",
 "Could not find category \"%s\"" => "No s'ha trobat la categoria \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 917f383bb8989bb7c1e6ee041a7626523276c821..ec54376024d748641efb7124cc66e147f8f6faa2 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "NÃ¡povÄ›da",
 "Personal" => "OsobnÃ",
 "Settings" => "NastavenÃ",
 "Users" => "UÅ¾ivatelÃ©",
-"Apps" => "Aplikace",
 "Admin" => "Administrace",
-"web services under your control" => "sluÅ¾by webu pod VaÅ¡Ã kontrolou",
-"ZIP download is turned off." => "StahovÃ¡nÃ ZIPu je vypnuto.",
+"Failed to upgrade \"%s\"." => "Selhala aktualizace verze \"%s\".",
+"web services under your control" => "webovÃ© sluÅ¾by pod VaÅ¡Ã kontrolou",
+"cannot open \"%s\"" => "nelze otevÅ™Ãt \"%s\"",
+"ZIP download is turned off." => "StahovÃ¡nÃ v ZIPu je vypnuto.",
 "Files need to be downloaded one by one." => "Soubory musÃ bÃ½t stahovÃ¡ny jednotlivÄ›.",
 "Back to Files" => "ZpÄ›t k souborÅ¯m",
-"Selected files too large to generate zip file." => "VybranÃ© soubory jsou pÅ™ÃliÅ¡ velkÃ© pro vytvoÅ™enÃ zip souboru.",
+"Selected files too large to generate zip file." => "VybranÃ© soubory jsou pÅ™ÃliÅ¡ velkÃ© pro vytvoÅ™enÃ ZIP souboru.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "StÃ¡hnÄ›te soubory po menÅ¡Ãch ÄÃ¡stech, samostatnÄ›, nebo se obraÅ¥te na sprÃ¡vce.",
 "couldn't be determined" => "nelze zjistit",
 "Application is not enabled" => "Aplikace nenÃ povolena",
 "Authentication error" => "Chyba ovÄ›Å™enÃ",
@@ -20,34 +23,34 @@
 "%s enter the database username." => "Zadejte uÅ¾ivatelskÃ© jmÃ©no %s databÃ¡ze.",
 "%s enter the database name." => "Zadejte nÃ¡zev databÃ¡ze pro %s databÃ¡ze.",
 "%s you may not use dots in the database name" => "V nÃ¡zvu databÃ¡ze %s nesmÃte pouÅ¾Ãvat teÄky.",
-"MS SQL username and/or password not valid: %s" => "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo MSSQL nenÃ platnÃ©: %s",
-"You need to enter either an existing account or the administrator." => "MusÃte zadat existujÃcÃ ÃºÄet, Äi sprÃ¡vce.",
-"MySQL username and/or password not valid" => "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo MySQL nenÃ platnÃ©",
-"DB Error: \"%s\"" => "Chyba DB: \"%s\"",
-"Offending command was: \"%s\"" => "PodezÅ™elÃ½ pÅ™Ãkaz byl: \"%s\"",
+"MS SQL username and/or password not valid: %s" => "UÅ¾ivatelskÃ© jmÃ©no Äi heslo MSSQL nenÃ platnÃ©: %s",
+"You need to enter either an existing account or the administrator." => "MusÃte zadat existujÃcÃ ÃºÄet Äi sprÃ¡vce.",
+"MySQL username and/or password not valid" => "UÅ¾ivatelskÃ© jmÃ©no Äi heslo MySQL nenÃ platnÃ©",
+"DB Error: \"%s\"" => "Chyba databÃ¡ze: \"%s\"",
+"Offending command was: \"%s\"" => "PÅ™ÃsluÅ¡nÃ½ pÅ™Ãkaz byl: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "UÅ¾ivatel '%s'@'localhost' jiÅ¾ v MySQL existuje.",
-"Drop this user from MySQL" => "Zahodit uÅ¾ivatele z MySQL",
+"Drop this user from MySQL" => "ZruÅ¡te tohoto uÅ¾ivatele z MySQL",
 "MySQL user '%s'@'%%' already exists" => "UÅ¾ivatel '%s'@'%%' jiÅ¾ v MySQL existuje",
-"Drop this user from MySQL." => "Zahodit uÅ¾ivatele z MySQL.",
+"Drop this user from MySQL." => "ZruÅ¡te tohoto uÅ¾ivatele z MySQL",
 "Oracle connection could not be established" => "SpojenÃ s Oracle nemohlo bÃ½t navÃ¡zÃ¡no",
-"Oracle username and/or password not valid" => "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo Oracle nenÃ platnÃ©",
-"Offending command was: \"%s\", name: %s, password: %s" => "PodezÅ™elÃ½ pÅ™Ãkaz byl: \"%s\", jmÃ©no: %s, heslo: %s",
-"PostgreSQL username and/or password not valid" => "UÅ¾ivatelskÃ© jmÃ©no, Äi heslo PostgreSQL nenÃ platnÃ©",
+"Oracle username and/or password not valid" => "UÅ¾ivatelskÃ© jmÃ©no Äi heslo Oracle nenÃ platnÃ©",
+"Offending command was: \"%s\", name: %s, password: %s" => "PÅ™ÃsluÅ¡nÃ½ pÅ™Ãkaz byl: \"%s\", jmÃ©no: %s, heslo: %s",
+"PostgreSQL username and/or password not valid" => "UÅ¾ivatelskÃ© jmÃ©no Äi heslo PostgreSQL nenÃ platnÃ©",
 "Set an admin username." => "Zadejte uÅ¾ivatelskÃ© jmÃ©no sprÃ¡vce.",
 "Set an admin password." => "Zadejte heslo sprÃ¡vce.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, protoÅ¾e rozhranÃ WebDAV je rozbitÃ©.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, rozhranÃ WebDAV se zdÃ¡ bÃ½t rozbitÃ©.",
 "Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosÃm, <a href='%s'>prÅ¯vodce instalacÃ</a>.",
-"seconds ago" => "pÅ™ed pÃ¡r vteÅ™inami",
-"1 minute ago" => "pÅ™ed minutou",
-"%d minutes ago" => "pÅ™ed %d minutami",
-"1 hour ago" => "pÅ™ed hodinou",
-"%d hours ago" => "pÅ™ed %d hodinami",
+"seconds ago" => "pÅ™ed pÃ¡r sekundami",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "dnes",
 "yesterday" => "vÄera",
-"%d days ago" => "pÅ™ed %d dny",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "minulÃ½ mÄ›sÃc",
-"%d months ago" => "PÅ™ed %d mÄ›sÃci",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "minulÃ½ rok",
 "years ago" => "pÅ™ed lety",
+"Caused by:" => "PÅ™ÃÄina:",
 "Could not find category \"%s\"" => "Nelze nalÃ©zt kategorii \"%s\""
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index 27140ba6dbbd52f1e9969e158a0bde94db2448e3..649a1ebffac0062a20d61d1b5ef7dc209cd0f3af 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Cymorth",
 "Personal" => "Personol",
 "Settings" => "Gosodiadau",
 "Users" => "Defnyddwyr",
-"Apps" => "Pecynnau",
 "Admin" => "Gweinyddu",
 "web services under your control" => "gwasanaethau gwe a reolir gennych",
 "ZIP download is turned off." => "Mae llwytho ZIP wedi ei ddiffodd.",
@@ -37,16 +37,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatÃ¡u cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
 "Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
 "seconds ago" => "eiliad yn Ã´l",
-"1 minute ago" => "1 munud yn Ã´l",
-"%d minutes ago" => "%d munud yn Ã´l",
-"1 hour ago" => "1 awr yn Ã´l",
-"%d hours ago" => "%d awr yn Ã´l",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
 "today" => "heddiw",
 "yesterday" => "ddoe",
-"%d days ago" => "%d diwrnod yn Ã´l",
+"_%n day go_::_%n days ago_" => array("","","",""),
 "last month" => "mis diwethaf",
-"%d months ago" => "%d mis yn Ã´l",
+"_%n month ago_::_%n months ago_" => array("","","",""),
 "last year" => "y llynedd",
 "years ago" => "blwyddyn yn Ã´l",
 "Could not find category \"%s\"" => "Methu canfod categori \"%s\""
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 5f11453bcdd6c78e992b9ea9eb31c2bad5a72e08..5822c925f4773e18d8d24ce54e8826fa4181c7dc 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "HjÃ¦lp",
 "Personal" => "Personligt",
 "Settings" => "Indstillinger",
 "Users" => "Brugere",
-"Apps" => "Apps",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "Upgradering af \"%s\" fejlede",
 "web services under your control" => "Webtjenester under din kontrol",
+"cannot open \"%s\"" => "Kan ikke Ã¥bne \"%s\"",
 "ZIP download is turned off." => "ZIP-download er slÃ¥et fra.",
 "Files need to be downloaded one by one." => "Filer skal downloades en for en.",
 "Back to Files" => "Tilbage til Filer",
 "Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download filerne i smÃ¥ bider, seperat, eller kontakt venligst din administrator.",
 "couldn't be determined" => "kunne ikke fastslÃ¥s",
 "Application is not enabled" => "Programmet er ikke aktiveret",
 "Authentication error" => "Adgangsfejl",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grÃ¦nsefladen virker Ã¸delagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
 "seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minut siden",
-"%d minutes ago" => "%d minutter siden",
-"1 hour ago" => "1 time siden",
-"%d hours ago" => "%d timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
-"%d days ago" => "%d dage siden",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "sidste mÃ¥ned",
-"%d months ago" => "%d mÃ¥neder siden",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "sidste Ã¥r",
 "years ago" => "Ã¥r siden",
+"Caused by:" => "ForÃ¥rsaget af:",
 "Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 4ef02402b9bc0c76e80ac9837503e1056768d284..ba43ad248ddbe76b417e67578d7e2ad1063866a2 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Hilfe",
 "Personal" => "PersÃ¶nlich",
 "Settings" => "Einstellungen",
 "Users" => "Benutzer",
-"Apps" => "Apps",
 "Admin" => "Administration",
+"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
 "web services under your control" => "Web-Services unter Deiner Kontrolle",
+"cannot open \"%s\"" => "Ã–ffnen von \"%s\" fehlgeschlagen",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien mÃ¼ssen einzeln heruntergeladen werden.",
 "Back to Files" => "ZurÃ¼ck zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewÃ¤hlten Dateien sind zu groÃŸ, um eine ZIP-Datei zu erstellen.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lade die Dateien in kleineren, separaten, StÃ¼cken herunter oder bitte deinen Administrator.",
 "couldn't be determined" => "konnte nicht festgestellt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Fehler bei der Anmeldung",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht fÃ¼r Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prÃ¼fe die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
-"1 minute ago" => "vor einer Minute",
-"%d minutes ago" => "Vor %d Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"%d hours ago" => "Vor %d Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Heute",
 "yesterday" => "Gestern",
-"%d days ago" => "Vor %d Tag(en)",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "Letzten Monat",
-"%d months ago" => "Vor %d Monaten",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
+"Caused by:" => "Verursacht durch:",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_AT.php b/lib/l10n/de_AT.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/de_AT.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..d99c144f18541a33561ebab762423c7b173a7cd4
--- /dev/null
+++ b/lib/l10n/de_CH.php
@@ -0,0 +1,56 @@
+<?php
+$TRANSLATIONS = array(
+"Help" => "Hilfe",
+"Personal" => "PersÃ¶nlich",
+"Settings" => "Einstellungen",
+"Users" => "Benutzer",
+"Admin" => "Administrator",
+"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"cannot open \"%s\"" => "Ã–ffnen von \"%s\" fehlgeschlagen",
+"ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
+"Files need to be downloaded one by one." => "Die Dateien mÃ¼ssen einzeln heruntergeladen werden.",
+"Back to Files" => "ZurÃ¼ck zu \"Dateien\"",
+"Selected files too large to generate zip file." => "Die gewÃ¤hlten Dateien sind zu gross, um eine ZIP-Datei zu erstellen.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, StÃ¼cken herunter oder bitten Sie Ihren Administrator.",
+"couldn't be determined" => "konnte nicht ermittelt werden",
+"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
+"Authentication error" => "Authentifizierungs-Fehler",
+"Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
+"Files" => "Dateien",
+"Text" => "Text",
+"Images" => "Bilder",
+"%s enter the database username." => "%s geben Sie den Datenbank-Benutzernamen an.",
+"%s enter the database name." => "%s geben Sie den Datenbank-Namen an.",
+"%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
+"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungÃ¼ltig: %s",
+"You need to enter either an existing account or the administrator." => "Sie mÃ¼ssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
+"MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungÃ¼ltig",
+"DB Error: \"%s\"" => "DB Fehler: \"%s\"",
+"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
+"Drop this user from MySQL" => "LÃ¶sche diesen Benutzer aus MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
+"Drop this user from MySQL." => "LÃ¶sche diesen Benutzer aus MySQL.",
+"Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungÃ¼ltig",
+"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungÃ¼ltig",
+"Set an admin username." => "Setze Administrator Benutzername.",
+"Set an admin password." => "Setze Administrator Passwort",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"seconds ago" => "Gerade eben",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "Heute",
+"yesterday" => "Gestern",
+"_%n day go_::_%n days ago_" => array("",""),
+"last month" => "Letzten Monat",
+"_%n month ago_::_%n months ago_" => array("",""),
+"last year" => "Letztes Jahr",
+"years ago" => "Vor  Jahren",
+"Caused by:" => "Verursacht durch:",
+"Could not find category \"%s\"" => "Die Kategorie Â«%sÂ» konnte nicht gefunden werden."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 823d423abcd533a1e7c371ac254db720c5618f88..a89c069eaab36e7ec46373b26a583624d92d7aa7 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Hilfe",
 "Personal" => "PersÃ¶nlich",
 "Settings" => "Einstellungen",
 "Users" => "Benutzer",
-"Apps" => "Apps",
 "Admin" => "Administrator",
+"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"cannot open \"%s\"" => "Ã–ffnen von \"%s\" fehlgeschlagen",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien mÃ¼ssen einzeln heruntergeladen werden.",
 "Back to Files" => "ZurÃ¼ck zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewÃ¤hlten Dateien sind zu groÃŸ, um eine ZIP-Datei zu erstellen.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, StÃ¼cken herunter oder bitten Sie Ihren Administrator.",
 "couldn't be determined" => "konnte nicht ermittelt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
-"1 minute ago" => "Vor 1 Minute",
-"%d minutes ago" => "Vor %d Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"%d hours ago" => "Vor %d Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Heute",
 "yesterday" => "Gestern",
-"%d days ago" => "Vor %d Tag(en)",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "Letzten Monat",
-"%d months ago" => "Vor %d Monaten",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor  Jahren",
+"Caused by:" => "Verursacht durch:",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 3e876aefdfec1f92f03ebd5bcba8363353112f9f..0fbd134ae92c5fce4ec112568821f9b8e765f787 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Î’Î¿Î®Î¸ÎµÎ¹Î±",
 "Personal" => "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¬",
 "Settings" => "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚",
 "Users" => "Î§ÏÎ®ÏƒÏ„ÎµÏ‚",
-"Apps" => "Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚",
 "Admin" => "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚",
+"Failed to upgrade \"%s\"." => "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î±Î½Î±Î²Î¬Î¸Î¼Î¹ÏƒÎ·Ï‚ Ï„Î¿Ï… \"%s\".",
 "web services under your control" => "Ï…Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚ Î´Î¹ÎºÏ„ÏÎ¿Ï… Ï…Ï€ÏŒ Ï„Î¿Î½ ÎÎ»ÎµÎ³Ï‡ÏŒ ÏƒÎ±Ï‚",
+"cannot open \"%s\"" => "Î±Î´Ï…Î½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±Ï„Î¿Ï‚ \"%s\"",
 "ZIP download is turned off." => "Î— Î»Î®ÏˆÎ· ZIP Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ.",
 "Files need to be downloaded one by one." => "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î»Î·Ï†Î¸Î¿ÏÎ½ ÎÎ½Î±-ÎÎ½Î±.",
 "Back to Files" => "Î Î¯ÏƒÏ‰ ÏƒÏ„Î± Î‘ÏÏ‡ÎµÎ¯Î±",
 "Selected files too large to generate zip file." => "Î¤Î± ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± ÎµÎ¯Î½Î±Î¹ Î¼ÎµÎ³Î¬Î»Î± ÏŽÏƒÏ„Îµ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸ÎµÎ¯ Î±ÏÏ‡ÎµÎ¯Î¿ zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Î›Î®ÏˆÎ· Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎµ Î¼Î¹ÎºÏÏŒÏ„ÎµÏÎ± ÎºÎ¿Î¼Î¼Î¬Ï„Î¹Î±, Ï‡Ï‰ÏÎ¹ÏƒÏ„Î¬ Î® ÏÏ‰Ï„Î®ÏƒÏ„Îµ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ÏƒÎ±Ï‚.",
 "couldn't be determined" => "Î´ÎµÎ½ Î¼Ï€Î¿ÏÎ¿ÏÏƒÎµ Î½Î± Ï€ÏÎ¿ÏƒÎ´Î¹Î¿ÏÎ¹ÏƒÎ¸ÎµÎ¯",
 "Application is not enabled" => "Î”ÎµÎ½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ Î· ÎµÏ†Î±ÏÎ¼Î¿Î³Î®",
 "Authentication error" => "Î£Ï†Î¬Î»Î¼Î± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ÏƒÎ±Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏÏ…Î¸Î¼Î¹ÏƒÏ„ÎµÎ¯ ÎºÎ±Ï„Î¬Î»Î»Î·Î»Î± ÏŽÏƒÏ„Îµ Î½Î± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î¿Î½ ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼ÏŒ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î³Î¹Î±Ï„Î¯ Î· Î´Î¹ÎµÏ€Î±Ï†Î® WebDAV Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„ÎµÏƒÏ„ÏÎ±Î¼Î¼ÎÎ½Î·.",
 "Please double check the <a href='%s'>installation guides</a>." => "Î•Î»ÎÎ³Î¾Ï„Îµ Î¾Î±Î½Î¬ Ï„Î¹Ï‚ <a href='%s'>Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚</a>.",
 "seconds ago" => "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½",
-"1 minute ago" => "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½",
-"%d minutes ago" => "%d Î»ÎµÏ€Ï„Î¬ Ï€ÏÎ¹Î½",
-"1 hour ago" => "1 ÏŽÏÎ± Ï€ÏÎ¹Î½",
-"%d hours ago" => "%d ÏŽÏÎµÏ‚ Ï€ÏÎ¹Î½",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "ÏƒÎ®Î¼ÎµÏÎ±",
 "yesterday" => "Ï‡Ï„ÎµÏ‚",
-"%d days ago" => "%d Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±",
-"%d months ago" => "%d Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿",
 "years ago" => "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½",
+"Caused by:" => "Î ÏÎ¿ÎºÎ»Î®Î¸Î·ÎºÎµ Î±Ï€ÏŒ:",
 "Could not find category \"%s\"" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏÏÎµÏƒÎ·Ï‚ ÎºÎ±Ï„Î·Î³Î¿ÏÎ¯Î±Ï‚ \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en@pirate.php b/lib/l10n/en@pirate.php
index 02ff0331e0513195a656150f57f4da764945a17d..a8175b1400f397396cd3cea4d8a5d1bf6cd0b641 100644
--- a/lib/l10n/en@pirate.php
+++ b/lib/l10n/en@pirate.php
@@ -1,3 +1,9 @@
-<?php $TRANSLATIONS = array(
-"web services under your control" => "web services under your control"
+<?php
+$TRANSLATIONS = array(
+"web services under your control" => "web services under your control",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index fd45f30c69bf1197dff7e7ada28b7c6ded7dee05..5311dd6eb159722129f1b0c44c01cddc5344592c 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Helpo",
 "Personal" => "Persona",
 "Settings" => "Agordo",
 "Users" => "Uzantoj",
-"Apps" => "AplikaÄµoj",
 "Admin" => "Administranto",
 "web services under your control" => "TTT-servoj regataj de vi",
 "ZIP download is turned off." => "ZIP-elÅuto estas malkapabligita.",
@@ -34,16 +34,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraÅ ne Äuste agordiÄis por permesi sinkronigi dosierojn Ä‰ar la WebDAV-interfaco Åajnas rompita.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
 "seconds ago" => "sekundoj antaÅe",
-"1 minute ago" => "antaÅ 1 minuto",
-"%d minutes ago" => "antaÅ %d minutoj",
-"1 hour ago" => "antaÅ 1 horo",
-"%d hours ago" => "antaÅ %d horoj",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hodiaÅ",
 "yesterday" => "hieraÅ",
-"%d days ago" => "antaÅ %d tagoj",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "lastamonate",
-"%d months ago" => "antaÅ %d monatoj",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "lastajare",
 "years ago" => "jaroj antaÅe",
 "Could not find category \"%s\"" => "Ne troviÄis kategorio â€œ%sâ€"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 1f243a224e41e15c1ab24aca67b8c92fbd5299b3..2029c9b17fef3591db7316465ee2cebc7079013e 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ayuda",
 "Personal" => "Personal",
 "Settings" => "Ajustes",
 "Users" => "Usuarios",
-"Apps" => "Aplicaciones",
 "Admin" => "AdministraciÃ³n",
+"Failed to upgrade \"%s\"." => "FallÃ³ la actualizaciÃ³n \"%s\".",
 "web services under your control" => "Servicios web bajo su control",
+"cannot open \"%s\"" => "No se puede abrir \"%s\"",
 "ZIP download is turned off." => "La descarga en ZIP estÃ¡ desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
 "Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue los archivos en trozos mÃ¡s pequeÃ±os, por separado o solicÃtelos amablemente su administrador.",
 "couldn't be determined" => "no pudo ser determinado",
 "Application is not enabled" => "La aplicaciÃ³n no estÃ¡ habilitada",
 "Authentication error" => "Error de autenticaciÃ³n",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aÃºn no estÃ¡ configurado adecuadamente para permitir sincronizaciÃ³n de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guÃas de instalaciÃ³n</a>.",
 "seconds ago" => "hace segundos",
-"1 minute ago" => "hace 1 minuto",
-"%d minutes ago" => "hace %d minutos",
-"1 hour ago" => "Hace 1 hora",
-"%d hours ago" => "Hace %d horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoy",
 "yesterday" => "ayer",
-"%d days ago" => "hace %d dÃas",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "mes pasado",
-"%d months ago" => "Hace %d meses",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "aÃ±o pasado",
 "years ago" => "hace aÃ±os",
+"Caused by:" => "Causado por:",
 "Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index e66771f7e747eec8e7967969ad987129269f3be3..0632c7540526f75264b6896d1b9913ee3f7ee83e 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -1,53 +1,56 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ayuda",
 "Personal" => "Personal",
 "Settings" => "ConfiguraciÃ³n",
 "Users" => "Usuarios",
-"Apps" => "Aplicaciones",
 "Admin" => "AdministraciÃ³n",
-"web services under your control" => "servicios web que controlÃ¡s",
+"Failed to upgrade \"%s\"." => "No se pudo actualizar \"%s\".",
+"web services under your control" => "servicios web sobre los que tenÃ©s control",
+"cannot open \"%s\"" => "no se puede abrir \"%s\"",
 "ZIP download is turned off." => "La descarga en ZIP estÃ¡ desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados de a uno.",
-"Back to Files" => "Volver a archivos",
+"Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
-"couldn't be determined" => "no pudo ser determinado",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "DescargÃ¡ los archivos en partes mÃ¡s chicas, de forma separada, o pedÃselos al administrador",
+"couldn't be determined" => "no se pudo determinar",
 "Application is not enabled" => "La aplicaciÃ³n no estÃ¡ habilitada",
 "Authentication error" => "Error al autenticar",
 "Token expired. Please reload page." => "Token expirado. Por favor, recargÃ¡ la pÃ¡gina.",
 "Files" => "Archivos",
 "Text" => "Texto",
 "Images" => "ImÃ¡genes",
-"%s enter the database username." => "%s Entre el Usuario de la Base de Datos",
-"%s enter the database name." => "%s Entre el Nombre de la Base de Datos",
-"%s you may not use dots in the database name" => "%s no puede usar puntos en el nombre de la Base de Datos",
+"%s enter the database username." => "%s EntrÃ¡ el usuario de la base de datos",
+"%s enter the database name." => "%s EntrÃ¡ el nombre de la base de datos.",
+"%s you may not use dots in the database name" => "%s no podÃ©s usar puntos en el nombre de la base de datos",
 "MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseÃ±a de MS SQL no son vÃ¡lidas: %s",
-"You need to enter either an existing account or the administrator." => "Debe ingresar una cuenta existente o el administrador",
+"You need to enter either an existing account or the administrator." => "TenÃ©s que ingresar una cuenta existente o el administrador.",
 "MySQL username and/or password not valid" => "Usuario y/o contraseÃ±a MySQL no vÃ¡lido",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
 "Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existente",
+"MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existe.",
 "Drop this user from MySQL" => "Borrar este usuario de MySQL",
-"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existente",
+"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
 "Drop this user from MySQL." => "Borrar este usuario de MySQL",
 "Oracle connection could not be established" => "No fue posible establecer la conexiÃ³n a Oracle",
-"Oracle username and/or password not valid" => "El nombre de usuario y contraseÃ±a no son vÃ¡lidos",
+"Oracle username and/or password not valid" => "El nombre de usuario y/o contraseÃ±a no son vÃ¡lidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseÃ±a: \"%s\"",
-"PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseÃ±a de PostgradeSQL no vÃ¡lido.",
-"Set an admin username." => "Configurar un nombre de administrador",
-"Set an admin password." => "Configurar una palabra clave de administrador",
+"PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseÃ±a PostgradeSQL invÃ¡lido.",
+"Set an admin username." => "Configurar un nombre de administrador.",
+"Set an admin password." => "Configurar una contraseÃ±a de administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no estÃ¡ configurado todavÃa para permitir sincronizaciÃ³n de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobÃ¡ nuevamente la <a href='%s'>guÃa de instalaciÃ³n</a>.",
 "seconds ago" => "segundos atrÃ¡s",
-"1 minute ago" => "hace 1 minuto",
-"%d minutes ago" => "hace %d minutos",
-"1 hour ago" => "1 hora atrÃ¡s",
-"%d hours ago" => "%d horas atrÃ¡s",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoy",
 "yesterday" => "ayer",
-"%d days ago" => "hace %d dÃas",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "el mes pasado",
-"%d months ago" => "%d meses atrÃ¡s",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "el aÃ±o pasado",
 "years ago" => "aÃ±os atrÃ¡s",
+"Caused by:" => "Provocado por:",
 "Could not find category \"%s\"" => "No fue posible encontrar la categorÃa \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 4da2c36d6acc508824d08c520db3054b61e8d58e..a7d823a62c1819498a1767a760f3526c6c4b6deb 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Abiinfo",
 "Personal" => "Isiklik",
 "Settings" => "Seaded",
 "Users" => "Kasutajad",
-"Apps" => "Rakendused",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "EbaÃµnnestunud uuendus \"%s\".",
 "web services under your control" => "veebitenused sinu kontrolli all",
+"cannot open \"%s\"" => "ei suuda avada \"%s\"",
 "ZIP download is turned off." => "ZIP-ina allalaadimine on vÃ¤lja lÃ¼litatud.",
 "Files need to be downloaded one by one." => "Failid tuleb alla laadida Ã¼kshaaval.",
 "Back to Files" => "Tagasi failide juurde",
 "Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laadi failid alla eraldi vÃ¤iksemate osadena vÃµi kÃ¼si nÃµu oma sÃ¼steemiadminstraatorilt.",
 "couldn't be determined" => "ei suudetud tuvastada",
 "Application is not enabled" => "Rakendus pole sisse lÃ¼litatud",
 "Authentication error" => "Autentimise viga",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud vÃµimaldamaks failide sÃ¼nkroniseerimist, kuna WebDAV liides nÃ¤ib olevat mittetoimiv.",
 "Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
 "seconds ago" => "sekundit tagasi",
-"1 minute ago" => "1 minut tagasi",
-"%d minutes ago" => "%d minutit tagasi",
-"1 hour ago" => "1 tund tagasi",
-"%d hours ago" => "%d tundi tagasi",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "tÃ¤na",
 "yesterday" => "eile",
-"%d days ago" => "%d pÃ¤eva tagasi",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "viimasel kuul",
-"%d months ago" => "%d kuud tagasi",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
+"Caused by:" => "PÃµhjustaja:",
 "Could not find category \"%s\"" => "Ei leia kategooriat \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 028ad0a631efc08673ddd56cfbfd04360cd0428b..c5ce243f2fae321b384aa80a42183c66bad2e616 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Laguntza",
 "Personal" => "Pertsonala",
 "Settings" => "Ezarpenak",
 "Users" => "Erabiltzaileak",
-"Apps" => "Aplikazioak",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "Ezin izan da \"%s\" eguneratu.",
 "web services under your control" => "web zerbitzuak zure kontrolpean",
+"cannot open \"%s\"" => "ezin da \"%s\" ireki",
 "ZIP download is turned off." => "ZIP deskarga ez dago gaituta.",
 "Files need to be downloaded one by one." => "Fitxategiak banan-banan deskargatu behar dira.",
 "Back to Files" => "Itzuli fitxategietara",
 "Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari",
 "couldn't be determined" => "ezin izan da zehaztu",
 "Application is not enabled" => "Aplikazioa ez dago gaituta",
 "Authentication error" => "Autentifikazio errorea",
@@ -29,6 +32,7 @@
 "Drop this user from MySQL" => "Ezabatu erabiltzaile hau MySQLtik",
 "MySQL user '%s'@'%%' already exists" => "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da",
 "Drop this user from MySQL." => "Ezabatu erabiltzaile hau MySQLtik.",
+"Oracle connection could not be established" => "Ezin da Oracle konexioa sortu",
 "Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
 "PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
@@ -37,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
 "Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
 "seconds ago" => "segundu",
-"1 minute ago" => "orain dela minutu 1",
-"%d minutes ago" => "orain dela %d minutu",
-"1 hour ago" => "orain dela ordu bat",
-"%d hours ago" => "orain dela %d ordu",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "gaur",
 "yesterday" => "atzo",
-"%d days ago" => "orain dela %d egun",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "joan den hilabetean",
-"%d months ago" => "orain dela %d hilabete",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "joan den urtean",
 "years ago" => "urte",
+"Caused by:" => "Honek eraginda:",
 "Could not find category \"%s\"" => "Ezin da \"%s\" kategoria aurkitu"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index a74188f62834f6ec97a1a9425700cc57741c0544..e2d8ed50aa34feaa92fc99a1c4d48f87234c7ba7 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ø±Ø§Ù‡â€ŒÙ†Ù…Ø§",
 "Personal" => "Ø´Ø®ØµÛŒ",
 "Settings" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
 "Users" => "Ú©Ø§Ø±Ø¨Ø±Ø§Ù†",
-"Apps" => "  Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§",
 "Admin" => "Ù…Ø¯ÛŒØ±",
 "web services under your control" => "Ø³Ø±ÙˆÛŒØ³ Ù‡Ø§ÛŒ ØªØØª ÙˆØ¨ Ø¯Ø± Ú©Ù†ØªØ±Ù„ Ø´Ù…Ø§",
 "ZIP download is turned off." => "Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø¨Ù‡ ØµÙˆØ±Øª ÙØ´Ø±Ø¯Ù‡ ØºÛŒØ± ÙØ¹Ø§Ù„ Ø§Ø³Øª",
@@ -24,28 +24,29 @@
 "You need to enter either an existing account or the administrator." => "Ø´Ù…Ø§ Ù†ÛŒØ§Ø² Ø¨Ù‡ ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† ÛŒÚ© ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø±ÛŒ Ù…ÙˆØ¬ÙˆØ¯ ÛŒØ§ ØØ³Ø§Ø¨ Ù…Ø¯ÛŒØ±ÛŒØªÛŒ Ø¯Ø§Ø±ÛŒØ¯.",
 "MySQL username and/or password not valid" => "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ùˆ / ÛŒØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± MySQL  Ù…Ø¹ØªØ¨Ø± Ù†ÛŒØ³Øª.",
 "DB Error: \"%s\"" => "Ø®Ø·Ø§ÛŒ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡: \"%s\"",
+"Offending command was: \"%s\"" => "Ø¯Ø³ØªÙˆØ± Ù…ØªØ®Ù„Ù Ø¹Ø¨Ø§Ø±Øª Ø§Ø³Øª Ø§Ø²: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "Ú©Ø§Ø±Ø¨Ø±MySQL '%s'@'localhost' Ø¯Ø±ØØ§Ù„ ØØ§Ø¶Ø± Ù…ÙˆØ¬ÙˆØ¯ Ø§Ø³Øª.",
 "Drop this user from MySQL" => "Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø§Ø² MySQL ØØ°Ù Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "MySQL user '%s'@'%%' already exists" => "Ú©Ø§Ø±Ø¨Ø±'%s'@'%%'  MySQL  Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± Ù…ÙˆØ¬ÙˆØ¯ Ø§Ø³Øª.",
 "Drop this user from MySQL." => "Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø§Ø² MySQL ØØ°Ù Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "Oracle connection could not be established" => "Ø§Ø±ØªØ¨Ø§Ø· Ø§Ø±Ø§Ú©Ù„ Ù†Ù…ÛŒØªÙˆØ§Ù†Ø¯ Ø¨Ø±Ù‚Ø±Ø§Ø± Ø¨Ø§Ø´Ø¯.",
 "Oracle username and/or password not valid" => "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ùˆ / ÛŒØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø§Ø±Ø§Ú©Ù„ Ù…Ø¹ØªØ¨Ø± Ù†ÛŒØ³Øª.",
+"Offending command was: \"%s\", name: %s, password: %s" => "Ø¯Ø³ØªÙˆØ± Ù…ØªØ®Ù„Ù Ø¹Ø¨Ø§Ø±Øª Ø§Ø³Øª Ø§Ø²: \"%s\"ØŒ Ù†Ø§Ù…: \"%s\"ØŒ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ±:\"%s\"",
 "PostgreSQL username and/or password not valid" => "PostgreSQL Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ùˆ / ÛŒØ§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ù…Ø¹ØªØ¨Ø± Ù†ÛŒØ³Øª.",
 "Set an admin username." => "ÛŒÚ© Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ± ØªÙ†Ø¸ÛŒÙ… Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "Set an admin password." => "ÛŒÚ© Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ± ØªÙ†Ø¸ÛŒÙ… Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù‡Ù…Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ Ø±Ø§ Ø¨Ø¯Ù‡Ø¯ Ø²ÛŒØ±Ø§ Ø¨Ù‡ Ù†Ø¸Ø± Ù…ÛŒØ±Ø³Ø¯ Ø±Ø§Ø¨Ø· WebDAV Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ù„Ø·ÙØ§Ù‹ Ø¯ÙˆØ¨Ø§Ø±Ù‡ <a href='%s'>Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒ Ù†ØµØ¨</a>Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯.",
 "seconds ago" => "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´",
-"1 minute ago" => "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
-"%d minutes ago" => "%d Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
-"1 hour ago" => "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´",
-"%d hours ago" => "%d Ø³Ø§Ø¹Øª Ù¾ÛŒØ´",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "Ø§Ù…Ø±ÙˆØ²",
 "yesterday" => "Ø¯ÛŒØ±ÙˆØ²",
-"%d days ago" => "%d Ø±ÙˆØ²  Ù¾ÛŒØ´",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "Ù…Ø§Ù‡ Ù‚Ø¨Ù„",
-"%d months ago" => "%dÙ…Ø§Ù‡ Ù¾ÛŒØ´",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "Ø³Ø§Ù„ Ù‚Ø¨Ù„",
 "years ago" => "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„",
 "Could not find category \"%s\"" => "Ø¯Ø³ØªÙ‡ Ø¨Ù†Ø¯ÛŒ %s ÛŒØ§ÙØª Ù†Ø´Ø¯"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/fi.php b/lib/l10n/fi.php
index daaddb25e48f83ccb62f74982992765348296cae..ac1f80a8f738f26db3c05aebbb7e85f22dbaf51f 100644
--- a/lib/l10n/fi.php
+++ b/lib/l10n/fi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "asetukset"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 75576c3034dc59edf81d50ef96a3d6d73139486e..0efef0c61b1a88423b8bdf803a7303d757fb242b 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ohje",
 "Personal" => "HenkilÃ¶kohtainen",
 "Settings" => "Asetukset",
 "Users" => "KÃ¤yttÃ¤jÃ¤t",
-"Apps" => "Sovellukset",
 "Admin" => "YllÃ¤pitÃ¤jÃ¤",
 "web services under your control" => "verkkopalvelut hallinnassasi",
 "ZIP download is turned off." => "ZIP-lataus on poistettu kÃ¤ytÃ¶stÃ¤.",
@@ -34,16 +34,15 @@
 "Set an admin password." => "Aseta yllÃ¤pitÃ¤jÃ¤n salasana.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
 "seconds ago" => "sekuntia sitten",
-"1 minute ago" => "1 minuutti sitten",
-"%d minutes ago" => "%d minuuttia sitten",
-"1 hour ago" => "1 tunti sitten",
-"%d hours ago" => "%d tuntia sitten",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "tÃ¤nÃ¤Ã¤n",
 "yesterday" => "eilen",
-"%d days ago" => "%d pÃ¤ivÃ¤Ã¤ sitten",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "viime kuussa",
-"%d months ago" => "%d kuukautta sitten",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
 "Could not find category \"%s\"" => "Luokkaa \"%s\" ei lÃ¶ytynyt"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 9f30b60269654c19a585217b72ae0d80483b48ee..0a040bb9e8e66c4c82948fb2d27ee7de13862b47 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Aide",
 "Personal" => "Personnel",
 "Settings" => "ParamÃ¨tres",
 "Users" => "Utilisateurs",
-"Apps" => "Applications",
 "Admin" => "Administration",
 "web services under your control" => "services web sous votre contrÃ´le",
 "ZIP download is turned off." => "TÃ©lÃ©chargement ZIP dÃ©sactivÃ©.",
@@ -38,16 +38,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configurÃ© pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
 "Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous rÃ©fÃ©rer au <a href='%s'>guide d'installation</a>.",
 "seconds ago" => "il y a quelques secondes",
-"1 minute ago" => "il y a une minute",
-"%d minutes ago" => "il y a %d minutes",
-"1 hour ago" => "Il y a une heure",
-"%d hours ago" => "Il y a %d heures",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "aujourd'hui",
 "yesterday" => "hier",
-"%d days ago" => "il y a %d jours",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "le mois dernier",
-"%d months ago" => "Il y a %d mois",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "l'annÃ©e derniÃ¨re",
 "years ago" => "il y a plusieurs annÃ©es",
 "Could not find category \"%s\"" => "Impossible de trouver la catÃ©gorie \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 351f18c715588f9a45bbb25e0ab3f09331f6bafc..085fd7272da37c1c90ffe7ecebcc1d005684075b 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Axuda",
 "Personal" => "Persoal",
 "Settings" => "Axustes",
 "Users" => "Usuarios",
-"Apps" => "Aplicativos",
 "Admin" => "AdministraciÃ³n",
+"Failed to upgrade \"%s\"." => "Non foi posÃbel anovar Â«%sÂ».",
 "web services under your control" => "servizos web baixo o seu control",
+"cannot open \"%s\"" => "non foi posÃbel abrir Â«%sÂ»",
 "ZIP download is turned off." => "As descargas ZIP estÃ¡n desactivadas.",
 "Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados dun en un.",
 "Back to Files" => "Volver aos ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue os ficheiros en cachos mÃ¡is pequenos e por separado, ou pÃdallos amabelmente ao seu administrador.",
 "couldn't be determined" => "non foi posÃbel determinalo",
 "Application is not enabled" => "O aplicativo non estÃ¡ activado",
 "Authentication error" => "Produciuse un erro de autenticaciÃ³n",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non estÃ¡ aÃnda configurado adecuadamente para permitir a sincronizaciÃ³n de ficheiros xa que semella que a interface WebDAV non estÃ¡ a funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guÃas de instalaciÃ³n</a>",
 "seconds ago" => "segundos atrÃ¡s",
-"1 minute ago" => "hai 1 minuto",
-"%d minutes ago" => "hai %d minutos",
-"1 hour ago" => "Vai 1 hora",
-"%d hours ago" => "Vai %d horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoxe",
 "yesterday" => "onte",
-"%d days ago" => "hai %d dÃas",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "Ãºltimo mes",
-"%d months ago" => "Vai %d meses",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Ãºltimo ano",
 "years ago" => "anos atrÃ¡s",
+"Caused by:" => "Causado por:",
 "Could not find category \"%s\"" => "Non foi posÃbel atopar a categorÃa Â«%sÂ»"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 2e011e342a07d923cc0902c68e71758e6251bad1..bab1a6ff42499711a367ac55571361564bf4a0fe 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "×¢×–×¨×”",
 "Personal" => "××™×©×™",
 "Settings" => "×”×’×“×¨×•×ª",
 "Users" => "×ž×©×ª×ž×©×™×",
-"Apps" => "×™×™×©×•×ž×™×",
 "Admin" => "×ž× ×”×œ",
 "web services under your control" => "×©×™×¨×•×ª×™ ×¨×©×ª ×ª×—×ª ×”×©×œ×™×˜×” ×©×œ×š",
 "ZIP download is turned off." => "×”×•×¨×“×ª ZIP ×›×‘×•×™×”",
@@ -19,16 +19,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "×©×¨×ª ×”××™× ×˜×¨× ×˜ ×©×œ×š ××™× ×• ×ž×•×’×“×¨ ×œ×¦×•×¨×›×™ ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ ×›×™×•×•×Ÿ ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• ×ª×§×™×Ÿ.",
 "Please double check the <a href='%s'>installation guides</a>." => "× × ×œ×¢×™×™×Ÿ ×©×•×‘ ×‘<a href='%s'>×ž×“×¨×™×›×™ ×”×”×ª×§× ×”</a>.",
 "seconds ago" => "×©× ×™×•×ª",
-"1 minute ago" => "×œ×¤× ×™ ×“×§×” ××—×ª",
-"%d minutes ago" => "×œ×¤× ×™ %d ×“×§×•×ª",
-"1 hour ago" => "×œ×¤× ×™ ×©×¢×”",
-"%d hours ago" => "×œ×¤× ×™ %d ×©×¢×•×ª",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "×”×™×•×",
 "yesterday" => "××ª×ž×•×œ",
-"%d days ago" => "×œ×¤× ×™ %d ×™×ž×™×",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "×—×•×“×© ×©×¢×‘×¨",
-"%d months ago" => "×œ×¤× ×™ %d ×—×•×“×©×™×",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "×©× ×” ×©×¢×‘×¨×”",
 "years ago" => "×©× ×™×",
 "Could not find category \"%s\"" => "×œ× × ×™×ª×Ÿ ×œ×ž×¦×•× ××ª ×”×§×˜×’×•×¨×™×” â€ž%sâ€œ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hi.php b/lib/l10n/hi.php
index f507993f494c76d4035c2df996be026801af2130..039dfa4465d96c001ae18f2339313e1db0e20087 100644
--- a/lib/l10n/hi.php
+++ b/lib/l10n/hi.php
@@ -1,7 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "à¤¸à¤¹à¤¯à¥‹à¤—",
 "Personal" => "à¤¯à¤•à¥à¤¤à¤¿à¤—à¤¤",
 "Settings" => "à¤¸à¥‡à¤Ÿà¤¿à¤‚à¤—à¥à¤¸",
 "Users" => "à¤‰à¤ªà¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾",
-"Apps" => "Apps"
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php
index 41c34d3108cafab4f3795a0b2aa0c5f613f89f0e..d217f924099cd86f4a041ceb06aa9141646e9993 100644
--- a/lib/l10n/hr.php
+++ b/lib/l10n/hr.php
@@ -1,18 +1,23 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "PomoÄ‡",
 "Personal" => "Osobno",
 "Settings" => "Postavke",
 "Users" => "Korisnici",
-"Apps" => "Aplikacije",
 "Admin" => "Administrator",
 "web services under your control" => "web usluge pod vaÅ¡om kontrolom",
 "Authentication error" => "GreÅ¡ka kod autorizacije",
 "Files" => "Datoteke",
 "Text" => "Tekst",
 "seconds ago" => "sekundi prije",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "danas",
 "yesterday" => "juÄer",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "proÅ¡li mjesec",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "proÅ¡lu godinu",
 "years ago" => "godina"
 );
+$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;";
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 3aa04274fa3a7db07fd3bcf58ab037920684c543..c8aff3add724eaaac87f220581fdc6a7cf468d0b 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "SÃºgÃ³",
 "Personal" => "SzemÃ©lyes",
 "Settings" => "BeÃ¡llÃtÃ¡sok",
 "Users" => "FelhasznÃ¡lÃ³k",
-"Apps" => "AlkalmazÃ¡sok",
 "Admin" => "AdminsztrÃ¡ciÃ³",
+"Failed to upgrade \"%s\"." => "Sikertelen FrissÃtÃ©s \"%s\".",
 "web services under your control" => "webszolgÃ¡ltatÃ¡sok sajÃ¡t kÃ©zben",
+"cannot open \"%s\"" => "nem sikerÃ¼lt megnyitni \"%s\"",
 "ZIP download is turned off." => "A ZIP-letÃ¶ltÃ©s nincs engedÃ©lyezve.",
 "Files need to be downloaded one by one." => "A fÃ¡jlokat egyenkÃ©nt kell letÃ¶lteni.",
 "Back to Files" => "Vissza a FÃ¡jlokhoz",
 "Selected files too large to generate zip file." => "A kivÃ¡lasztott fÃ¡jlok tÃºl nagyok a zip tÃ¶mÃ¶rÃtÃ©shez.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "TÃ¶lts le a fileokat kisebb chunkokban, kÃ¶lÃ¼n vagy kÃ©rj segitsÃ©get a rendszergazdÃ¡dtÃ³l.",
 "couldn't be determined" => "nem hatÃ¡rozhatÃ³ meg",
 "Application is not enabled" => "Az alkalmazÃ¡s nincs engedÃ©lyezve",
 "Authentication error" => "AzonosÃtÃ¡si hiba",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ã–n webkiszolgÃ¡lÃ³ja nincs megfelelÅ‘en beÃ¡llÃtva az Ã¡llomÃ¡nyok szinkronizÃ¡lÃ¡sÃ¡hoz, mert a WebDAV-elÃ©rÃ©s Ãºgy tÅ±nik, nem mÅ±kÃ¶dik.",
 "Please double check the <a href='%s'>installation guides</a>." => "KÃ©rjÃ¼k tÃ¼zetesen tanulmÃ¡nyozza Ã¡t a <a href='%s'>telepÃtÃ©si ÃºtmutatÃ³t</a>.",
 "seconds ago" => "pÃ¡r mÃ¡sodperce",
-"1 minute ago" => "1 perce",
-"%d minutes ago" => "%d perce",
-"1 hour ago" => "1 Ã³rÃ¡ja",
-"%d hours ago" => "%d Ã³rÃ¡ja",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "ma",
 "yesterday" => "tegnap",
-"%d days ago" => "%d napja",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "mÃºlt hÃ³napban",
-"%d months ago" => "%d hÃ³napja",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "tavaly",
 "years ago" => "tÃ¶bb Ã©ve",
+"Caused by:" => "Okozta:",
 "Could not find category \"%s\"" => "Ez a kategÃ³ria nem talÃ¡lhatÃ³: \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hy.php b/lib/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/hy.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
index e5f6e3ddf581c438612c158c524950ca50166836..34f43bc424a641fac3dfc07db3b8548b051e354a 100644
--- a/lib/l10n/ia.php
+++ b/lib/l10n/ia.php
@@ -1,11 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Adjuta",
 "Personal" => "Personal",
 "Settings" => "Configurationes",
 "Users" => "Usatores",
-"Apps" => "Applicationes",
 "Admin" => "Administration",
 "web services under your control" => "servicios web sub tu controlo",
 "Files" => "Files",
-"Text" => "Texto"
+"Text" => "Texto",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index c247651f0c969246ce7c89d0ceab175673dd4ec6..eaec65516b84756f32e8f7a214deccccdf86c048 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Bantuan",
 "Personal" => "Pribadi",
 "Settings" => "Setelan",
 "Users" => "Pengguna",
-"Apps" => "Aplikasi",
 "Admin" => "Admin",
 "web services under your control" => "layanan web dalam kontrol Anda",
 "ZIP download is turned off." => "Pengunduhan ZIP dimatikan.",
@@ -37,16 +37,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
 "Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
 "seconds ago" => "beberapa detik yang lalu",
-"1 minute ago" => "1 menit yang lalu",
-"%d minutes ago" => "%d menit yang lalu",
-"1 hour ago" => "1 jam yang lalu",
-"%d hours ago" => "%d jam yang lalu",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "hari ini",
 "yesterday" => "kemarin",
-"%d days ago" => "%d hari yang lalu",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "bulan kemarin",
-"%d months ago" => "%d bulan yang lalu",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
 "Could not find category \"%s\"" => "Tidak dapat menemukan kategori \"%s\""
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/is.php b/lib/l10n/is.php
index 0f7a22fd13ef1e34560201d2b6952ac13f44c824..7512d278fb85f89daec1755772a04772a89a85a9 100644
--- a/lib/l10n/is.php
+++ b/lib/l10n/is.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "HjÃ¡lp",
 "Personal" => "Um mig",
 "Settings" => "Stillingar",
 "Users" => "Notendur",
-"Apps" => "Forrit",
 "Admin" => "StjÃ³rnun",
 "web services under your control" => "vefÃ¾jÃ³nusta undir Ã¾inni stjÃ³rn",
 "ZIP download is turned off." => "SlÃ¶kkt Ã¡ ZIP niÃ°urhali.",
@@ -17,16 +17,15 @@
 "Text" => "Texti",
 "Images" => "Myndir",
 "seconds ago" => "sek.",
-"1 minute ago" => "Fyrir 1 mÃnÃºtu",
-"%d minutes ago" => "fyrir %d mÃnÃºtum",
-"1 hour ago" => "Fyrir 1 klst.",
-"%d hours ago" => "fyrir %d klst.",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Ã dag",
 "yesterday" => "Ã gÃ¦r",
-"%d days ago" => "fyrir %d dÃ¶gum",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "sÃÃ°asta mÃ¡nuÃ°i",
-"%d months ago" => "fyrir %d mÃ¡nuÃ°um",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "sÃÃ°asta Ã¡ri",
 "years ago" => "einhverjum Ã¡rum",
 "Could not find category \"%s\"" => "Fann ekki flokkinn \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 74483315ca016f9fbe1fc23722e3e324a94202bf..c29ab4833e30bae5c214d70e86a6cc67d068627b 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Aiuto",
 "Personal" => "Personale",
 "Settings" => "Impostazioni",
 "Users" => "Utenti",
-"Apps" => "Applicazioni",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "Aggiornamento non riuscito \"%s\".",
 "web services under your control" => "servizi web nelle tue mani",
+"cannot open \"%s\"" => "impossibile aprire \"%s\"",
 "ZIP download is turned off." => "Lo scaricamento in formato ZIP Ã¨ stato disabilitato.",
 "Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
 "Back to Files" => "Torna ai file",
 "Selected files too large to generate zip file." => "I  file selezionati sono troppo grandi per generare un file zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Scarica i file in blocchi piÃ¹ piccoli, separatamente o chiedi al tuo amministratore.",
 "couldn't be determined" => "non puÃ² essere determinato",
 "Application is not enabled" => "L'applicazione  non Ã¨ abilitata",
 "Authentication error" => "Errore di autenticazione",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non Ã¨ configurato correttamente per consentire la sincronizzazione dei file poichÃ© l'interfaccia WebDAV sembra essere danneggiata.",
 "Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
 "seconds ago" => "secondi fa",
-"1 minute ago" => "Un minuto fa",
-"%d minutes ago" => "%d minuti fa",
-"1 hour ago" => "1 ora fa",
-"%d hours ago" => "%d ore fa",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "oggi",
 "yesterday" => "ieri",
-"%d days ago" => "%d giorni fa",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "mese scorso",
-"%d months ago" => "%d mesi fa",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "anno scorso",
 "years ago" => "anni fa",
+"Caused by:" => "Causato da:",
 "Could not find category \"%s\"" => "Impossibile trovare la categoria \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 36d06d360b95ec3158e0440812d39db9bf3e2cb0..482806d49461c2606d9c128804c116f101d2750a 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ãƒ˜ãƒ«ãƒ—",
 "Personal" => "å€‹äºº",
 "Settings" => "è¨å®š",
 "Users" => "ãƒ¦ãƒ¼ã‚¶",
-"Apps" => "ã‚¢ãƒ—ãƒª",
 "Admin" => "ç®¡ç†",
+"Failed to upgrade \"%s\"." => "\"%s\" ã¸ã®ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã«å¤±æ•—ã—ã¾ã—ãŸã€‚",
 "web services under your control" => "ç®¡ç†ä¸‹ã®ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹",
+"cannot open \"%s\"" => "\"%s\" ãŒé–‹ã‘ã¾ã›ã‚“",
 "ZIP download is turned off." => "ZIPãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚",
 "Files need to be downloaded one by one." => "ãƒ•ã‚¡ã‚¤ãƒ«ã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
 "Back to Files" => "ãƒ•ã‚¡ã‚¤ãƒ«ã«æˆ»ã‚‹",
 "Selected files too large to generate zip file." => "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ZIPãƒ•ã‚¡ã‚¤ãƒ«ã®ç”Ÿæˆã«ã¯å¤§ãã™ãŽã¾ã™ã€‚",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€å°ã•ã„ãƒ•ã‚¡ã‚¤ãƒ«ã«åˆ†å‰²ã•ã‚Œã¦ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã™ã€‚ã‚‚ã—ãã¯ã€ç®¡ç†è€…ã«ãŠå°‹ããã ã•ã„ã€‚",
 "couldn't be determined" => "æ¸¬å®šã§ãã¾ã›ã‚“ã§ã—ãŸ",
 "Application is not enabled" => "ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¯ç„¡åŠ¹ã§ã™",
 "Authentication error" => "èªè¨¼ã‚¨ãƒ©ãƒ¼",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBã‚µãƒ¼ãƒã¯ã¾ã ãƒ•ã‚¡ã‚¤ãƒ«ã®åŒæœŸã‚’è¨±å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¬ã‚¤ãƒ‰</a>ã‚’ã‚ˆãç¢ºèªã—ã¦ãã ã•ã„ã€‚",
 "seconds ago" => "æ•°ç§’å‰",
-"1 minute ago" => "1 åˆ†å‰",
-"%d minutes ago" => "%d åˆ†å‰",
-"1 hour ago" => "1 æ™‚é–“å‰",
-"%d hours ago" => "%d æ™‚é–“å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šæ—¥",
 "yesterday" => "æ˜¨æ—¥",
-"%d days ago" => "%d æ—¥å‰",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "ä¸€æœˆå‰",
-"%d months ago" => "%d åˆ†å‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "ä¸€å¹´å‰",
 "years ago" => "å¹´å‰",
+"Caused by:" => "åŽŸå› ã¯ä»¥ä¸‹:",
 "Could not find category \"%s\"" => "ã‚«ãƒ†ã‚´ãƒª \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ka.php b/lib/l10n/ka.php
index e5a3e6596684f6dc2dbeb860d626c135ec61e103..04fefe8bdf1edfa27eb427e67c89ec0cc1e7e5e4 100644
--- a/lib/l10n/ka.php
+++ b/lib/l10n/ka.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "áƒ¨áƒ•áƒ”áƒšáƒ",
 "Personal" => "áƒžáƒ”áƒ áƒ¡áƒáƒœáƒ",
 "Users" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜",
@@ -6,10 +7,11 @@
 "ZIP download is turned off." => "ZIP áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ”áƒ áƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ",
 "Files" => "áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜",
 "seconds ago" => "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 minute ago" => "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"%d minutes ago" => "%d áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 hour ago" => "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "áƒ“áƒ¦áƒ”áƒ¡",
 "yesterday" => "áƒ’áƒ£áƒ¨áƒ˜áƒœ",
-"%d days ago" => "%d áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index c6e77da2dac6ce36a9e3a3ebcced02731639ab14..3cb55277d6c146b9c66c45ac16aad50a0c416411 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ",
 "Personal" => "áƒžáƒ˜áƒ áƒáƒ“áƒ˜",
 "Settings" => "áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜",
 "Users" => "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜",
-"Apps" => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜",
 "Admin" => "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜",
 "web services under your control" => "web services under your control",
 "ZIP download is turned off." => "ZIP downloadâ€“áƒ˜ áƒ’áƒáƒ—áƒ˜áƒ¨áƒ£áƒšáƒ˜áƒ",
@@ -37,16 +37,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ web áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒš áƒ¡áƒ˜áƒœáƒ¥áƒ áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ áƒáƒ“áƒ’áƒáƒœ WebDAV áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒ’áƒáƒ¢áƒ”áƒ®áƒ˜áƒšáƒ˜.",
 "Please double check the <a href='%s'>installation guides</a>." => "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒ“áƒáƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒáƒ— <a href='%s'>áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒ–áƒáƒ›áƒ™áƒ•áƒšáƒ”áƒ•áƒ˜</a>.",
 "seconds ago" => "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 minute ago" => "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"%d minutes ago" => "%d áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"1 hour ago" => "1 áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
-"%d hours ago" => "%d áƒ¡áƒáƒáƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "áƒ“áƒ¦áƒ”áƒ¡",
 "yesterday" => "áƒ’áƒ£áƒ¨áƒ˜áƒœ",
-"%d days ago" => "%d  áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜",
-"%d months ago" => "%d áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡",
 "years ago" => "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "Could not find category \"%s\"" => "\"%s\" áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ›áƒáƒ«áƒ”áƒ‘áƒœáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/kn.php b/lib/l10n/kn.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7b09649a240500e39096daf02b7cc137312f444
--- /dev/null
+++ b/lib/l10n/kn.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 31245ea96f20e8fc9170087ecec04788e6da3068..824882c984d360d635496a3e025433d736e58525 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ë„ì›€ë§",
 "Personal" => "ê°œì¸",
 "Settings" => "ì„¤ì •",
 "Users" => "ì‚¬ìš©ìž",
-"Apps" => "ì•±",
 "Admin" => "ê´€ë¦¬ìž",
 "web services under your control" => "ë‚´ê°€ ê´€ë¦¬í•˜ëŠ” ì›¹ ì„œë¹„ìŠ¤",
 "ZIP download is turned off." => "ZIP ë‹¤ìš´ë¡œë“œê°€ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤.",
@@ -17,19 +17,25 @@
 "Files" => "íŒŒì¼",
 "Text" => "í…ìŠ¤íŠ¸",
 "Images" => "ê·¸ë¦¼",
+"%s enter the database username." => "ë°ì´í„°ë² ì´ìŠ¤ ì‚¬ìš©ìž ëª…ì„ %s ì— ìž…ë ¥í•´ì£¼ì‹ì‹œì˜¤",
+"%s enter the database name." => "ë°ì´í„°ë² ì´ìŠ¤ ëª…ì„ %s ì— ìž…ë ¥í•´ì£¼ì‹ì‹œì˜¤",
+"%s you may not use dots in the database name" => "%s ì— ì ìœ¼ì‹  ë°ì´í„°ë² ì´ìŠ¤ ì´ë¦„ì—ëŠ” ì ì„ ì‚¬ìš©í• ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
+"DB Error: \"%s\"" => "DB ì˜¤ë¥˜: \"%s\"",
+"PostgreSQL username and/or password not valid" => "PostgreSQLì˜ ì‚¬ìš©ìž ëª… í˜¹ì€ ë¹„ë°€ë²ˆí˜¸ê°€ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤",
+"Set an admin username." => "ê´€ë¦¬ìž ì´ë¦„ ì„¤ì •",
+"Set an admin password." => "ê´€ë¦¬ìž ë¹„ë°€ë²ˆí˜¸ ì„¤ì •",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV ì¸í„°íŽ˜ì´ìŠ¤ê°€ ì œëŒ€ë¡œ ìž‘ë™í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì›¹ ì„œë²„ì—ì„œ íŒŒì¼ ë™ê¸°í™”ë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆë„ë¡ ì„¤ì •ì´ ì œëŒ€ë¡œ ë˜ì§€ ì•Šì€ ê²ƒ ê°™ìŠµë‹ˆë‹¤.",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>ì„¤ì¹˜ ê°€ì´ë“œ</a>ë¥¼ ë‹¤ì‹œ í•œ ë²ˆ í™•ì¸í•˜ì‹ì‹œì˜¤.",
 "seconds ago" => "ì´ˆ ì „",
-"1 minute ago" => "1ë¶„ ì „",
-"%d minutes ago" => "%dë¶„ ì „",
-"1 hour ago" => "1ì‹œê°„ ì „",
-"%d hours ago" => "%dì‹œê°„ ì „",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ì˜¤ëŠ˜",
 "yesterday" => "ì–´ì œ",
-"%d days ago" => "%dì¼ ì „",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "ì§€ë‚œ ë‹¬",
-"%d months ago" => "%dê°œì›” ì „",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "ìž‘ë…„",
 "years ago" => "ë…„ ì „",
 "Could not find category \"%s\"" => "ë¶„ë¥˜ \"%s\"ì„(ë¥¼) ì°¾ì„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤."
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
index 6d7461a1685ba084616659529e6b7f6b73a2f3b0..c99f9dd2a1277d24777163957417d5e0f4c5ca23 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -1,8 +1,13 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ÛŒØ§Ø±Ù…Û•ØªÛŒ",
 "Settings" => "Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒ",
 "Users" => "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±",
-"Apps" => "Ø¨Ù‡â€ŒØ±Ù†Ø§Ù…Ù‡â€ŒÙƒØ§Ù†",
 "Admin" => "Ø¨Ù‡â€ŒÚ•ÛŽÙˆÙ‡â€ŒØ¨Ù‡â€ŒØ±ÛŒ Ø³Ù‡â€ŒØ±Ù‡â€ŒÙƒÛŒ",
-"web services under your control" => "Ú•Ø§Ú˜Ù‡â€ŒÛŒ ÙˆÛŽØ¨ Ù„Ù‡â€ŒÚ˜ÛŽØ± Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒØª Ø¯Ø§ÛŒÙ‡"
+"web services under your control" => "Ú•Ø§Ú˜Ù‡â€ŒÛŒ ÙˆÛŽØ¨ Ù„Ù‡â€ŒÚ˜ÛŽØ± Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒØª Ø¯Ø§ÛŒÙ‡",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 867b0a3740933c066ac22a84fe4da5944df54660..c25f5b55bd5b9f7458374ff48ae71cfe82bc1f47 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -1,20 +1,23 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "HÃ«llef",
 "Personal" => "PersÃ©inlech",
 "Settings" => "Astellungen",
 "Users" => "Benotzer",
-"Apps" => "Applikatiounen",
 "Admin" => "Admin",
 "web services under your control" => "Web-Servicer Ã«nnert denger Kontroll",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Files" => "Dateien",
 "Text" => "SMS",
 "seconds ago" => "Sekonnen hir",
-"1 minute ago" => "1 Minutt hir",
-"1 hour ago" => "vrun 1 Stonn",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "haut",
 "yesterday" => "gÃ«schter",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "LÃ¤schte Mount",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "LÃ¤scht Joer",
 "years ago" => "Joren hier"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index 5e3a04820330d63a346239f9f6384a0a3d62e9da..fb109b86339be00a87c5865ffbc5dcb6aea431e2 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Pagalba",
 "Personal" => "Asmeniniai",
 "Settings" => "Nustatymai",
 "Users" => "Vartotojai",
-"Apps" => "Programos",
 "Admin" => "Administravimas",
 "web services under your control" => "jÅ«sÅ³ valdomos web paslaugos",
 "ZIP download is turned off." => "ZIP atsisiuntimo galimybÄ— yra iÅ¡jungta.",
@@ -17,15 +17,14 @@
 "Text" => "Å½inuÄiÅ³",
 "Images" => "PaveikslÄ—liai",
 "seconds ago" => "prieÅ¡ sekundÄ™",
-"1 minute ago" => "PrieÅ¡ 1 minutÄ™",
-"%d minutes ago" => "prieÅ¡ %d minuÄiÅ³",
-"1 hour ago" => "prieÅ¡ 1 valandÄ…",
-"%d hours ago" => "prieÅ¡ %d valandÅ³",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Å¡iandien",
 "yesterday" => "vakar",
-"%d days ago" => "prieÅ¡ %d dienÅ³",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "praeitÄ… mÄ—nesÄ¯",
-"%d months ago" => "prieÅ¡ %d mÄ—nesiÅ³",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "praeitais metais",
 "years ago" => "prieÅ¡ metus"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 662f4d5b245647f280d516cd40a23a7faacb230a..2a2daee8d89f5638a5d9d60249b402a20b4d3021 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "PalÄ«dzÄ«ba",
 "Personal" => "PersonÄ«gi",
 "Settings" => "IestatÄ«jumi",
 "Users" => "LietotÄji",
-"Apps" => "Lietotnes",
 "Admin" => "Administratori",
 "web services under your control" => "tÄ«mekÄ¼a servisi tavÄ varÄ",
 "ZIP download is turned off." => "ZIP lejupielÄdÄ“Å¡ana ir izslÄ“gta.",
@@ -37,16 +37,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai Ä¼autu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta.",
 "Please double check the <a href='%s'>installation guides</a>." => "LÅ«dzu, vÄ“lreiz pÄrbaudiet <a href='%s'>instalÄ“Å¡anas palÄ«dzÄ«bu</a>.",
 "seconds ago" => "sekundes atpakaÄ¼",
-"1 minute ago" => "pirms 1 minÅ«tes",
-"%d minutes ago" => "pirms %d minÅ«tÄ“m",
-"1 hour ago" => "pirms 1 stundas",
-"%d hours ago" => "pirms %d stundÄm",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Å¡odien",
 "yesterday" => "vakar",
-"%d days ago" => "pirms %d dienÄm",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "pagÄjuÅ¡ajÄ mÄ“nesÄ«",
-"%d months ago" => "pirms %d mÄ“neÅ¡iem",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "gÄjuÅ¡ajÄ gadÄ",
 "years ago" => "gadus atpakaÄ¼",
 "Could not find category \"%s\"" => "NevarÄ“ja atrast kategoriju â€œ%sâ€"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index 30fa9ab73c1671dd28921507f9bda614491a42aa..69d4a1cb6946947650c59036be7ae1ad9a2d06bf 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñˆ",
 "Personal" => "Ð›Ð¸Ñ‡Ð½Ð¾",
 "Settings" => "ÐŸÐ¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐ°",
 "Users" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
-"Apps" => "ÐÐ¿Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸",
 "Admin" => "ÐÐ´Ð¼Ð¸Ð½",
 "web services under your control" => "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð°",
 "ZIP download is turned off." => "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ Ð²Ð¾ ZIP Ðµ Ð¸ÑÐºÐ»ÑƒÑ‡ÐµÐ½Ð¾",
@@ -17,16 +17,15 @@
 "Text" => "Ð¢ÐµÐºÑÑ‚",
 "Images" => "Ð¡Ð»Ð¸ÐºÐ¸",
 "seconds ago" => "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸",
-"1 minute ago" => "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
-"%d minutes ago" => "Ð¿Ñ€ÐµÐ´ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð¸",
-"1 hour ago" => "Ð¿Ñ€ÐµÐ´ 1 Ñ‡Ð°Ñ",
-"%d hours ago" => "Ð¿Ñ€ÐµÐ´ %d Ñ‡Ð°ÑÐ¾Ð²Ð¸",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "Ð´ÐµÐ½ÐµÑÐºÐ°",
 "yesterday" => "Ð²Ñ‡ÐµÑ€Ð°",
-"%d days ago" => "Ð¿Ñ€ÐµÐ´ %d Ð´ÐµÐ½Ð¾Ð²Ð¸",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "Ð¼Ð¸Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð¼ÐµÑÐµÑ†",
-"%d months ago" => "Ð¿Ñ€ÐµÐ´ %d Ð¼ÐµÑÐµÑ†Ð¸",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°",
 "years ago" => "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸",
 "Could not find category \"%s\"" => "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð½Ð°Ñ˜Ð´Ð°Ð¼ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° â€ž%sâ€œ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/lib/l10n/ml_IN.php b/lib/l10n/ml_IN.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/ml_IN.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index a2930597971a22f126aa800211f9e23feed0a7b8..17ef07f83dd46266bf42842b10722504d152371d 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -1,12 +1,17 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Bantuan",
 "Personal" => "Peribadi",
 "Settings" => "Tetapan",
 "Users" => "Pengguna",
-"Apps" => "Aplikasi",
 "Admin" => "Admin",
 "web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Authentication error" => "Ralat pengesahan",
 "Files" => "Fail-fail",
-"Text" => "Teks"
+"Text" => "Teks",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
index f214a1ed79426afd8c884f434201550cca719f25..b2e9ca181397bd13be4de3a1016626785aed3b5c 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/l10n/my_MM.php
@@ -1,7 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "á€¡á€€á€°á€¡á€Šá€®",
 "Users" => "á€žá€¯á€¶á€¸á€…á€½á€²á€žá€°",
-"Apps" => "Apps",
 "Admin" => "á€¡á€€á€ºá€’á€™á€„á€º",
 "web services under your control" => "á€žá€„á€ºáá€‘á€á€”á€ºá€¸á€á€»á€¯á€•á€ºá€™á€¾á€¯á€·á€¡á€±á€¬á€€á€ºá€á€½á€„á€ºá€›á€¾á€á€žá€±á€¬ Web services",
 "ZIP download is turned off." => "ZIP á€’á€±á€«á€„á€ºá€¸á€œá€¯á€á€ºá€€á€á€¯á€•á€á€á€ºá€‘á€¬á€¸á€žá€Šá€º",
@@ -14,16 +14,15 @@
 "Text" => "á€…á€¬á€žá€¬á€¸",
 "Images" => "á€•á€¯á€¶á€›á€á€•á€ºá€™á€»á€¬á€¸",
 "seconds ago" => "á€…á€€á€¹á€€á€”á€·á€ºá€¡á€”á€Šá€ºá€¸á€„á€šá€ºá€€",
-"1 minute ago" => "á á€™á€á€”á€…á€ºá€¡á€›á€„á€ºá€€",
-"%d minutes ago" => "%d á€™á€á€”á€…á€ºá€¡á€›á€„á€ºá€€",
-"1 hour ago" => "á á€”á€¬á€›á€® á€¡á€›á€„á€ºá€€",
-"%d hours ago" => "%d á€”á€¬á€›á€®á€¡á€›á€„á€ºá€€",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "á€šá€”á€±á€·",
 "yesterday" => "á€™á€”á€±á€·á€€",
-"%d days ago" => "%d á€›á€€á€º á€¡á€›á€„á€ºá€€",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "á€•á€¼á€®á€¸á€á€²á€·á€žá€±á€¬á€œ",
-"%d months ago" => "%d á€œá€¡á€›á€„á€ºá€€",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "á€™á€”á€¾á€…á€ºá€€",
 "years ago" => "á€”á€¾á€…á€º á€¡á€›á€„á€ºá€€",
 "Could not find category \"%s\"" => "\"%s\"á€á€±á€«á€„á€ºá€¸á€…á€‰á€ºá€€á€á€¯ á€›á€¾á€¬á€™á€á€½á€±á€·á€•á€«"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index ab2d4f91920f8772a5f2a1d1a17617e8bc47de24..8e7d095d369b2efea37ae0710658e4a4adeb5b0c 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Hjelp",
 "Personal" => "Personlig",
 "Settings" => "Innstillinger",
 "Users" => "Brukere",
-"Apps" => "Apper",
 "Admin" => "Admin",
 "web services under your control" => "web tjenester du kontrollerer",
 "ZIP download is turned off." => "ZIP-nedlasting av avslÃ¥tt",
@@ -19,16 +19,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til Ã¥ ikke funkere.",
 "Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
 "seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minutt siden",
-"%d minutes ago" => "%d minutter siden",
-"1 hour ago" => "1 time siden",
-"%d hours ago" => "%d timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
-"%d days ago" => "%d dager siden",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "forrige mÃ¥ned",
-"%d months ago" => "%d mÃ¥neder siden",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "forrige Ã¥r",
 "years ago" => "Ã¥r siden",
 "Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ne.php b/lib/l10n/ne.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/ne.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index de80d1b5d56045a40e9435711892deb80f644deb..2d737bd5ebdd1a1ae22e9d491d43a7622a87b169 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Help",
 "Personal" => "Persoonlijk",
 "Settings" => "Instellingen",
 "Users" => "Gebruikers",
-"Apps" => "Apps",
 "Admin" => "Beheerder",
+"Failed to upgrade \"%s\"." => "Upgrade \"%s\" mislukt.",
 "web services under your control" => "Webdiensten in eigen beheer",
+"cannot open \"%s\"" => "Kon \"%s\" niet openen",
 "ZIP download is turned off." => "ZIP download is uitgeschakeld.",
 "Files need to be downloaded one by one." => "Bestanden moeten Ã©Ã©n voor Ã©Ã©n worden gedownload.",
 "Back to Files" => "Terug naar bestanden",
 "Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download de bestanden in kleinere brokken, appart of vraag uw administrator.",
 "couldn't be determined" => "kon niet worden vastgesteld",
 "Application is not enabled" => "De applicatie is niet actief",
 "Authentication error" => "Authenticatie fout",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
 "seconds ago" => "seconden geleden",
-"1 minute ago" => "1 minuut geleden",
-"%d minutes ago" => "%d minuten geleden",
-"1 hour ago" => "1 uur geleden",
-"%d hours ago" => "%d uren geleden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "vandaag",
 "yesterday" => "gisteren",
-"%d days ago" => "%d dagen geleden",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "vorige maand",
-"%d months ago" => "%d maanden geleden",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
+"Caused by:" => "Gekomen door:",
 "Could not find category \"%s\"" => "Kon categorie \"%s\" niet vinden"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index c17393981095d8b4e545dcc466894654632b41d7..28b4f7b7d945b8d74cc0d9b68a9408a042a808df 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Hjelp",
 "Personal" => "Personleg",
 "Settings" => "Innstillingar",
 "Users" => "Brukarar",
-"Apps" => "Program",
 "Admin" => "Administrer",
 "web services under your control" => "Vev tjenester under din kontroll",
 "Authentication error" => "Feil i autentisering",
@@ -12,11 +12,14 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til Ã¥ tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til Ã¥ vera Ã¸ydelagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
 "seconds ago" => "sekund sidan",
-"1 minute ago" => "1 minutt sidan",
-"1 hour ago" => "1 time sidan",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "fÃ¸rre mÃ¥nad",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "i fjor",
 "years ago" => "Ã¥r sidan"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
index a72da90790aca632ed309f0e5f7f6a43b0414fc7..40a527cc76c0cf8ecf0a28ba295c22b91ae8ae6d 100644
--- a/lib/l10n/oc.php
+++ b/lib/l10n/oc.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ajuda",
 "Personal" => "Personal",
 "Settings" => "Configuracion",
 "Users" => "UsanciÃ¨rs",
-"Apps" => "Apps",
 "Admin" => "Admin",
 "web services under your control" => "Services web jos ton contrarÃ²tle",
 "ZIP download is turned off." => "Avalcargar los ZIP es inactiu.",
@@ -12,12 +12,14 @@
 "Authentication error" => "Error d'autentificacion",
 "Files" => "FichiÃ¨rs",
 "seconds ago" => "segonda a",
-"1 minute ago" => "1 minuta a",
-"%d minutes ago" => "%d minutas a",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "uÃ¨i",
 "yesterday" => "iÃ¨r",
-"%d days ago" => "%d jorns a",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "mes passat",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "an passat",
 "years ago" => "ans a"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index bbca1913b70c1417e918b0044eb9770d9e1d6cec..1740676080e88b434742bf360ff8aab235e127db 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Pomoc",
 "Personal" => "Osobiste",
 "Settings" => "Ustawienia",
 "Users" => "UÅ¼ytkownicy",
-"Apps" => "Aplikacje",
 "Admin" => "Administrator",
+"Failed to upgrade \"%s\"." => "BÅ‚Ä…d przy aktualizacji \"%s\".",
 "web services under your control" => "Kontrolowane serwisy",
+"cannot open \"%s\"" => "Nie moÅ¼na otworzyÄ‡ \"%s\"",
 "ZIP download is turned off." => "Pobieranie ZIP jest wyÅ‚Ä…czone.",
 "Files need to be downloaded one by one." => "Pliki muszÄ… zostaÄ‡ pobrane pojedynczo.",
 "Back to Files" => "WrÃ³Ä‡ do plikÃ³w",
 "Selected files too large to generate zip file." => "Wybrane pliki sÄ… zbyt duÅ¼e, aby wygenerowaÄ‡ plik zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawaÅ‚kach, oddzielnie lub poproÅ› administratora o zwiÄ™kszenie limitu.",
 "couldn't be determined" => "nie moÅ¼e zostaÄ‡ znaleziony",
 "Application is not enabled" => "Aplikacja nie jest wÅ‚Ä…czona",
 "Authentication error" => "BÅ‚Ä…d uwierzytelniania",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umoÅ¼liwiÄ‡ synchronizacjÄ™ plikÃ³w, poniewaÅ¼ interfejs WebDAV wydaje siÄ™ byÄ‡ uszkodzony.",
 "Please double check the <a href='%s'>installation guides</a>." => "SprawdÅº ponownie <a href='%s'>przewodniki instalacji</a>.",
 "seconds ago" => "sekund temu",
-"1 minute ago" => "1 minutÄ™ temu",
-"%d minutes ago" => "%d minut temu",
-"1 hour ago" => "1 godzinÄ™ temu",
-"%d hours ago" => "%d godzin temu",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "dziÅ›",
 "yesterday" => "wczoraj",
-"%d days ago" => "%d dni temu",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "w zeszÅ‚ym miesiÄ…cu",
-"%d months ago" => "%d miesiecy temu",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "w zeszÅ‚ym roku",
 "years ago" => "lat temu",
+"Caused by:" => "Spowodowane przez:",
 "Could not find category \"%s\"" => "Nie moÅ¼na odnaleÅºÄ‡ kategorii \"%s\""
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pl_PL.php b/lib/l10n/pl_PL.php
index 67cf0a33259224384df3bdc17b8b5eb84385d08e..5494e3dab25cc64b2ebc7fbcd2adad3f1595bb29 100644
--- a/lib/l10n/pl_PL.php
+++ b/lib/l10n/pl_PL.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "Ustawienia"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 029331fdec8206b9f6d769619fcac3ece2424287..4ebf587cf868222dd9f89c69a46f3791677f69c9 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ajuda",
 "Personal" => "Pessoal",
 "Settings" => "Ajustes",
 "Users" => "UsuÃ¡rios",
-"Apps" => "AplicaÃ§Ãµes",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "Falha na atualizaÃ§Ã£o de \"%s\".",
 "web services under your control" => "serviÃ§os web sob seu controle",
+"cannot open \"%s\"" => "nÃ£o pode abrir \"%s\"",
 "ZIP download is turned off." => "Download ZIP estÃ¡ desligado.",
 "Files need to be downloaded one by one." => "Arquivos precisam ser baixados um de cada vez.",
 "Back to Files" => "Voltar para Arquivos",
 "Selected files too large to generate zip file." => "Arquivos selecionados sÃ£o muito grandes para gerar arquivo zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixe os arquivos em pedaÃ§os menores, separadamente ou solicite educadamente  ao seu administrador.",
 "couldn't be determined" => "nÃ£o pÃ´de ser determinado",
 "Application is not enabled" => "AplicaÃ§Ã£o nÃ£o estÃ¡ habilitada",
 "Authentication error" => "Erro de autenticaÃ§Ã£o",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web nÃ£o estÃ¡ configurado corretamente para permitir sincronizaÃ§Ã£o de arquivos porque a interface WebDAV parece estar quebrada.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalaÃ§Ã£o</a>.",
 "seconds ago" => "segundos atrÃ¡s",
-"1 minute ago" => "1 minuto atrÃ¡s",
-"%d minutes ago" => "%d minutos atrÃ¡s",
-"1 hour ago" => "1 hora atrÃ¡s",
-"%d hours ago" => "%d horas atrÃ¡s",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoje",
 "yesterday" => "ontem",
-"%d days ago" => "%d dias atrÃ¡s",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "Ãºltimo mÃªs",
-"%d months ago" => "%d meses atrÃ¡s",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Ãºltimo ano",
 "years ago" => "anos atrÃ¡s",
+"Caused by:" => "Causados â€‹â€‹por:",
 "Could not find category \"%s\"" => "ImpossÃvel localizar categoria \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 7480026e920d43f5fd42e18989a5219c6effd90f..3131499e130c4eeb8d9d81a8c54b5bbe3a148fb9 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ajuda",
 "Personal" => "Pessoal",
 "Settings" => "ConfiguraÃ§Ãµes",
 "Users" => "Utilizadores",
-"Apps" => "AplicaÃ§Ãµes",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "A actualizaÃ§Ã£o \"%s\" falhou.",
 "web services under your control" => "serviÃ§os web sob o seu controlo",
+"cannot open \"%s\"" => "NÃ£o foi possÃvel abrir \"%s\"",
 "ZIP download is turned off." => "Descarregamento em ZIP estÃ¡ desligado.",
 "Files need to be downloaded one by one." => "Os ficheiros precisam de ser descarregados um por um.",
 "Back to Files" => "Voltar a Ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados sÃ£o grandes demais para gerar um ficheiro zip.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descarregue os ficheiros em partes menores, separados ou peÃ§a gentilmente ao seu administrador.",
 "couldn't be determined" => "NÃ£o foi possÃvel determinar",
 "Application is not enabled" => "A aplicaÃ§Ã£o nÃ£o estÃ¡ activada",
 "Authentication error" => "Erro na autenticaÃ§Ã£o",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web nÃ£o estÃ¡ configurado correctamente para autorizar sincronizaÃ§Ã£o de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
 "seconds ago" => "Minutos atrÃ¡s",
-"1 minute ago" => "HÃ¡ 1 minuto",
-"%d minutes ago" => "hÃ¡ %d minutos",
-"1 hour ago" => "HÃ¡ 1 horas",
-"%d hours ago" => "HÃ¡ %d horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "hoje",
 "yesterday" => "ontem",
-"%d days ago" => "hÃ¡ %d dias",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "ultÃmo mÃªs",
-"%d months ago" => "HÃ¡ %d meses atrÃ¡s",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "ano passado",
 "years ago" => "anos atrÃ¡s",
+"Caused by:" => "Causado por:",
 "Could not find category \"%s\"" => "NÃ£o foi encontrado a categoria \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 5a34e9571e5dbcc4b13c2e0ca67fbdf9b1d181d2..3a555f6a29fe81577d0c1f8584eec602f0a969c0 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ajutor",
 "Personal" => "Personal",
 "Settings" => "SetÄƒri",
 "Users" => "Utilizatori",
-"Apps" => "AplicaÈ›ii",
 "Admin" => "Admin",
 "web services under your control" => "servicii web controlate de tine",
 "ZIP download is turned off." => "DescÄƒrcarea ZIP este dezactivatÄƒ.",
@@ -20,16 +20,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este Ã®ncÄƒ setat corespunzÄƒtor pentru a permite sincronizarea fiÈ™ierelor deoarece interfaÈ›a WebDAV pare a fi Ã®ntreruptÄƒ.",
 "Please double check the <a href='%s'>installation guides</a>." => "VÄƒ rugÄƒm sÄƒ verificaÈ›i <a href='%s'>ghiduri de instalare</ a>.",
 "seconds ago" => "secunde Ã®n urmÄƒ",
-"1 minute ago" => "1 minut Ã®n urmÄƒ",
-"%d minutes ago" => "%d minute Ã®n urmÄƒ",
-"1 hour ago" => "Acum o ora",
-"%d hours ago" => "%d ore in urma",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "astÄƒzi",
 "yesterday" => "ieri",
-"%d days ago" => "%d zile Ã®n urmÄƒ",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "ultima lunÄƒ",
-"%d months ago" => "%d luni in urma",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "ultimul an",
 "years ago" => "ani Ã®n urmÄƒ",
 "Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\""
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 052b0487c6cb554f5ba0755e27dc87c8916b833c..92b14b9b89ea6c8884052d9e8824890626156bdc 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ",
 "Personal" => "Ð›Ð¸Ñ‡Ð½Ð¾Ðµ",
 "Settings" => "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ",
 "Users" => "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸",
-"Apps" => "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "ÐÐµ ÑÐ¼Ð¾Ð³ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ \"%s\".",
 "web services under your control" => "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ð¸ÑÑ‹ Ð¿Ð¾Ð´ Ð²Ð°ÑˆÐ¸Ð¼ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸ÐµÐ¼",
+"cannot open \"%s\"" => "Ð½Ðµ Ð¼Ð¾Ð³Ñƒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ \"%s\"",
 "ZIP download is turned off." => "ZIP-ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾.",
 "Files need to be downloaded one by one." => "Ð¤Ð°Ð¹Ð»Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¿Ð¾ Ð¾Ð´Ð½Ð¾Ð¼Ñƒ.",
 "Back to Files" => "ÐÐ°Ð·Ð°Ð´ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼",
 "Selected files too large to generate zip file." => "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ zip Ñ„Ð°Ð¹Ð».",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð» Ð¼Ð°Ð»ÐµÐ½ÑŒÑˆÐ¸Ð¼Ð¸ Ð¿Ð¾Ñ€Ñ†Ð¸ÑÐ¼Ð¸, Ñ€Ð°Ð·Ð´ÐµÐ»ÑŒÐ½Ð¾ Ð¸Ð»Ð¸ Ð²ÐµÐ¶Ð»Ð¸Ð²Ð¾ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ðµ Ð’Ð°ÑˆÐµÐ³Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°.",
 "couldn't be determined" => "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ",
 "Application is not enabled" => "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾",
 "Authentication error" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’Ð°Ñˆ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð¾ ÑÐ¸Ñ… Ð¿Ð¾Ñ€ Ð½Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð², Ð¿Ð¾Ñ…Ð¾Ð¶Ðµ Ñ‡Ñ‚Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð² Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ÑÑ‚Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ° WebDAV.",
 "Please double check the <a href='%s'>installation guides</a>." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ <a href='%s'>Ð¸Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ð¸ Ð¿Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ</a>.",
 "seconds ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´",
-"1 minute ago" => "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´",
-"%d minutes ago" => "%d Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´",
-"1 hour ago" => "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´",
-"%d hours ago" => "%d Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "ÑÐµÐ³Ð¾Ð´Ð½Ñ",
 "yesterday" => "Ð²Ñ‡ÐµÑ€Ð°",
-"%d days ago" => "%d Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ",
-"%d months ago" => "%d Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ",
 "years ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´",
+"Caused by:" => "Ð’Ñ‹Ð·Ð²Ð°Ð½Ð¾:",
 "Could not find category \"%s\"" => "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ \"%s\"  Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°"
 );
+$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);";
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
index 7639a3cc97e4f605e1343ad34ee941cc1fddb2cb..1761c1ebf3bd78b8053e2ab1a61cf9749736ee37 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
 "Text" => "Ð¢ÐµÐºÑÑ‚"
 );
+$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);";
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
index 49ded7026e0a6227a7306c3bb063f3d6fa92b778..d10804cae69396d929b1fb5683e5de1901ca54c2 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/l10n/si_LK.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "à¶‹à¶¯à·€à·Š",
 "Personal" => "à¶´à·žà¶¯à·Šà¶œà¶½à·’à¶š",
 "Settings" => "à·ƒà·’à¶§à·”à·€à¶¸à·Š",
 "Users" => "à¶´à¶»à·’à·à·“à¶½à¶šà¶ºà¶±à·Š",
-"Apps" => "à¶ºà·™à¶¯à·”à¶¸à·Š",
 "Admin" => "à¶´à¶»à·’à¶´à·à¶½à¶š",
 "web services under your control" => "à¶”à¶¶à¶§ à¶´à·à¶½à¶±à¶º à¶šà·… à·„à·à¶šà·’ à·€à·™à¶¶à·Š à·ƒà·šà·€à·à·€à¶±à·Š",
 "ZIP download is turned off." => "ZIP à¶·à·à¶œà¶ à¶šà·’à¶»à·“à¶¸à·Š à¶…à¶šà·Šâ€à¶»à·’à¶ºà¶ºà·’",
@@ -17,12 +17,14 @@
 "Text" => "à¶´à·™à·…",
 "Images" => "à¶…à¶±à·” à¶»à·–",
 "seconds ago" => "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»",
-"1 minute ago" => "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»",
-"%d minutes ago" => "%d à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶±à·Šà¶§ à¶´à·™à¶»",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à¶…à¶¯",
 "yesterday" => "à¶Šà¶ºà·š",
-"%d days ago" => "%d à¶¯à·’à¶±à¶šà¶§ à¶´à·™à¶»",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "à¶´à·™à¶» à¶¸à·à·ƒà¶ºà·š",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š",
 "years ago" => "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sk.php b/lib/l10n/sk.php
new file mode 100644
index 0000000000000000000000000000000000000000..54812b15a6f41bb15db873cda47fe6648fd5e474
--- /dev/null
+++ b/lib/l10n/sk.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 64ad1e540f3c14036aa166d13e359576552f9e73..ef3dc6eb9776a7005d791ba69b53135af198b25a 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Pomoc",
 "Personal" => "OsobnÃ©",
 "Settings" => "Nastavenia",
 "Users" => "PouÅ¾Ãvatelia",
-"Apps" => "AplikÃ¡cie",
 "Admin" => "AdministrÃ¡tor",
+"Failed to upgrade \"%s\"." => "Zlyhala aktualizÃ¡cia \"%s\".",
 "web services under your control" => "webovÃ© sluÅ¾by pod VaÅ¡ou kontrolou",
+"cannot open \"%s\"" => "nemoÅ¾no otvoriÅ¥ \"%s\"",
 "ZIP download is turned off." => "SÅ¥ahovanie sÃºborov ZIP je vypnutÃ©.",
 "Files need to be downloaded one by one." => "SÃºbory musia byÅ¥ nahrÃ¡vanÃ© jeden za druhÃ½m.",
 "Back to Files" => "SpÃ¤Å¥ na sÃºbory",
 "Selected files too large to generate zip file." => "ZvolenÃ© sÃºbory sÃº prÃliÅ¡ veÄ¾kÃ© na vygenerovanie zip sÃºboru.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stiahnite sÃºbory po menÅ¡Ãch Äastiach, samostatne, alebo sa obrÃ¡Å¥te na sprÃ¡vcu.",
 "couldn't be determined" => "nedÃ¡ sa zistiÅ¥",
 "Application is not enabled" => "AplikÃ¡cia nie je zapnutÃ¡",
 "Authentication error" => "Chyba autentifikÃ¡cie",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "VÃ¡Å¡ webovÃ½ server nie je sprÃ¡vne nastavenÃ½ na synchronizÃ¡ciu, pretoÅ¾e rozhranie WebDAV je poÅ¡kodenÃ©.",
 "Please double check the <a href='%s'>installation guides</a>." => "ProsÃm skontrolujte <a href='%s'>inÅ¡talaÄnÃº prÃruÄku</a>.",
 "seconds ago" => "pred sekundami",
-"1 minute ago" => "pred minÃºtou",
-"%d minutes ago" => "pred %d minÃºtami",
-"1 hour ago" => "Pred 1 hodinou",
-"%d hours ago" => "Pred %d hodinami.",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "dnes",
 "yesterday" => "vÄera",
-"%d days ago" => "pred %d dÅˆami",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "minulÃ½ mesiac",
-"%d months ago" => "Pred %d mesiacmi.",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "minulÃ½ rok",
 "years ago" => "pred rokmi",
+"Caused by:" => "PrÃÄina:",
 "Could not find category \"%s\"" => "NemoÅ¾no nÃ¡jsÅ¥ danÃº kategÃ³riu \"%s\""
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index a5b4decd61a0ab01d27f4ea1bb7f4149990f0e1e..73a397f3c84f2dc12faaa8ac01c75568fe3d06d1 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "PomoÄ",
 "Personal" => "Osebno",
 "Settings" => "Nastavitve",
 "Users" => "Uporabniki",
-"Apps" => "Programi",
 "Admin" => "SkrbniÅ¡tvo",
 "web services under your control" => "spletne storitve pod vaÅ¡im nadzorom",
 "ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogoÄeno.",
@@ -38,16 +38,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni straÅ¾nik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena.",
 "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "seconds ago" => "pred nekaj sekundami",
-"1 minute ago" => "pred minuto",
-"%d minutes ago" => "pred %d minutami",
-"1 hour ago" => "Pred 1 uro",
-"%d hours ago" => "Pred %d urami",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
 "today" => "danes",
 "yesterday" => "vÄeraj",
-"%d days ago" => "pred %d dnevi",
+"_%n day go_::_%n days ago_" => array("","","",""),
 "last month" => "zadnji mesec",
-"%d months ago" => "Pred %d meseci",
+"_%n month ago_::_%n months ago_" => array("","","",""),
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
 "Could not find category \"%s\"" => "Kategorije \"%s\" ni mogoÄe najti."
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index df5e2a317433c50d6da794b50e5bd02ecdd83cb0..ca2364f9864832df253525d1de0e699cf06d7bd9 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "NdihmÃ«",
 "Personal" => "Personale",
 "Settings" => "Parametra",
 "Users" => "PÃ«rdoruesit",
-"Apps" => "App",
 "Admin" => "Admin",
 "web services under your control" => "shÃ«rbime web nÃ«n kontrollin tÃ«nd",
 "ZIP download is turned off." => "Shkarimi i skedarÃ«ve ZIP Ã«shtÃ« i Ã§aktivizuar.",
@@ -37,16 +37,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk Ã«shtÃ« konfiguruar akoma pÃ«r tÃ« lejuar sinkronizimin e skedarÃ«ve sepse ndÃ«rfaqja WebDAV mund tÃ« jetÃ« e dÃ«mtuar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirÃ« <a href='%s'>shoqÃ«ruesin e instalimit</a>.",
 "seconds ago" => "sekonda mÃ« parÃ«",
-"1 minute ago" => "1 minutÃ« mÃ« parÃ«",
-"%d minutes ago" => "%d minuta mÃ« parÃ«",
-"1 hour ago" => "1 orÃ« mÃ« parÃ«",
-"%d hours ago" => "%d orÃ« mÃ« parÃ«",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "sot",
 "yesterday" => "dje",
-"%d days ago" => "%d ditÃ« mÃ« parÃ«",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "muajin e shkuar",
-"%d months ago" => "%d muaj mÃ« parÃ«",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "vitin e shkuar",
 "years ago" => "vite mÃ« parÃ«",
 "Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 71d627e78900df2bf632c3894f0eac8587dba017..c42419b6d92973358fdc0c0716851ad9cd2a0ef0 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ÐŸÐ¾Ð¼Ð¾Ñ›",
 "Personal" => "Ð›Ð¸Ñ‡Ð½Ð¾",
 "Settings" => "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ",
 "Users" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
-"Apps" => "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ",
 "Admin" => "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€",
 "web services under your control" => "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¾Ð¼",
 "ZIP download is turned off." => "ÐŸÑ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ ZIP-Ð° Ñ˜Ðµ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÐ½Ð¾.",
@@ -20,16 +20,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’Ð°Ñˆ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ˜Ñƒ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜ÐµÑ€ ÑÐµ Ñ‡Ð¸Ð½Ð¸ Ð´Ð° Ñ˜Ðµ WebDAV ÑÑƒÑ‡ÐµÑ™Ðµ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾.",
 "Please double check the <a href='%s'>installation guides</a>." => "ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ <a href='%s'>Ð²Ð¾Ð´Ð¸Ñ‡Ðµ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ</a>.",
 "seconds ago" => "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸",
-"1 minute ago" => "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚",
-"%d minutes ago" => "Ð¿Ñ€Ðµ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
-"1 hour ago" => "ÐŸÑ€Ðµ Ñ˜ÐµÐ´Ð½Ð¾Ð³ ÑÐ°Ñ‚Ð°",
-"%d hours ago" => "Ð¿Ñ€Ðµ %d ÑÐ°Ñ‚Ð°/Ð¸",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Ð´Ð°Ð½Ð°Ñ",
 "yesterday" => "Ñ˜ÑƒÑ‡Ðµ",
-"%d days ago" => "Ð¿Ñ€Ðµ %d Ð´Ð°Ð½Ð°",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³ Ð¼ÐµÑÐµÑ†Ð°",
-"%d months ago" => "Ð¿Ñ€Ðµ %d Ð¼ÐµÑÐµÑ†Ð°/Ð¸",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ",
 "years ago" => "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ",
 "Could not find category \"%s\"" => "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ¼ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ñƒ â€ž%sâ€œ."
 );
+$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);";
diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php
index 13cedc832791bab4f8bdb66b4f47fe16fe227a52..5ba51bc0ba708e4de0adc9dcae752a4ff1f65584 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/l10n/sr@latin.php
@@ -1,11 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "PomoÄ‡",
 "Personal" => "LiÄno",
 "Settings" => "PodeÅ¡avanja",
 "Users" => "Korisnici",
-"Apps" => "Programi",
 "Admin" => "Adninistracija",
 "Authentication error" => "GreÅ¡ka pri autentifikaciji",
 "Files" => "Fajlovi",
-"Text" => "Tekst"
+"Text" => "Tekst",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
 );
+$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);";
diff --git a/lib/l10n/string.php b/lib/l10n/string.php
index 8eef10071e6451010dfb385f889bcfc1cb5536af..88c85b32e70f8551093e4d342d0f362e098000dd 100644
--- a/lib/l10n/string.php
+++ b/lib/l10n/string.php
@@ -7,19 +7,50 @@
  */
 
 class OC_L10N_String{
+	/**
+	 * @var OC_L10N
+	 */
 	protected $l10n;
-	public function __construct($l10n, $text, $parameters) {
+
+	/**
+	 * @var string
+	 */
+	protected $text;
+
+	/**
+	 * @var array
+	 */
+	protected $parameters;
+
+	/**
+	 * @var integer
+	 */
+	protected $count;
+
+	public function __construct($l10n, $text, $parameters, $count = 1) {
 		$this->l10n = $l10n;
 		$this->text = $text;
 		$this->parameters = $parameters;
-
+		$this->count = $count;
 	}
 
 	public function __toString() {
 		$translations = $this->l10n->getTranslations();
+
+		$text = $this->text;
 		if(array_key_exists($this->text, $translations)) {
-			return vsprintf($translations[$this->text], $this->parameters);
+			if(is_array($translations[$this->text])) {
+				$fn = $this->l10n->getPluralFormFunction();
+				$id = $fn($this->count);
+				$text = $translations[$this->text][$id];
+			}
+			else{
+				$text = $translations[$this->text];
+			}
 		}
-		return vsprintf($this->text, $this->parameters);
+
+		// Replace %n first (won't interfere with vsprintf)
+		$text = str_replace('%n', $this->count, $text);
+		return vsprintf($text, $this->parameters);
 	}
 }
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 56776e574aaf153b1c38ba8ae4306a018029f419..fa3ae318cee55d01271c0236d8ec1895e94fa485 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -1,15 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "HjÃ¤lp",
 "Personal" => "Personligt",
 "Settings" => "InstÃ¤llningar",
 "Users" => "AnvÃ¤ndare",
-"Apps" => "Program",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "Misslyckades med att uppgradera \"%s\".",
 "web services under your control" => "webbtjÃ¤nster under din kontroll",
+"cannot open \"%s\"" => "Kan inte Ã¶ppna \"%s\"",
 "ZIP download is turned off." => "Nerladdning av ZIP Ã¤r avstÃ¤ngd.",
 "Files need to be downloaded one by one." => "Filer laddas ner en Ã¥t gÃ¥ngen.",
 "Back to Files" => "Tillbaka till Filer",
 "Selected files too large to generate zip file." => "Valda filer Ã¤r fÃ¶r stora fÃ¶r att skapa zip-fil.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ladda ner filerna i mindre bitar, separat eller frÃ¥ga din administratÃ¶r.",
 "couldn't be determined" => "kunde inte bestÃ¤mmas",
 "Application is not enabled" => "Applikationen Ã¤r inte aktiverad",
 "Authentication error" => "Fel vid autentisering",
@@ -38,16 +41,16 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver Ã¤r inte korrekt konfigurerad fÃ¶r att tillÃ¥ta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "seconds ago" => "sekunder sedan",
-"1 minute ago" => "1 minut sedan",
-"%d minutes ago" => "%d minuter sedan",
-"1 hour ago" => "1 timme sedan",
-"%d hours ago" => "%d timmar sedan",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "i dag",
 "yesterday" => "i gÃ¥r",
-"%d days ago" => "%d dagar sedan",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "fÃ¶rra mÃ¥naden",
-"%d months ago" => "%d mÃ¥nader sedan",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "fÃ¶rra Ã¥ret",
 "years ago" => "Ã¥r sedan",
+"Caused by:" => "Orsakad av:",
 "Could not find category \"%s\"" => "Kunde inte hitta kategorin \"%s\""
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sw_KE.php b/lib/l10n/sw_KE.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f78e0bce6d7e36688d2913f6affa4c17472a65
--- /dev/null
+++ b/lib/l10n/sw_KE.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
index 9193f6f1d2f9c45cbcd79d541d72a1065eebd248..e70e65845bea2d65fda8ec396c7ff99aeb01508b 100644
--- a/lib/l10n/ta_LK.php
+++ b/lib/l10n/ta_LK.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "à®‰à®¤à®µà®¿",
 "Personal" => "à®¤à®©à®¿à®ªà¯à®ªà®Ÿà¯à®Ÿ",
 "Settings" => "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯",
 "Users" => "à®ªà®¯à®©à®¾à®³à®°à¯",
-"Apps" => "à®šà¯†à®¯à®²à®¿à®•à®³à¯",
 "Admin" => "à®¨à®¿à®°à¯à®µà®¾à®•à®®à¯",
 "web services under your control" => "à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®•à®³à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ à®•à¯€à®´à¯ à®‰à®³à¯à®³à®¤à¯",
 "ZIP download is turned off." => "à®µà¯€à®šà¯Šà®²à®¿à®ªà¯ à®ªà¯‚à®Ÿà¯à®Ÿà¯ à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à®®à¯ à®¨à®¿à®±à¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯.",
@@ -17,16 +17,15 @@
 "Text" => "à®‰à®°à¯ˆ",
 "Images" => "à®ªà®Ÿà®™à¯à®•à®³à¯",
 "seconds ago" => "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
-"1 minute ago" => "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ ",
-"%d minutes ago" => "%d à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
-"1 hour ago" => "1 à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯",
-"%d hours ago" => "%d à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à®‡à®©à¯à®±à¯",
 "yesterday" => "à®¨à¯‡à®±à¯à®±à¯",
-"%d days ago" => "%d à®¨à®¾à®Ÿà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "à®•à®Ÿà®¨à¯à®¤ à®®à®¾à®¤à®®à¯",
-"%d months ago" => "%d à®®à®¾à®¤à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯",
 "years ago" => "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
 "Could not find category \"%s\"" => "à®ªà®¿à®°à®¿à®µà¯ \"%s\" à® à®•à®£à¯à®Ÿà¯à®ªà¯à®ªà®¿à®Ÿà®¿à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/te.php b/lib/l10n/te.php
index 87c73d790e2c4dbe164e7e706ba9bc1b960daf1a..524ea0c60248b396ddbd63f641dd315b4b114e94 100644
--- a/lib/l10n/te.php
+++ b/lib/l10n/te.php
@@ -1,13 +1,17 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "à°¸à°¹à°¾à°¯à°‚",
 "Settings" => "à°…à°®à°°à°¿à°•à°²à±",
 "Users" => "à°µà°¾à°¡à±à°•à°°à±à°²à±",
 "seconds ago" => "à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚",
-"1 minute ago" => "1 à°¨à°¿à°®à°¿à°·à°‚ à°•à±à°°à°¿à°¤à°‚",
-"1 hour ago" => "1 à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "à°ˆà°°à±‹à°œà±",
 "yesterday" => "à°¨à°¿à°¨à±à°¨",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "à°ªà±‹à°¯à°¿à°¨ à°¨à±†à°²",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "à°ªà±‹à°¯à°¿à°¨ à°¸à°‚à°µà°¤à±à°¸à°°à°‚",
 "years ago" => "à°¸à°‚à°µà°¤à±à°¸à°°à°¾à°² à°•à±à°°à°¿à°¤à°‚"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 4ec6ef55f4e91210aba933c9d434dad3e861716f..53a150d8f1e76c6ae2b04ff758fd97891abb22c6 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸",
 "Personal" => "à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§",
 "Settings" => "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²",
 "Users" => "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
-"Apps" => "à¹à¸à¸›à¸¯",
 "Admin" => "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥",
 "web services under your control" => "à¹€à¸§à¹‡à¸šà¹€à¸‹à¸à¸£à¹Œà¸§à¸´à¸ªà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸„à¸§à¸šà¸„à¸¸à¸¡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰",
 "ZIP download is turned off." => "à¸„à¸¸à¸“à¸ªà¸¡à¸šà¸±à¸•à¸´à¸à¸²à¸£à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸” zip à¸–à¸¹à¸à¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸§à¹‰",
@@ -18,16 +18,15 @@
 "Text" => "à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡",
 "Images" => "à¸£à¸¹à¸›à¸ à¸²à¸ž",
 "seconds ago" => "à¸§à¸´à¸™à¸²à¸—à¸µ à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"1 minute ago" => "1 à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"%d minutes ago" => "%d à¸™à¸²à¸—à¸µà¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²",
-"1 hour ago" => "1 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
-"%d hours ago" => "%d à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "à¸§à¸±à¸™à¸™à¸µà¹‰",
 "yesterday" => "à¹€à¸¡à¸·à¹ˆà¸à¸§à¸²à¸™à¸™à¸µà¹‰",
-"%d days ago" => "%d à¸§à¸±à¸™à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "à¹€à¸”à¸·à¸à¸™à¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§",
-"%d months ago" => "%d à¹€à¸”à¸·à¸à¸™à¸¡à¸²à¹à¸¥à¹‰à¸§",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§",
 "years ago" => "à¸›à¸µ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²",
 "Could not find category \"%s\"" => "à¹„à¸¡à¹ˆà¸žà¸šà¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆ \"%s\""
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 6325ad9886aecdd86efc67e290579c98a79d181a..6dc20e8f595df41bdf941017a363ee67b1d6ab84 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "YardÄ±m",
 "Personal" => "KiÅŸisel",
 "Settings" => "Ayarlar",
 "Users" => "KullanÄ±cÄ±lar",
-"Apps" => "Uygulamalar",
 "Admin" => "YÃ¶netici",
 "web services under your control" => "Bilgileriniz gÃ¼venli ve ÅŸifreli",
 "ZIP download is turned off." => "ZIP indirmeleri kapatÄ±lmÄ±ÅŸtÄ±r.",
@@ -38,16 +38,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi iÃ§in dÃ¼zgÃ¼n bir ÅŸekilde yapÄ±landÄ±rÄ±lmamÄ±ÅŸ. WevDAV arabirimini sorunlu gÃ¶zÃ¼kÃ¼yor.",
 "Please double check the <a href='%s'>installation guides</a>." => "LÃ¼tfen <a href='%s'>kurulum kÄ±lavuzlarÄ±nÄ±</a> iki kez kontrol edin.",
 "seconds ago" => "saniye Ã¶nce",
-"1 minute ago" => "1 dakika Ã¶nce",
-"%d minutes ago" => "%d dakika Ã¶nce",
-"1 hour ago" => "1 saat Ã¶nce",
-"%d hours ago" => "%d saat Ã¶nce",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "bugÃ¼n",
 "yesterday" => "dÃ¼n",
-"%d days ago" => "%d gÃ¼n Ã¶nce",
+"_%n day go_::_%n days ago_" => array("",""),
 "last month" => "geÃ§en ay",
-"%d months ago" => "%d ay Ã¶nce",
+"_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "geÃ§en yÄ±l",
 "years ago" => "yÄ±l Ã¶nce",
 "Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadÄ±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
index 62d91616c1d3cd02a9270195be5d287eb578a673..731ad904d7e7480a3c094a52d6ab1ed4b095ff3b 100644
--- a/lib/l10n/ug.php
+++ b/lib/l10n/ug.php
@@ -1,19 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "ÙŠØ§Ø±Ø¯Û•Ù…",
 "Personal" => "Ø´Û•Ø®Ø³Ù‰ÙŠ",
 "Settings" => "ØªÛ•ÚØ´Û•ÙƒÙ„Û•Ø±",
 "Users" => "Ø¦Ù‰Ø´Ù„Û•ØªÙƒÛˆÚ†Ù‰Ù„Û•Ø±",
-"Apps" => "Ø¦Û•Ù¾Ù„Û•Ø±",
 "Authentication error" => "Ø³Ø§Ù„Ø§Ú¾Ù‰ÙŠÛ•Øª Ø¯Û•Ù„Ù‰Ù„Ù„Û•Ø´ Ø®Ø§ØªØ§Ù„Ù‰Ù‚Ù‰",
 "Files" => "Ú¾Û†Ø¬Ø¬Û•ØªÙ„Û•Ø±",
 "Text" => "Ù‚Ù‰Ø³Ù‚Ø§ Ø¦Û‡Ú†Û‡Ø±",
 "Images" => "Ø³ÛˆØ±Û•ØªÙ„Û•Ø±",
-"1 minute ago" => "1 Ù…Ù‰Ù†Û‡Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰",
-"%d minutes ago" => "%d Ù…Ù‰Ù†Û‡Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰",
-"1 hour ago" => "1 Ø³Ø§Ø¦Û•Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰",
-"%d hours ago" => "%d Ø³Ø§Ø¦Û•Øª Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "Ø¨ÛˆÚ¯ÛˆÙ†",
 "yesterday" => "ØªÛˆÙ†ÛˆÚ¯ÛˆÙ†",
-"%d days ago" => "%d ÙƒÛˆÙ† Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰",
-"%d months ago" => "%d Ø¦Ø§ÙŠ Ø¦Ù‰Ù„Ú¯Ù‰Ø±Ù‰"
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 7ff7829e1a25e126bca179f54f6ecaf87b13e22c..26617396e06bb3ff6a728070f5161e94f645a4fb 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°",
 "Personal" => "ÐžÑÐ¾Ð±Ð¸ÑÑ‚Ðµ",
 "Settings" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
 "Users" => "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–",
-"Apps" => "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¸",
 "Admin" => "ÐÐ´Ð¼Ñ–Ð½",
 "web services under your control" => "Ð¿Ñ–Ð´ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ– Ð’Ð°Ð¼ Ð²ÐµÐ±-ÑÐµÑ€Ð²Ñ–ÑÐ¸",
 "ZIP download is turned off." => "ZIP Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾.",
@@ -37,16 +37,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’Ð°Ñˆ Web-ÑÐµÑ€Ð²ÐµÑ€ Ñ‰Ðµ Ð½Ðµ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ‡Ð¸Ð½Ð¾Ð¼ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–ÑŽ Ñ„Ð°Ð¹Ð»Ñ–Ð², Ñ‡ÐµÑ€ÐµÐ· Ñ‚Ðµ Ñ‰Ð¾ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, Ð·Ð´Ð°Ñ”Ñ‚ÑŒÑÑ, Ð·Ð»Ð°Ð¼Ð°Ð½Ð¸Ð¹.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ <a href='%s'>Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð¿Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑŽ</a>.",
 "seconds ago" => "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ",
-"1 minute ago" => "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ",
-"%d minutes ago" => "%d Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ",
-"1 hour ago" => "1 Ð³Ð¾Ð´Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ",
-"%d hours ago" => "%d Ð³Ð¾Ð´Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–",
 "yesterday" => "Ð²Ñ‡Ð¾Ñ€Ð°",
-"%d days ago" => "%d Ð´Ð½Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ",
+"_%n day go_::_%n days ago_" => array("","",""),
 "last month" => "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ð¼Ñ–ÑÑÑ†Ñ",
-"%d months ago" => "%d Ð¼Ñ–ÑÑÑ†Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ",
+"_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ",
 "years ago" => "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ",
 "Could not find category \"%s\"" => "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–ÑŽ \"%s\""
 );
+$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);";
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
index 21e711c6df5fb10e46739f6be8d69dbac4bbe124..7dc967ccd9323ff236cccbb31a49b183e43d6c1a 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/l10n/ur_PK.php
@@ -1,9 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "Ù…Ø¯Ø¯",
 "Personal" => "Ø°Ø§ØªÛŒ",
 "Settings" => "Ø³ÛŒÙ¹ÛŒÙ†Ú¯Ø²",
 "Users" => "ÛŒÙˆØ²Ø±Ø²",
-"Apps" => "Ø§ÛŒÙ¾Ø²",
 "Admin" => "Ø§ÛŒÚˆÙ…Ù†",
-"web services under your control" => "Ø¢Ù¾ Ú©Û’ Ø§Ø®ØªÛŒØ§Ø± Ù…ÛŒÚº ÙˆÛŒØ¨ Ø³Ø±ÙˆØ³ÛŒØ²"
+"web services under your control" => "Ø¢Ù¾ Ú©Û’ Ø§Ø®ØªÛŒØ§Ø± Ù…ÛŒÚº ÙˆÛŒØ¨ Ø³Ø±ÙˆØ³ÛŒØ²",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index f2a7d669b8f25607ed7671163798c7024c0833bc..ebdb3ab281076573db1f6fc48a372c24b5e99f52 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "GiÃºp Ä‘á»¡",
 "Personal" => "CÃ¡ nhÃ¢n",
 "Settings" => "CÃ i Ä‘áº·t",
 "Users" => "NgÆ°á»i dÃ¹ng",
-"Apps" => "á»¨ng dá»¥ng",
 "Admin" => "Quáº£n trá»‹",
 "web services under your control" => "dá»‹ch vá»¥ web dÆ°á»›i sá»± kiá»ƒm soÃ¡t cá»§a báº¡n",
 "ZIP download is turned off." => "Táº£i vá» ZIP Ä‘Ã£ bá»‹ táº¯t.",
@@ -18,16 +18,15 @@
 "Text" => "VÄƒn báº£n",
 "Images" => "HÃ¬nh áº£nh",
 "seconds ago" => "vÃ i giÃ¢y trÆ°á»›c",
-"1 minute ago" => "1 phÃºt trÆ°á»›c",
-"%d minutes ago" => "%d phÃºt trÆ°á»›c",
-"1 hour ago" => "1 giá» trÆ°á»›c",
-"%d hours ago" => "%d giá» trÆ°á»›c",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "hÃ´m nay",
 "yesterday" => "hÃ´m qua",
-"%d days ago" => "%d ngÃ y trÆ°á»›c",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "thÃ¡ng trÆ°á»›c",
-"%d months ago" => "%d thÃ¡ng trÆ°á»›c",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "nÄƒm trÆ°á»›c",
 "years ago" => "nÄƒm trÆ°á»›c",
 "Could not find category \"%s\"" => "khÃ´ng thá»ƒ tÃ¬m tháº¥y má»¥c \"%s\""
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
index 4780a69eb34aa84d6c4b55a50ed72b49a17a6ff3..64c9926d5cfeb8bd408805460782266cae55185c 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "å¸®åŠ©",
 "Personal" => "ç§äºº",
 "Settings" => "è®¾ç½®",
 "Users" => "ç”¨æˆ·",
-"Apps" => "ç¨‹åº",
 "Admin" => "ç®¡ç†å‘˜",
 "web services under your control" => "æ‚¨æŽ§åˆ¶çš„ç½‘ç»œæœåŠ¡",
 "ZIP download is turned off." => "ZIP ä¸‹è½½å·²å…³é—",
@@ -19,13 +19,14 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "å› WebDAVæŽ¥å£æ•…éšœï¼Œæ‚¨çš„ç½‘ç»œæœåŠ¡å™¨å¥½åƒå¹¶æœªå…è®¸æ–‡ä»¶åŒæ¥ã€‚",
 "Please double check the <a href='%s'>installation guides</a>." => "è¯·åŒå‡»<a href='%s'>å®‰è£…å‘å¯¼</a>ã€‚",
 "seconds ago" => "ç§’å‰",
-"1 minute ago" => "1 åˆ†é’Ÿå‰",
-"%d minutes ago" => "%d åˆ†é’Ÿå‰",
-"1 hour ago" => "1å°æ—¶å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
-"%d days ago" => "%d å¤©å‰",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "ä¸Šä¸ªæœˆ",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹´å‰"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 7630f885c4a2ccec67b3ae591c179d78293609f5..b814b055a224ca06e1f11cbd681e6542864dad64 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "å¸®åŠ©",
 "Personal" => "ä¸ªäºº",
 "Settings" => "è®¾ç½®",
 "Users" => "ç”¨æˆ·",
-"Apps" => "åº”ç”¨",
 "Admin" => "ç®¡ç†",
 "web services under your control" => "æ‚¨æŽ§åˆ¶çš„webæœåŠ¡",
 "ZIP download is turned off." => "ZIP ä¸‹è½½å·²ç»å…³é—",
@@ -38,16 +38,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "æ‚¨çš„WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…è®¸æ–‡ä»¶åŒæ¥, å› ä¸ºWebDAVçš„æŽ¥å£ä¼¼ä¹Žå·²æŸå.",
 "Please double check the <a href='%s'>installation guides</a>." => "è¯·è®¤çœŸæ£€æŸ¥<a href='%s'>å®‰è£…æŒ‡å—</a>.",
 "seconds ago" => "ç§’å‰",
-"1 minute ago" => "ä¸€åˆ†é’Ÿå‰",
-"%d minutes ago" => "%d åˆ†é’Ÿå‰",
-"1 hour ago" => "1å°æ—¶å‰",
-"%d hours ago" => "%då°æ—¶å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
-"%d days ago" => "%d å¤©å‰",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "ä¸Šæœˆ",
-"%d months ago" => "%d æœˆå‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹´å‰",
 "Could not find category \"%s\"" => "æ— æ³•æ‰¾åˆ°åˆ†ç±» \"%s\""
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_HK.php b/lib/l10n/zh_HK.php
index cfa33ec36f5e5b30ee168e173a6c629be10a6360..ca3e6d504e7e4af4d8e2d107b2f38698d5079a0a 100644
--- a/lib/l10n/zh_HK.php
+++ b/lib/l10n/zh_HK.php
@@ -1,13 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "å¹«åŠ©",
 "Personal" => "å€‹äºº",
 "Settings" => "è¨å®š",
 "Users" => "ç”¨æˆ¶",
-"Apps" => "è»Ÿä»¶",
 "Admin" => "ç®¡ç†",
 "Files" => "æ–‡ä»¶",
 "Text" => "æ–‡å—",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šæ—¥",
 "yesterday" => "æ˜¨æ—¥",
-"last month" => "å‰ä¸€æœˆ"
+"_%n day go_::_%n days ago_" => array(""),
+"last month" => "å‰ä¸€æœˆ",
+"_%n month ago_::_%n months ago_" => array("")
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index afd196f7c821315f49f40649e98bbf7d2b9eab72..83e0dff39268dd3c19066d7dcb4098a4c4815481 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Help" => "èªªæ˜Ž",
 "Personal" => "å€‹äºº",
 "Settings" => "è¨å®š",
 "Users" => "ä½¿ç”¨è€…",
-"Apps" => "æ‡‰ç”¨ç¨‹å¼",
 "Admin" => "ç®¡ç†",
 "web services under your control" => "ç”±æ‚¨æŽ§åˆ¶çš„ç¶²è·¯æœå‹™",
 "ZIP download is turned off." => "ZIP ä¸‹è¼‰å·²é—œé–‰ã€‚",
@@ -38,16 +38,15 @@
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "æ‚¨çš„ç¶²é ä¼ºæœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”æ¡ˆåŒæ¥ï¼Œå› ç‚ºæ‚¨çš„ WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚",
 "Please double check the <a href='%s'>installation guides</a>." => "è«‹åƒè€ƒ<a href='%s'>å®‰è£æŒ‡å—</a>ã€‚",
 "seconds ago" => "å¹¾ç§’å‰",
-"1 minute ago" => "1 åˆ†é˜å‰",
-"%d minutes ago" => "%d åˆ†é˜å‰",
-"1 hour ago" => "1 å°æ™‚ä¹‹å‰",
-"%d hours ago" => "%d å°æ™‚ä¹‹å‰",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
-"%d days ago" => "%d å¤©å‰",
+"_%n day go_::_%n days ago_" => array(""),
 "last month" => "ä¸Šå€‹æœˆ",
-"%d months ago" => "%d å€‹æœˆä¹‹å‰",
+"_%n month ago_::_%n months ago_" => array(""),
 "last year" => "åŽ»å¹´",
 "years ago" => "å¹¾å¹´å‰",
 "Could not find category \"%s\"" => "æ‰¾ä¸åˆ°åˆ†é¡žï¼š\"%s\""
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/legacy/config.php b/lib/legacy/config.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e4980137377baadc8959bd1fe2a8326a753b752
--- /dev/null
+++ b/lib/legacy/config.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Frank Karlitschek
+ * @author Jakob Sack
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+/*
+ *
+ * An example of config.php
+ *
+ * <?php
+ * $CONFIG = array(
+ *     "database" => "mysql",
+ *     "firstrun" => false,
+ *     "pi" => 3.14
+ * );
+ * ?>
+ *
+ */
+
+/**
+ * This class is responsible for reading and writing config.php, the very basic
+ * configuration file of ownCloud.
+ */
+OC_Config::$object = new \OC\Config(OC::$SERVERROOT.'/config/');
+class OC_Config {
+
+	/**
+	 * @var \OC\Config
+	 */
+	public static $object;
+
+	public static function getObject() {
+		return self::$object;
+	}
+
+	/**
+	 * @brief Lists all available config keys
+	 * @return array with key names
+	 *
+	 * This function returns all keys saved in config.php. Please note that it
+	 * does not return the values.
+	 */
+	public static function getKeys() {
+		return self::$object->getKeys();
+	}
+
+	/**
+	 * @brief Gets a value from config.php
+	 * @param string $key key
+	 * @param string $default = null default value
+	 * @return string the value or $default
+	 *
+	 * This function gets the value from config.php. If it does not exist,
+	 * $default will be returned.
+	 */
+	public static function getValue($key, $default = null) {
+		return self::$object->getValue($key, $default);
+	}
+
+	/**
+	 * @brief Sets a value
+	 * @param string $key key
+	 * @param string $value value
+	 *
+	 * This function sets the value and writes the config.php.
+	 *
+	 */
+	public static function setValue($key, $value) {
+		try {
+			self::$object->setValue($key, $value);
+		} catch (\OC\HintException $e) {
+			\OC_Template::printErrorPage($e->getMessage(), $e->getHint());
+		}
+	}
+
+	/**
+	 * @brief Removes a key from the config
+	 * @param string $key key
+	 *
+	 * This function removes a key from the config.php.
+	 *
+	 */
+	public static function deleteKey($key) {
+		try {
+			self::$object->deleteKey($key);
+		} catch (\OC\HintException $e) {
+			\OC_Template::printErrorPage($e->getMessage(), $e->getHint());
+		}
+	}
+}
diff --git a/lib/legacy/log.php b/lib/legacy/log.php
index 7802ead24127d27012fcfef31cb91dcf4668e791..027cb89e97cbe99fd8a53902c88c0fddac21c5dd 100644
--- a/lib/legacy/log.php
+++ b/lib/legacy/log.php
@@ -47,31 +47,4 @@ class OC_Log {
 			call_user_func($func, $message, $context);
 		}
 	}
-
-	//Fatal errors handler
-	public static function onShutdown() {
-		$error = error_get_last();
-		if($error) {
-			//ob_end_clean();
-			self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL);
-		} else {
-			return true;
-		}
-	}
-
-	// Uncaught exception handler
-	public static function onException($exception) {
-		self::write('PHP',
-			$exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(),
-			self::FATAL);
-	}
-
-	//Recoverable errors handler
-	public static function onError($number, $message, $file, $line) {
-		if (error_reporting() === 0) {
-			return;
-		}
-		self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN);
-
-	}
 }
diff --git a/lib/log/errorhandler.php b/lib/log/errorhandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..69cb960de915268fac38ac2cf5c0dacb77e507dc
--- /dev/null
+++ b/lib/log/errorhandler.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Log;
+
+use OC\Log as LoggerInterface;
+
+class ErrorHandler {
+	/** @var LoggerInterface */
+	private static $logger;
+
+	public static function register() {
+		$handler = new ErrorHandler();
+
+		set_error_handler(array($handler, 'onError'));
+		register_shutdown_function(array($handler, 'onShutdown'));
+		set_exception_handler(array($handler, 'onException'));
+	}
+
+	public static function setLogger(LoggerInterface $logger) {
+		self::$logger = $logger;
+	}
+
+	//Fatal errors handler
+	public static function onShutdown() {
+		$error = error_get_last();
+		if($error && self::$logger) {
+			//ob_end_clean();
+			$msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line'];
+			self::$logger->critical($msg, array('app' => 'PHP'));
+		}
+	}
+
+	// Uncaught exception handler
+	public static function onException($exception) {
+		$msg = $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine();
+		self::$logger->critical($msg, array('app' => 'PHP'));
+	}
+
+	//Recoverable errors handler
+	public static function onError($number, $message, $file, $line) {
+		if (error_reporting() === 0) {
+			return;
+		}
+		$msg = $message . ' at ' . $file . '#' . $line;
+		self::$logger->warning($msg, array('app' => 'PHP'));
+
+	}
+}
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 7a11a588330c7a79902fda7e82a25a0fcf4aaebe..d16b9537a1658ca4f9835494e2d9265433dd0b41 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -44,12 +44,14 @@ class OC_Log_Owncloud {
 	 * write a message in the log
 	 * @param string $app
 	 * @param string $message
-	 * @param int level
+	 * @param int $level
 	 */
 	public static function write($app, $message, $level) {
 		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
 		if($level>=$minLevel) {
-			$time = date("F d, Y H:i:s", time());
+			// default to ISO8601
+			$format = OC_Config::getValue('logdateformat', 'c');
+			$time = date($format, time());
 			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time);
 			$handle = @fopen(self::$logFile, 'a');
 			if ($handle) {
@@ -61,8 +63,8 @@ class OC_Log_Owncloud {
 
 	/**
 	 * get entries from the log in reverse chronological order
-	 * @param int limit
-	 * @param int offset
+	 * @param int $limit
+	 * @param int $offset
 	 * @return array
 	 */
 	public static function getEntries($limit=50, $offset=0) {
diff --git a/lib/log/syslog.php b/lib/log/syslog.php
index d1fb28d8b0a7f7e1a36c5ac2601f49eaf2845dbb..c98deab7109bed68359baaa4fc41429c98df3825 100644
--- a/lib/log/syslog.php
+++ b/lib/log/syslog.php
@@ -28,10 +28,13 @@ class OC_Log_Syslog {
 	 * write a message in the log
 	 * @param string $app
 	 * @param string $message
-	 * @param int level
+	 * @param int $level
 	 */
 	public static function write($app, $message, $level) {
-		$syslog_level = self::$levels[$level];
-		syslog($syslog_level, '{'.$app.'} '.$message);
+		$minLevel = min(OC_Config::getValue("loglevel", OC_Log::WARN), OC_Log::ERROR);
+		if ($level >= $minLevel) {
+			$syslog_level = self::$levels[$level];
+			syslog($syslog_level, '{'.$app.'} '.$message);
+		}
 	}
 }
diff --git a/lib/memcache/apc.php b/lib/memcache/apc.php
new file mode 100644
index 0000000000000000000000000000000000000000..575ee4427db6d5773466ec573e906026fcc3f740
--- /dev/null
+++ b/lib/memcache/apc.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Memcache;
+
+class APC extends Cache {
+	/**
+	 * entries in APC gets namespaced to prevent collisions between owncloud instances and users
+	 */
+	protected function getNameSpace() {
+		return $this->prefix;
+	}
+
+	public function get($key) {
+		$result = apc_fetch($this->getNamespace() . $key, $success);
+		if (!$success) {
+			return null;
+		}
+		return $result;
+	}
+
+	public function set($key, $value, $ttl = 0) {
+		return apc_store($this->getNamespace() . $key, $value, $ttl);
+	}
+
+	public function hasKey($key) {
+		return apc_exists($this->getNamespace() . $key);
+	}
+
+	public function remove($key) {
+		return apc_delete($this->getNamespace() . $key);
+	}
+
+	public function clear($prefix = '') {
+		$ns = $this->getNamespace() . $prefix;
+		$cache = apc_cache_info('user');
+		foreach ($cache['cache_list'] as $entry) {
+			if (strpos($entry['info'], $ns) === 0) {
+				apc_delete($entry['info']);
+			}
+		}
+		return true;
+	}
+
+	static public function isAvailable() {
+		if (!extension_loaded('apc')) {
+			return false;
+		} elseif (!ini_get('apc.enable_cli') && \OC::$CLI) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+}
+
+if (!function_exists('apc_exists')) {
+	function apc_exists($keys) {
+		$result = false;
+		apc_fetch($keys, $result);
+		return $result;
+	}
+}
diff --git a/lib/memcache/apcu.php b/lib/memcache/apcu.php
new file mode 100644
index 0000000000000000000000000000000000000000..ccc1aa6e5622652d9c43bfaef608bbb8d75472ce
--- /dev/null
+++ b/lib/memcache/apcu.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Memcache;
+
+class APCu extends APC {
+	public function clear($prefix = '') {
+		$ns = $this->getNamespace() . $prefix;
+		$ns = preg_quote($ns, '/');
+		$iter = new \APCIterator('/^'.$ns.'/');
+		return apc_delete($iter);
+	}
+
+	static public function isAvailable() {
+		if (!extension_loaded('apcu')) {
+			return false;
+		} elseif (!ini_get('apc.enable_cli') && \OC::$CLI) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+}
diff --git a/lib/memcache/cache.php b/lib/memcache/cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..0ad1cc7ec0391025ef11be3296b9aa992375d0fa
--- /dev/null
+++ b/lib/memcache/cache.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Memcache;
+
+abstract class Cache implements \ArrayAccess {
+	/**
+	 * @var string $prefix
+	 */
+	protected $prefix;
+
+	/**
+	 * @param string $prefix
+	 */
+	public function __construct($prefix = '') {
+		$this->prefix = \OC_Util::getInstanceId() . '/' . $prefix;
+	}
+
+	public function getPrefix() {
+		return $this->prefix;
+	}
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	abstract public function get($key);
+
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 * @param int $ttl
+	 * @return mixed
+	 */
+	abstract public function set($key, $value, $ttl = 0);
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	abstract public function hasKey($key);
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	abstract public function remove($key);
+
+	/**
+	 * @param string $prefix
+	 * @return mixed
+	 */
+	abstract public function clear($prefix = '');
+
+	//implement the ArrayAccess interface
+
+	public function offsetExists($offset) {
+		return $this->hasKey($offset);
+	}
+
+	public function offsetSet($offset, $value) {
+		$this->set($offset, $value);
+	}
+
+	public function offsetGet($offset) {
+		return $this->get($offset);
+	}
+
+	public function offsetUnset($offset) {
+		$this->remove($offset);
+	}
+}
diff --git a/lib/memcache/factory.php b/lib/memcache/factory.php
new file mode 100644
index 0000000000000000000000000000000000000000..4c1b1ab207f228cbb5bb7a1774d2820733b0c6ad
--- /dev/null
+++ b/lib/memcache/factory.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Memcache;
+
+class Factory {
+	/**
+	 * get a cache instance, will return null if no backend is available
+	 *
+	 * @param string $prefix
+	 * @return \OC\Memcache\Cache
+	 */
+	function create($prefix = '') {
+		if (XCache::isAvailable()) {
+			return new XCache($prefix);
+		} elseif (APCu::isAvailable()) {
+			return new APCu($prefix);
+		} elseif (APC::isAvailable()) {
+			return new APC($prefix);
+		} elseif (Memcached::isAvailable()) {
+			return new Memcached($prefix);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * check if there is a memcache backend available
+	 *
+	 * @return bool
+	 */
+	public function isAvailable() {
+		return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable() || Memcached::isAvailable();
+	}
+}
diff --git a/lib/memcache/memcached.php b/lib/memcache/memcached.php
new file mode 100644
index 0000000000000000000000000000000000000000..978e6c2eff12b398beead40859e2eb87a2367e10
--- /dev/null
+++ b/lib/memcache/memcached.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Memcache;
+
+class Memcached extends Cache {
+	/**
+	 * @var \Memcached $cache
+	 */
+	private static $cache = null;
+
+	public function __construct($prefix = '') {
+		parent::__construct($prefix);
+		if (is_null(self::$cache)) {
+			self::$cache = new \Memcached();
+			list($host, $port) = \OC_Config::getValue('memcached_server', array('localhost', 11211));
+			self::$cache->addServer($host, $port);
+		}
+	}
+
+	/**
+	 * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
+	 */
+	protected function getNameSpace() {
+		return $this->prefix;
+	}
+
+	public function get($key) {
+		$result = self::$cache->get($this->getNamespace() . $key);
+		if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
+			return null;
+		} else {
+			return $result;
+		}
+	}
+
+	public function set($key, $value, $ttl = 0) {
+		if ($ttl > 0) {
+			return self::$cache->set($this->getNamespace() . $key, $value, $ttl);
+		} else {
+			return self::$cache->set($this->getNamespace() . $key, $value);
+		}
+	}
+
+	public function hasKey($key) {
+		self::$cache->get($this->getNamespace() . $key);
+		return self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND;
+	}
+
+	public function remove($key) {
+		return self::$cache->delete($this->getNamespace() . $key);
+	}
+
+	public function clear($prefix = '') {
+		$prefix = $this->getNamespace() . $prefix;
+		$allKeys = self::$cache->getAllKeys();
+		$keys = array();
+		$prefixLength = strlen($prefix);
+		foreach ($allKeys as $key) {
+			if (substr($key, 0, $prefixLength) === $prefix) {
+				$keys[] = $key;
+			}
+		}
+		self::$cache->deleteMulti($keys);
+		return true;
+	}
+
+	static public function isAvailable() {
+		return extension_loaded('memcached');
+	}
+}
diff --git a/lib/cache/xcache.php b/lib/memcache/xcache.php
similarity index 69%
rename from lib/cache/xcache.php
rename to lib/memcache/xcache.php
index 9f380f870b98da0d83b72e77a90074abfdeddc8a..33de30562f901e7bbaef111cc823f70db700ec95 100644
--- a/lib/cache/xcache.php
+++ b/lib/memcache/xcache.php
@@ -6,16 +6,9 @@
  * See the COPYING-README file.
  */
 
-class OC_Cache_XCache {
-	protected $prefix;
-
-	public function __construct($global = false) {
-		$this->prefix = OC_Util::getInstanceId().'/';
-		if (!$global) {
-			$this->prefix .= OC_User::getUser().'/';
-		}
-	}
+namespace OC\Memcache;
 
+class XCache extends Cache {
 	/**
 	 * entries in XCache gets namespaced to prevent collisions between owncloud instances and users
 	 */
@@ -44,13 +37,24 @@ class OC_Cache_XCache {
 	}
 
 	public function clear($prefix='') {
-		if(!function_exists('xcache_unset_by_prefix')) {
-			function xcache_unset_by_prefix($prefix) {
-				// Since we can't clear targetted cache, we'll clear all. :(
-				xcache_clear_cache(XC_TYPE_VAR, 0);
-			}
-		}
 		xcache_unset_by_prefix($this->getNamespace().$prefix);
 		return true;
 	}
+
+	static public function isAvailable(){
+		if (!extension_loaded('xcache')) {
+			return false;
+		} elseif (\OC::$CLI) {
+			return false;
+		}else{
+			return true;
+		}
+	}
+}
+
+if(!function_exists('xcache_unset_by_prefix')) {
+	function xcache_unset_by_prefix($prefix) {
+		// Since we can't clear targetted cache, we'll clear all. :(
+		xcache_clear_cache(\XC_TYPE_VAR, 0);
+	}
 }
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 400a46a434041c7d9a4799a214eb58beb0294f49..2d8268a1d74b2a08fbcd15cea3d25ff18e20fc34 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -112,7 +112,7 @@ class OC_Migration_Content{
 
 			foreach( $options['matchval'] as $matchval ) {
 				// Run the query for this match value (where x = y value)
-				$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '` WHERE `' . $options['matchcol'] . '` LIKE ?';
+				$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '` WHERE `' . $options['matchcol'] . '` = ?';
 				$query = OC_DB::prepare( $sql );
 				$results = $query->execute( array( $matchval ) );
 				$newreturns = $this->insertData( $results, $options );
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index 2aac3bbfd27b1b88e6faee225b9144e48497d0d2..8ab8ac81bd83025a911e60cfa647bc17210f892e 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -102,5 +102,6 @@ return array(
 	'md' => 'text/markdown',
 	'markdown' => 'text/markdown',
 	'mdown' => 'text/markdown',
-	'mdwn' => 'text/markdown'
+	'mdwn' => 'text/markdown',
+	'reveal' => 'text/reveal'
 );
diff --git a/lib/preferences.php b/lib/preferences.php
index 5f6434bcf9cd9a12b1ab43d7a8e4dd9fa796acef..11ca760830edea40b35ead1154e02d516fc92328 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -59,7 +59,7 @@ class OC_Preferences{
 	}
 
 	/**
-	 * @brief Get all apps of a user
+	 * @brief Get all apps of an user
 	 * @param string $user user
 	 * @return array with app ids
 	 *
diff --git a/lib/public/config.php b/lib/public/config.php
index 8076d640b497cc3c751643f161e0f2200ae7745d..73476d7551ddffb391aa0aeff4e8d783cacec076 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -49,7 +49,7 @@ class Config {
 	 * $default will be returned.
 	 */
 	public static function getSystemValue( $key, $default = null ) {
-		return(\OC_Config::getValue( $key, $default ));
+		return \OC_Config::getValue( $key, $default );
 	}
 
 	/**
@@ -62,7 +62,12 @@ class Config {
 	 * not be written, false will be returned.
 	 */
 	public static function setSystemValue( $key, $value ) {
-		return(\OC_Config::setValue( $key, $value ));
+		try {
+			\OC_Config::setValue( $key, $value );
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
 	}
 
 	/**
@@ -76,7 +81,7 @@ class Config {
 	 * not exist the default value will be returned
 	 */
 	public static function getAppValue( $app, $key, $default = null ) {
-		return(\OC_Appconfig::getValue( $app, $key, $default ));
+		return \OC_Appconfig::getValue( $app, $key, $default );
 	}
 
 	/**
@@ -89,7 +94,12 @@ class Config {
 	 * Sets a value. If the key did not exist before it will be created.
 	 */
 	public static function setAppValue( $app, $key, $value ) {
-		return(\OC_Appconfig::setValue( $app, $key, $value ));
+		try {
+			\OC_Appconfig::setValue( $app, $key, $value );
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
 	}
 
 	/**
@@ -104,7 +114,7 @@ class Config {
 	 * not exist the default value will be returned
 	 */
 	public static function getUserValue( $user, $app, $key, $default = null ) {
-		return(\OC_Preferences::getValue( $user, $app, $key, $default ));
+		return \OC_Preferences::getValue( $user, $app, $key, $default );
 	}
 
 	/**
@@ -119,6 +129,11 @@ class Config {
 	 * will be added automagically.
 	 */
 	public static function setUserValue( $user, $app, $key, $value ) {
-		return(\OC_Preferences::setValue( $user, $app, $key, $value ));
+		try {
+			\OC_Preferences::setValue( $user, $app, $key, $value );
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
 	}
 }
diff --git a/lib/public/files.php b/lib/public/files.php
index 4975bbb7dfa03456b252ece8d0c89017113f6452..852b041eefb1bc1af72cce4640bff5d41c6f44e7 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -61,7 +61,7 @@ class Files {
 	 * @param string $query
 	 * @return array
 	 */
-	public function searchByMime($mimetype) {
+	static public function searchByMime($mimetype) {
 		return(\OC\Files\Filesystem::searchByMime( $mimetype ));
 	}
 
diff --git a/tests/lib/cache/xcache.php b/lib/public/image.php
similarity index 68%
rename from tests/lib/cache/xcache.php
rename to lib/public/image.php
index 43bed2db037a5f30ab45c2d280b42edcc83ddfd7..c6dd9a113ab81a50665ec327d69b81e6d3e4df2d 100644
--- a/tests/lib/cache/xcache.php
+++ b/lib/public/image.php
@@ -2,8 +2,8 @@
 /**
 * ownCloud
 *
-* @author Robin Appelman
-* @copyright 2012 Robin Appelman icewind@owncloud.com
+* @author Bart Visscher
+* @copyright 2013 Bart Visscher <bartv@thisnet.nl>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -20,12 +20,10 @@
 *
 */
 
-class Test_Cache_XCache extends Test_Cache {
-	public function setUp() {
-		if(!function_exists('xcache_get')) {
-			$this->markTestSkipped('The xcache extension is not available.');
-			return;
-		}
-		$this->instance=new OC_Cache_XCache();
-	}
+namespace OCP;
+
+/**
+ * This class provides functions to handle images
+ */
+class Image extends \OC_Image {
 }
diff --git a/lib/public/share.php b/lib/public/share.php
index 596a729a47d06a3c02357c99584235014ae38c33..63645e6fa34bd15bb2f8ec493ecda0531d6b8fc5 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -454,6 +454,9 @@ class Share {
 					$forcePortable = (CRYPT_BLOWFISH != 1);
 					$hasher = new \PasswordHash(8, $forcePortable);
 					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+				} else {
+					// reuse the already set password
+					$shareWith = $checkExists['share_with'];
 				}
 
 				// Generate token
@@ -1285,6 +1288,8 @@ class Share {
 		if ($shareType == self::SHARE_TYPE_GROUP) {
 			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
 				$uidOwner, $suggestedItemTarget);
+			$run = true;
+			$error = '';
 			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
 				'itemType' => $itemType,
 				'itemSource' => $itemSource,
@@ -1294,8 +1299,15 @@ class Share {
 				'uidOwner' => $uidOwner,
 				'permissions' => $permissions,
 				'fileSource' => $fileSource,
-				'token' => $token
+				'token' => $token,
+				'run' => &$run,
+				'error' => &$error
 			));
+			
+			if ($run === false) {
+				throw new \Exception($error);
+			}
+			
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
@@ -1371,6 +1383,8 @@ class Share {
 		} else {
 			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
 				$suggestedItemTarget);
+			$run = true;
+			$error = '';
 			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
 				'itemType' => $itemType,
 				'itemSource' => $itemSource,
@@ -1380,8 +1394,15 @@ class Share {
 				'uidOwner' => $uidOwner,
 				'permissions' => $permissions,
 				'fileSource' => $fileSource,
-				'token' => $token
+				'token' => $token,
+				'run' => &$run,
+				'error' => &$error
 			));
+			
+			if ($run === false) {
+				throw new \Exception($error);
+			}
+			
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
diff --git a/lib/public/template.php b/lib/public/template.php
index ccf19cf052cbefc4a7e52c7a22f82cb898560858..ab1089c332d659088c0ad69067a03af90fb3959c 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -77,12 +77,13 @@ function relative_modified_date($timestamp) {
 
 
 /**
- * @brief Return a human readable outout for a file size.
+ * @brief DEPRECATED Return a human readable outout for a file size.
+ * @deprecated human_file_size() instead
  * @param $byte size of a file in byte
  * @returns human readable interpretation of a file size
  */
 function simple_file_size($bytes) {
-	return(\simple_file_size($bytes));
+	return(\human_file_size($bytes));
 }
 
 
diff --git a/lib/public/user.php b/lib/public/user.php
index 9edebe0e7cf5ccc822b84f59193867403ba3b6d7..23ff991642dfb7e9c457bb34c5c5698c9eaeceb0 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -40,7 +40,7 @@ class User {
 	 * @return string uid or false
 	 */
 	public static function getUser() {
-		return \OC_USER::getUser();
+		return \OC_User::getUser();
 	}
 
 	/**
@@ -50,7 +50,7 @@ class User {
 	 * Get a list of all users.
 	 */
 	public static function getUsers($search = '', $limit = null, $offset = null) {
-		return \OC_USER::getUsers();
+		return \OC_User::getUsers($search, $limit, $offset);
 	}
 
 	/**
@@ -58,7 +58,7 @@ class User {
 	 * @return string display name
 	 */
 	public static function getDisplayName($user=null) {
-		return \OC_USER::getDisplayName($user);
+		return \OC_User::getDisplayName($user);
 	}
 
 	/**
@@ -68,7 +68,7 @@ class User {
 	 * Get a list of all display names and user ids.
 	 */
 	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
-		return \OC_USER::getDisplayNames($search, $limit, $offset);
+		return \OC_User::getDisplayNames($search, $limit, $offset);
 	}
 
 	/**
@@ -78,7 +78,7 @@ class User {
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn() {
-		return \OC_USER::isLoggedIn();
+		return \OC_User::isLoggedIn();
 	}
 
 	/**
@@ -88,14 +88,14 @@ class User {
 	 * @return boolean
 	 */
 	public static function userExists( $uid, $excludingBackend = null ) {
-		return \OC_USER::userExists( $uid, $excludingBackend );
+		return \OC_User::userExists( $uid, $excludingBackend );
 	}
 	/**
 	 * @brief Loggs the user out including all the session data
 	 * Logout, destroys session
 	 */
 	public static function logout() {
-		\OC_USER::logout();
+		\OC_User::logout();
 	}
 
 	/**
@@ -107,7 +107,7 @@ class User {
 	 * Check if the password is correct without logging in the user
 	 */
 	public static function checkPassword( $uid, $password ) {
-		return \OC_USER::checkPassword( $uid, $password );
+		return \OC_User::checkPassword( $uid, $password );
 	}
 
 	/**
diff --git a/lib/public/util.php b/lib/public/util.php
index d69602f4507af9654c60cc54b95aeaae544fd284..693805946ea3473d050eb2971a1827b97424a5c1 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -77,6 +77,15 @@ class Util {
 		\OC_LOG::write( $app, $message, $level );
 	}
 
+	/**
+	 * @brief get l10n object
+	 * @param string $app
+	 * @return OC_L10N
+	 */
+	public static function getL10N( $application ) {
+		return \OC_L10N::get( $application );
+	}
+
 	/**
 	 * @brief add a css file
 	 * @param string $url
diff --git a/lib/setup.php b/lib/setup.php
index d8f4cbfbcbd982f19624710e5cbaf503cec2ea98..05a49890976f6d5d9b0d4855218081f6922aadc4 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -1,21 +1,7 @@
 <?php
 
-class DatabaseSetupException extends Exception
+class DatabaseSetupException extends \OC\HintException
 {
-	private $hint;
-
-	public function __construct($message, $hint = '', $code = 0, Exception $previous = null) {
-		$this->hint = $hint;
-		parent::__construct($message, $code, $previous);
-	}
-
-	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
-	}
-
-	public function getHint() {
-		return $this->hint;
-	}
 }
 
 class OC_Setup {
@@ -199,9 +185,7 @@ class OC_Setup {
 			$hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.',
 				'http://doc.owncloud.org/server/5.0/admin_manual/installation.html');
 
-			$tmpl = new OC_Template('', 'error', 'guest');
-			$tmpl->assign('errors', array(1 => array('error' => $error, 'hint' => $hint)));
-			$tmpl->printPage();
+			OC_Template::printErrorPage($error, $hint);
 			exit();
 		}
 	}
diff --git a/lib/setup/oci.php b/lib/setup/oci.php
index 577948766bd8abc459621a5abdaca638e1b58714..86b53de45a49513d9021be521b145874f89db953 100644
--- a/lib/setup/oci.php
+++ b/lib/setup/oci.php
@@ -9,8 +9,8 @@ class OCI extends AbstractDatabase {
 
 	public function initialize($config) {
 		parent::initialize($config);
-		if (array_key_exists('dbtablespace', $options)) {
-			$this->dbtablespace = $options['dbtablespace'];
+		if (array_key_exists('dbtablespace', $config)) {
+			$this->dbtablespace = $config['dbtablespace'];
 		} else {
 			$this->dbtablespace = 'USERS';
 		}
@@ -31,14 +31,14 @@ class OCI extends AbstractDatabase {
 		if(!$connection) {
 			$e = oci_error();
 			if (is_array ($e) && isset ($e['message'])) {
-				throw new DatabaseSetupException($l->t('Oracle connection could not be established'),
+				throw new \DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
 				$e['message'].' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
 							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
 			}
-			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'),
+			throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
diff --git a/lib/template.php b/lib/template.php
index ae9ea187445912434622f0f0a8481ac9a2d98d44..9b2c1211e61c8e2b3dbb21c02c2dabfe87a5399d 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -21,152 +21,20 @@
  *
  */
 
-/**
- * Prints an XSS escaped string
- * @param string $string the string which will be escaped and printed
- */
-function p($string) {
-	print(OC_Util::sanitizeHTML($string));
-}
-
-/**
- * Prints an unescaped string
- * @param string $string the string which will be printed as it is
- */
-function print_unescaped($string) {
-	print($string);
-}
-
-/**
- * @brief make OC_Helper::linkTo available as a simple function
- * @param string $app app
- * @param string $file file
- * @param array $args array with param=>value, will be appended to the returned url
- * @return string link to the file
- *
- * For further information have a look at OC_Helper::linkTo
- */
-function link_to( $app, $file, $args = array() ) {
-	return OC_Helper::linkTo( $app, $file, $args );
-}
+require_once __DIR__.'/template/functions.php';
 
 /**
- * @brief make OC_Helper::imagePath available as a simple function
- * @param string $app app
- * @param string $image image
- * @return string link to the image
- *
- * For further information have a look at OC_Helper::imagePath
+ * This class provides the templates for ownCloud.
  */
-function image_path( $app, $image ) {
-	return OC_Helper::imagePath( $app, $image );
-}
-
-/**
- * @brief make OC_Helper::mimetypeIcon available as a simple function
- * @param string $mimetype mimetype
- * @return string link to the image
- *
- * For further information have a look at OC_Helper::mimetypeIcon
- */
-function mimetype_icon( $mimetype ) {
-	return OC_Helper::mimetypeIcon( $mimetype );
-}
-
-/**
- * @brief make OC_Helper::humanFileSize available as a simple function
- * @param int $bytes size in bytes
- * @return string size as string
- *
- * For further information have a look at OC_Helper::humanFileSize
- */
-function human_file_size( $bytes ) {
-	return OC_Helper::humanFileSize( $bytes );
-}
-
-function simple_file_size($bytes) {
-	if ($bytes < 0) {
-		return '?';
-	}
-	$mbytes = round($bytes / (1024 * 1024), 1);
-	if ($bytes == 0) {
-		return '0';
-	}
-	if ($mbytes < 0.1) {
-		return '&lt; 0.1';
-	}
-	if ($mbytes > 1000) {
-		return '&gt; 1000';
-	} else {
-		return number_format($mbytes, 1);
-	}
-}
-
-function relative_modified_date($timestamp) {
-	$l=OC_L10N::get('lib');
-	$timediff = time() - $timestamp;
-	$diffminutes = round($timediff/60);
-	$diffhours = round($diffminutes/60);
-	$diffdays = round($diffhours/24);
-	$diffmonths = round($diffdays/31);
-
-	if($timediff < 60) { return $l->t('seconds ago'); }
-	else if($timediff < 120) { return $l->t('1 minute ago'); }
-	else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); }
-	else if($timediff < 7200) { return $l->t('1 hour ago'); }
-	else if($timediff < 86400) { return $l->t('%d hours ago', $diffhours); }
-	else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
-	else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
-	else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); }
-	else if($timediff < 5184000) { return $l->t('last month'); }
-	else if((date('n')-$diffmonths) > 0) { return $l->t('%d months ago', $diffmonths); }
-	else if($timediff < 63113852) { return $l->t('last year'); }
-	else { return $l->t('years ago'); }
-}
-
-function html_select_options($options, $selected, $params=array()) {
-	if (!is_array($selected)) {
-		$selected=array($selected);
-	}
-	if (isset($params['combine']) && $params['combine']) {
-		$options = array_combine($options, $options);
-	}
-	$value_name = $label_name = false;
-	if (isset($params['value'])) {
-		$value_name = $params['value'];
-	}
-	if (isset($params['label'])) {
-		$label_name = $params['label'];
-	}
-	$html = '';
-	foreach($options as $value => $label) {
-		if ($value_name && is_array($label)) {
-			$value = $label[$value_name];
-		}
-		if ($label_name && is_array($label)) {
-			$label = $label[$label_name];
-		}
-		$select = in_array($value, $selected) ? ' selected="selected"' : '';
-		$html .= '<option value="' . OC_Util::sanitizeHTML($value) . '"' . $select . '>' . OC_Util::sanitizeHTML($label) . '</option>'."\n";
-	}
-	return $html;
-}
-
-/**
- * This class provides the templates for owncloud.
- */
-class OC_Template{
+class OC_Template extends \OC\Template\Base {
 	private $renderas; // Create a full page?
-	private $application; // template Application
-	private $vars; // Vars
-	private $template; // The path to the template
-	private $l10n; // The l10n-Object
+	private $path; // The path to the template
 	private $headers=array(); //custom headers
 
 	/**
 	 * @brief Constructor
 	 * @param string $app app providing the template
-	 * @param string $file name of the template file (without suffix)
+	 * @param string $name of the template file (without suffix)
 	 * @param string $renderas = ""; produce a full page
 	 * @return OC_Template object
 	 *
@@ -177,13 +45,25 @@ class OC_Template{
 	 * "admin".
 	 */
 	public function __construct( $app, $name, $renderas = "" ) {
+		// Read the selected theme from the config file
+		$theme = OC_Util::getTheme();
+
+		// Read the detected formfactor and use the right file name.
+		$fext = self::getFormFactorExtension();
+
+		$requesttoken = OC::$session ? OC_Util::callRegister() : '';
+
+		$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
+		$l10n = OC_L10N::get($parts[0]);
+		$themeDefaults = new OC_Defaults();
+
+		list($path, $template) = $this->findTemplate($theme, $app, $name, $fext);
+
 		// Set the private data
 		$this->renderas = $renderas;
-		$this->application = $app;
-		$this->vars = array();
-		$this->vars['requesttoken'] = OC_Util::callRegister();
-		$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
-		$this->l10n = OC_L10N::get($parts[0]);
+		$this->path = $path;
+
+		parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
 
 		// Some headers to enhance security
 		header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
@@ -207,7 +87,6 @@ class OC_Template{
 			.'media-src *');
 		header('Content-Security-Policy:'.$policy); // Standard
 
-		$this->findTemplate($name);
 	}
 
 	/**
@@ -243,6 +122,9 @@ class OC_Template{
 	 */
 	static public function getFormFactorExtension()
 	{
+		if (!\OC::$session) {
+			return '';
+		}
 		// if the formfactor is not yet autodetected do the
 		// autodetection now. For possible formfactors check the
 		// detectFormfactor documentation
@@ -254,13 +136,13 @@ class OC_Template{
 			\OC::$session->set('formfactor', $_GET['formfactor']);
 		}
 		$formfactor = \OC::$session->get('formfactor');
-		if($formfactor=='default') {
+		if($formfactor==='default') {
 			$fext='';
-		}elseif($formfactor=='mobile') {
+		}elseif($formfactor==='mobile') {
 			$fext='.mobile';
-		}elseif($formfactor=='tablet') {
+		}elseif($formfactor==='tablet') {
 			$fext='.tablet';
-		}elseif($formfactor=='standalone') {
+		}elseif($formfactor==='standalone') {
 			$fext='.standalone';
 		}else{
 			$fext='';
@@ -275,112 +157,23 @@ class OC_Template{
 	 * Will select the template file for the selected theme and formfactor.
 	 * Checking all the possible locations.
 	 */
-	protected function findTemplate($name)
-	{
-		// Read the selected theme from the config file
-		$theme = OC_Util::getTheme();
-
-		// Read the detected formfactor and use the right file name.
-		$fext = self::getFormFactorExtension();
-
-		$app = $this->application;
+	protected function findTemplate($theme, $app, $name, $fext) {
 		// Check if it is a app template or not.
-		if( $app != "" ) {
-			// Check if the app is in the app folder or in the root
-			if( file_exists(OC_App::getAppPath($app)."/templates/" )) {
-				// Check if the template is overwritten by the selected theme
-				if ($this->checkPathForTemplate(OC::$SERVERROOT."/themes/$theme/apps/$app/templates/", $name, $fext)) {
-				}elseif ($this->checkPathForTemplate(OC_App::getAppPath($app)."/templates/", $name, $fext)) {
-				}
-			}else{
-				// Check if the template is overwritten by the selected theme
-				if ($this->checkPathForTemplate(OC::$SERVERROOT."/themes/$theme/$app/templates/", $name, $fext)) {
-				}elseif ($this->checkPathForTemplate(OC::$SERVERROOT."/$app/templates/", $name, $fext)) {
-				}else{
-					echo('template not found: template:'.$name.' formfactor:'.$fext
-						.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-					die();
-				}
-
-			}
-		}else{
-			// Check if the template is overwritten by the selected theme
-			if ($this->checkPathForTemplate(OC::$SERVERROOT."/themes/$theme/core/templates/", $name, $fext)) {
-			} elseif ($this->checkPathForTemplate(OC::$SERVERROOT."/core/templates/", $name, $fext)) {
-			}else{
-				echo('template not found: template:'.$name.' formfactor:'.$fext
-					.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-				die();
-			}
-		}
-	}
-
-	/**
-	 * @brief check Path For Template with and without $fext
-	 * @param string $path to check
-	 * @param string $name of the template file (without suffix)
-	 * @param string $fext formfactor extension
-	 * @return bool true when found
-	 *
-	 * Will set $this->template and $this->path if there is a template at
-	 * the specific $path
-	 */
-	protected function checkPathForTemplate($path, $name, $fext)
-	{
-		if ($name =='') return false;
-		$template = null;
-		if( is_file( $path.$name.$fext.'.php' )) {
-			$template = $path.$name.$fext.'.php';
-		}elseif( is_file( $path.$name.'.php' )) {
-			$template = $path.$name.'.php';
-		}
-		if ($template) {
-			$this->template = $template;
-			$this->path = $path;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @brief Assign variables
-	 * @param string $key key
-	 * @param string $value value
-	 * @return bool
-	 *
-	 * This function assigns a variable. It can be accessed via $_[$key] in
-	 * the template.
-	 *
-	 * If the key existed before, it will be overwritten
-	 */
-	public function assign( $key, $value) {
-		$this->vars[$key] = $value;
-		return true;
-	}
-
-	/**
-	 * @brief Appends a variable
-	 * @param string $key key
-	 * @param string $value value
-	 * @return bool
-	 *
-	 * This function assigns a variable in an array context. If the key already
-	 * exists, the value will be appended. It can be accessed via
-	 * $_[$key][$position] in the template.
-	 */
-	public function append( $key, $value ) {
-		if( array_key_exists( $key, $this->vars )) {
-			$this->vars[$key][] = $value;
-		}
-		else{
-			$this->vars[$key] = array( $value );
+		if( $app !== '' ) {
+			$dirs = $this->getAppTemplateDirs($theme, $app, OC::$SERVERROOT, OC_App::getAppPath($app));
+		} else {
+			$dirs = $this->getCoreTemplateDirs($theme, OC::$SERVERROOT);
 		}
+		$locator = new \OC\Template\TemplateFileLocator( $fext, $dirs );
+		$template = $locator->find($name);
+		$path = $locator->getPath();
+		return array($path, $template);
 	}
 
 	/**
 	 * @brief Add a custom element to the header
 	 * @param string $tag tag name of the element
-	 * @param array $attributes array of attrobutes for the element
+	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
 	 */
 	public function addHeader( $tag, $attributes, $text='') {
@@ -388,31 +181,14 @@ class OC_Template{
 	}
 
 	/**
-	 * @brief Prints the proceeded template
-	 * @return bool
-	 *
-	 * This function proceeds the template and prints its output.
-	 */
-	public function printPage() {
-		$data = $this->fetchPage();
-		if( $data === false ) {
-			return false;
-		}
-		else{
-			print $data;
-			return true;
-		}
-	}
-
-	/**
-	 * @brief Proceeds the template
+	 * @brief Process the template
 	 * @return bool
 	 *
-	 * This function proceeds the template. If $this->renderas is set, it
+	 * This function process the template. If $this->renderas is set, it
 	 * will produce a full page.
 	 */
 	public function fetchPage() {
-		$data = $this->_fetch();
+		$data = parent::fetchPage();
 
 		if( $this->renderas ) {
 			$page = new OC_TemplateLayout($this->renderas);
@@ -431,27 +207,6 @@ class OC_Template{
 		}
 	}
 
-	/**
-	 * @brief doing the actual work
-	 * @return string content
-	 *
-	 * Includes the template file, fetches its output
-	 */
-	private function _fetch() {
-		// Register the variables
-		$_ = $this->vars;
-		$l = $this->l10n;
-
-		// Execute the template
-		ob_start();
-		include $this->template; // <-- we have to use include because we pass $_!
-		$data = ob_get_contents();
-		@ob_end_clean();
-
-		// return the data
-		return $data;
-	}
-
 	/**
 	 * @brief Include template
 	 * @return string returns content of included template
@@ -460,21 +215,7 @@ class OC_Template{
 	 * do this.
 	 */
 	public function inc( $file, $additionalparams = null ) {
-		$_ = $this->vars;
-		$l = $this->l10n;
-
-		if( !is_null($additionalparams)) {
-			$_ = array_merge( $additionalparams, $this->vars );
-		}
-
-		// Include
-		ob_start();
-		include $this->path.$file.'.php';
-		$data = ob_get_contents();
-		@ob_end_clean();
-
-		// Return data
-		return $data;
+		return $this->load($this->path.$file.'.php', $additionalparams);
 	}
 
 	/**
@@ -524,8 +265,8 @@ class OC_Template{
 
 	/**
 		* @brief Print a fatal error page and terminates the script
-		* @param string $error The error message to show
-		* @param string $hint An optional hint message 
+		* @param string $error_msg The error message to show
+		* @param string $hint An optional hint message
 		* Warning: All data passed to $hint needs to get sanitized using OC_Util::sanitizeHTML
 		*/
 	public static function printErrorPage( $error_msg, $hint = '' ) {
@@ -546,14 +287,25 @@ class OC_Template{
 		if ($exception->getCode()) {
 			$error_msg = '['.$exception->getCode().'] '.$error_msg;
 		}
-		$hint = $exception->getTraceAsString();
-		while (method_exists($exception,'previous') && $exception = $exception->previous()) {
-			$error_msg .= '<br/>Caused by: ';
-			if ($exception->getCode()) {
-				$error_msg .= '['.$exception->getCode().'] ';
+		if (defined('DEBUG') and DEBUG) {
+			$hint = $exception->getTraceAsString();
+			if (!empty($hint)) {
+				$hint = '<pre>'.$hint.'</pre>';
 			}
-			$error_msg .= $exception->getMessage();
-		};
+			$l = OC_L10N::get('lib');
+			while (method_exists($exception, 'previous') && $exception = $exception->previous()) {
+				$error_msg .= '<br/>'.$l->t('Caused by:').' ';
+				if ($exception->getCode()) {
+					$error_msg .= '['.$exception->getCode().'] ';
+				}
+				$error_msg .= $exception->getMessage();
+			};
+		} else {
+			$hint = '';
+			if ($exception instanceof \OC\HintException) {
+				$hint = $exception->getHint();
+			}
+		}
 		self::printErrorPage($error_msg, $hint);
 	}
 }
diff --git a/lib/template/base.php b/lib/template/base.php
new file mode 100644
index 0000000000000000000000000000000000000000..88941bc7132d7144ee05d7eaa9875c50f2809ee7
--- /dev/null
+++ b/lib/template/base.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Template;
+
+class Base {
+	private $template; // The template
+	private $vars; // Vars
+	private $l10n; // The l10n-Object
+	private $theme; // theme defaults
+
+	public function __construct( $template, $requesttoken, $l10n, $theme ) {
+		$this->vars = array();
+		$this->vars['requesttoken'] = $requesttoken;
+		$this->l10n = $l10n;
+		$this->template = $template;
+		$this->theme = $theme;
+	}
+
+	protected function getAppTemplateDirs($theme, $app, $serverroot, $app_dir) {
+		// Check if the app is in the app folder or in the root
+		if( file_exists($app_dir.'/templates/' )) {
+			return array(
+				$serverroot.'/themes/'.$theme.'/apps/'.$app.'/templates/',
+				$app_dir.'/templates/',
+			);
+		}
+		return array(
+			$serverroot.'/themes/'.$theme.'/'.$app.'/templates/',
+			$serverroot.'/'.$app.'/templates/',
+		);
+	}
+
+	protected function getCoreTemplateDirs($theme, $serverroot) {
+		return array(
+			$serverroot.'/themes/'.$theme.'/core/templates/',
+			$serverroot.'/core/templates/',
+		);
+	}
+
+	/**
+	 * @brief Assign variables
+	 * @param string $key key
+	 * @param string $value value
+	 * @return bool
+	 *
+	 * This function assigns a variable. It can be accessed via $_[$key] in
+	 * the template.
+	 *
+	 * If the key existed before, it will be overwritten
+	 */
+	public function assign( $key, $value) {
+		$this->vars[$key] = $value;
+		return true;
+	}
+
+	/**
+	 * @brief Appends a variable
+	 * @param string $key key
+	 * @param string $value value
+	 * @return bool
+	 *
+	 * This function assigns a variable in an array context. If the key already
+	 * exists, the value will be appended. It can be accessed via
+	 * $_[$key][$position] in the template.
+	 */
+	public function append( $key, $value ) {
+		if( array_key_exists( $key, $this->vars )) {
+			$this->vars[$key][] = $value;
+		}
+		else{
+			$this->vars[$key] = array( $value );
+		}
+	}
+
+	/**
+	 * @brief Prints the proceeded template
+	 * @return bool
+	 *
+	 * This function proceeds the template and prints its output.
+	 */
+	public function printPage() {
+		$data = $this->fetchPage();
+		if( $data === false ) {
+			return false;
+		}
+		else{
+			print $data;
+			return true;
+		}
+	}
+
+	/**
+	 * @brief Process the template
+	 * @return bool
+	 *
+	 * This function processes the template.
+	 */
+	public function fetchPage() {
+		return $this->load($this->template);
+	}
+
+	/**
+	 * @brief doing the actual work
+	 * @return string content
+	 *
+	 * Includes the template file, fetches its output
+	 */
+	protected function load( $file, $additionalparams = null ) {
+		// Register the variables
+		$_ = $this->vars;
+		$l = $this->l10n;
+		$theme = $this->theme;
+
+		if( !is_null($additionalparams)) {
+			$_ = array_merge( $additionalparams, $this->vars );
+		}
+
+		// Include
+		ob_start();
+		include $file;
+		$data = ob_get_contents();
+		@ob_end_clean();
+
+		// Return data
+		return $data;
+	}
+
+}
diff --git a/lib/template/cssresourcelocator.php b/lib/template/cssresourcelocator.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e7831ca549fa615d87cbb4176d27a813d058d55
--- /dev/null
+++ b/lib/template/cssresourcelocator.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Template;
+
+class CSSResourceLocator extends ResourceLocator {
+	public function doFind( $style ) {
+		if (strpos($style, '3rdparty') === 0
+			&& $this->appendIfExist($this->thirdpartyroot, $style.'.css')
+			|| $this->appendIfExist($this->serverroot, $style.$this->form_factor.'.css')
+			|| $this->appendIfExist($this->serverroot, $style.'.css')
+			|| $this->appendIfExist($this->serverroot, 'core/'.$style.$this->form_factor.'.css')
+			|| $this->appendIfExist($this->serverroot, 'core/'.$style.'.css')
+		) {
+			return;
+		}
+		$app = substr($style, 0, strpos($style, '/'));
+		$style = substr($style, strpos($style, '/')+1);
+		$app_path = \OC_App::getAppPath($app);
+		$app_url = $this->webroot . '/index.php/apps/' . $app;
+		if ($this->appendIfExist($app_path, $style.$this->form_factor.'.css', $app_url)
+			|| $this->appendIfExist($app_path, $style.'.css', $app_url)
+		) {
+			return;
+		}
+		throw new \Exception('css file not found: style:'.$style);
+	}
+
+	public function doFindTheme( $style ) {
+		$theme_dir = 'themes/'.$this->theme.'/';
+		$this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$style.$this->form_factor.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$style.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.$style.$this->form_factor.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.$style.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$style.$this->form_factor.'.css')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$style.'.css');
+	}
+}
diff --git a/lib/template/functions.php b/lib/template/functions.php
new file mode 100644
index 0000000000000000000000000000000000000000..717e197c1cb1b73466b31041e58d9d0fbb65fc40
--- /dev/null
+++ b/lib/template/functions.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Prints an XSS escaped string
+ * @param string $string the string which will be escaped and printed
+ */
+function p($string) {
+	print(OC_Util::sanitizeHTML($string));
+}
+
+/**
+ * Prints an unescaped string
+ * @param string $string the string which will be printed as it is
+ */
+function print_unescaped($string) {
+	print($string);
+}
+
+/**
+ * @brief make OC_Helper::linkTo available as a simple function
+ * @param string $app app
+ * @param string $file file
+ * @param array $args array with param=>value, will be appended to the returned url
+ * @return string link to the file
+ *
+ * For further information have a look at OC_Helper::linkTo
+ */
+function link_to( $app, $file, $args = array() ) {
+	return OC_Helper::linkTo( $app, $file, $args );
+}
+
+/**
+ * @brief make OC_Helper::imagePath available as a simple function
+ * @param string $app app
+ * @param string $image image
+ * @return string link to the image
+ *
+ * For further information have a look at OC_Helper::imagePath
+ */
+function image_path( $app, $image ) {
+	return OC_Helper::imagePath( $app, $image );
+}
+
+/**
+ * @brief make OC_Helper::mimetypeIcon available as a simple function
+ * @param string $mimetype mimetype
+ * @return string link to the image
+ *
+ * For further information have a look at OC_Helper::mimetypeIcon
+ */
+function mimetype_icon( $mimetype ) {
+	return OC_Helper::mimetypeIcon( $mimetype );
+}
+
+/**
+ * @brief make OC_Helper::humanFileSize available as a simple function
+ * @param int $bytes size in bytes
+ * @return string size as string
+ *
+ * For further information have a look at OC_Helper::humanFileSize
+ */
+function human_file_size( $bytes ) {
+	return OC_Helper::humanFileSize( $bytes );
+}
+
+function relative_modified_date($timestamp) {
+	$l=OC_L10N::get('lib');
+	$timediff = time() - $timestamp;
+	$diffminutes = round($timediff/60);
+	$diffhours = round($diffminutes/60);
+	$diffdays = round($diffhours/24);
+	$diffmonths = round($diffdays/31);
+
+	if($timediff < 60) { return $l->t('seconds ago'); }
+	else if($timediff < 3600) { return $l->n('%n minute ago', '%n minutes ago', $diffminutes); }
+	else if($timediff < 86400) { return $l->n('%n hour ago', '%n hours ago', $diffhours); }
+	else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
+	else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
+	else if($timediff < 2678400) { return $l->n('%n day go', '%n days ago', $diffdays); }
+	else if($timediff < 5184000) { return $l->t('last month'); }
+	else if((date('n')-$diffmonths) > 0) { return $l->n('%n month ago', '%n months ago', $diffmonths); }
+	else if($timediff < 63113852) { return $l->t('last year'); }
+	else { return $l->t('years ago'); }
+}
+
+function html_select_options($options, $selected, $params=array()) {
+	if (!is_array($selected)) {
+		$selected=array($selected);
+	}
+	if (isset($params['combine']) && $params['combine']) {
+		$options = array_combine($options, $options);
+	}
+	$value_name = $label_name = false;
+	if (isset($params['value'])) {
+		$value_name = $params['value'];
+	}
+	if (isset($params['label'])) {
+		$label_name = $params['label'];
+	}
+	$html = '';
+	foreach($options as $value => $label) {
+		if ($value_name && is_array($label)) {
+			$value = $label[$value_name];
+		}
+		if ($label_name && is_array($label)) {
+			$label = $label[$label_name];
+		}
+		$select = in_array($value, $selected) ? ' selected="selected"' : '';
+		$html .= '<option value="' . OC_Util::sanitizeHTML($value) . '"' . $select . '>' . OC_Util::sanitizeHTML($label) . '</option>'."\n";
+	}
+	return $html;
+}
diff --git a/lib/template/jsresourcelocator.php b/lib/template/jsresourcelocator.php
new file mode 100644
index 0000000000000000000000000000000000000000..f8fe3817ce60a4d40151d5516ae505d1f27f67a5
--- /dev/null
+++ b/lib/template/jsresourcelocator.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Template;
+
+class JSResourceLocator extends ResourceLocator {
+	public function doFind( $script ) {
+		$theme_dir = 'themes/'.$this->theme.'/';
+		if (strpos($script, '3rdparty') === 0
+			&& $this->appendIfExist($this->thirdpartyroot, $script.'.js')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.$this->form_factor.'.js')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.$script.$this->form_factor.'.js')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js')
+			|| $this->appendIfExist($this->serverroot, $script.$this->form_factor.'.js')
+			|| $this->appendIfExist($this->serverroot, $script.'.js')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.$this->form_factor.'.js')
+			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js')
+			|| $this->appendIfExist($this->serverroot, 'core/'.$script.$this->form_factor.'.js')
+			|| $this->appendIfExist($this->serverroot, 'core/'.$script.'.js')
+		) {
+			return;
+		}
+		$app = substr($script, 0, strpos($script, '/'));
+		$script = substr($script, strpos($script, '/')+1);
+		$app_path = \OC_App::getAppPath($app);
+		$app_url = \OC_App::getAppWebPath($app);
+		if ($this->appendIfExist($app_path, $script.$this->form_factor.'.js', $app_url)
+			|| $this->appendIfExist($app_path, $script.'.js', $app_url)
+		) {
+			return;
+		}
+		throw new \Exception('js file not found: script:'.$script);
+	}
+
+	public function doFindTheme( $script ) {
+	}
+}
diff --git a/lib/template/resourcelocator.php b/lib/template/resourcelocator.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f83673664dfbe6d3923cf3d8aa0b9e8637cdb7c
--- /dev/null
+++ b/lib/template/resourcelocator.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Template;
+
+abstract class ResourceLocator {
+	protected $theme;
+	protected $form_factor;
+
+	protected $mapping;
+	protected $serverroot;
+	protected $thirdpartyroot;
+	protected $webroot;
+
+	protected $resources = array();
+
+	public function __construct( $theme, $form_factor, $core_map, $party_map ) {
+		$this->theme = $theme;
+		$this->form_factor = $form_factor;
+		$this->mapping = $core_map + $party_map;
+		$this->serverroot = key($core_map);
+		$this->thirdpartyroot = key($party_map);
+		$this->webroot = $this->mapping[$this->serverroot];
+	}
+
+	abstract public function doFind( $resource );
+	abstract public function doFindTheme( $resource );
+
+	public function find( $resources ) {
+		try {
+			foreach($resources as $resource) {
+				$this->doFind($resource);
+			}
+			if (!empty($this->theme)) {
+				foreach($resources as $resource) {
+					$this->doFindTheme($resource);
+				}
+			}
+		} catch (\Exception $e) {
+			throw new \Exception($e->getMessage().' formfactor:'.$this->form_factor
+						.' serverroot:'.$this->serverroot);
+		}
+	}
+
+	/*
+	 * @brief append the $file resource if exist at $root
+	 * @param $root path to check
+	 * @param $file the filename
+	 * @param $web base for path, default map $root to $webroot
+	 */
+	protected function appendIfExist($root, $file, $webroot = null) {
+		if (is_file($root.'/'.$file)) {
+			if (!$webroot) {
+				$webroot = $this->mapping[$root];
+			}
+			$this->resources[] = array($root, $webroot, $file);
+			return true;
+		}
+		return false;
+	}
+
+	public function getResources() {
+		return $this->resources;
+	}
+}
diff --git a/lib/template/templatefilelocator.php b/lib/template/templatefilelocator.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5a484b1a1475bec7f15faa40b11ef6085f8671f
--- /dev/null
+++ b/lib/template/templatefilelocator.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Template;
+
+class TemplateFileLocator {
+	protected $form_factor;
+	protected $dirs;
+	private $path;
+
+	public function __construct( $form_factor, $dirs ) {
+		$this->form_factor = $form_factor;
+		$this->dirs = $dirs;
+	}
+
+	public function find( $template ) {
+		if ($template === '') {
+			throw new \InvalidArgumentException('Empty template name');
+		}
+
+		foreach($this->dirs as $dir) {
+			$file = $dir.$template.$this->form_factor.'.php';
+			if (is_file($file)) {
+				$this->path = $dir;
+				return $file;
+			}
+			$file = $dir.$template.'.php';
+			if (is_file($file)) {
+				$this->path = $dir;
+				return $file;
+			}
+		}
+		throw new \Exception('template file not found: template:'.$template.' formfactor:'.$this->form_factor);
+	}
+
+	public function getPath() {
+		return $this->path;
+	}
+}
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 7115b8f03063092de620bf3646a72c7abde0ac8b..0024c9d4960dc5383ca5f2657a25e5ba2964d459 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -83,21 +83,6 @@ class OC_TemplateLayout extends OC_Template {
 		}
 	}
 
-	/*
-	 * @brief append the $file-url if exist at $root
-	 * @param $files array to append file info to
-	 * @param $root path to check
-	 * @param $web base for path
-	 * @param $file the filename
-	 */
-	static public function appendIfExist(&$files, $root, $webroot, $file) {
-		if (is_file($root.'/'.$file)) {
-			$files[] = array($root, $webroot, $file);
-			return true;
-		}
-		return false;
-	}
-
 	static public function findStylesheetFiles($styles) {
 		// Read the selected theme from the config file
 		$theme = OC_Util::getTheme();
@@ -105,51 +90,11 @@ class OC_TemplateLayout extends OC_Template {
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
 
-		$files = array();
-		foreach($styles as $style) {
-			// is it in 3rdparty?
-			if(strpos($style, '3rdparty') === 0 &&
-				self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
-
-			// or in the owncloud root?
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style.css" )) {
-
-			// or in core ?
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style$fext.css" )) {
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
-
-			}else{
-				$app = substr($style, 0, strpos($style, '/'));
-				$style = substr($style, strpos($style, '/')+1);
-				$app_path = OC_App::getAppPath($app);
-				$app_url = OC::$WEBROOT . '/index.php/apps/' . $app;
-				if(self::appendIfExist($files, $app_path, $app_url, "$style$fext.css")) {
-				}
-				elseif(self::appendIfExist($files, $app_path, $app_url, "$style.css")) {
-				}
-				else {
-					echo('css file not found: style:'.$style.' formfactor:'.$fext
-						.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-					die();
-				}
-			}
-		}
-		// Add the theme css files. you can override the default values here
-		if(!empty($theme)) {
-			foreach($styles as $style) {
-				     if(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style$fext.css" )) {
-				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$style.css" )) {
-
-				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style$fext.css" )) {
-				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$style.css" )) {
-
-				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style$fext.css" )) {
-				}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$style.css" )) {
-				}
-			}
-		}
-		return $files;
+		$locator = new \OC\Template\CSSResourceLocator( $theme, $fext,
+			array( OC::$SERVERROOT => OC::$WEBROOT ),
+			array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
+		$locator->find($styles);
+		return $locator->getResources();
 	}
 
 	static public function findJavascriptFiles($scripts) {
@@ -159,49 +104,10 @@ class OC_TemplateLayout extends OC_Template {
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
 
-		$files = array();
-		foreach($scripts as $script) {
-			// Is it in 3rd party?
-			if(strpos($script, '3rdparty') === 0 &&
-				self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
-
-			// Is it in apps and overwritten by the theme?
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script.js" )) {
-
-			// Is it in the owncloud root but overwritten by the theme?
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script$fext.js" )) {
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/$script.js" )) {
-
-			// Is it in the owncloud root ?
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script$fext.js" )) {
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$script.js" )) {
-
-			// Is in core but overwritten by a theme?
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script$fext.js" )) {
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/core/$script.js" )) {
-
-			// Is it in core?
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script$fext.js" )) {
-			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$script.js" )) {
-
-			}else{
-				// Is it part of an app?
-				$app = substr($script, 0, strpos($script, '/'));
-				$script = substr($script, strpos($script, '/')+1);
-				$app_path = OC_App::getAppPath($app);
-				$app_url = OC_App::getAppWebPath($app);
-				if(self::appendIfExist($files, $app_path, $app_url, "$script$fext.js")) {
-				}
-				elseif(self::appendIfExist($files, $app_path, $app_url, "$script.js")) {
-				}
-				else {
-					echo('js file not found: script:'.$script.' formfactor:'.$fext
-						.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-					die();
-				}
-			}
-		}
-		return $files;
+		$locator = new \OC\Template\JSResourceLocator( $theme, $fext,
+			array( OC::$SERVERROOT => OC::$WEBROOT ),
+			array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
+		$locator->find($scripts);
+		return $locator->getResources();
 	}
 }
diff --git a/lib/user.php b/lib/user.php
index 830f13bb8df6900304eb60d042d410ac844b54ef..93c7c9d4cd504120ddb2bfdcb094dd0cfb8f613a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -39,7 +39,7 @@
 class OC_User {
 	public static $userSession = null;
 
-	private static function getUserSession() {
+	public static function getUserSession() {
 		if (!self::$userSession) {
 			$manager = new \OC\User\Manager();
 			self::$userSession = new \OC\User\Session($manager, \OC::$session);
@@ -83,7 +83,7 @@ class OC_User {
 	/**
 	 * @return \OC\User\Manager
 	 */
-	private static function getManager() {
+	public static function getManager() {
 		return self::getUserSession()->getManager();
 	}
 
@@ -137,7 +137,6 @@ class OC_User {
 	 */
 	public static function useBackend($backend = 'database') {
 		if ($backend instanceof OC_User_Interface) {
-			OC_Log::write('core', 'Adding user backend instance of ' . get_class($backend) . '.', OC_Log::DEBUG);
 			self::$_usedBackends[get_class($backend)] = $backend;
 			self::getManager()->registerBackend($backend);
 		} else {
@@ -316,7 +315,7 @@ class OC_User {
 	 * @return string uid or false
 	 */
 	public static function getUser() {
-		$uid = OC::$session->get('user_id');
+		$uid = OC::$session ? OC::$session->get('user_id') : null;
 		if (!is_null($uid)) {
 			return $uid;
 		} else {
diff --git a/lib/user/manager.php b/lib/user/manager.php
index d17cdf1a200790dcc815edfc1f231d1dcfd9e1d7..8dc9bfe27297a31cad756eeceaf3f74cd25ef095 100644
--- a/lib/user/manager.php
+++ b/lib/user/manager.php
@@ -30,6 +30,9 @@ class Manager extends PublicEmitter {
 	 */
 	private $backends = array();
 
+	/**
+	 * @var \OC\User\User[] $cachedUsers
+	 */
 	private $cachedUsers = array();
 
 	public function __construct() {
diff --git a/lib/user/session.php b/lib/user/session.php
index cf93d9593afa8f76e4f55a5b6aceb149f6653934..9a6c669e935a8010c8c593c93a59f561c8a6df48 100644
--- a/lib/user/session.php
+++ b/lib/user/session.php
@@ -166,8 +166,8 @@ class Session implements Emitter {
 		unset($_COOKIE["oc_username"]); //TODO: DI
 		unset($_COOKIE["oc_token"]);
 		unset($_COOKIE["oc_remember_login"]);
-		setcookie("oc_username", null, -1);
-		setcookie("oc_token", null, -1);
-		setcookie("oc_remember_login", null, -1);
+		setcookie('oc_username', '', time()-3600, \OC::$WEBROOT);
+		setcookie('oc_token', '', time()-3600, \OC::$WEBROOT);
+		setcookie('oc_remember_login', '', time()-3600, \OC::$WEBROOT);
 	}
 }
diff --git a/lib/user/user.php b/lib/user/user.php
index 55d7848a979c80e8b229cb41949e22f979709ad3..8115c43198cde309baac391334dca7ab1ef3ba56 100644
--- a/lib/user/user.php
+++ b/lib/user/user.php
@@ -44,7 +44,7 @@ class User {
 	 */
 	public function __construct($uid, $backend, $emitter = null) {
 		$this->uid = $uid;
-		if ($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+		if ($backend and $backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
 			$this->displayName = $backend->getDisplayName($uid);
 		} else {
 			$this->displayName = $uid;
diff --git a/lib/util.php b/lib/util.php
index 981b05b2b46130a60318203705059da1c9e5fc88..25632ac1ea229ec8a31e8aea0b463dfa434266d5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'Patchwork/PHP/Shim/Normalizer.php';
-
 /**
  * Class for utility functions
  *
@@ -170,6 +168,10 @@ class OC_Util {
 	 * @return array arrays with error messages and hints
 	 */
 	public static function checkServer() {
+		// Assume that if checkServer() succeeded before in this session, then all is fine.
+		if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded'))
+			return array();
+
 		$errors=array();
 
 		$defaults = new \OC_Defaults();
@@ -311,6 +313,9 @@ class OC_Util {
 				'hint'=>'Please ask your server administrator to restart the web server.');
 		}
 
+		// Cache the result of this function
+		\OC::$session->set('checkServer_suceeded', count($errors) == 0);
+
 		return $errors;
 	}
 
@@ -873,6 +878,10 @@ class OC_Util {
 		if (function_exists('xcache_clear_cache')) {
 			xcache_clear_cache(XC_TYPE_VAR, 0);
 		}
+		// Opcache (PHP >= 5.5)
+		if (function_exists('opcache_reset')) {
+			opcache_reset();
+		}
 	}
 
 	/**
@@ -892,4 +901,11 @@ class OC_Util {
 
 		return $value;
 	}
+
+	public static function basename($file)
+	{
+		$file = rtrim($file, '/');
+		$t = explode('/', $file);
+		return array_pop($t);
+	}
 }
diff --git a/occ b/occ
new file mode 100755
index 0000000000000000000000000000000000000000..e2b71fe4abc09a846921d05ce202c93493f33e50
--- /dev/null
+++ b/occ
@@ -0,0 +1,11 @@
+#!/usr/bin/php
+<?php
+/**
+ * Copyright (c) 2013 Thomas MÃ¼ller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//$argv = $_SERVER['argv'];
+require_once __DIR__ . '/console.php';
diff --git a/search/css/results.css b/search/css/results.css
index 2f092f3789cc9dc1e38001a9e113286c88d7be60..30cc352fd7b8532e0f591b480e76e6b406acc775 100644
--- a/search/css/results.css
+++ b/search/css/results.css
@@ -2,67 +2,68 @@
  This file is licensed under the Affero General Public License version 3 or later.
  See the COPYING-README file. */
 
- #searchresults {
- 	background-color:#fff;
- 	border-bottom-left-radius:1em;
- 	box-shadow:0 0 10px #000;
- 	list-style:none;
- 	max-height:80%;
- 	overflow:hidden;
- 	padding-bottom:1em;
- 	position:fixed;
- 	right:0;
- 	text-overflow:ellipsis;
- 	top:3.5em;
- 	width:26.5em;
- 	z-index:75;
- }
- 
- .ie8 #searchresults {
-	 border: 1px solid #666 !important;
- }
+#searchresults {
+	background-color:#fff;
+	border-bottom-left-radius:11px;
+	box-shadow:0 0 10px #000;
+	list-style:none;
+	max-height:80%;
+	overflow-x:hidden;
+	overflow-y: scroll;
+	padding-bottom:6px;
+	position:fixed;
+	right:0;
+	text-overflow:ellipsis;
+	top:20px;
+	width:380px;
+	z-index:75;
+}
 
- #searchresults li.resultHeader {
- 	background-color:#eee;
- 	border-bottom:solid 1px #CCC;
- 	font-size:1.2em;
- 	font-weight:700;
- 	padding:.2em;
- }
+.ie8 #searchresults {
+	border: 1px solid #666 !important;
+}
 
- #searchresults li.result {
- 	margin-left:2em;
- }
+#searchresults li.resultHeader {
+	background-color:#eee;
+	border-bottom:solid 1px #CCC;
+	font-size:1.2em;
+	font-weight:700;
+	padding:.2em;
+}
 
- #searchresults table {
- 	border-spacing:0;
- 	table-layout:fixed;
- 	top:0;
- 	width:100%;
- }
+#searchresults li.result {
+	margin-left:2em;
+}
 
- #searchresults td {
- 	vertical-align:top;
- 	padding:0 .3em;
- }
+#searchresults table {
+	border-spacing:0;
+	table-layout:fixed;
+	top:0;
+	width:100%;
+}
 
- #searchresults td.result div.text {
- 	padding-left:1em;
- 	white-space:nowrap;
- }
+#searchresults td {
+	vertical-align:top;
+	padding:0 .3em;
+}
 
- #searchresults td.result * {
- 	cursor:pointer;
- }
+#searchresults td.result div.text {
+	padding-left:1em;
+	white-space:nowrap;
+}
 
- #searchresults td.type {
- 	border-bottom:none;
- 	border-right:1px solid #aaa;
- 	font-weight:700;
- 	text-align:right;
- 	width:3.5em;
- }
+#searchresults td.result * {
+	cursor:pointer;
+}
 
- #searchresults tr.current {
- 	background-color:#ddd;
- }
\ No newline at end of file
+#searchresults td.type {
+	border-bottom:none;
+	border-right:1px solid #aaa;
+	font-weight:700;
+	text-align:right;
+	width:3.5em;
+}
+
+#searchresults tr.current {
+	background-color:#ddd;
+}
\ No newline at end of file
diff --git a/settings/admin.php b/settings/admin.php
index db041ef889c08e527fd9bdffc0b514e37b50c0ed..10e239204f28cd55fec87c185167379d0ec9cf1b 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -32,15 +32,16 @@ $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundj
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 
 // Check if connected using HTTPS
-if (OC_Request::serverProtocol() == 'https') {
+if (OC_Request::serverProtocol() === 'https') {
 	$connectedHTTPS = true; 
 } else {
 	$connectedHTTPS = false;
 } 
 $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
-$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); 
+$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
 
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $tmpl->assign('forms', array());
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 9c5adfcfef95080ff0250d7e2aa2af4acb18aab8..b68083fca6bed85026cb862ceba11fb47afe505b 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -33,18 +33,18 @@ if(is_array($categoryNames)) {
 		// show only external apps that aren't enabled yet
 		$local=false;
 		foreach($enabledApps as $a) {
-			if($a == $app['name']) {
+			if($a === $app['name']) {
 				$local=true;
 			}
 		}
 
 		if(!$local) {
-			if($app['preview']=='') {
+			if($app['preview'] === '') {
 				$pre=OC_Helper::imagePath('settings', 'trans.png');
 			} else {
 				$pre=$app['preview'];
 			}
-			if($app['label']=='recommended') {
+			if($app['label'] === 'recommended') {
 				$label='3rd Party';
 			} else {
 				$label='Recommended';
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
index faf962fbdd7fa2ca63395c50be5af9b4e1894048..4bb41fa3d3b1a146da9c107eea0221663892ea48 100644
--- a/settings/ajax/changedisplayname.php
+++ b/settings/ajax/changedisplayname.php
@@ -17,7 +17,7 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
 
-if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
+if ($username === OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
 	$userstatus = 'changeOwnDisplayName';
 }
 
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 56653bed6bd7e8d2f4ea1a8a72033d665509b93c..205958f88d337e4ea0429f534483d8ea3045d20a 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -16,7 +16,7 @@ if(OC_User::isAdminUser(OC_User::getUser())) {
 				$groups[] = $group;
 			}
 		}
-		if(count($groups) == 0) {
+		if(count($groups) === 0) {
 			$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
 		}
 	}else{
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index da69a2863b75b05c0ec972e9931c689e367d0e49..e71514192860009286f4189b335cfdd45fe0299c 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -16,6 +16,6 @@ $data = array();
 OC_JSON::success(
 	array(
 		"data" => $entries,
-		"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) != 0) ? true : false
+		"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0) ? true : false
 	)
 );
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index aebb1b31b6f9f0bfad0cd77f169119a1f057ba99..94773f3dc70beeb2712717f8196a5bed42324999 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 if( isset( $_POST['lang'] ) ) {
 	$languageCodes=OC_L10N::findAvailableLanguages();
 	$lang=$_POST['lang'];
-	if(array_search($lang, $languageCodes) or $lang=='en') {
+	if(array_search($lang, $languageCodes) or $lang === 'en') {
 		OC_Preferences::setValue( OC_User::getUser(), 'core', 'lang', $lang );
 		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
 	}else{
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 8dcb7ddd424bc234b696bef8224ea865ac4cfa94..2e6de2b759c32dd0aacb2c2377b58ba627769f96 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
+if(($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
 	|| (!OC_User::isAdminUser(OC_User::getUser())
 		&& !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
 	$l = OC_L10N::get('core');
@@ -20,7 +20,7 @@ if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
 
 //make sure the quota is in the expected format
 $quota=$_POST["quota"];
-if($quota!='none' and $quota!='default') {
+if($quota !== 'none' and $quota !== 'default') {
 	$quota= OC_Helper::computerFileSize($quota);
 	$quota=OC_Helper::humanFileSize($quota);
 }
@@ -29,7 +29,7 @@ if($quota!='none' and $quota!='default') {
 if($username) {
 	OC_Preferences::setValue($username, 'files', 'quota', $quota);
 }else{//set the default quota when no username is specified
-	if($quota=='default') {//'default' as default quota makes no sense
+	if($quota === 'default') {//'default' as default quota makes no sense
 		$quota='none';
 	}
 	OC_Appconfig::setValue('files', 'default_quota', $quota);
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f6fd9aba6d908a0d77f52732bcbedcf1bddda149..6963f9eb43c15912e21e53ecb2ab06417f1b835d 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,7 +7,7 @@ $success = true;
 $username = $_POST["username"];
 $group = $_POST["group"];
 
-if($username == OC_User::getUser() && $group == "admin" &&  OC_User::isAdminUser($username)) {
+if($username === OC_User::getUser() && $group === "admin" &&  OC_User::isAdminUser($username)) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
 	exit();
@@ -36,7 +36,7 @@ if( OC_Group::inGroup( $username, $group )) {
 	$error = $l->t("Unable to remove user from group %s", $group);
 	$success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
-	if(count($usersInGroup)==0) {
+	if(count($usersInGroup) === 0) {
 		OC_Group::deleteGroup($group);
 	}
 }
diff --git a/settings/apps.php b/settings/apps.php
index 44cfff7e3f1e1f375db2295e720659d237355053..20b128875541fff881bf74b98a48ba432dd80adf 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -30,13 +30,13 @@ OC_App::setActiveNavigationEntry( "core_apps" );
 
 function app_sort( $a, $b ) {
 
-	if ($a['active'] != $b['active']) {
+	if ($a['active'] !== $b['active']) {
 
 		return $b['active'] - $a['active'];
 
 	}
 
-	if ($a['internal'] != $b['internal']) {
+	if ($a['internal'] !== $b['internal']) {
 		return $b['internal'] - $a['internal'];
 	}
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 3c406109a1f8a63f2070142e0d75c22e2750321c..20df5d86d65100a581a4b462e918f61cfb927d09 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -9,10 +9,10 @@ input#openid, input#webdav { width:20em; }
 /* PERSONAL */
 
 /* Sync clients */
-.clientsbox { margin:12px; text-align:center; }
+.clientsbox { margin:12px; }
 .clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; }
 .clientsbox h2 { font-size:20px; font-weight:bold; margin:35px 0 10px; }
-.clientsbox center { margin-top:10px; }
+.clientsbox .center { margin-top:10px; }
 
 #passworderror { display:none; }
 #passwordchanged { display:none; }
@@ -57,6 +57,8 @@ select.quota.active { background: #fff; }
 #newuser .multiselect { top:1px; }
 #headerGroups, #headerSubAdmins, #headerQuota { padding-left:18px; }
 
+.ie8 table.hascontrols{border-collapse:collapse;width: 100%;}
+.ie8 table.hascontrols tbody tr{border-collapse:collapse;border: 1px solid #ddd !important;}
 
 /* APPS */
 .appinfo { margin: 1em; }
diff --git a/settings/help.php b/settings/help.php
index a5ac11ec9a3e0e41d5662a90e4a0b32a5ff27ea4..713b23f78570883bfa3e086c907805ff28535f92 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -13,7 +13,7 @@ OC_Util::addStyle( "settings", "settings" );
 OC_App::setActiveNavigationEntry( "help" );
 
 
-if(isset($_GET['mode']) and $_GET['mode']=='admin') {
+if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
 	$url=OC_Helper::linkToAbsolute( 'core', 'doc/admin' );
 	$style1='';
 	$style2=' pressed';
diff --git a/settings/img/apps.png b/settings/img/apps.png
index 2b18f678a0295f45a82250698440a9b6d9e1ed43..6dc8d4c8a6e1f345d150b19c66badceefed15fe8 100644
Binary files a/settings/img/apps.png and b/settings/img/apps.png differ
diff --git a/settings/img/apps.svg b/settings/img/apps.svg
index e2cc48f295697fc61dfdd1349be43714b981345c..338938f256e8372c74f18357370c7cbef8e1063a 100644
--- a/settings/img/apps.svg
+++ b/settings/img/apps.svg
@@ -1,8 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <g>
-  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 2v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z"/>
-  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 3v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z" fill="#fff"/>
- </g>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <defs></defs>
+ <path fill="#000" d="m14,5,0,8-8,0,0,4,8,0,0,8,4,0,0-8,8,0,0-4-8,0,0-8-4,0z"/>
+ <path fill="#FFF" d="M14,6v8h-8v4h8v8h4v-8h8v-4h-8v-8h-4z"/>
+ <path opacity="0.1" d="m14,7,0,8-8,0,0,4,8,0,0,8,4,0,0-8,8,0,0-4-8,0,0-8-4,0z" fill="#FFF"/>
 </svg>
diff --git a/settings/js/admin.js b/settings/js/admin.js
index ab218377fb3c6d548d93ca3ff9f81810f2f0ef34..f2d6f37a51a3494269e36240920be665311cf1a0 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -8,7 +8,7 @@ $(document).ready(function(){
 	$('#backgroundjobs input').change(function(){
 		if($(this).attr('checked')){
 			var mode = $(this).val();
-			if (mode == 'ajax' || mode == 'webcron' || mode == 'cron') {
+			if (mode === 'ajax' || mode === 'webcron' || mode === 'cron') {
 				OC.AppConfig.setValue('core', 'backgroundjobs_mode', mode);
 			}
 		}
@@ -19,7 +19,7 @@ $(document).ready(function(){
 	});
 
 	$('#shareAPI input').change(function() {
-		if ($(this).attr('type') == 'checkbox') {
+		if ($(this).attr('type') === 'checkbox') {
 			if (this.checked) {
 				var value = 'yes';
 			} else {
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 1ee3372f893c0b9b080d290e131b8e775acc91f5..2ff3f0536d4d183d6e1a98f24027a181084cff46 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -29,7 +29,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('span.author').text(app.author);
 		page.find('span.licence').text(app.licence);
 
-		if (app.update != false) {
+		if (app.update !== false) {
 			page.find('input.update').show();
 			page.find('input.update').data('appid', app.id);
 			page.find('input.update').attr('value',t('settings', 'Update to {appversion}', {appversion:app.update}));
@@ -41,7 +41,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('input.enable').val((app.active) ? t('settings', 'Disable') : t('settings', 'Enable'));
 		page.find('input.enable').data('appid', app.id);
 		page.find('input.enable').data('active', app.active);
-		if (app.internal == false) {
+		if (app.internal === false) {
 			page.find('span.score').show();
 			page.find('p.appslink').show();
 			page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
@@ -60,7 +60,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		element.val(t('settings','Please wait....'));
 		if(active) {
 			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
-				if(!result || result.status!='success') {
+				if(!result || result.status !== 'success') {
 					OC.dialogs.alert('Error while disabling app', t('core', 'Error'));
 				}
 				else {
@@ -72,7 +72,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			$('#leftcontent li[data-id="'+appid+'"]').removeClass('active');
 		} else {
 			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
-				if(!result || result.status!='success') {
+				if(!result || result.status !== 'success') {
 					OC.dialogs.alert('Error while enabling app', t('core', 'Error'));
 				}
 				else {
@@ -94,7 +94,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		console.log('updateApp:', appid, element);
 		element.val(t('settings','Updating....'));
 		$.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appid},function(result) {
-			if(!result || result.status!='success') {
+			if(!result || result.status !== 'success') {
 				OC.dialogs.alert(t('settings','Error while updating app'),t('settings','Error'));
 			}
 			else {
@@ -152,7 +152,13 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						a.prepend(filename);
 						a.prepend(img);
 						li.append(a);
-						container.append(li);
+						// prepend the new app before the 'More apps' function
+						$('#apps-management').before(li);
+						// scroll the app navigation down so the newly added app is seen
+						$('#navigation').animate({ scrollTop: $('#apps').height() }, 'slow');
+						// draw attention to the newly added app entry by flashing it twice
+						container.children('li[data-id="'+entry.id+'"]').animate({opacity:.3}).animate({opacity:1}).animate({opacity:.3}).animate({opacity:1});
+
 						if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
 							$(img).addClass('svg');
 							replaceSVG();
@@ -171,7 +177,7 @@ $(document).ready(function(){
 		$(this).find('span.hidden').remove();
 	});
 	$('#leftcontent li').keydown(function(event) {
-		if (event.which == 13 || event.which == 32) {
+		if (event.which === 13 || event.which === 32) {
 			$(event.target).click();
 		}
 		return false;
diff --git a/settings/js/log.js b/settings/js/log.js
index 84f6d1aa5f3f9f6cbc58d2f8ee8134b685756657..1ef9b419cdb3cfc903968deebdfc7c9d5bdfbafd 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -19,7 +19,7 @@ OC.Log={
 	getMore:function(count){
 		count = count || 10;
 		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
-			if(result.status=='success'){
+			if(result.status === 'success'){
 				OC.Log.addEntries(result.data);
 				if(!result.remain){
 					$('#moreLog').hide();
diff --git a/settings/js/users.js b/settings/js/users.js
index 9fe593214f21611c1c940da804f528e8ed9320a4..6a8afc4ca366021395904ca97c20150e9eb17370 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -67,7 +67,7 @@ var UserList = {
 				async: false,
 				data: { username: UserList.deleteUid },
 				success: function (result) {
-					if (result.status == 'success') {
+					if (result.status === 'success') {
 						// Remove undo option, & remove user from table
 						OC.Notification.hide();
 						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
@@ -76,7 +76,7 @@ var UserList = {
 							ready();
 						}
 					} else {
-						oc.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
+						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
 					}
 				}
 			});
@@ -97,7 +97,7 @@ var UserList = {
 		}
 		$.each(this.availableGroups, function (i, group) {
 			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+			if (typeof subadminSelect !== 'undefined' && group !== 'admin') {
 				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
 			}
 		});
@@ -107,7 +107,7 @@ var UserList = {
 			tr.find('td.subadmins').append(subadminSelect);
 			UserList.applyMultiplySelect(subadminSelect);
 		}
-		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+		if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
 			var rm_img = $('<img class="svg action">').attr({
 				src: OC.imagePath('core', 'actions/delete')
 			});
@@ -115,11 +115,11 @@ var UserList = {
 				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
 				.append(rm_img);
 			tr.find('td.remove').append(rm_link);
-		} else if (OC.currentUser == username) {
+		} else if (OC.currentUser === username) {
 			tr.find('td.remove a').remove();
 		}
 		var quotaSelect = tr.find('select.quota-user');
-		if (quota == 'default') {
+		if (quota === 'default') {
 			quotaSelect.find('option').attr('selected', null);
 			quotaSelect.find('option').first().attr('selected', 'selected');
 			quotaSelect.data('previous', 'default');
@@ -148,7 +148,7 @@ var UserList = {
 			var tz = [], x = 0, y = -1, n = 0, i, j;
 
 			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
-			var m = (i == 46 || (i >=48 && i <= 57));
+			var m = (i === 46 || (i >=48 && i <= 57));
 			if (m !== n) {
 				tz[++y] = "";
 				n = m;
@@ -164,7 +164,7 @@ var UserList = {
 		for (x = 0; aa[x] && bb[x]; x++) {
 			if (aa[x] !== bb[x]) {
 			var c = Number(aa[x]), d = Number(bb[x]);
-			if (c == aa[x] && d == bb[x]) {
+			if (c === aa[x] && d === bb[x]) {
 				return c - d;
 			} else return (aa[x] > bb[x]) ? 1 : -1;
 			}
@@ -207,7 +207,7 @@ var UserList = {
 						return true;
 					}
 					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
-					if (index == 9) {
+					if (index === 9) {
 						$(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 							$(this).unbind(event);
 							UserList.update();
@@ -225,16 +225,16 @@ var UserList = {
 	applyMultiplySelect: function (element) {
 		var checked = [];
 		var user = element.attr('data-username');
-		if ($(element).attr('class') == 'groupsselect') {
+		if ($(element).attr('class') === 'groupsselect') {
 			if (element.data('userGroups')) {
 				checked = String(element.data('userGroups')).split(', ');
 			}
 			if (user) {
 				var checkHandeler = function (group) {
-					if (user == OC.currentUser && group == 'admin') {
+					if (user === OC.currentUser && group === 'admin') {
 						return false;
 					}
-					if (!isadmin && checked.length == 1 && checked[0] == group) {
+					if (!isadmin && checked.length === 1 && checked[0] === group) {
 						return false;
 					}
 					$.post(
@@ -280,12 +280,12 @@ var UserList = {
 				minWidth: 100
 			});
 		}
-		if ($(element).attr('class') == 'subadminsselect') {
+		if ($(element).attr('class') === 'subadminsselect') {
 			if (element.data('subadmin')) {
 				checked = String(element.data('subadmin')).split(', ');
 			}
 			var checkHandeler = function (group) {
-				if (group == 'admin') {
+				if (group === 'admin') {
 					return false;
 				}
 				$.post(
@@ -301,7 +301,7 @@ var UserList = {
 
 			var addSubAdmin = function (group) {
 				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length == 0) {
+					if ($(element).find('option[value="' + group + '"]').length === 0) {
 						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
 				})
@@ -349,7 +349,7 @@ $(document).ready(function () {
 		img.parent().children('span').replaceWith(input);
 		input.focus();
 		input.keypress(function (event) {
-			if (event.keyCode == 13) {
+			if (event.keyCode === 13) {
 				if ($(this).val().length > 0) {
 					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
 					$.post(
@@ -390,7 +390,7 @@ $(document).ready(function () {
 		img.parent().children('span').replaceWith(input);
 		input.focus();
 		input.keypress(function (event) {
-			if (event.keyCode == 13) {
+			if (event.keyCode === 13) {
 				if ($(this).val().length > 0) {
 					$.post(
 						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
@@ -423,13 +423,13 @@ $(document).ready(function () {
 		event.preventDefault();
 		var username = $('#newusername').val();
 		var password = $('#newuserpassword').val();
-		if ($.trim(username) == '') {
+		if ($.trim(username) === '') {
 			OC.dialogs.alert(
 				t('settings', 'A valid username must be provided'),
 				t('settings', 'Error creating user'));
 			return false;
 		}
-		if ($.trim(password) == '') {
+		if ($.trim(password) === '') {
 			OC.dialogs.alert(
 				t('settings', 'A valid password must be provided'),
 				t('settings', 'Error creating user'));
@@ -445,7 +445,7 @@ $(document).ready(function () {
 				groups: groups
 			},
 			function (result) {
-				if (result.status != 'success') {
+				if (result.status !== 'success') {
 					OC.dialogs.alert(result.data.message,
 						t('settings', 'Error creating user'));
 				} else {
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
index f89e0062928bd27984752c4f67b0f2fb803554af..b6c502526675dd6339c32d94d503aad54c6d4ab9 100644
--- a/settings/l10n/af_ZA.php
+++ b/settings/l10n/af_ZA.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Wagwoord",
 "New password" => "Nuwe wagwoord",
 "Username" => "Gebruikersnaam"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 0f23111abbb03a60bbff0d9ff07b12f8f403b48b..423c9cec666483cf08fa32f04c9dd6428db2d056 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ÙØ´Ù„ ØªØÙ…ÙŠÙ„ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ù…Ù† Ø§Ù„Ø¢Ø¨ Ø³ØªÙˆØ±",
 "Authentication error" => "Ù„Ù… ÙŠØªÙ… Ø§Ù„ØªØ£ÙƒØ¯ Ù…Ù† Ø§Ù„Ø´Ø®ØµÙŠØ© Ø¨Ù†Ø¬Ø§Ø",
 "Unable to change display name" => "ØªØ¹Ø°Ø± ØªØºÙŠÙŠØ± Ø§Ø³Ù… Ø§Ù„ØØ³Ø§Ø¨",
@@ -36,20 +37,14 @@
 "A valid password must be provided" => "ÙŠØ¬Ø¨ Ø§Ø¯Ø®Ø§Ù„ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± ØµØÙŠØØ©",
 "__language_name__" => "__language_name__",
 "Security Warning" => "ØªØØ°ÙŠØ± Ø£Ù…Ø§Ù†",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ù…Ø¬Ù„Ø¯Ø§Øª data  ÙˆÙ…Ù„ÙØ§ØªÙƒ Ù‚Ø¯ ØªÙƒÙˆÙ† Ù‚Ø§Ø¨Ù„Ø© Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø´Ø¨ÙƒØ© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù…Ù„Ù .htaccess Ø§Ù„Ø°ÙŠ ÙˆÙØ±ØªÙ‡ Owncloud Ù„Ø§ ÙŠØ¹Ù…Ù„ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨Ø§Ø¹Ø¯Ø§Ø¯ Ø®Ø§Ø¯Ù…Ùƒ Ø¨Ø·Ø±ÙŠÙ‚Ø© ØªØ¬Ø¹Ù„ Ù…Ø¬Ù„Ø¯ data ØºÙŠØ± Ù‚Ø§Ø¨Ù„ Ù„Ù„ÙˆØµÙˆÙ„ Ø§Ù„ÙŠÙ‡ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ø£Ùˆ Ø£Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØºÙŠÙŠØ± Ù…Ø³Ø§Ø±Ù‡ Ø§Ù„Ù‰ Ø®Ø§Ø±Ø¬ Ù…Ø³Ø§Ø± Ù…Ø¬Ù„Ø¯ Ø§Ù„ØµÙØØ§Øª Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠ document root Ø§Ù„Ø®Ø§Øµ Ø¨Ø®Ø§Ø¯Ù… Ø§Ù„ÙˆÙŠØ¨ .",
 "Setup Warning" => "ØªØØ°ÙŠØ± ÙÙŠ Ø§Ù„ØªÙ†ØµÙŠØ¨",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ø§Ø¹Ø¯Ø§Ø¯Ø§Øª Ø®Ø§Ø¯Ù…Ùƒ ØºÙŠØ± ØµØÙŠØØ© Ø¨Ø´ÙƒÙ„ ØªØ³Ù…Ø Ù„Ùƒ Ø¨Ù…Ø²Ø§Ù…Ù†Ø© Ù…Ù„ÙØ§ØªÙƒ ÙˆØ°Ù„Ùƒ Ø¨Ø³Ø¨Ø¨ Ø£Ù† ÙˆØ§Ø¬Ù‡Ø© WebDAV ØªØ¨Ø¯Ùˆ Ù…Ø¹Ø·Ù„Ø©",
-"Please double check the <a href='%s'>installation guides</a>." => "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† <a href='%s'>Ø¯Ù„ÙŠÙ„ Ø§Ù„ØªÙ†ØµÙŠØ¨</a>.",
 "Module 'fileinfo' missing" => "Ø§Ù„Ù…ÙˆØ¯ÙŠÙ„ 'fileinfo' Ù…ÙÙ‚ÙˆØ¯",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Ù…ÙˆØ¯ÙŠÙ„  'fileinfo' Ø§Ù„Ø®Ø§Øµ Ø¨Ø§Ù„Ù€PHP  Ù…ÙÙ‚ÙˆØ¯ . Ù†ÙˆØµÙŠ Ø¨ØªÙØ¹ÙŠÙ„ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆØ¯ÙŠÙ„ Ù„Ù„ØØµÙˆÙ„ Ø¹Ù„Ù‰ Ø£ÙØ¶Ù„ Ø§Ù„Ù†ØªØ§Ø¦Ø¬ Ù…Ø¹ Ø®Ø§ØµÙŠØ© Ø§Ù„ØªØÙ‚Ù‚ ",
 "Locale not working" => "Ø§Ù„Ù„ØºÙ‡ Ù„Ø§ ØªØ¹Ù…Ù„",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ø®Ø§Ø¯Ù… ownCloud Ù‡Ø°Ø§ ÙƒÙ… Ø¶Ø¨Ø· Ù„ØºØ© Ø§Ù„Ù†Ø¸Ø§Ù… Ø§Ù„Ù‰ %s . Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø§Ù†Ù‡ Ù‚Ø¯ ÙŠÙƒÙˆÙ† Ù‡Ù†Ø§Ùƒ Ø£Ø®Ø·Ø§Ø¡ ÙÙŠ Ø§Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ù„ÙØ§Øª. Ù†ØÙ† Ù†ÙˆØµÙŠ Ø§Ù† ØªÙ‚ÙˆÙ… Ø¨ØªØ±ÙƒÙŠØ¨ Ø§Ù„ØØ²Ù… Ø§Ù„Ù„Ø§Ø²Ù…Ø© Ù„Ø¯Ø¹Ù… %s Ø¹Ù„Ù‰ Ù†Ø¸Ø§Ù…Ùƒ . ",
 "Internet connection not working" => "Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª Ù„Ø§ ÙŠØ¹Ù…Ù„",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ø®Ø§Ø¯Ù… Ø§Ù„Ù€ Owncloud  Ù‡Ø°Ø§ ØºÙŠØ± Ù…ØªØµÙ„ Ø¨Ø§Ù„Ø§Ù†ØªØ±Ù†Øª. Ù‡Ø°Ø§ ÙŠØ¹Ù†ÙŠ Ø£Ù† Ø¨Ø¹Ø¶ Ø§Ù„Ù…ÙŠØ²Ø§Øª Ù…Ø«Ù„ Ø§Ù„Ø±Ø¨Ø· Ø¨ÙˆØØ¯Ø© ØªØ®Ø²ÙŠÙ†ÙŠØ© Ø®Ø§Ø±Ø¬ÙŠÙ‡, Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ø§Ù„ØªØØ¯ÙŠØ«Ø§Øª Ø£Ùˆ ØªØ±ÙƒÙŠØ¨ ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ù…Ù† Ù…ØµØ§Ø¯Ø± Ø®Ø§Ø±Ø¬ÙŠØ© Ù„Ù† ÙŠØ¹Ù…Ù„ . ÙƒÙ…Ø§ Ø§Ù† Ø§Ù„ÙˆØµÙˆÙ„ Ø§Ù„Ù‰ Ø§Ù„Ù…Ù„ÙØ§Øª Ù…Ù† Ø®Ø§Ø±Ø¬ Ø§Ù„Ø®Ø§Ø¯Ù… ÙˆØ§Ø±Ø³Ø§Ù„ Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„ØªÙ†Ø¨ÙŠÙ‡ÙŠØ© Ù„Ù† ØªØ¹Ù…Ù„ Ø£ÙŠØ¶Ø§ . Ù†Ù‚ØªØ±Ø Ø£Ù† ØªÙØ¹Ù„ Ø®Ø¯Ù…Ø© Ø§Ù„Ø§Ù†ØªØ±Ù†Øª ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ø°Ø§ Ø£Ø±Ø¯Øª Ø§Ù† ØªØ³ØªÙÙŠØ¯ Ù…Ù† ÙƒØ§ÙØ© Ù…ÙŠØ²Ø§Øª Owncloud",
 "Cron" => "Ù…Ø¬Ø¯ÙˆÙ„",
 "Execute one task with each page loaded" => "Ù‚Ù… Ø¨ØªÙ†ÙÙŠØ° Ù…Ù‡Ù…Ø© ÙˆØ§ØØ¯Ø© Ù…Ø¹ ÙƒÙ„ ØµÙØØ© ØªÙ… ØªØÙ…ÙŠÙ„Ù‡Ø§",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php Ù…Ø³Ø¬Ù„Ø© ÙÙŠ Ø®Ø¯Ù…Ø© webcron . Ù‚Ù… Ø¨Ø§Ø³ØªØ¯Ø¹Ø§Ø¡ ØµÙØØ© cron.php Ø§Ù„Ù…ÙˆØ¬ÙˆØ¯Ø© ÙÙŠ owncloud root Ù…Ø±Ù‡ ÙƒÙ„ Ø¯Ù‚ÙŠÙ‚Ø© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ http",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Ù‚Ù… Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø®Ø¯Ù…Ø© cron . Ù‚Ù… Ø¨Ø§Ø³ØªØ¯Ø¹Ø§Ø¡ Ù…Ù„Ù cron.php Ø§Ù„Ù…ÙˆØ¬ÙˆØ¯ ÙÙŠ Ù…Ø¬Ù„Ø¯ Owncloud  Ø¹Ù† Ø·Ø±ÙŠÙ‚ system cronjob Ù…Ø±Ù‡ ÙƒÙ„ Ø¯Ù‚ÙŠÙ‚Ø©",
 "Sharing" => "Ù…Ø´Ø§Ø±ÙƒØ©",
 "Enable Share API" => "Ø§Ù„Ø³Ù…Ø§Ø Ø¨Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„API ",
 "Allow apps to use the Share API" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø¨Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§Ù„API",
@@ -61,8 +56,6 @@
 "Allow users to only share with users in their groups" => "Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ¹Ù…ÙŠÙ†Ù Ù„Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ© ÙÙ‚Ø· Ù…Ø¹ Ø§Ù„Ù…Ø³ØªØ¹Ù…Ù„ÙŠÙ† ÙÙŠ Ù…Ø¬Ù…ÙˆØ¹Ø§ØªÙ‡Ù…",
 "Security" => "ØÙ…Ø§ÙŠØ©",
 "Enforce HTTPS" => "ÙØ±Ø¶ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø¨Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Owncloud  Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ø§ØªØµØ§Ù„ Ù…Ø´ÙØ±",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„Ø§ØªØµØ§Ù„ Ù…Ø¹ Ø®Ø§Ø¯Ù… Owncloud  Ù‡Ø°Ø§ Ø¹Ù† Ø·Ø±ÙŠÙ‚ HTTPS Ù„ØªÙØ¹ÙŠÙ„ Ø£Ùˆ ØªØ¹Ø·ÙŠÙ„ Ø§Ø¬Ø¨Ø§Ø± Ø§Ù„Ø¯Ø®ÙˆÙ„ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… ",
 "Log" => "Ø³Ø¬Ù„",
 "Log level" => "Ù…Ø³ØªÙˆÙ‰ Ø§Ù„Ø³Ø¬Ù„",
 "More" => "Ø§Ù„Ù…Ø²ÙŠØ¯",
@@ -108,3 +101,4 @@
 "set new password" => "Ø§Ø¹Ø¯Ø§Ø¯ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ø¬Ø¯ÙŠØ¯Ø©",
 "Default" => "Ø§ÙØªØ±Ø§Ø¶ÙŠ"
 );
+$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;";
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 31e5132edd28c800e27a543b5ab9b406ff75961f..d7b892bcca753f58c1ba36f23fa15412d770133b 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Authentication error" => "Ð’ÑŠÐ·Ð½Ð¸ÐºÐ½Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÑÑ‚Ð°",
 "Group already exists" => "Ð“Ñ€ÑƒÐ¿Ð°Ñ‚Ð° Ð²ÐµÑ‡Ðµ ÑÑŠÑ‰ÐµÑÑ‚Ð²ÑƒÐ²Ð°",
 "Unable to add group" => "ÐÐµÐ²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²ÑÐ½Ðµ Ð½Ð° Ð³Ñ€ÑƒÐ¿Ð°",
@@ -23,7 +24,6 @@
 "add group" => "Ð½Ð¾Ð²Ð° Ð³Ñ€ÑƒÐ¿Ð°",
 "__language_name__" => "__language_name__",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’Ð°ÑˆÐ¸ÑÑ‚ web ÑÑŠÑ€Ð²ÑŠÑ€ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ ÑƒÐ´Ð°Ñ‡Ð½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð´Ð° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐ²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ, Ð·Ð°Ñ‰Ð¾Ñ‚Ð¾ WebDAV Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÑŠÑ‚ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð° Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð¸.",
-"Please double check the <a href='%s'>installation guides</a>." => "ÐœÐ¾Ð»Ñ Ð½Ð°Ð¿Ñ€Ð°Ð²ÐµÑ‚Ðµ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð° ÑÐ¿Ñ€Ð°Ð²ÐºÐ° Ñ <a href='%s'>Ñ€ÑŠÐºÐ¾Ð²Ð¾Ð´ÑÑ‚Ð²Ð¾Ñ‚Ð¾ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ðµ</a>.",
 "Cron" => "ÐšÑ€Ð¾Ð½",
 "Sharing" => "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ðµ",
 "More" => "ÐžÑ‰Ðµ",
@@ -61,3 +61,4 @@
 "Storage" => "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ",
 "Default" => "ÐŸÐ¾ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð±Ð¸Ñ€Ð°Ð½Ðµ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index c5116af74633a24787c3884bc427da66fe9609df..c679fcef8a2b50d60eb4d2e5596095d919aa80ea 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "à¦…à§à¦¯à¦¾à¦ªà¦¸à§à¦Ÿà§‹à¦° à¦¥à§‡à¦•à§‡ à¦¤à¦¾à¦²à¦¿à¦•à¦¾ à¦²à§‹à¦¡ à¦•à¦°à¦¤à§‡ à¦¸à¦•à§à¦·à¦® à¦¨à§Ÿ",
 "Authentication error" => "à¦…à¦¨à§à¦®à§‹à¦¦à¦¨ à¦˜à¦Ÿà¦¿à¦¤ à¦¸à¦®à¦¸à§à¦¯à¦¾",
 "Group already exists" => "à¦—à§‹à¦·à§à¦ à§€à¦Ÿà¦¿ à¦ªà§‚à¦°à§à¦¬ à¦¥à§‡à¦•à§‡à¦‡ à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨",
@@ -61,3 +62,4 @@
 "Storage" => "à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦°",
 "Default" => "à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bs.php b/settings/l10n/bs.php
index 774f081673dc49395c18685a4bed2e29ed93090b..708e045adebb6fa3a36e65fea2416ead10d58b93 100644
--- a/settings/l10n/bs.php
+++ b/settings/l10n/bs.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Saving..." => "SpaÅ¡avam..."
 );
+$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);";
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 55b48a4d606d0e82cd009eaf8b8c12749cfd055f..52dec3a892effda681b495c4d775174d5641158a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
 "Authentication error" => "Error d'autenticaciÃ³",
 "Your display name has been changed." => "El nom a mostrar ha canviat.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Heu de facilitar una contrasenya vÃ lida",
 "__language_name__" => "CatalÃ ",
 "Security Warning" => "AvÃs de seguretat",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La carpeta de dades i els fitxers provablement sÃ³n accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La carpeta de dades i els vostres fitxersprobablement sÃ³n accessibles des d'Internet. La fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
 "Setup Warning" => "AvÃs de configuraciÃ³",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no estÃ  configurat correctament per permetre la sincronitzaciÃ³ de fitxers perquÃ¨ la interfÃcie WebDAV sembla no funcionar correctament.",
-"Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instalÂ·laciÃ³</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Comproveu les <a href='%s'>guies d'instalÂ·laciÃ³</a>.",
 "Module 'fileinfo' missing" => "No s'ha trobat el mÃ²dul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El mÃ²dul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mÃ²dul per obtenir millors resultats amb la detecciÃ³ mime-type.",
 "Locale not working" => "Locale no funciona",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Aquest servidor ownCloud no pot establir el locale del sistema a %s. AixÃ² significa que hi poden haver problemes amb alguns carÃ cters en el nom dels fitxers. Us recomanem instalÂ·lar els paquets necessaris al sistema per donar suport a %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Les locale del sistema no es poden establir en %s. AixÃ² significa que hi poden haver problemes amb alguns carÃ cters en el nom dels fitxers. Us recomanem instalÂ·lar els paquets necessaris al sistema per donar suport a %s.",
 "Internet connection not working" => "La connexiÃ³ a internet no funciona",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Aquest servidor ownCloud no tÃ© cap connexiÃ³ a internet que funcioni. AixÃ² significa que algunes de les caracterÃstiques com el muntatge d'emmagatzemament externs, les notificacions quant a actualitzacions o la instalÂ·laciÃ³ d'aplicacions de tercers no funcionarÃ . L'accÃ©s remot a fitxers i l'enviament de correus electrÃ²nics podria tampoc no funcionar. Us suggerim que habiliteu la connexiÃ³ a internet per aquest servidor si voleu gaudir de totes les possibilitats d'ownCloud.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Aquest servidor no tÃ© cap connexiÃ³ a internet que funcioni. AixÃ² significa que algunes de les caracterÃstiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instalÂ·laciÃ³ d'aplicacions de tercers no funcionarÃ . L'accÃ©s remot a fitxers i l'enviament de correus electrÃ²nics podria tampoc no funcionar. Us suggerim que habiliteu la connexiÃ³ a internet per aquest servidor si voleu tenir totes les caracterÃstiques.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executa una tasca per cada paquet carregat",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php estÃ  registrat en un servei webcron. Feu la crida a cron.php a l'arrel d'ownCloud cada minut a travÃ©s de http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa un servei cron del sistema. Feu la crida al fitxer cron.php a travÃ©s d'un cronjob del sistema cada minut.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php estÃ  registrat en un servei webcron que fa una crida cada minut a la pÃ gina cron.php a travÃ©s de http.",
+"Use systems cron service to call the cron.php file once a minute." => "Utilitzeu el sistema de servei cron per cridar el fitxer cron.php cada minut.",
 "Sharing" => "Compartir",
 "Enable Share API" => "Habilita l'API de compartir",
 "Allow apps to use the Share API" => "Permet que les aplicacions utilitzin l'API de compartir",
 "Allow links" => "Permet enllaÃ§os",
 "Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el pÃºblic amb enllaÃ§os",
+"Allow public uploads" => "Permet pujada pÃºblica",
+"Allow users to enable others to upload into their publicly shared folders" => "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al pÃºblic",
 "Allow resharing" => "Permet compartir de nou",
 "Allow users to share items shared with them again" => "Permet als usuaris compartir de nou elements ja compartits amb ells",
 "Allow users to share with anyone" => "Permet compartir amb qualsevol",
 "Allow users to only share with users in their groups" => "Permet als usuaris compartir nomÃ©s amb els usuaris del seu grup",
 "Security" => "Seguretat",
 "Enforce HTTPS" => "ForÃ§a HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "ForÃ§a als clients la connexiÃ³ amb ownCloud via una connexiÃ³ encriptada.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Connecteu aquesta instÃ ncia onwCloud via HTTPS per habilitar o deshabilitar el forÃ§ament SSL.",
+"Forces the clients to connect to %s via an encrypted connection." => "ForÃ§a la connexiÃ³ dels clients a %s a travÃ©s d'una connexiÃ³ encriptada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connecteu a %s a travÃ©s de HTTPS per habilitar o inhabilitar l'accÃ©s SSL.",
 "Log" => "Registre",
 "Log level" => "Nivell de registre",
 "More" => "MÃ©s",
@@ -98,6 +101,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducciÃ³",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreÃ§a per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
 "Login Name" => "Nom d'accÃ©s",
 "Create" => "Crea",
 "Admin Recovery Password" => "RecuperaciÃ³ de contrasenya d'administrador",
@@ -111,3 +115,4 @@
 "set new password" => "estableix nova contrasenya",
 "Default" => "Per defecte"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 433eb83462f5a61183c5b340ee75d779ffe15ca4..68c2f42c529f74174870e4dd94394e0fc1731793 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,6 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nelze naÄÃst seznam z App Store",
-"Authentication error" => "Chyba ovÄ›Å™enÃ",
+"Authentication error" => "Chyba pÅ™ihlÃ¡Å¡enÃ",
 "Your display name has been changed." => "VaÅ¡e zobrazovanÃ© jmÃ©no bylo zmÄ›nÄ›no.",
 "Unable to change display name" => "Nelze zmÄ›nit zobrazovanÃ© jmÃ©no",
 "Group already exists" => "Skupina jiÅ¾ existuje",
@@ -14,7 +15,7 @@
 "Invalid request" => "NeplatnÃ½ poÅ¾adavek",
 "Admins can't remove themself from the admin group" => "SprÃ¡vci se nemohou odebrat sami ze skupiny sprÃ¡vcÅ¯",
 "Unable to add user to group %s" => "Nelze pÅ™idat uÅ¾ivatele do skupiny %s",
-"Unable to remove user from group %s" => "Nelze odstranit uÅ¾ivatele ze skupiny %s",
+"Unable to remove user from group %s" => "Nelze odebrat uÅ¾ivatele ze skupiny %s",
 "Couldn't update app." => "Nelze aktualizovat aplikaci.",
 "Update to {appversion}" => "Aktualizovat na {appversion}",
 "Disable" => "ZakÃ¡zat",
@@ -26,7 +27,7 @@
 "Updated" => "AktualizovÃ¡no",
 "Saving..." => "UklÃ¡dÃ¡m...",
 "deleted" => "smazÃ¡no",
-"undo" => "zpÄ›t",
+"undo" => "vrÃ¡tit zpÄ›t",
 "Unable to remove user" => "Nelze odebrat uÅ¾ivatele",
 "Groups" => "Skupiny",
 "Group Admin" => "SprÃ¡va skupiny",
@@ -37,40 +38,42 @@
 "A valid password must be provided" => "MusÃte zadat platnÃ© heslo",
 "__language_name__" => "ÄŒesky",
 "Security Warning" => "BezpeÄnostnÃ upozornÄ›nÃ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "VÃ¡Å¡ adresÃ¡Å™ dat a vÅ¡echny VaÅ¡e soubory jsou pravdÄ›podobnÄ› pÅ™ÃstupnÃ© z internetu. Soubor .htaccess, kterÃ½ je poskytovÃ¡n ownCloud, nefunguje. DÅ¯raznÄ› VÃ¡m doporuÄujeme nastavit vÃ¡Å¡ webovÃ½ server tak, aby nebyl adresÃ¡Å™ dat pÅ™ÃstupnÃ½, nebo pÅ™esunout adresÃ¡Å™ dat mimo koÅ™enovou sloÅ¾ku dokumentÅ¯ webovÃ©ho serveru.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "VÃ¡Å¡ datovÃ½ adresÃ¡Å™ i vaÅ¡e soubory jsou pravdÄ›podobnÄ› pÅ™ÃstupnÃ© z internetu. Soubor .htaccess nefunguje. DÅ¯raznÄ› doporuÄujeme nakonfigurovat webovÃ½ server tak, aby datovÃ½ adresÃ¡Å™ nebyl nadÃ¡le pÅ™ÃstupnÃ½, nebo pÅ™esunout datovÃ½ adresÃ¡Å™ mimo prostor zpÅ™ÃstupÅˆovanÃ½ webovÃ½m serverem.",
 "Setup Warning" => "UpozornÄ›nÃ nastavenÃ",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, protoÅ¾e rozhranÃ WebDAV je rozbitÃ©.",
-"Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosÃm, <a href='%s'>prÅ¯vodce instalacÃ</a>.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "VÃ¡Å¡ webovÃ½ server nenÃ sprÃ¡vnÄ› nastaven pro umoÅ¾nÄ›nÃ synchronizace, protoÅ¾e rozhranÃ WebDAV se zdÃ¡ nefunkÄnÃ.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Zkontrolujte prosÃm znovu <a href=\"%s\">instalaÄnÃ pÅ™ÃruÄku</a>.",
 "Module 'fileinfo' missing" => "SchÃ¡zÃ modul 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "SchÃ¡zÃ modul PHP 'fileinfo'. DoporuÄujeme jej povolit pro nejlepÅ¡Ã vÃ½sledky detekce typÅ¯ MIME.",
-"Locale not working" => "Locale nefunguje",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Server ownCloud nemÅ¯Å¾e nastavit locale systÃ©mu na %s. MÅ¯Å¾ete tedy mÃt problÃ©my s nÄ›kterÃ½mi znaky v nÃ¡zvech souborÅ¯. DÅ¯raznÄ› doporuÄujeme nainstalovat potÅ™ebnÃ© balÃÄky pro podporu %s.",
-"Internet connection not working" => "SpojenÃ s internetem nefujguje",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Server ownCloud nemÃ¡ funkÄnÃ spojenÃ s internetem. NÄ›kterÃ© moduly jako externÃ ÃºloÅ¾iÅ¡tÄ›, oznÃ¡menÃ o dostupnÃ½ch aktualizacÃch, nebo instalace aplikacÃ tÅ™etÃch stran nefungujÃ. PÅ™Ãstup k souborÅ¯m z jinÃ½ch mÃst a odesÃlÃ¡nÃ oznamovacÃch e-mailÅ¯ takÃ© nemusÃ fungovat. Pokud si pÅ™ejete vyuÅ¾Ãvat vÅ¡ech vlastnostÃ ownCloud, doporuÄujeme povolit internetovÃ© spojenÃ pro tento server.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "SchÃ¡zÃ PHP modul 'fileinfo'. DoporuÄujeme jej povolit pro nejlepÅ¡Ã vÃ½sledky detekce typÅ¯ MIME.",
+"Locale not working" => "Lokalizace nefunguje",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "SystÃ©movÃ© nastavenÃ lokalizace nemohlo bÃ½t nastaveno na %s. To znamenÃ¡, Å¾e se mohou vyskytnout problÃ©my s nÄ›kterÃ½mi znaky v nÃ¡zvech souborÅ¯. DÅ¯raznÄ› doporuÄujeme nainstalovat do vaÅ¡eho systÃ©mu balÃÄky potÅ™ebnÃ© pro podporu %s.",
+"Internet connection not working" => "PÅ™ipojenÃ k internetu nefunguje",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server nemÃ¡ funkÄnÃ pÅ™ipojenÃ k internetu. NÄ›kterÃ© moduly jako napÅ™. externÃ ÃºloÅ¾iÅ¡tÄ›, oznÃ¡menÃ o dostupnÃ½ch aktualizacÃch nebo instalace aplikacÃ tÅ™etÃch stran nebudou fungovat. PÅ™Ãstup k souborÅ¯m z jinÃ½ch mÃst a odesÃlÃ¡nÃ oznamovacÃch e-mailÅ¯ takÃ© nemusÃ fungovat. Pokud si pÅ™ejete vyuÅ¾Ãvat vÅ¡ech vlastnostÃ ownCloud, doporuÄujeme povolit pÅ™ipojenÃ k internetu tomuto serveru.",
 "Cron" => "Cron",
-"Execute one task with each page loaded" => "Spustit jednu Ãºlohu s kaÅ¾dou naÄtenou strÃ¡nkou",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php je registrovÃ¡n u sluÅ¾by webcron. ZavolÃ¡ strÃ¡nku cron.php v koÅ™enovÃ©m adresÃ¡Å™i owncloud kaÅ¾dou minutu skrze http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "PouÅ¾Ãt systÃ©movou sluÅ¾bu cron. Zavolat soubor cron.php ze sloÅ¾ky owncloud pomocÃ systÃ©movÃ© Ãºlohy cron kaÅ¾dou minutu.",
+"Execute one task with each page loaded" => "Spustit jednu Ãºlohu s kaÅ¾dÃ½m naÄtenÃm strÃ¡nky",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php je registrovÃ¡n u sluÅ¾by webcron pro zavolÃ¡nÃ strÃ¡nky cron.php jednou za minutu pÅ™es HTTP.",
+"Use systems cron service to call the cron.php file once a minute." => "PouÅ¾Ãt systÃ©movou sluÅ¾bu cron pro spouÅ¡tÄ›nÃ souboru cron.php jednou za minutu.",
 "Sharing" => "SdÃlenÃ",
 "Enable Share API" => "Povolit API sdÃlenÃ",
 "Allow apps to use the Share API" => "Povolit aplikacÃm pouÅ¾Ãvat API sdÃlenÃ",
 "Allow links" => "Povolit odkazy",
-"Allow users to share items to the public with links" => "Povolit uÅ¾ivatelÅ¯m sdÃlet poloÅ¾ky s veÅ™ejnostÃ pomocÃ odkazÅ¯",
+"Allow users to share items to the public with links" => "Povolit uÅ¾ivatelÅ¯m sdÃlet poloÅ¾ky veÅ™ejnÄ› pomocÃ odkazÅ¯",
+"Allow public uploads" => "Povolit veÅ™ejnÃ© nahrÃ¡vÃ¡nÃ souborÅ¯",
+"Allow users to enable others to upload into their publicly shared folders" => "Povolit uÅ¾ivatelÅ¯m, aby mohli ostatnÃm umoÅ¾nit nahrÃ¡vat do jejich veÅ™ejnÄ› sdÃlenÃ© sloÅ¾ky",
 "Allow resharing" => "Povolit znovu-sdÃlenÃ",
 "Allow users to share items shared with them again" => "Povolit uÅ¾ivatelÅ¯m znovu sdÃlet poloÅ¾ky, kterÃ© jsou pro nÄ› sdÃleny",
 "Allow users to share with anyone" => "Povolit uÅ¾ivatelÅ¯m sdÃlet s kÃ½mkoliv",
 "Allow users to only share with users in their groups" => "Povolit uÅ¾ivatelÅ¯m sdÃlet pouze s uÅ¾ivateli v jejich skupinÃ¡ch",
 "Security" => "ZabezpeÄenÃ",
 "Enforce HTTPS" => "Vynutit HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "VynutÃ pÅ™ipojovÃ¡nÃ klientÅ¯ ownCloud skrze Å¡ifrovanÃ© spojenÃ.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "PÅ™ipojte se, prosÃm, k tÃ©to instanci ownCloud skrze HTTPS pro povolenÃ, nebo zakaÅ¾te vynucenÃ SSL.",
+"Forces the clients to connect to %s via an encrypted connection." => "VynutÃ pÅ™ipojovÃ¡nÃ klientÅ¯ k %s Å¡ifrovanÃ½m spojenÃm.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "PÅ™ipojte se k %s skrze HTTPS pro povolenÃ nebo zakÃ¡zÃ¡nÃ vynucovÃ¡nÃ SSL.",
 "Log" => "ZÃ¡znam",
-"Log level" => "ÃšroveÅˆ zÃ¡znamu",
+"Log level" => "ÃšroveÅˆ zaznamenÃ¡vÃ¡nÃ",
 "More" => "VÃce",
 "Less" => "MÃ©nÄ›",
 "Version" => "Verze",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojovÃ½ kÃ³d</a> je licencovÃ¡n pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "PÅ™idat VaÅ¡Ã aplikaci",
+"Add your App" => "PÅ™idat VaÅ¡i aplikaci",
 "More Apps" => "VÃce aplikacÃ",
 "Select an App" => "Vyberte aplikaci",
 "See application page at apps.owncloud.com" => "VÃce na strÃ¡nce s aplikacemi na apps.owncloud.com",
@@ -87,17 +90,18 @@
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "PouÅ¾ÃvÃ¡te <strong>%s</strong> z <strong>%s</strong> dostupnÃ½ch",
 "Password" => "Heslo",
 "Your password was changed" => "VaÅ¡e heslo bylo zmÄ›nÄ›no",
-"Unable to change your password" => "VaÅ¡e heslo nelze zmÄ›nit",
+"Unable to change your password" => "ZmÄ›na vaÅ¡eho hesla se nezdaÅ™ila",
 "Current password" => "SouÄasnÃ© heslo",
 "New password" => "NovÃ© heslo",
 "Change password" => "ZmÄ›nit heslo",
 "Display Name" => "ZobrazovanÃ© jmÃ©no",
 "Email" => "E-mail",
 "Your email address" => "VaÅ¡e e-mailovÃ¡ adresa",
-"Fill in an email address to enable password recovery" => "Pro povolenÃ zmÄ›ny hesla vyplÅˆte adresu e-mailu",
+"Fill in an email address to enable password recovery" => "Pro povolenÃ obnovy hesla vyplÅˆte e-mailovou adresu",
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s pÅ™ekladem",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "PouÅ¾ijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro pÅ™Ãstup k vaÅ¡im souborÅ¯m pÅ™es WebDAV</a>",
 "Login Name" => "PÅ™ihlaÅ¡ovacÃ jmÃ©no",
 "Create" => "VytvoÅ™it",
 "Admin Recovery Password" => "Heslo obnovy sprÃ¡vce",
@@ -111,3 +115,4 @@
 "set new password" => "nastavit novÃ© heslo",
 "Default" => "VÃ½chozÃ"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 98a46f5aca9bc20cd2bd64fa66902d4ba5017b43..b18ace866980b81b19646d9fd278d58e55ef8413 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Authentication error" => "Gwall dilysu",
 "Invalid request" => "Cais annilys",
 "Error" => "Gwall",
@@ -8,10 +9,10 @@
 "Delete" => "Dileu",
 "Security Warning" => "Rhybudd Diogelwch",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatÃ¡u cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
-"Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
 "Other" => "Arall",
 "Username" => "Enw defnyddiwr"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0b7b4b6e97a73c657676485fce74c23b7f43b9cd..a36c6bb61fde1374d910c0eedf0e08cbc7413539 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kunne ikke indlÃ¦se listen fra App Store",
 "Authentication error" => "Adgangsfejl",
 "Your display name has been changed." => "Dit skÃ¦rmnavn blev Ã¦ndret.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "En gyldig adgangskode skal angives",
 "__language_name__" => "Dansk",
 "Security Warning" => "Sikkerhedsadvarsel",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din data mappe og dine filer er muligvis tilgÃ¦ngelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler pÃ¥ det kraftigste at du konfigurerer din webserver pÃ¥ en mÃ¥ske sÃ¥ data mappen ikke  lÃ¦ngere er tilgÃ¦ngelig eller at du flytter data mappen uden for webserverens dokument rod.  ",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din data mappe og dine filer er muligvis tilgÃ¦ngelige fra internettet. .htaccess filen virker ikke. Vi anbefaler pÃ¥ det kraftigste at du konfigurerer din webserver sÃ¥ data mappen ikke lÃ¦ngere er tilgÃ¦ngelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
 "Setup Warning" => "OpsÃ¦tnings Advarsel",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grÃ¦nsefladen virker Ã¸delagt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' mangler",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulet 'fileinfo' mangler. Vi anbefaler stÃ¦rkt at aktivere dette modul til at fÃ¥ de bedste resultater med mime-type detektion.",
 "Locale not working" => "Landestandard fungerer ikke",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan vÃ¦re problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nÃ¸dvendige pakker pÃ¥ dit system til at understÃ¸tte %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Systemet kan ikke indstille systemets landestandard for %s. Det betyder, at der kan vÃ¦re problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nÃ¸dvendige pakker pÃ¥ dit system til at understÃ¸tte %s.",
 "Internet connection not working" => "Internetforbindelse fungerer ikke",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af eksterne applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgÃ¥ filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, sÃ¥fremt du Ã¸nsker alle ownClouds funktioner.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgÃ¥ filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, sÃ¥fremt du Ã¸nsker samtlige funktioner.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "UdfÃ¸re en opgave med hver side indlÃ¦st",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php er registeret hos en webcron-tjeneste til at kalde cron.php en gang i minuttet over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Brug systemets cron service til at kalde cron.php filen en gang i minuttet",
 "Sharing" => "Deling",
 "Enable Share API" => "Aktiver Share API",
 "Allow apps to use the Share API" => "Tillad apps til at bruge Share API",
 "Allow links" => "Tillad links",
 "Allow users to share items to the public with links" => "Tillad brugere at dele elementer til offentligheden med links",
+"Allow public uploads" => "Tillad offentlig upload",
+"Allow users to enable others to upload into their publicly shared folders" => "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper",
 "Allow resharing" => "Tillad videredeling",
 "Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen",
 "Allow users to share with anyone" => "Tillad brugere at dele med alle",
 "Allow users to only share with users in their groups" => "Tillad brugere at kun dele med brugerne i deres grupper",
 "Security" => "Sikkerhed",
 "Enforce HTTPS" => "Gennemtving HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "HÃ¥ndhÃ¦ver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL hÃ¥ndhÃ¦velse.",
+"Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Mere",
@@ -98,6 +101,7 @@
 "Language" => "Sprog",
 "Help translate" => "HjÃ¦lp med oversÃ¦ttelsen",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgÃ¥ dine filer via WebDAV</a>",
 "Login Name" => "Loginnavn",
 "Create" => "Ny",
 "Admin Recovery Password" => "Administrator gendannelse kodeord",
@@ -111,3 +115,4 @@
 "set new password" => "skift kodeord",
 "Default" => "Standard"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index b48ffb103038818466e96a610d5aa03b9d8d5e9d..a195858773d1af01d13011b1ba44554c8558e00e 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Your display name has been changed." => "Dein Anzeigename ist geÃ¤ndert worden.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Es muss ein gÃ¼ltiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (PersÃ¶nlich)",
 "Security Warning" => "Sicherheitswarnung",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht lÃ¤nger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und deine Dateien sind mÃ¶glicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht lÃ¤nger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis auÃŸerhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht fÃ¼r Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte Ã¼berprÃ¼fe die <a href=\"%s\">Instalationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
 "Locale not working" => "LÃ¤ndereinstellung funktioniert nicht",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud Server kann die LÃ¤ndereinstellung nicht auf %s Ã¤ndern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen die fÃ¼r %s benÃ¶tigten Pakete auf Deinem System zu installieren.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Die System-LÃ¤ndereinstellung kann nicht auf %s geÃ¤ndert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren.",
 "Internet connection not working" => "Keine Netzwerkverbindung",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung fÃ¼r diesen Server zu aktivieren, wenn Du alle Funktionen von ownCloud nutzen mÃ¶chtest.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "FÃ¼hre eine Aufgabe mit jeder geladenen Seite aus",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute Ã¼ber http abgerufen.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute Ã¼ber einen Cronjob auf.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php minÃ¼tlich per HTTP aufruft.",
+"Use systems cron service to call the cron.php file once a minute." => "Benutze den System-Crondienst um die cron.php minÃ¼tlich aufzurufen.",
 "Sharing" => "Teilen",
 "Enable Share API" => "Aktiviere Sharing-API",
 "Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
 "Allow links" => "Erlaubt Links",
 "Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte Ã¼ber Ã¶ffentliche Links zu teilen",
+"Allow public uploads" => "Ã–ffentliches Hochladen erlauben",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren Ã¶ffentlich freigegebene Ordner hochladen zu dÃ¼rfen",
 "Allow resharing" => "Erlaubt erneutes Teilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "Erzwinge HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Erzwingt die Verwendung einer verschlÃ¼sselten Verbindung",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde Dich Ã¼ber eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu Ã¤ndern",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung zu %s zu verbinden.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde dich zu deinem %s Ã¼ber HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
 "Log" => "Log",
 "Log level" => "Loglevel",
 "More" => "Mehr",
@@ -98,6 +101,7 @@
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Ãœbersetzung",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
 "Login Name" => "Loginname",
 "Create" => "Anlegen",
 "Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
@@ -111,3 +115,4 @@
 "set new password" => "Neues Passwort setzen",
 "Default" => "Standard"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
new file mode 100644
index 0000000000000000000000000000000000000000..d874eafd3bf482ebff82cb01cb155d91eb44da28
--- /dev/null
+++ b/settings/l10n/de_CH.php
@@ -0,0 +1,118 @@
+<?php
+$TRANSLATIONS = array(
+"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
+"Authentication error" => "Authentifizierungs-Fehler",
+"Your display name has been changed." => "Dein Anzeigename ist geÃ¤ndert worden.",
+"Unable to change display name" => "Das Ã„ndern des Anzeigenamens ist nicht mÃ¶glich",
+"Group already exists" => "Die Gruppe existiert bereits",
+"Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
+"Could not enable app. " => "Die Anwendung konnte nicht aktiviert werden.",
+"Email saved" => "E-Mail-Adresse gespeichert",
+"Invalid email" => "UngÃ¼ltige E-Mail-Adresse",
+"Unable to delete group" => "Die Gruppe konnte nicht gelÃ¶scht werden",
+"Unable to delete user" => "Der Benutzer konnte nicht gelÃ¶scht werden",
+"Language changed" => "Sprache geÃ¤ndert",
+"Invalid request" => "UngÃ¼ltige Anforderung",
+"Admins can't remove themself from the admin group" => "Administratoren kÃ¶nnen sich nicht selbst aus der admin-Gruppe lÃ¶schen",
+"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefÃ¼gt werden",
+"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
+"Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
+"Update to {appversion}" => "Update zu {appversion}",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
+"Please wait...." => "Bitte warten....",
+"Error" => "Fehler",
+"Updating...." => "Update...",
+"Error while updating app" => "Es ist ein Fehler wÃ¤hrend des Updates aufgetreten",
+"Updated" => "Aktualisiert",
+"Saving..." => "Speichern...",
+"deleted" => "gelÃ¶scht",
+"undo" => "rÃ¼ckgÃ¤ngig machen",
+"Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
+"Groups" => "Gruppen",
+"Group Admin" => "Gruppenadministrator",
+"Delete" => "LÃ¶schen",
+"add group" => "Gruppe hinzufÃ¼gen",
+"A valid username must be provided" => "Es muss ein gÃ¼ltiger Benutzername angegeben werden",
+"Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
+"A valid password must be provided" => "Es muss ein gÃ¼ltiges Passwort angegeben werden",
+"__language_name__" => "Deutsch (FÃ¶rmlich: Sie)",
+"Security Warning" => "Sicherheitshinweis",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind mÃ¶glicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht lÃ¤nger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+"Setup Warning" => "Einrichtungswarnung",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte Ã¼berprÃ¼fen Sie die <a href=\"%s\">Instalationsanleitungen</a>.",
+"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
+"Locale not working" => "Die Lokalisierung funktioniert nicht",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Die System-LÃ¤ndereinstellung kann nicht auf %s geÃ¤ndert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren.",
+"Internet connection not working" => "Keine Internetverbindung",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausfÃ¼hren",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php minÃ¼tlich per HTTP aufruft.",
+"Use systems cron service to call the cron.php file once a minute." => "Benutzen Sie den System-Crondienst um die cron.php minÃ¼tlich aufzurufen.",
+"Sharing" => "Teilen",
+"Enable Share API" => "Share-API aktivieren",
+"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
+"Allow links" => "Links erlauben",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per Ã¶ffentlichem Link zu teilen",
+"Allow public uploads" => "Erlaube Ã¶ffentliches hochladen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren Ã¶ffentlich freigegebene Ordner hochladen zu dÃ¼rfen",
+"Allow resharing" => "Erlaube Weiterverteilen",
+"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
+"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
+"Security" => "Sicherheit",
+"Enforce HTTPS" => "HTTPS erzwingen",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung zu %s zu verbinden.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich zu Ihrem %s Ã¼ber HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Log" => "Log",
+"Log level" => "Log-Level",
+"More" => "Mehr",
+"Less" => "Weniger",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+"Add your App" => "FÃ¼gen Sie Ihre Anwendung hinzu",
+"More Apps" => "Weitere Anwendungen",
+"Select an App" => "WÃ¤hlen Sie eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"Update" => "Update durchfÃ¼hren",
+"User Documentation" => "Dokumentation fÃ¼r Benutzer",
+"Administrator Documentation" => "Dokumentation fÃ¼r Administratoren",
+"Online Documentation" => "Online-Dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerzieller Support",
+"Get the apps to sync your files" => "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+"Show First Run Wizard again" => "Den Einrichtungsassistenten erneut anzeigen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfÃ¼gbaren <strong>%s</strong>",
+"Password" => "Passwort",
+"Your password was changed" => "Ihr Passwort wurde geÃ¤ndert.",
+"Unable to change your password" => "Das Passwort konnte nicht geÃ¤ndert werden",
+"Current password" => "Aktuelles Passwort",
+"New password" => "Neues Passwort",
+"Change password" => "Passwort Ã¤ndern",
+"Display Name" => "Anzeigename",
+"Email" => "E-Mail",
+"Your email address" => "Ihre E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Language" => "Sprache",
+"Help translate" => "Helfen Sie bei der Ãœbersetzung",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
+"Login Name" => "Loginname",
+"Create" => "Erstellen",
+"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
+"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wÃ¤hrend PasswortÃ¤nderung wiederherzustellen",
+"Default Storage" => "Standard-Speicher",
+"Unlimited" => "Unbegrenzt",
+"Other" => "Andere",
+"Username" => "Benutzername",
+"Storage" => "Speicher",
+"change display name" => "Anzeigenamen Ã¤ndern",
+"set new password" => "Neues Passwort setzen",
+"Default" => "Standard"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 5dea8e534e4a271a515673ee1600dd63f7ebb6b6..3faa8858e8e344f167070f2d0b1e71b253c99436 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Your display name has been changed." => "Dein Anzeigename ist geÃ¤ndert worden.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Es muss ein gÃ¼ltiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (FÃ¶rmlich: Sie)",
 "Security Warning" => "Sicherheitshinweis",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich Ã¼ber das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr Ã¼ber das Internet erreichbar ist. Alternativ kÃ¶nnen Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind mÃ¶glicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht lÃ¤nger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis auÃŸerhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht fÃ¼r eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prÃ¼fen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte Ã¼berprÃ¼fen Sie die <a href=\"%s\">Instalationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
 "Locale not working" => "Die Lokalisierung funktioniert nicht",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Dieser ownCloud-Server kann die LÃ¤ndereinstellung nicht auf %s Ã¤ndern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Die System-LÃ¤ndereinstellung kann nicht auf %s geÃ¤ndert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben kÃ¶nnte. Wir empfehlen, die fÃ¼r %s benÃ¶tigten Pakete auf ihrem System zu installieren.",
 "Internet connection not working" => "Keine Internetverbindung",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud-Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungs-E-Mails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren, wenn Sie alle Funktionen von ownCloud nutzen wollen.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung fÃ¼r diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausfÃ¼hren",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Service registriert. Die cron.php Seite im ownCloud-Wurzelverzeichniss wird einmal pro Minute Ã¼ber http abgerufen.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutzen Sie den Cron-Systemdienst. Rufen Sie die Datei cron.php im ownCloud-Ordner einmal pro Minute Ã¼ber einen Cronjob auf.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php minÃ¼tlich per HTTP aufruft.",
+"Use systems cron service to call the cron.php file once a minute." => "Benutzen Sie den System-Crondienst um die cron.php minÃ¼tlich aufzurufen.",
 "Sharing" => "Teilen",
 "Enable Share API" => "Share-API aktivieren",
 "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per Ã¶ffentlichem Link zu teilen",
+"Allow public uploads" => "Erlaube Ã¶ffentliches hochladen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren Ã¶ffentlich freigegebene Ordner hochladen zu dÃ¼rfen",
 "Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung mit ownCloud zu verbinden.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich mit dieser ownCloud-Instanz per HTTPS, um SSL-Erzwingung zu aktivieren oder deaktivieren.",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich Ã¼ber eine verschlÃ¼sselte Verbindung zu %s zu verbinden.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich zu Ihrem %s Ã¼ber HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
 "Log" => "Log",
 "Log level" => "Log-Level",
 "More" => "Mehr",
@@ -98,9 +101,10 @@
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Ãœbersetzung",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
-"Admin Recovery Password" => "Admin-Paswort-Wiederherstellung",
+"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
 "Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien wÃ¤hrend PasswortÃ¤nderung wiederherzustellen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
@@ -111,3 +115,4 @@
 "set new password" => "Neues Passwort setzen",
 "Default" => "Standard"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 7ef677bc746e5594833a024dd02c4be61b9110e6..194e8a61d3dc7b273ae9167c4c352af6d12a938e 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Î£Ï†Î¬Î»Î¼Î± ÏƒÏ„Î·Î½ Ï†ÏŒÏÏ„Ï‰ÏƒÎ· Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚ Î±Ï€ÏŒ Ï„Î¿ App Store",
 "Authentication error" => "Î£Ï†Î¬Î»Î¼Î± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚",
 "Your display name has been changed." => "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± ÏƒÎ±Ï‚ ÏƒÏ„Î·Î½ Î¿Î¸ÏŒÎ½Î· Î¬Î»Î»Î±Î¾Îµ. ",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "Î ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î¿Î¸ÎµÎ¯ ÎÎ³ÎºÏ…ÏÎ¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ",
 "__language_name__" => "__ÏŒÎ½Î¿Î¼Î±_Î³Î»ÏŽÏƒÏƒÎ±Ï‚__",
 "Security Warning" => "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î‘ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ data ÎºÎ±Î¹ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±Ï‚ Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î½Î± ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î± ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿. Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ .htaccess Ï€Î¿Ï… Ï€Î±ÏÎÏ‡ÎµÎ¹ Ï„Î¿ ownCloud Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹. Î£Î±Ï‚ Ï€ÏÎ¿Ï„ÎµÎ¯Î½Î¿Ï…Î¼Îµ Î±Î½ÎµÏ€Î¹Ï†ÏÎ»Î±ÎºÏ„Î± Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Ï„Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÎ±Ï‚ Î¼Îµ Ï„ÎÏ„Î¿Î¹Î¿ Ï„ÏÏŒÏ€Î¿ ÏŽÏƒÏ„Îµ Î¿ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ data Î½Î± Î¼Î·Î½ ÎµÎ¯Î½Î±Î¹ Ï€Î»ÎÎ¿Î½ Ï€ÏÎ¿ÏƒÎ²Î¬ÏƒÎ¹Î¼Î¿Ï‚ Î® Î½Î± Î¼ÎµÏ„Î±ÎºÎ¹Î½Î®ÏƒÎµÏ„Îµ Ï„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ data ÎÎ¾Ï‰ Î±Ï€ÏŒ Ï„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®.",
 "Setup Warning" => "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ÏƒÎ±Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏÏ…Î¸Î¼Î¹ÏƒÏ„ÎµÎ¯ ÎºÎ±Ï„Î¬Î»Î»Î·Î»Î± ÏŽÏƒÏ„Îµ Î½Î± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î¿Î½ ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼ÏŒ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î³Î¹Î±Ï„Î¯ Î· Î´Î¹ÎµÏ€Î±Ï†Î® WebDAV Ï€Î¹Î¸Î±Î½ÏŒÎ½ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„ÎµÏƒÏ„ÏÎ±Î¼Î¼ÎÎ½Î·.",
-"Please double check the <a href='%s'>installation guides</a>." => "Î•Î»ÎÎ³Î¾Ï„Îµ Î¾Î±Î½Î¬ Ï„Î¹Ï‚ <a href='%s'>Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚</a>.",
 "Module 'fileinfo' missing" => "Î— ÎµÎ½Î¿Ï„Î·Ï„Î± 'fileinfo' Î»ÎµÎ¹Ï€ÎµÎ¹",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Î— PHP ÎµÎ½Î¿Ï„Î·Ï„Î± 'fileinfo' Î»ÎµÎ¹Ï€ÎµÎ¹. Î£Î±Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¿ÏÎ¼Îµ Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ½ÏŒÏ„Î·Ï„Î± Î³Î¹Î± Î½Î± ÎÏ‡ÎµÏ„Îµ ÎºÎ±Î»ÏÏ„ÎµÏÎ± Î±Ï€Î¿Ï„ÎµÎ»ÎÏƒÎ¼Î±Ï„Î± Î¼Îµ Ï„Î¿Î½ ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼ÏŒ Ï„ÏÏ€Î¿Ï… MIME. ",
 "Locale not working" => "Î— Î¼ÎµÏ„Î¬Ï†ÏÎ±ÏƒÎ· Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Î‘Ï…Ï„ÏŒÏ‚ Î¿ ownCloud Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î·Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÎµÎ¹ Ï„Î¿ ÏƒÏÎ½Î¿Î»Î¿ Ï„Î¿Ï€Î¹ÎºÎ®Ï‚ Ï€ÏÎ¿ÏƒÎ±ÏÎ¼Î¿Î³Î®Ï‚ ÏƒÏ…ÏƒÏ„Î·Î¼Î¬Ï„Ï‰Î½ ÏƒÏ„Î¿ %s. Î‘Ï…Ï„ÏŒ ÏƒÎ·Î¼Î±Î¯Î½ÎµÎ¹ ÏŒÏ„Î¹ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï…Ï€Î¬ÏÎ¾Î¿Ï…Î½ Ï€ÏÎ¿Î²Î»Î®Î¼Î±Ï„Î± Î¼Îµ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï…Ï‚ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ ÏƒÎµ Î¿Î½ÏŒÎ¼Î±Ï„Î± Î±ÏÏ‡ÎµÎ¯Ï‰Î½. Î£Î±Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¿ÏÎ¼Îµ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¹Ï‚ Î±Ï€Î±ÏÎ±Î¯Ï„Î·Ï„ÎµÏ‚ ÏƒÏ…ÏƒÎºÎµÏ…Î±ÏƒÎ¯ÎµÏ‚ ÏƒÏ„Î¿ ÏƒÏÏƒÏ„Î·Î¼Î¬ ÏƒÎ±Ï‚ Î³Î¹Î± Î½Î± Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Ï‡Î¸ÎµÎ¹ Ï„Î¿ %s. ",
 "Internet connection not working" => "Î— ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿ Î´ÎµÎ½ Î´Î¿Ï…Î»ÎµÏÎµÎ¹",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Î‘Ï…Ï„ÏŒÏ‚ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ownCloud Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿. Î‘Ï…Ï„ÏŒ ÏƒÎ·Î¼Î±Î¯Î½ÎµÎ¹ ÏŒÏ„Î¹ Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î± Î±Ï€ÏŒ Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Î³Î½Ï‰ÏÎ¯ÏƒÎ¼Î±Ï„Î± ÏŒÏ€Ï‰Ï‚ Î· Ï„Î¿Ï€Î¿Î¸ÎÏ„Î·ÏƒÎ· ÎµÎ¾Ï‰Ï„ÎµÏÎ¹ÎºÎ®Ï‚ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚, Î¿Î¹ ÎºÎ¿Î¹Î½Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Î±Î½Î±Î½ÎµÏ‰ÏƒÎµÎ¹Ï‚, Î® ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· 3Ï‰Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Î´ÎµÎ½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¿ÏÎ½.  Î— Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÎµ Î±ÏÏ‡ÎµÎ¯Î± ÎºÎ±Î¹ Î· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½ Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ ÎµÏ€Î¯ÏƒÎ·Ï‚ Î½Î± Î¼Î·Î½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³ÎµÎ¯. Î£Î±Ï‚ Ï€ÏÎ¿Ï„ÎµÎ¯Î½Î¿Ï…Î¼Îµ Î½Î± ÏƒÏÎ½Î´ÎµÎ¸ÎµÎ¹Ï„Îµ ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¹ÎºÏ„Ï…Î¿ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®, ÎµÎ¬Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± ÎÏ‡ÎµÏ„Îµ ÏŒÎ»Î± Ï„Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„Î¹ÎºÎ¬ Ï„Î¿Ï… ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Î¼Î¹Î±Ï‚ Î´Î¹ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î¼Îµ ÎºÎ¬Î¸Îµ ÏƒÎµÎ»Î¯Î´Î± Ï€Î¿Ï… Ï†Î¿ÏÏ„ÏŽÎ½ÎµÏ„Î±Î¹",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Î¤Î¿ cron.php ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿ ÏƒÏ„Î·Î½ Ï…Ï€Î·ÏÎµÏƒÎ¯Î± webcron. ÎÎ± ÎºÎ±Î»ÎµÎ¯Ï„Î±Î¹ Î¼Î¹Î± Ï†Î¿ÏÎ¬ Ï„Î¿ Î»ÎµÏ€Ï„ÏŒ Î· ÏƒÎµÎ»Î¯Î´Î± cron.php Î±Ï€ÏŒ Ï„Î¿Î½ root Ï„Î¿Ï… owncloud Î¼ÎÏƒÏ‰ http",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Î§ÏÎ®ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ cron. ÎÎ± ÎºÎ±Î»ÎµÎ¯Ï„Î±Î¹ Î¼Î¹Î± Ï†Î¿ÏÎ¬ Ï„Î¿ Î»ÎµÏ€Ï„ÏŒ, Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ cron.php Î±Ï€ÏŒ Ï„Î¿Î½ Ï†Î¬ÎºÎµÎ»Î¿ Ï„Î¿Ï… owncloud Î¼ÎÏƒÏ‰ Ï„Î¿Ï… cronjob Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚.",
 "Sharing" => "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚",
 "Enable Share API" => "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· API Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï",
 "Allow apps to use the Share API" => "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¹Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î¿ÏÎ½ Ï„Î¿ API Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î¿ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼ÏŒÎ½Î¿ Î¼Îµ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Ï„Î·Ï‚ Î¯Î´Î¹Î±Ï‚ Î¿Î¼Î¬Î´Î±Ï‚",
 "Security" => "Î‘ÏƒÏ†Î¬Î»ÎµÎ¹Î±",
 "Enforce HTTPS" => "Î•Ï€Î¹Î²Î¿Î»Î® Ï‡ÏÎ®ÏƒÎ·Ï‚ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Î•Ï€Î¹Î²Î¿Î»Î® ÏƒÏ„Î¿Ï…Ï‚ Ï€ÎµÎ»Î¬Ï„ÎµÏ‚ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸Î¿ÏÎ½ ÏƒÏ„Î¿ ownCloud Î¼ÎÏƒÏ‰ Î¼Î¹Î±Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î·Ï‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î¼Îµ Ï„Î¿ ownCloud Î¼ÎÏƒÏ‰ HTTPS Î³Î¹Î± Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î® Î½Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ ÎµÏ€Î¹Î²Î¿Î»Î® SSL. ",
 "Log" => "ÎšÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚",
 "Log level" => "Î•Ï€Î¯Ï€ÎµÎ´Î¿ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†Î®Ï‚",
 "More" => "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±",
@@ -98,6 +91,7 @@
 "Language" => "Î“Î»ÏŽÏƒÏƒÎ±",
 "Help translate" => "Î’Î¿Î·Î¸Î®ÏƒÏ„Îµ ÏƒÏ„Î· Î¼ÎµÏ„Î¬Ï†ÏÎ±ÏƒÎ·",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Î§ÏÎ®ÏƒÎ· Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚ Î³Î¹Î± <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎ±Ï‚ Î¼ÎÏƒÏ‰ WebDAV</a>",
 "Login Name" => "ÎŒÎ½Î¿Î¼Î± Î£ÏÎ½Î´ÎµÏƒÎ·Ï‚",
 "Create" => "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±",
 "Admin Recovery Password" => "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬Ï‚ Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® ",
@@ -111,3 +105,4 @@
 "set new password" => "ÎµÏ€Î¹Î»Î¿Î³Î® Î½ÎÎ¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï",
 "Default" => "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/en@pirate.php b/settings/l10n/en@pirate.php
index 482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c..e269c57c3d0ab870cda3a02975dc40af05fac9a0 100644
--- a/settings/l10n/en@pirate.php
+++ b/settings/l10n/en@pirate.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "Passcode"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 5ca1cea113519d673af8430346bf665712c52937..7cda89f4965035ce844e223d2766d38cb916552b 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ne eblis Åargi liston el aplikaÄµovendejo",
 "Authentication error" => "AÅtentiga eraro",
 "Group already exists" => "La grupo jam ekzistas",
@@ -25,7 +26,6 @@
 "__language_name__" => "Esperanto",
 "Security Warning" => "Sekureca averto",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraÅ ne Äuste agordiÄis por permesi sinkronigi dosierojn Ä‰ar la WebDAV-interfaco Åajnas rompita.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
 "Cron" => "Cron",
 "Sharing" => "Kunhavigo",
 "Enable Share API" => "Kapabligi API-on por Kunhavigo",
@@ -76,3 +76,4 @@
 "Storage" => "Konservejo",
 "Default" => "DefaÅlta"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 55eb1aad1b5368a9dd41a4a600adab6ae87acae2..ad8b198e1adb2c2a552013b0d01db9154b21a626 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticaciÃ³n",
 "Your display name has been changed." => "Su nombre fue cambiado.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Se debe usar una contraseÃ±a valida",
 "__language_name__" => "Castellano",
 "Security Warning" => "Advertencia de seguridad",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no estÃ¡ funcionando. Le recomendamos encarecidamente que configure su servidor web de manera que el directorio de datos no estÃ© accesible, o mueva el directorio de datos fuera del documento raÃz de su servidor web.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Su directorio de datos y sus archivos probablemente estÃ¡n accesibles desde Internet. El archivo .htaccess no estÃ¡ funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raÃz de documentos del servidor web.",
 "Setup Warning" => "Advertencia de configuraciÃ³n",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aÃºn no estÃ¡ configurado adecuadamente para permitir sincronizaciÃ³n de archivos ya que la interfaz WebDAV parece no estar funcionando.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guÃas de instalaciÃ³n</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guÃas de instalaciÃ³n</a>.",
 "Module 'fileinfo' missing" => "Modulo 'fileinfo' perdido",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este mÃ³dulo para obtener mejores resultados con la detecciÃ³n del mime-type",
 "Locale not working" => "La configuraciÃ³n regional no estÃ¡ funcionando",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor ownCloud no puede establecer la configuraciÃ³n regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar el %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "La configuraciÃ³n regional del sistema no se puede ajustar a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo. Le recomendamos instalar los paquetes necesarios en el sistema para soportar % s.",
 "Internet connection not working" => "La conexion a internet no esta funcionando",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionarÃ¡n. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexiÃ³n a Internet para este servidor si quiere disfrutar de todas las caracterÃsticas de ownCloud.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor no tiene una conexiÃ³n a Internet. Esto significa que algunas de las caracterÃsticas como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o instalaciÃ³n de aplicaciones de terceros no funcionan. PodrÃa no funcionar el acceso a los archivos de forma remota y el envÃo de correos electrÃ³nicos de notificaciÃ³n. Sugerimos habilitar la conexiÃ³n a Internet de este servidor, si quiere tener todas las funciones.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecutar una tarea con cada pÃ¡gina cargada",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php es un sistema webcron registrado. Llama a la pÃ¡gina cron.php en la raÃz de owncloud una vez por minuto sobre http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilizar el servicio cron del sistema. Llama al archivo cron.php en la carpeta de owncloud a travÃ©s de un cronjob del sistema una vez por minuto.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php estÃ¡ registrado en un servicio WebCron para llamar cron.php una vez por minuto a travÃ©s de HTTP.",
+"Use systems cron service to call the cron.php file once a minute." => "Usar el servicio cron del sistema para llamar al archivo cron.php una vez por minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Activar API de ComparticiÃ³n",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de ComparticiÃ³n",
 "Allow links" => "Permitir enlaces",
 "Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al pÃºblico con enlaces",
+"Allow public uploads" => "Permitir subidas pÃºblicas",
+"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas pÃºblicamente",
 "Allow resharing" => "Permitir re-comparticiÃ³n",
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con todo el mundo",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sÃ³lo con los usuarios en sus grupos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Fuerza la conexiÃ³n de los clientes a ownCloud con una conexiÃ³n cifrada.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor, conecte esta instancia de ownCloud vÃa HTTPS para activar o desactivar la aplicaciÃ³n de SSL.",
+"Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexiÃ³n encriptada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conÃ©ctese a su %s a travÃ©s de HTTPS para habilitar o deshabilitar la aplicaciÃ³n SSL.",
 "Log" => "Registro",
 "Log level" => "Nivel de registro",
 "More" => "MÃ¡s",
@@ -98,6 +101,7 @@
 "Language" => "Idioma",
 "Help translate" => "AyÃºdnos a traducir",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta direcciÃ³n para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a travÃ©s de WebDAV</a>",
 "Login Name" => "Nombre de usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "RecuperaciÃ³n de la contraseÃ±a de administraciÃ³n",
@@ -111,3 +115,4 @@
 "set new password" => "Configurar nueva contraseÃ±a",
 "Default" => "Predeterminado"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 496ee1f58169a3e2ddf3d88e45b35c0918c7552c..fad7e52b91cfcfe1687b72cd7b14fa1cfb7f12d7 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
 "Your display name has been changed." => "El nombre mostrado que usÃ¡s fue cambiado.",
@@ -37,33 +38,27 @@
 "A valid password must be provided" => "Debe ingresar una contraseÃ±a vÃ¡lida",
 "__language_name__" => "Castellano (Argentina)",
 "Security Warning" => "Advertencia de seguridad",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no estÃ¡ funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no estÃ© accesible, o que muevas el directorio de datos afuera del directorio raÃz de tu servidor web.",
 "Setup Warning" => "Alerta de ConfiguraciÃ³n",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no estÃ¡ configurado todavÃa para permitir sincronizaciÃ³n de archivos porque la interfaz WebDAV parece no funcionar.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobÃ¡ nuevamente la <a href='%s'>guÃa de instalaciÃ³n</a>.",
 "Module 'fileinfo' missing" => "El mÃ³dulo 'fileinfo' no existe",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El mÃ³dulo PHP 'fileinfo' no existe. Es recomendable que actives este mÃ³dulo para obtener mejores resultados con la detecciÃ³n mime-type",
 "Locale not working" => "\"Locale\" no estÃ¡ funcionando",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "El servidor ownCloud no puede asignar la localizaciÃ³n de sistema a %s. Esto puede provocar que existan problemas con algunos caracteres en los nombres de los archivos. Te sugerimos que instales los paquetes necesarios en tu sistema para dar soporte a %s.",
 "Internet connection not working" => "La conexiÃ³n a Internet no esta funcionando. ",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene una conexiÃ³n a internet que funcione. Esto significa que alguno de sus servicios, tales  como montar dispositivos externos, notificaciÃ³n de actualizaciones o instalar Apps de otros desarrolladores no funcionan. Puede ser que tampoco puedas acceder a archivos remotos y mandar e-mails. Te sugerimos que actives una conexiÃ³n a internet si querÃ©s estas caracterÃsticas en ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "EjecutÃ¡ una tarea con cada pagina cargada.",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php estÃ¡ registrado como un servicio webcron. Llamar la pÃ¡gina cron.php en la raÃz de ownCloud una vez al minuto sobre http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar el servicio de sistema cron. Llama al archivo cron.php en la carpeta de ownCloud a travÃ©s del sistema cronjob cada un minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
 "Allow links" => "Permitir enlaces",
 "Allow users to share items to the public with links" => "Permitir a los usuarios compartir enlaces pÃºblicos",
+"Allow public uploads" => "Permitir subidas pÃºblicas",
+"Allow users to enable others to upload into their publicly shared folders" => "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios pÃºblicos compartidos",
 "Allow resharing" => "Permitir Re-Compartir",
 "Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera.",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sÃ³lo con los de sus mismos grupos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar a los clientes conectar a ownCloud vÃa conexiÃ³n encriptada.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor conectate a este ownCloud vÃa HTTPS para habilitar o deshabilitar el SSL.",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "MÃ¡s",
@@ -98,6 +93,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "UsÃ¡ esta direcciÃ³n para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a travÃ©s de WebDAV</a>",
 "Login Name" => "Nombre de Usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "RecuperaciÃ³n de contraseÃ±a de administrador",
@@ -111,3 +107,4 @@
 "set new password" => "Configurar nueva contraseÃ±a",
 "Default" => "Predeterminado"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 0bbebaee78e34d22aa6d5568cd70e2b37ab7455f..0f0947fa5b8afebf5984d5d23ee1991d914c1a8b 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Store'i nimekirja laadimine ebaÃµnnestus",
 "Authentication error" => "Autentimise viga",
 "Your display name has been changed." => "Sinu nÃ¤idatav nimi on muudetud.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Sisesta nÃµuetele vastav parool",
 "__language_name__" => "Eesti",
 "Security Warning" => "Turvahoiatus",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Andmete kataloog ja failid on tÃµenÃ¤oliselt internetis avalikult saadaval. .htaccess fail, mida pakub ownCloud, ei toimi. Soovitame tungivalt veebiserveri seadistust selliselt, et andmete kataloog ei oleks enam vabalt saadaval vÃµi tÃµstaksid andmete kataloogi oma veebiserveri veebi-juurkataloogist mujale.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Andmete kataloog ja failid on tÃµenÃ¤oliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval vÃµi tÃµstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale.",
 "Setup Warning" => "Paigalduse hoiatus",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud vÃµimaldamaks failide sÃ¼nkroniseerimist, kuna WebDAV liides nÃ¤ib olevat mittetoimiv.",
-"Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Palun kontrolli uuesti <a href=\"%s\">paigaldusjuhendeid</a>.",
 "Module 'fileinfo' missing" => "Moodul 'fileinfo' puudub",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitÃ¼Ã¼pide tuvastamisel.",
 "Locale not working" => "Lokalisatsioon ei toimi",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud server ei suuda seadistada sÃ¼steemi lokalisatsiooni %s. See tÃ¤hendab, et vÃµib esineda probleeme teatud tÃ¤hemÃ¤rkidega failide nimedes. Soovitame tungivalt paigaldada sÃ¼steemi vajalikud pakid toetamaks %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "SÃ¼steemi lokaliseeringut ei saa panna %s. See tÃ¤hendab, et vÃµib esineda probleeme teatud tÃ¤hemÃ¤rkidega failide nimedes. Soovitame tungivalt paigaldada sÃ¼steemi vajalikud pakid toetamaks %s.",
 "Internet connection not working" => "InternetiÃ¼hendus ei toimi",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud serveril puudub toimiv internetiÃ¼hendus. See tÃ¤hendab, et mÃµned funktsionaalsused, nagu nÃ¤iteks vÃ¤liste andmehoidlate Ã¼hendamine, teavitused uuendustest vÃµi kolmandate osapoolte rakenduste paigaldamine ei tÃ¶Ã¶ta. Eemalt failidele ligipÃ¤Ã¤s ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid tÃ¤ielikku funktsionaalsust, siis soovitame serverile tagada ligipÃ¤Ã¤s internetti.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Serveril puudub toimiv internetiÃ¼hendus. See tÃ¤hendab, et mÃµned funktsionaalsused, nagu nÃ¤iteks vÃ¤liste andmehoidlate Ã¼hendamine, teavitused uuendustest vÃµi kolmandate osapoolte rakenduste paigaldamine ei tÃ¶Ã¶ta. Eemalt failidele ligipÃ¤Ã¤s ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid tÃ¤ielikku funktsionaalsust, siis soovitame serverile tagada ligipÃ¤Ã¤s internetti.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "KÃ¤ivita toiming lehe laadimisel",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php on registreeritud webcron teenusena. Lae cron.php lehte owncloud veebikataloogist iga minut Ã¼le http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Kasuta sÃ¼steemi cron teenust. KÃ¤ivita cron.php fail owncloud veebikataloogist kasutades sÃ¼steemi crontab toimingut iga minut.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php on registreeritud webcron teenusena laadimaks cron.php iga minut Ã¼le http.",
+"Use systems cron service to call the cron.php file once a minute." => "Kasuta sÃ¼steemi cron teenust kÃ¤ivitamaks faili cron.php kord minutis.",
 "Sharing" => "Jagamine",
 "Enable Share API" => "Luba Share API",
 "Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
 "Allow links" => "Luba lingid",
 "Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
+"Allow public uploads" => "Luba avalikud Ã¼leslaadimised",
+"Allow users to enable others to upload into their publicly shared folders" => "Luba kasutajatel Ã¼leslaadimine teiste poolt oma avalikult jagatud kataloogidesse ",
 "Allow resharing" => "Luba edasijagamine",
 "Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
 "Allow users to share with anyone" => "Luba kasutajatel kÃµigiga jagada",
 "Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
 "Security" => "Turvalisus",
 "Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Sunnib kliente ownCloudiga Ã¼henduma krÃ¼pteeritult.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Palun Ã¼hendu selle ownCloud instantsiga Ã¼le HTTPS vÃµi keela SSL kasutamine.",
+"Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s Ã¼henduma krÃ¼pteeritult.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Palun Ã¼hendu oma %s Ã¼le HTTPS vÃµi keela SSL kasutamine.",
 "Log" => "Logi",
 "Log level" => "Logi tase",
 "More" => "Rohkem",
@@ -98,6 +101,7 @@
 "Language" => "Keel",
 "Help translate" => "Aita tÃµlkida",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipÃ¤Ã¤suks WebDAV kaudu</a>",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
 "Admin Recovery Password" => "Admin taasteparool",
@@ -111,3 +115,4 @@
 "set new password" => "mÃ¤Ã¤ra uus parool",
 "Default" => "VaikevÃ¤Ã¤rtus"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4cf22c06a981e998b3349a57b831030c7cb4421d..4b6c13127b72811e7a6dda9f12f5651514676fbd 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Authentication error" => "Autentifikazio errorea",
 "Your display name has been changed." => "Zure bistaratze izena aldatu egin da.",
@@ -37,33 +38,32 @@
 "A valid password must be provided" => "Baliozko pasahitza eman behar da",
 "__language_name__" => "Euskera",
 "Security Warning" => "Segurtasun abisua",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
 "Setup Warning" => "Konfiguratu Abisuak",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
-"Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Mesedez birpasatu <a href=\"%s\">instalazio gidak</a>.",
 "Module 'fileinfo' missing" => "'fileinfo' Modulua falta da",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
 "Locale not working" => "Lokala ez dabil",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "OwnClud zerbitzari honek ezin du sistemaren lokala %s-ra ezarri. Honek fitxategien izenetan karaktere batzuekin arazoak egon daitekeela esan nahi du. Aholkatzen dizugu zure sistema %s lokalea onartzeko beharrezkoak diren paketeak instalatzea.",
 "Internet connection not working" => "Interneteko konexioak ez du funtzionatzen",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Exekutatu zeregin bat orri karga bakoitzean",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php webcron zerbitzu batean erregistratua dago cron.php  minuturo http bidez deitzeko.",
+"Use systems cron service to call the cron.php file once a minute." => "Erabili sistemaren cron zerbitzua cron.php fitxategia minuturo deitzeko.",
 "Sharing" => "Partekatzea",
 "Enable Share API" => "Gaitu Elkarbanatze APIa",
 "Allow apps to use the Share API" => "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko",
 "Allow links" => "Baimendu loturak",
 "Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
+"Allow public uploads" => "Baimendu igoera publikoak",
+"Allow users to enable others to upload into their publicly shared folders" => "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea",
 "Allow resharing" => "Baimendu birpartekatzea",
 "Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
 "Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
 "Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen",
 "Security" => "Segurtasuna",
 "Enforce HTTPS" => "Behartu HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Bezeroak konexio enkriptatu baten bidez ownCloud-era konektatzera behartzen du.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Mesedez konektatu ownCloud honetara HTTPS bidez SSL-ren beharra gaitu edo ezgaitzeko",
+"Forces the clients to connect to %s via an encrypted connection." => "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
 "Log" => "Egunkaria",
 "Log level" => "Erregistro maila",
 "More" => "Gehiago",
@@ -98,6 +98,7 @@
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
 "Login Name" => "Sarrera Izena",
 "Create" => "Sortu",
 "Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
@@ -111,3 +112,4 @@
 "set new password" => "ezarri pasahitz berria",
 "Default" => "Lehenetsia"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 9900cc206b9307d1c5385a9ff270e096e8ec7e8e..5d478bc49393450ded5209782b899e1a5018c6c8 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ù‚Ø§Ø¯Ø± Ø¨Ù‡ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù„ÛŒØ³Øª Ø§Ø² ÙØ±ÙˆØ´Ú¯Ø§Ù‡ Ø§Ù¾ Ù†ÛŒØ³ØªÙ…",
 "Authentication error" => "Ø®Ø·Ø§ Ø¯Ø± Ø§Ø¹ØªØ¨Ø§Ø± Ø³Ù†Ø¬ÛŒ",
 "Your display name has been changed." => "Ù†Ø§Ù… Ù†Ù…Ø§ÛŒØ´ Ø´Ù…Ø§ ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª.",
@@ -37,16 +38,13 @@
 "A valid password must be provided" => "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± ØµØÛŒØ Ø¨Ø§ÛŒØ¯ ÙˆØ§Ø±Ø¯ Ø´ÙˆØ¯",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Ø§Ø®Ø·Ø§Ø± Ø§Ù…Ù†ÛŒØªÛŒ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙÙ‡Ø±Ø³Øª Ùˆ ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ†ØªØ±Ù†Øª Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯. ÙØ§ÛŒÙ„ Ø¨Ø§ ÙØ±Ù…Øª .htaccess Ú©Ù‡ ownCloud Ø§Ø±Ø§Ø¯Ù‡ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯. Ù…Ø§ Ù‚ÙˆÛŒØ§Ù‹ ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ… Ú©Ù‡ Ø´Ù…Ø§ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø®ÙˆØ¯ØªØ§Ù† Ø±Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯ Ú©Ù‡ ÙÙ‡Ø±Ø³Øª Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø´Ù…Ø§ ØºÛŒØ± Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ø§Ø´Ù†Ø¯ ÛŒØ§ ÙÙ‡Ø±Ø³Øª Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø±Ø§ Ø¨Ù‡ Ø®Ø§Ø±Ø¬ Ø§Ø² Ø±ÛŒØ´Ù‡ ÛŒ Ø§ØµÙ„ÛŒ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø§Ù†ØªÙ‚Ø§Ù„ Ø¯Ù‡ÛŒØ¯.",
 "Setup Warning" => "Ù‡Ø´Ø¯Ø§Ø± Ø±Ø§Ù‡ Ø§Ù†Ø¯Ø§Ø²ÛŒ",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ø§ØØªÙ…Ø§Ù„Ø§Ù‹ ÙˆØ¨ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ Ø·ÙˆØ±ÛŒ ØªÙ†Ø¸ÛŒÙ… Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø¬Ø§Ø²Ù‡ ÛŒ Ù‡Ù…Ú¯Ø§Ù… Ø³Ø§Ø²ÛŒ ÙØ§ÛŒÙ„Ù‡Ø§ Ø±Ø§ Ø¨Ø¯Ù‡Ø¯ Ø²ÛŒØ±Ø§ Ø¨Ù‡ Ù†Ø¸Ø± Ù…ÛŒØ±Ø³Ø¯ Ø±Ø§Ø¨Ø· WebDAV Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ù„Ø·ÙØ§Ù‹ Ø¯ÙˆØ¨Ø§Ø±Ù‡ <a href='%s'>Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒ Ù†ØµØ¨</a>Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ù†ÛŒØ¯.",
 "Module 'fileinfo' missing" => "Ù…Ø§Ú˜ÙˆÙ„ 'fileinfo' Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Ù…Ø§Ú˜ÙˆÙ„ 'fileinfo' PHP Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù‡ Ø§Ø³Øª.Ù…Ø§ Ø§Ú©ÛŒØ¯Ø§ ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ… Ú©Ù‡ Ø§ÛŒÙ† Ù…Ø§Ú˜ÙˆÙ„ Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯ ØªØ§ Ù†ØªØ§ÛŒØ¬ Ø¨Ù‡ØªØ±ÛŒ Ø¨Ù‡ ÙˆØ³ÛŒÙ„Ù‡ ÛŒ mime-type detection Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†ÛŒØ¯.",
 "Locale not working" => "Ø²Ø¨Ø§Ù† Ù…ØÙ„ÛŒ Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯.",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ø§ÛŒÙ† Ø³Ø±ÙˆØ± ownCloud Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø³ÛŒØ³ØªÙ… Ù…ØÙ„ÛŒ Ø±Ø§ Ø¨Ø± Ø±ÙˆÛŒ %s ØªÙ†Ø¸ÛŒÙ… Ú©Ù†Ø¯.Ø§ÛŒÙ† Ø¨Ù‡ Ø§ÛŒÙ† Ù…Ø¹Ù†ÛŒ Ø³Øª Ú©Ù‡ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø¨Ø§ Ú©Ø§Ø±Ø§Ú©ØªØ±Ù‡Ø§ÛŒ Ø®Ø§ØµÛŒ Ø¯Ø± Ù†Ø§Ù… ÙØ§ÛŒÙ„ Ù‡Ø§ Ù…Ø´Ú©Ù„ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯.Ù…Ø§ Ø§Ú©ÛŒØ¯Ø§Ù‹ Ù†ØµØ¨ Ú©Ø±Ø¯Ù† Ø¨Ø³ØªÙ‡ Ù‡Ø§ÛŒ Ù„Ø§Ø²Ù… Ø±Ø§ Ø¨Ø± Ø±ÙˆÛŒ Ø³ÛŒØ³ØªÙ… Ø®ÙˆØ¯ØªØ§Ù† Ø¨Ø±Ø§ÛŒ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ %s ØªÙˆØµÛŒÙ‡ Ù…ÛŒ Ú©Ù†ÛŒÙ….",
 "Internet connection not working" => "Ø§ØªØµØ§Ù„ Ø§ÛŒÙ†ØªØ±Ù†Øª Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ø¯",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ø§ÛŒÙ† Ø³Ø±ÙˆØ± OwnCloud Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù†Ø¯Ø§Ø±Ø¯.Ø§ÛŒÙ† Ø¨Ø¯ÛŒÙ† Ù…Ø¹Ù†Ø§Ø³Øª Ú©Ù‡ Ø¨Ø¹Ø¶ÛŒ Ø§Ø² Ø®ØµÙˆØµÛŒØ§Øª Ù†Ø¸ÛŒØ± Ø®Ø§Ø±Ø¬ Ú©Ø±Ø¯Ù† Ù…Ù†Ø¨Ø¹ Ø°Ø®ÛŒØ±Ù‡ ÛŒ Ø®Ø§Ø±Ø¬ÛŒØŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¯Ø± Ù…ÙˆØ±Ø¯ Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù‡Ø§ ÛŒØ§ Ù†ØµØ¨ Ø¨Ø±Ù†Ø§Ù…Ù‡ Ù‡Ø§ÛŒ Ù†ÙˆØ¹ 3Ø§Ù… Ú©Ø§Ø± Ù†Ù…ÛŒ Ú©Ù†Ù†Ø¯.Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ ÙØ§ÛŒÙ„ Ù‡Ø§ Ø§Ø² Ø±Ø§Ù‡ Ø¯ÙˆØ± Ùˆ Ø§Ø±Ø³Ø§Ù„ Ø¢Ú¯Ø§Ù‡ Ø³Ø§Ø²ÛŒ Ø§ÛŒÙ…ÛŒÙ„ Ù‡Ø§ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù‡Ù…Ú†Ù†Ø§Ù† Ú©Ø§Ø± Ù†Ú©Ù†Ù†Ø¯.Ø§Ú¯Ø±Ø´Ù…Ø§ Ù‡Ù…Ù‡ ÛŒ Ø®ØµÙˆØµÛŒØ§Øª OwnCloud Ù…ÛŒ Ø®ÙˆØ§Ù‡ÛŒØ¯ Ù…Ø§ Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù…ÛŒ Ú©Ù†ÛŒÙ… ØªØ§ Ø§Ø±ØªØ¨Ø§Ø· Ø§ÛŒÙ†ØªØ±Ù†ØªÛŒ Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯.",
+"Cron" => "Ø²Ù…Ø§Ù†Ø¨Ù†Ø¯",
 "Execute one task with each page loaded" => "Ø§Ø¬Ø±Ø§ÛŒ ÛŒÚ© ÙˆØ¸ÛŒÙÙ‡ Ø¨Ø§ Ù‡Ø± Ø¨Ø§Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ØµÙØÙ‡",
 "Sharing" => "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ",
 "Enable Share API" => "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† API Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ",
@@ -59,8 +57,6 @@
 "Allow users to only share with users in their groups" => "Ø§Ø¬Ø§Ø²Ù‡ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ ØŒ ØªÙ†Ù‡Ø§ Ø¨Ø§ Ø¯ÛŒÚ¯Ø± Ú©Ø§Ø¨Ø±Ø§Ù† Ú¯Ø±ÙˆÙ‡ Ø®ÙˆØ¯Ø´Ø§Ù†",
 "Security" => "Ø§Ù…Ù†ÛŒØª",
 "Enforce HTTPS" => "ÙˆØ§Ø¯Ø§Ø± Ú©Ø±Ø¯Ù† HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "ÙˆØ§Ø¯Ø§Ø± Ú©Ø±Ø¯Ù† Ù…Ø´ØªØ±ÛŒØ§Ù† Ø¨Ø±Ø§ÛŒ Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ ownCloud Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø§Ø±ØªØ¨Ø§Ø·",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ø§Ø² Ø·Ø±ÛŒÙ‚ HTTPS Ø¨Ù‡ Ø§ÛŒÙ† Ù†Ø³Ø®Ù‡ Ø§Ø² ownCloud Ù…ØªØµÙ„ Ø´ÙˆÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†ÛŒØ¯ SSL  Ø±Ø§ ÙØ¹Ø§Ù„ ÛŒØ§ ØºÛŒØ± ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "Log" => "Ú©Ø§Ø±Ù†Ø§Ù…Ù‡",
 "Log level" => "Ø³Ø·Ø ÙˆØ±ÙˆØ¯",
 "More" => "Ø¨ÛŒØ´â€ŒØªØ±",
@@ -94,6 +90,8 @@
 "Fill in an email address to enable password recovery" => "Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ø±Ø§ Ù¾Ø±Ú©Ù†ÛŒØ¯  ØªØ§ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ ÙØ¹Ø§Ù„ Ø´ÙˆØ¯",
 "Language" => "Ø²Ø¨Ø§Ù†",
 "Help translate" => "Ø¨Ù‡ ØªØ±Ø¬Ù…Ù‡ Ø¢Ù† Ú©Ù…Ú© Ú©Ù†ÛŒØ¯",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø¨Ù† Ø¢Ø¯Ø±Ø³ <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªØ±Ø³ÛŒ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ø§Ø² Ø·Ø±ÛŒÙ‚ WebDAV </a>",
 "Login Name" => "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ",
 "Create" => "Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø±Ø¯Ù†",
 "Admin Recovery Password" => "Ù…Ø¯ÛŒØ±ÛŒØª Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±",
@@ -107,3 +105,4 @@
 "set new password" => "ØªÙ†Ø¸ÛŒÙ… Ú©Ù„Ù…Ù‡ Ø¹Ø¨ÙˆØ± Ø¬Ø¯ÛŒØ¯",
 "Default" => "Ù¾ÛŒØ´ ÙØ±Ø¶"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index ef3ada50462fb61d8486eb8e1057a1b1df34343a..61d0a51bf923a0dba17fb8054783f9c896e19685 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ei pystytÃ¤ lataamaan listaa sovellusvarastosta (App Store)",
 "Authentication error" => "Tunnistautumisvirhe",
 "Your display name has been changed." => "NÃ¤yttÃ¶nimesi on muutettu.",
@@ -32,11 +33,11 @@
 "Group Admin" => "RyhmÃ¤n yllÃ¤pitÃ¤jÃ¤",
 "Delete" => "Poista",
 "add group" => "lisÃ¤Ã¤ ryhmÃ¤",
+"A valid username must be provided" => "Anna kelvollinen kÃ¤yttÃ¤jÃ¤tunnus",
 "Error creating user" => "Virhe kÃ¤yttÃ¤jÃ¤Ã¤ luotaessa",
+"A valid password must be provided" => "Anna kelvollinen salasana",
 "__language_name__" => "_kielen_nimi_",
 "Security Warning" => "Turvallisuusvaroitus",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Data-kansio ja tiedostot ovat ehkÃ¤ saavutettavissa InternetistÃ¤. .htaccess-tiedosto, jolla kontrolloidaan pÃ¤Ã¤syÃ¤, ei toimi. Suosittelemme, ettÃ¤ muutat web-palvelimesi asetukset niin ettei data-kansio ole enÃ¤Ã¤ pÃ¤Ã¤syÃ¤ tai siirrÃ¤t data-kansion pois web-palvelimen tiedostojen juuresta.",
-"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
 "Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
 "Internet connection not working" => "Internet-yhteys ei toimi",
 "Cron" => "Cron",
@@ -51,7 +52,6 @@
 "Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissÃ¤ olevien kÃ¤yttÃ¤jien kesken",
 "Security" => "Tietoturva",
 "Enforce HTTPS" => "Pakota HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Pakottaa salaamaan ownCloudiin kohdistuvat yhteydet.",
 "Log" => "Loki",
 "Log level" => "Lokitaso",
 "More" => "EnemmÃ¤n",
@@ -70,6 +70,7 @@
 "Forum" => "Keskustelupalsta",
 "Bugtracker" => "Ohjelmistovirheiden jÃ¤ljitys",
 "Commercial Support" => "Kaupallinen tuki",
+"Get the apps to sync your files" => "Aseta sovellukset synkronoimaan tiedostosi",
 "Show First Run Wizard again" => "NÃ¤ytÃ¤ ensimmÃ¤isen kÃ¤yttÃ¶kerran avustaja uudelleen",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "KÃ¤ytÃ¶ssÃ¤si on <strong>%s</strong>/<strong>%s</strong>",
 "Password" => "Salasana",
@@ -85,6 +86,7 @@
 "Language" => "Kieli",
 "Help translate" => "Auta kÃ¤Ã¤ntÃ¤misessÃ¤",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "KÃ¤ytÃ¤ tÃ¤tÃ¤ osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pÃ¤Ã¤stÃ¤ksesi kÃ¤siksi tiedostoihisi WebDAVin kautta</a>",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
 "Default Storage" => "Oletustallennustila",
@@ -96,3 +98,4 @@
 "set new password" => "aseta uusi salasana",
 "Default" => "Oletus"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 2b11d0c865ac0449dfde19413ab3f8371f5786a2..1c64b01f5668336e1c5a1ba87e629c2c1aff8225 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
 "Authentication error" => "Erreur d'authentification",
 "Your display name has been changed." => "Votre nom d'affichage a bien Ã©tÃ© modifiÃ©.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "Un mot de passe valide doit Ãªtre saisi",
 "__language_name__" => "FranÃ§ais",
 "Security Warning" => "Avertissement de sÃ©curitÃ©",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de maniÃ¨re Ã  ce que le dossier data ne soit plus accessible ou bien de dÃ©placer le dossier data en dehors du dossier racine des documents du serveur web.",
 "Setup Warning" => "Avertissement, problÃ¨me de configuration",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configurÃ© pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
-"Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous rÃ©fÃ©rer au <a href='%s'>guide d'installation</a>.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandÃ© de l'activer afin d'obtenir de meilleurs rÃ©sultats pour la dÃ©tection des types de fichiers.",
 "Locale not working" => "Localisation non fonctionnelle",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ce serveur ownCloud ne peut pas ajuster la localisation du systÃ¨me en %s. Cela signifie qu'il pourra y avoir des problÃ¨mes avec certains caractÃ¨res dans les noms de fichiers. Il est vivement recommandÃ© d'installer les paquets requis pour le support de %s.",
 "Internet connection not working" => "La connexion internet ne fonctionne pas",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ce serveur ownCloud ne peut pas se connecter Ã  internet. Cela signifie que certaines fonctionnalitÃ©s, telles que l'utilisation de supports de stockage distants, les notifications de mises Ã  jour, ou l'installation d'applications tierces ne fonctionneront pas. L'accÃ¨s aux fichiers Ã  distance, ainsi que les notifications par mails ne marcheront pas non plus. Il est recommandÃ© d'activer la connexion internet pour ce serveur si vous souhaitez utiliser toutes les fonctionnalitÃ©s offertes par ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "ExÃ©cute une tÃ¢che Ã  chaque chargement de page",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php est enregistrÃ© en tant que service webcron. Veuillez appeler la page cron.php situÃ©e Ã  la racine du serveur ownCoud via http toute les minutes.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilise le service cron du systÃ¨me. Appelle le fichier cron.php du rÃ©pertoire owncloud toutes les minutes grÃ¢ce Ã  une tÃ¢che cron du systÃ¨me.",
 "Sharing" => "Partage",
 "Enable Share API" => "Activer l'API de partage",
 "Allow apps to use the Share API" => "Autoriser les applications Ã  utiliser l'API de partage",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "Autoriser les utilisateurs Ã  partager avec des utilisateurs de leur groupe uniquement",
 "Security" => "SÃ©curitÃ©",
 "Enforce HTTPS" => "Forcer HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forcer les clients Ã  se connecter Ã  Owncloud via une connexion chiffrÃ©e.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Merci de vous connecter Ã  cette instance Owncloud en HTTPS pour activer ou dÃ©sactiver SSL.",
 "Log" => "Log",
 "Log level" => "Niveau de log",
 "More" => "Plus",
@@ -98,6 +91,7 @@
 "Language" => "Langue",
 "Help translate" => "Aidez Ã  traduire",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accÃ©der Ã  vos fichiers via WebDAV</a>",
 "Login Name" => "Nom de la connexion",
 "Create" => "CrÃ©er",
 "Admin Recovery Password" => "RÃ©cupÃ©ration du mot de passe administrateur",
@@ -111,3 +105,4 @@
 "set new password" => "Changer le mot de passe",
 "Default" => "DÃ©faut"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 281a4708cacbb49fff9a7fa1b393d7645db19b33..85e40f07638ba205c117ee0ad4c71a46b99f11bb 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Non foi posÃbel cargar a lista desde a App Store",
 "Authentication error" => "Produciuse un erro de autenticaciÃ³n",
 "Your display name has been changed." => "O seu nome visÃbel foi cambiado",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Debe fornecer un contrasinal",
 "__language_name__" => "Galego",
 "Security Warning" => "Aviso de seguranza",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesÃbeis a travÃ©s da Internet. O ficheiro .htaccess que fornece ownCloud non estÃ¡ a empregarse. SuxerÃmoslle que configure o seu servidor web de tal xeito que o cartafol de datos non estea accesÃbel ou mova o cartafol de datos fora do directorio raÃz de datos do servidor web.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesÃbeis a travÃ©s de internet. O ficheiro .htaccess non estÃ¡ a traballar. SuxerÃmoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesÃbel ou que mova o o directorio de datos fÃ³ra da raÃz de documentos do servidor web.",
 "Setup Warning" => "Configurar os avisos",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non estÃ¡ aÃnda configurado adecuadamente para permitir a sincronizaciÃ³n de ficheiros xa que semella que a interface WebDAV non estÃ¡ a funcionar.",
-"Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guÃas de instalaciÃ³n</a>",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Volva comprobar as <a href=\"%s\">guÃas de instalaciÃ³n</a>",
 "Module 'fileinfo' missing" => "Non se atopou o mÃ³dulo Â«fileinfoÂ»",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o mÃ³dulo de PHP Â«fileinfoÂ». Ã‰ recomendÃ¡bel activar este mÃ³dulo para obter os mellores resultados coa detecciÃ³n do tipo MIME.",
 "Locale not working" => "A configuraciÃ³n rexional non funciona",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor ownCloud non pode estabelecer a configuraciÃ³n rexional do sistema a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. RecomendÃ¡moslle que inste os paquetes necesarios no sistema para aceptar o %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "A configuraciÃ³n rexional do sistema non pode estabelecerse a %s. Isto significa que pode haber problemas con certos caracteres nos nomes de ficheiro. RecomendÃ¡moslle que instale os paquetes necesarios no sistema para aceptar o %s.",
 "Internet connection not working" => "A conexiÃ³n Ã¡ Internet non funciona",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud non ten conexiÃ³n a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificaciÃ³ns sobre actualizaciÃ³ns ou instalaciÃ³n de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envÃo de mensaxes de notificaciÃ³n poderÃan non funcionar. SuxerÃmoslle que active a conexiÃ³n a Internet deste servidor se quere dispor de todas as funcionalidades de ownCloud.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor non ten conexiÃ³n a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificaciÃ³ns sobre actualizaciÃ³ns ou instalaciÃ³n de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envÃo de mensaxes de notificaciÃ³n poderÃan non funcionar. SuxerÃmoslle que active a conexiÃ³n a Internet deste servidor se quere dispor de todas as funcionalidades.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executar unha tarefa con cada pÃ¡xina cargada",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php estÃ¡ rexistrado nun servizo de WebCron. Chame Ã¡ pÃ¡gina cron.php na raÃz ownCloud unha vez por minuto a travÃ©s de HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no cartafol owncloud a travÃ©s dun sistema de cronjob unha vez por minuto.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php estÃ¡ rexistrado nun servizo de WebCron para chamar a cron.php unha vez por minuto a travÃ©s de HTTP.",
+"Use systems cron service to call the cron.php file once a minute." => "Use o servizo de sistema cron para chamar ao ficheiro cron.php unha vez por minuto.",
 "Sharing" => "Compartindo",
 "Enable Share API" => "Activar o API para compartir",
 "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
 "Allow links" => "Permitir ligazÃ³ns",
 "Allow users to share items to the public with links" => "Permitir que os usuarios compartan elementos ao pÃºblico con ligazÃ³ns",
+"Allow public uploads" => "Permitir os envÃos pÃºblicos",
+"Allow users to enable others to upload into their publicly shared folders" => "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente",
 "Allow resharing" => "Permitir compartir",
 "Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles",
 "Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera",
 "Allow users to only share with users in their groups" => "Permitir que os usuarios compartan sÃ³ cos usuarios dos seus grupos",
 "Security" => "Seguranza",
 "Enforce HTTPS" => "Forzar HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar que os clientes se conecten a ownCloud empregando unha conexiÃ³n cifrada",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Conectese a esta instancia ownCloud empregando HTTPS para activar ou desactivar o forzado de SSL.",
+"Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexiÃ³n cifrada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "ConÃ©ctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
 "Log" => "Rexistro",
 "Log level" => "Nivel de rexistro",
 "More" => "MÃ¡is",
@@ -98,6 +101,7 @@
 "Language" => "Idioma",
 "Help translate" => "Axude na traduciÃ³n",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazÃ³n <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
 "Login Name" => "Nome de acceso",
 "Create" => "Crear",
 "Admin Recovery Password" => "Contrasinal de recuperaciÃ³n do administrador",
@@ -111,3 +115,4 @@
 "set new password" => "estabelecer un novo contrasinal",
 "Default" => "Predeterminado"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 077bc9e97f9c249ed57bba1645ffd7856edfbde1..b82e5a9b3e4a0505fbbf102fbd6bc271daf7e844 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "×œ× × ×™×ª×Ÿ ×œ×˜×¢×•×Ÿ ×¨×©×™×ž×” ×ž×”Ö¾App Store",
 "Authentication error" => "×©×’×™××ª ×”×–×“×”×•×ª",
 "Your display name has been changed." => "×©× ×”×ª×¦×•×’×” ×©×œ×š ×”×•×—×œ×£.",
@@ -37,10 +38,8 @@
 "A valid password must be provided" => "×™×© ×œ×¡×¤×§ ×¡×¡×ž×” ×ª×§× ×™×ª",
 "__language_name__" => "×¢×‘×¨×™×ª",
 "Security Warning" => "××–×”×¨×ª ××‘×˜×—×”",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "×™×ª×›×Ÿ ×©×ª×™×§×™×™×ª ×”× ×ª×•× ×™× ×•×”×§×‘×¦×™× ×©×œ×š × ×’×™×©×™× ×“×¨×š ×”××™× ×˜×¨× ×˜. ×§×•×‘×¥ ×”Ö¾â€Ž.htaccess ×©×ž×¡×•×¤×§ ×¢×œ ×™×“×™ ownCloud ×›× ×¨××” ××™× ×• ×¢×•×‘×“. ×× ×• ×ž×ž×œ×™×¦×™× ×‘×—×•× ×œ×”×’×“×™×¨ ××ª ×©×¨×ª ×”××™× ×˜×¨× ×˜ ×©×œ×š ×‘×“×¨×š ×©×‘×” ×ª×™×§×™×™×ª ×”× ×ª×•× ×™× ×œ× ×ª×”×™×” ×–×ž×™× ×” ×¢×•×“ ××• ×œ×”×¢×‘×™×¨ ××ª ×ª×™×§×™×™×ª ×”× ×ª×•× ×™× ×ž×—×•×¥ ×œ×¡×¤×¨×™×™×ª ×”×¢×œ ×©×œ ×©×¨×ª ×”××™× ×˜×¨× ×˜.",
 "Setup Warning" => "×©×’×™××ª ×”×’×“×¨×”",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "×©×¨×ª ×”××™× ×˜×¨× ×˜ ×©×œ×š ××™× ×• ×ž×•×’×“×¨ ×œ×¦×•×¨×›×™ ×¡× ×›×¨×•×Ÿ ×§×‘×¦×™× ×¢×“×™×™×Ÿ ×›×™×•×•×Ÿ ×©×ž× ×©×§ ×”Ö¾WebDAV ×›× ×¨××” ××™× ×• ×ª×§×™×Ÿ.",
-"Please double check the <a href='%s'>installation guides</a>." => "× × ×œ×¢×™×™×Ÿ ×©×•×‘ ×‘<a href='%s'>×ž×“×¨×™×›×™ ×”×”×ª×§× ×”</a>.",
 "Module 'fileinfo' missing" => "×”×ž×•×“×•×œ â€žfileinfoâ€œ ×—×¡×¨",
 "Internet connection not working" => "×”×—×™×‘×•×¨ ×œ××™× ×˜×¨× ×˜ ××™× ×• ×¤×¢×™×œ",
 "Cron" => "Cron",
@@ -102,3 +101,4 @@
 "set new password" => "×”×’×“×¨×ª ×¡×¡×ž×” ×—×“×©×”",
 "Default" => "×‘×¨×¨×ª ×ž×—×“×œ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index eb3fcc251f4698aee273972059f459f13fea619a..094a9dba298e69ab2e883486fb25f15f3c5062f6 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à¤¤à¥à¤°à¥à¤Ÿà¤¿",
 "Update" => "à¤…à¤¦à¥à¤¯à¤¤à¤¨",
 "Password" => "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡",
 "New password" => "à¤¨à¤¯à¤¾ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡",
 "Username" => "à¤ªà¥à¤°à¤¯à¥‹à¤•à¥à¤¤à¤¾ à¤•à¤¾ à¤¨à¤¾à¤®"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 4bfbc2d3d50defb11409911fe2c9ddd0dcdff1b5..4a225ed4b8a374ec4bcef8feefc1d22f952e6730 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "NemogiÄ‡nost uÄitavanja liste sa Apps Stora",
 "Authentication error" => "GreÅ¡ka kod autorizacije",
 "Email saved" => "Email spremljen",
@@ -35,3 +36,4 @@
 "Other" => "ostali",
 "Username" => "KorisniÄko ime"
 );
+$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;";
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 377ec24956247b7d19c9074f6cb55c2460bd8776..cfc6eff5638f5fc25f403774476e8d0c015514c0 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nem tÃ¶lthetÅ‘ le a lista az App Store-bÃ³l",
 "Authentication error" => "AzonosÃtÃ¡si hiba",
 "Your display name has been changed." => "Az Ã–n megjelenÃtÃ©si neve megvÃ¡ltozott.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Ã‰rvÃ©nyes jelszÃ³t kell megadnia",
 "__language_name__" => "__language_name__",
 "Security Warning" => "BiztonsÃ¡gi figyelmeztetÃ©s",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Az adatkÃ¶nytÃ¡ra Ã©s az itt levÅ‘ fÃ¡jlok valÃ³szÃnÅ±leg elÃ©rhetÅ‘k az internetrÅ‘l. Az ownCloud Ã¡ltal beillesztett .htaccess fÃ¡jl nem mÅ±kÃ¶dik. Nagyon fontos, hogy a webszervert Ãºgy konfigurÃ¡lja, hogy az adatkÃ¶nyvtÃ¡r ne legyen kÃ¶zvetlenÃ¼l kÃvÃ¼lrÅ‘l elÃ©rhetÅ‘, vagy az adatkÃ¶nyvtÃ¡rt tegye a webszerver dokumentumfÃ¡jÃ¡n kÃvÃ¼lre.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Az adatkÃ¶nytÃ¡ra Ã©s az itt levÅ‘ fÃ¡jlok valÃ³szÃnÅ±leg elÃ©rhetÅ‘k az internetrÅ‘l. Az ownCloud Ã¡ltal beillesztett .htaccess fÃ¡jl nem mÅ±kÃ¶dik. Nagyon erÅ‘sen ajÃ¡nlott, hogy a webszervert Ãºgy konfigurÃ¡lja, hogy az adatkÃ¶nyvtÃ¡r ne legyen kÃ¶zvetlenÃ¼l kÃvÃ¼lrÅ‘l elÃ©rhetÅ‘, vagy az adatkÃ¶nyvtÃ¡rt tegye a webszerver dokumentumfÃ¡jÃ¡n kÃvÃ¼lre.",
 "Setup Warning" => "A beÃ¡llÃtÃ¡ssal kapcsolatos figyelmeztetÃ©s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ã–n webkiszolgÃ¡lÃ³ja nincs megfelelÅ‘en beÃ¡llÃtva az Ã¡llomÃ¡nyok szinkronizÃ¡lÃ¡sÃ¡hoz, mert a WebDAV-elÃ©rÃ©s Ãºgy tÅ±nik, nem mÅ±kÃ¶dik.",
-"Please double check the <a href='%s'>installation guides</a>." => "KÃ©rjÃ¼k tÃ¼zetesen tanulmÃ¡nyozza Ã¡t a <a href='%s'>telepÃtÃ©si ÃºtmutatÃ³t</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "KÃ©rjÃ¼k tÃ¼zetesen tanulmÃ¡nyozza Ã¡t a <a href='%s'>telepÃtÃ©si ÃºtmutatÃ³t</a>.",
 "Module 'fileinfo' missing" => "A 'fileinfo' modul hiÃ¡nyzik",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiÃ¡nyzik. ErÅ‘sen javasolt ennek a modulnak a telepÃtÃ©se a MIME-tÃpusok felismerÃ©sÃ©nek eredmÃ©nyessÃ© tÃ©telÃ©hez.",
 "Locale not working" => "A nyelvi lokalizÃ¡ciÃ³ nem mÅ±kÃ¶dik",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ezen az ownCloud kiszolgÃ¡lÃ³n nem hasznÃ¡lhatÃ³ a %s nyelvi beÃ¡llÃtÃ¡s. Ez azt jelenti, hogy a fÃ¡jlnevekben gond lehet bizonyos karakterekkel. NyomatÃ©kosan ajÃ¡nlott, hogy telepÃtse a szÃ¼ksÃ©ges csomagokat annak Ã©rdekÃ©ben, hogy a rendszer tÃ¡mogassa a %s beÃ¡llÃtÃ¡st.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ezen az ownCloud kiszolgÃ¡lÃ³n nem hasznÃ¡lhatÃ³ a %s nyelvi beÃ¡llÃtÃ¡s. Ez azt jelenti, hogy a fÃ¡jlnevekben gond lehet bizonyos karakterekkel. NyomatÃ©kosan ajÃ¡nlott, hogy telepÃtse a szÃ¼ksÃ©ges csomagokat annak Ã©rdekÃ©ben, hogy a rendszer tÃ¡mogassa a %s beÃ¡llÃtÃ¡st.",
 "Internet connection not working" => "Az internet kapcsolat nem mÅ±kÃ¶dik",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Az ownCloud kiszolgÃ¡lÃ³nak nincs internet kapcsolata. Ez azt jelenti, hogy bizonyos dolgok nem fognak mÅ±kÃ¶dni, pl. kÃ¼lsÅ‘ tÃ¡rolÃ³k csatolÃ¡sa, programfrissÃtÃ©sekrÅ‘l valÃ³ Ã©rtesÃtÃ©sek, vagy kÃ¼lsÅ‘ fejlesztÅ‘i modulok telepÃtÃ©se. Lehet, hogy az Ã¡llomÃ¡nyok tÃ¡volrÃ³l tÃ¶rtÃ©nÅ‘ elÃ©rÃ©se, ill. az email Ã©rtesÃtÃ©sek sem fog mÅ±kÃ¶dni. Javasoljuk, hogy engedÃ©lyezze az internet kapcsolatot a kiszolgÃ¡lÃ³ szÃ¡mÃ¡ra, ha az ownCloud Ã¶sszes szolgÃ¡ltatÃ¡sÃ¡t szeretnÃ© hasznÃ¡lni.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "A kiszolgÃ¡lÃ³nak nincs mÃ¼kÃ¶dÅ‘ internet kapcsolata. Ez azt jelenti, hogy nÃ©hÃ¡ny kÃ©pessÃ©gÃ©t a kiszolgÃ¡lÃ³nak mint pÃ©ldÃ¡ul becsatolni egy kÃ¼lsÅ‘ tÃ¡rolÃ³t, Ã©rtesÃtÃ©sek kÃ¼lsÅ‘ gyÃ¡rtÃ³k programjÃ¡nak frissÃtÃ©sÃ©rÅ‘l nem fog mÃ¼kÃ¶dni. A tÃ¡volrÃ³l valÃ³ elÃ©rÃ©se a fileoknak Ã©s email Ã©rtesÃtÃ©sek kÃ¼ldÃ©se szintÃ©n nem fog mÃ¼kÃ¶dni. Ha hasznÃ¡lni szeretnÃ©d mindezeket a kÃ©pessÃ©geit a szervernek, ahoz javasoljuk, hogy engedÃ©lyezzed az internet elÃ©rÃ©sÃ©t a szervernek.",
 "Cron" => "Ãœtemezett feladatok",
 "Execute one task with each page loaded" => "Egy-egy feladat vÃ©grehajtÃ¡sa minden alkalommal, amikor egy weboldalt letÃ¶ltenek",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "A cron.php webcron szolgÃ¡ltatÃ¡skÃ©nt van regisztrÃ¡lva. HÃvja meg az owncloud kÃ¶nyvtÃ¡rban levÅ‘ cron.php Ã¡llomÃ¡nyt http-n keresztÃ¼l percenkÃ©nt egyszer.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "A rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak hasznÃ¡lata. HÃvja meg az owncloud kÃ¶nyvtÃ¡rban levÅ‘  cron.php Ã¡llomÃ¡nyt percenkÃ©nt egyszer a rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak segÃtsÃ©gÃ©vel.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "A cron.php webcron szolgÃ¡ltatÃ¡skÃ©nt van regisztrÃ¡lva. HÃvja meg a cron.php Ã¡llomÃ¡nyt http-n keresztÃ¼l percenkÃ©nt egyszer.",
+"Use systems cron service to call the cron.php file once a minute." => "A rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak hasznÃ¡lata. HÃvja meg a cron.php Ã¡llomÃ¡nyt percenkÃ©nt egyszer a rendszer cron szolgÃ¡ltatÃ¡sÃ¡nak segÃtsÃ©gÃ©vel.",
 "Sharing" => "MegosztÃ¡s",
 "Enable Share API" => "A megosztÃ¡s API-jÃ¡nak engedÃ©lyezÃ©se",
 "Allow apps to use the Share API" => "LehetÅ‘vÃ© teszi, hogy a programmodulok is hasznÃ¡lhassÃ¡k a megosztÃ¡st",
 "Allow links" => "Linkek engedÃ©lyezÃ©se",
 "Allow users to share items to the public with links" => "LehetÅ‘vÃ© teszi, hogy a felhasznÃ¡lÃ³k linkek segÃtsÃ©gÃ©vel kÃ¼lsÅ‘sÃ¶kkel is megoszthassÃ¡k az adataikat",
+"Allow public uploads" => "FeltÃ¶ltÃ©st engedÃ©lyezÃ©se mindenki szÃ¡mÃ¡ra",
+"Allow users to enable others to upload into their publicly shared folders" => "EngedÃ©lyezni a felhasznÃ¡lÃ³knak, hogy beÃ¡llÃithassÃ¡k, hogy mÃ¡sok feltÃ¶lthetnek a nyilvÃ¡nosan megosztott mappÃ¡kba.",
 "Allow resharing" => "A tovÃ¡bbosztÃ¡s engedÃ©lyezÃ©se",
 "Allow users to share items shared with them again" => "LehetÅ‘vÃ© teszi, hogy a felhasznÃ¡lÃ³k a velÃ¼k megosztott Ã¡llomÃ¡nyokat megosszÃ¡k egy tovÃ¡bbi, harmadik fÃ©llel",
 "Allow users to share with anyone" => "A felhasznÃ¡lÃ³k bÃ¡rkivel megoszthatjÃ¡k Ã¡llomÃ¡nyaikat",
 "Allow users to only share with users in their groups" => "A felhasznÃ¡lÃ³k csak olyanokkal oszthatjÃ¡k meg Ã¡llomÃ¡nyaikat, akikkel kÃ¶zÃ¶s csoportban vannak",
 "Security" => "BiztonsÃ¡g",
 "Enforce HTTPS" => "KÃ¶telezÅ‘ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "KÃ¶telezÅ‘vÃ© teszi, hogy a bÃ¶ngÃ©szÅ‘programok titkosÃtott csatornÃ¡n kapcsolÃ³djanak az ownCloud szolgÃ¡ltatÃ¡shoz.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "KÃ©rjÃ¼k, hogy HTTPS protokollt hasznÃ¡ljon, ha be vagy ki  akarja kapcsolni a kÃ¶telezÅ‘ SSL beÃ¡llÃtÃ¡st.",
+"Forces the clients to connect to %s via an encrypted connection." => "KÃ¶telezÅ‘vÃ© teszi, hogy a bÃ¶ngÃ©szÅ‘programok titkosÃtott csatornÃ¡n kapcsolÃ³djanak a %s szolgÃ¡ltatÃ¡shoz.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "KÃ©rjÃ¼k kapcsolodjon a %s rendszerhez HTTPS protokollon keresztÃ¼l, hogy be vagy ki kapcsoljaa kÃ¶telezÅ‘ SSL beÃ¡llÃtÃ¡st.",
 "Log" => "NaplÃ³zÃ¡s",
 "Log level" => "NaplÃ³zÃ¡si szint",
 "More" => "TÃ¶bb",
@@ -98,6 +101,7 @@
 "Language" => "Nyelv",
 "Help translate" => "SegÃtsen a fordÃtÃ¡sban!",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a cÃmet hasznÃ¡lja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztÃ¼l szeretnÃ© elÃ©rni az Ã¡llomÃ¡nyait</a>",
 "Login Name" => "BejelentkezÃ©si nÃ©v",
 "Create" => "LÃ©trehozÃ¡s",
 "Admin Recovery Password" => "A jelszÃ³visszaÃ¡llÃtÃ¡s adminisztrÃ¡ciÃ³ja",
@@ -111,3 +115,4 @@
 "set new password" => "Ãºj jelszÃ³ beÃ¡llÃtÃ¡sa",
 "Default" => "AlapÃ©rtelmezett"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hy.php b/settings/l10n/hy.php
index 9a9e46085ef5ea94f5a0191efce9e8e44c17bcfa..d73cb37a765755991fd92b529b9f342e180788e3 100644
--- a/settings/l10n/hy.php
+++ b/settings/l10n/hy.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Delete" => "Õ‹Õ¶Õ»Õ¥Õ¬",
 "Other" => "Ô±ÕµÕ¬"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index d6d1c9eb86e102d0d80aa9d71fa1c1dc6440de01..3f61ff8eefee8ae7a8ad6bc3faf0a6573bfc9474 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Language changed" => "Linguage cambiate",
 "Invalid request" => "Requesta invalide",
 "Error" => "Error",
@@ -24,3 +25,4 @@
 "Other" => "Altere",
 "Username" => "Nomine de usator"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 012f5885b423af7bda95431ae535fe368758a040..6c3ad8b3e771362ddf84bd9d8fb3409c2b0f6d33 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
 "Authentication error" => "Galat saat autentikasi",
 "Unable to change display name" => "Tidak dapat mengubah nama tampilan",
@@ -36,20 +37,14 @@
 "A valid password must be provided" => "Tuliskan sandi yang valid",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Peringatan Keamanan",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Mungkin direktori data dan berkas Anda dapat diakses dari internet. Berkas .htaccess yang disediakan oleh ownCloud tidak berfungsi. Kami sangat menyarankan Anda untuk mengonfigurasi webserver Anda agar direktori data tidak lagi dapat diakses atau pindahkan direktori data ke luar akar dokumen webserver.",
 "Setup Warning" => "Peringatan Persiapan",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
-"Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' tidak ada",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
 "Locale not working" => "Kode pelokalan tidak berfungsi",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Server ownCloud ini tidak dapat menyetel kode pelokalan sistem ke nilai %s. Ini berarti mungkin akan terjadi masalah pada karakter tertentu pada nama berkas. Kami sarankan untuk menginstal paket yang dibutuhkan pada sistem Anda untuk mendukung %s.",
 "Internet connection not working" => "Koneksi internet tidak berfungsi",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Server ownCloud ini tidak memiliki koneksi internet yang berfungsi. Artinya, beberapa fitur misalnya mengaitkan penyimpanan eksternal, notifikasi tentang pembaruan, atau instalasi aplikasi dari pihak ketiga tidak akan dapat berfungsi. Pengaksesan berkas secara online dan pengiriman email notifikasi mungkin juga tidak dapat berfungsi. Kami sarankan untuk mengaktifkan koneksi internet server ini agar mendapatkan semua fitur ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Jalankan tugas setiap kali halaman dimuat",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php telah terdaftar sebagai layanan webcron. Panggil halaman cron.php pada akar direktori ownCloud tiap menit lewat http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Gunakan layanan cron sistem. Panggil berkas cron.php pada folder ownCloud lewat cronjob sistem tiap menit.",
 "Sharing" => "Berbagi",
 "Enable Share API" => "Aktifkan API Pembagian",
 "Allow apps to use the Share API" => "Izinkan aplikasi untuk menggunakan API Pembagian",
@@ -61,8 +56,6 @@
 "Allow users to only share with users in their groups" => "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri",
 "Security" => "Keamanan",
 "Enforce HTTPS" => "Selalu Gunakan HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Paksa klien untuk tersambung ke ownCloud lewat koneksi yang dienkripsi.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Silakan sambungkan ke instalasi ownCloud lewat HTTPS untuk mengaktifkan atau menonaktifkan fitur SSL.",
 "Log" => "Catat",
 "Log level" => "Level pencatatan",
 "More" => "Lainnya",
@@ -108,3 +101,4 @@
 "set new password" => "setel sandi baru",
 "Default" => "Baku"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index fecc82ec6d73c2ba6a75cc0da61bd921b563ccfe..2e97650bdb8563beeeb426f148974c2d417fe5c0 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ekki tÃ³kst aÃ° hlaÃ°a lista frÃ¡ forrita sÃÃ°u",
 "Authentication error" => "Villa viÃ° auÃ°kenningu",
 "Group already exists" => "HÃ³pur er Ã¾egar til",
@@ -27,7 +28,6 @@
 "Delete" => "EyÃ°a",
 "__language_name__" => "__nafn_tungumÃ¡ls__",
 "Security Warning" => "Ã–ryggis aÃ°vÃ¶run",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Gagnamappan Ã¾Ãn er aÃ° Ã¶llum lÃkindum aÃ°gengileg frÃ¡ internetinu. SkrÃ¡in .htaccess sem fylgir meÃ° ownCloud er ekki aÃ° virka. ViÃ° mÃ¦lum eindregiÃ° meÃ° Ã¾vÃ aÃ° Ã¾Ãº stillir vefÃ¾jÃ³ninn Ã¾annig aÃ° gagnamappan verÃ°i ekki aÃ°gengileg frÃ¡ internetinu eÃ°a fÃ¦rir hana Ãºt fyrir vefrÃ³tina.",
 "More" => "Meira",
 "Less" => "Minna",
 "Version" => "ÃštgÃ¡fa",
@@ -66,3 +66,4 @@
 "Storage" => "gagnaplÃ¡ss",
 "Default" => "SjÃ¡lfgefiÃ°"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 86b5b356f56a37840845f84d7f3f92a5b43f7b1c..b6a508ba46ba43efbf3bed26fb2d6a9858390da0 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
 "Authentication error" => "Errore di autenticazione",
 "Your display name has been changed." => "Il tuo nome visualizzato Ã¨ stato cambiato.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Deve essere fornita una password valida",
 "__language_name__" => "Italiano",
 "Security Warning" => "Avviso di sicurezza",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet. Il file .htaccess fornito da ownCloud non funziona. Ti suggeriamo vivamente di configurare il server web in modo che la cartella dei dati non sia piÃ¹ accessibile o sposta tale cartella fuori dalla radice del sito.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia piÃ¹ accessibile o spostare la cartella fuori dalla radice del server web.",
 "Setup Warning" => "Avviso di configurazione",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non Ã¨ configurato correttamente per consentire la sincronizzazione dei file poichÃ© l'interfaccia WebDAV sembra essere danneggiata.",
-"Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
 "Module 'fileinfo' missing" => "Modulo 'fileinfo' mancante",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Il modulo PHP 'fileinfo' non Ã¨ presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
 "Locale not working" => "Locale non funzionante",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Questo server ownCloud non puÃ² impostare la localizzazione a %s. CiÃ² significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti richiesti sul sistema per supportare %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "La localizzazione di sistema Ã¨ impostata a %s. CiÃ² significa che potrebbero verificarsi dei problemi con alcuni caratteri nei nomi dei file. Consigliamo vivamente di installare i pacchetti necessari a supportare %s.",
 "Internet connection not working" => "Concessione Internet non funzionante",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Questo server ownCloud non ha una connessione a Internet funzionante. CiÃ² significa che alcune delle funzionalitÃ  come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. Anche l'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalitÃ  di ownCloud.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Questo server ownCloud non ha una connessione a Internet funzionante. CiÃ² significa che alcune delle funzionalitÃ  come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalitÃ .",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Esegui un'operazione con ogni pagina caricata",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php Ã¨ registrato su un sevizio webcron. Invoca la pagina cron.php nella radice di ownCloud ogni minuto, tramite http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilizza il servizio cron di sistema. Invoca il file cron.php nella cartella di ownCloud tramite un job ogni minuto.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php Ã¨ registrato su un servizio webcron per invocare la pagina cron.php ogni minuto su http.",
+"Use systems cron service to call the cron.php file once a minute." => "Usa il servizio cron di sistema per invocare il file cron.php ogni minuto.",
 "Sharing" => "Condivisione",
 "Enable Share API" => "Abilita API di condivisione",
 "Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
 "Allow links" => "Consenti collegamenti",
 "Allow users to share items to the public with links" => "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti",
+"Allow public uploads" => "Consenti caricamenti pubblici",
+"Allow users to enable others to upload into their publicly shared folders" => "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise",
 "Allow resharing" => "Consenti la ri-condivisione",
 "Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri",
 "Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
 "Allow users to only share with users in their groups" => "Consenti agli utenti di condividere solo con utenti dei loro gruppi",
 "Security" => "Protezione",
 "Enforce HTTPS" => "Forza HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Obbliga i client a connettersi a ownCloud tramite una confessione cifrata.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL.",
+"Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
 "Log" => "Log",
 "Log level" => "Livello di log",
 "More" => "Altro",
@@ -98,6 +101,7 @@
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>",
 "Login Name" => "Nome utente",
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
@@ -111,3 +115,4 @@
 "set new password" => "imposta una nuova password",
 "Default" => "Predefinito"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 94012982652b39eed566d01989c292e8caf4b130..2fbe05befa9fe7aaaf45bfa85ab7719e14ebc404 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ã‚¢ãƒ—ãƒªã‚¹ãƒˆã‚¢ã‹ã‚‰ãƒªã‚¹ãƒˆã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“",
 "Authentication error" => "èªè¨¼ã‚¨ãƒ©ãƒ¼",
 "Your display name has been changed." => "è¡¨ç¤ºåã‚’å¤‰æ›´ã—ã¾ã—ãŸã€‚",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "æœ‰åŠ¹ãªãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
 "__language_name__" => "Japanese (æ—¥æœ¬èªž)",
 "Security Warning" => "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£è¦å‘Š",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒæã‚‰ãã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã§ãã‚‹ã‚ˆã†ã«ãªã£ã¦ã„ã¾ã™ã€‚ownCloudãŒæä¾›ã™ã‚‹ .htaccessãƒ•ã‚¡ã‚¤ãƒ«ãŒæ©Ÿèƒ½ã—ã¦ã„ã¾ã›ã‚“ã€‚ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å…¨ãã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„ã‚ˆã†ã«ã™ã‚‹ã‹ã€ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãƒ«ãƒ¼ãƒˆã®å¤–ã«ç½®ãã‚ˆã†ã«ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒã‚’è¨å®šã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚ ",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ã«ãªã£ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚.htaccessãƒ•ã‚¡ã‚¤ãƒ«ãŒæ©Ÿèƒ½ã—ã¦ã„ã¾ã›ã‚“ã€‚ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œãªã„ã‚ˆã†ã«ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒãƒ¼ã‚’è¨å®šã™ã‚‹ã‹ã€ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒãƒ¼ã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆãƒ«ãƒ¼ãƒˆã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ç§»å‹•ã™ã‚‹ã‚ˆã†ã«å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚",
 "Setup Warning" => "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—è¦å‘Š",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ãŒå‹•ä½œã—ã¦ã„ãªã„ã¨è€ƒãˆã‚‰ã‚Œã‚‹ãŸã‚ã€ã‚ãªãŸã®WEBã‚µãƒ¼ãƒã¯ã¾ã ãƒ•ã‚¡ã‚¤ãƒ«ã®åŒæœŸã‚’è¨±å¯ã™ã‚‹ã‚ˆã†ã«é©åˆ‡ãªè¨å®šãŒã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
-"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¬ã‚¤ãƒ‰</a>ã‚’ã‚ˆãç¢ºèªã—ã¦ãã ã•ã„ã€‚",
+"Please double check the <a href=\"%s\">installation guides</a>." => "<a href=\"%s\">installation guides</a>ã‚’ã‚‚ã†ä¸€åº¦ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«ãŠé¡˜ã„ã„ãŸã—ã¾ã™ã€‚",
 "Module 'fileinfo' missing" => "ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« 'fileinfo' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« 'fileinfo' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã€‚mimeã‚¿ã‚¤ãƒ—ã®æ¤œå‡ºã‚’ç²¾åº¦è‰¯ãè¡Œã†ãŸã‚ã«ã€ã“ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚",
 "Locale not working" => "ãƒã‚±ãƒ¼ãƒ«ãŒå‹•ä½œã—ã¦ã„ã¾ã›ã‚“",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ã“ã® ownCloud ã‚µãƒ¼ãƒã¯ã€ã‚·ã‚¹ãƒ†ãƒ ãƒã‚±ãƒ¼ãƒ«ã‚’ %s ã«è¨å®šã§ãã¾ã›ã‚“ã€‚ã“ã‚Œã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«åã®ç‰¹å®šã®æ–‡å—ã§å•é¡ŒãŒç™ºç”Ÿã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚‹ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚%s ã‚’ã‚µãƒãƒ¼ãƒˆã™ã‚‹ãŸã‚ã«ã€ã‚·ã‚¹ãƒ†ãƒ ã«å¿…è¦ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã“ã¨ã‚’å¼·ãæŽ¨å¥¨ã—ã¾ã™ã€‚",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ã‚·ã‚¹ãƒ†ãƒ ãƒã‚±ãƒ¼ãƒ«ãŒ %s ã«è¨å®šå‡ºæ¥ã¾ã›ã‚“ã€‚ã“ã®å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«åã«ãã®ãƒã‚±ãƒ¼ãƒ«ã®æ–‡å—ãŒå…¥ã£ã¦ã„ãŸã¨ãã«å•é¡Œã«ãªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚å¿…è¦ãªãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’ã‚·ã‚¹ãƒ†ãƒ ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã€%s ã‚’ã‚µãƒãƒ¼ãƒˆã™ã‚‹ã“ã¨ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚",
 "Internet connection not working" => "ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šãŒå‹•ä½œã—ã¦ã„ã¾ã›ã‚“",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ã“ã® ownCloud ã‚µãƒ¼ãƒã«ã¯æœ‰åŠ¹ãªã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šãŒã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã‚Œã¯ã€å¤–éƒ¨ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã®ãƒžã‚¦ãƒ³ãƒˆã€æ›´æ–°ã®é€šçŸ¥ã€ã‚µãƒ¼ãƒ‰ãƒ‘ãƒ¼ãƒ†ã‚£è£½ã‚¢ãƒ—ãƒªã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€ã®ã‚ˆã†ãªã„ãã¤ã‹ã®æ©Ÿèƒ½ãŒå‹•ä½œã—ãªã„ã“ã¨ã‚’æ„å‘³ã—ã¦ã„ã¾ã™ã€‚ãƒªãƒ¢ãƒ¼ãƒˆã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸã‚Šã€é€šçŸ¥ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ãŸã‚Šã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã›ã‚“ã€‚å…¨ã¦ã®æ©Ÿèƒ½ã‚’åˆ©ç”¨ã™ã‚‹ãŸã‚ã«ã¯ã€ã“ã®ã‚µãƒ¼ãƒã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæŽ¥ç¶šã‚’æœ‰åŠ¹ã«ã™ã‚‹ã“ã¨ã‚’æŽ¨å¥¨ã—ã¾ã™ã€‚",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«æŽ¥ç¶šã—ã¦ã„ã¾ã›ã‚“ã€‚ã“ã®å ´åˆã€å¤–éƒ¨ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã®ãƒžã‚¦ãƒ³ãƒˆã€æ›´æ–°ã®é€šçŸ¥ã‚„ã‚µãƒ¼ãƒ‰ãƒ‘ãƒ¼ãƒ†ã‚£ã‚¢ãƒ—ãƒªã¨ã„ã£ãŸã„ãã¤ã‹ã®æ©Ÿèƒ½ãŒä½¿ãˆã¾ã›ã‚“ã€‚ã¾ãŸã€ãƒªãƒ¢ãƒ¼ãƒˆæŽ¥ç¶šã§ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚¢ã‚¯ã‚»ã‚¹ã€é€šçŸ¥ãƒ¡ãƒ¼ãƒ«ã®é€ä¿¡ã¨è¨€ã£ãŸæ©Ÿèƒ½ã‚‚åˆ©ç”¨ã§ããªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚å…¨ã¦ã®æ©Ÿèƒ½ã‚’åˆ©ç”¨ã—ãŸã„ã®ã§ã‚ã‚Œã°ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«æŽ¥ç¶šã§ãã‚‹ã‚ˆã†ã«ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "å„ãƒšãƒ¼ã‚¸ã®èªã¿è¾¼ã¿æ™‚ã«ã‚¿ã‚¹ã‚¯ã‚’å®Ÿè¡Œã™ã‚‹",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ã¯ webcron ã‚µãƒ¼ãƒ“ã‚¹ã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã™ã€‚owncloud ã®ãƒ«ãƒ¼ãƒˆã«ã‚ã‚‹ cron.php ã®ãƒšãƒ¼ã‚¸ã‚’ http çµŒç”±ã§1åˆ†ã«1å›žå‘¼ã³å‡ºã—ã¦ä¸‹ã•ã„ã€‚",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ã‚·ã‚¹ãƒ†ãƒ ã® cron ã‚µãƒ¼ãƒ“ã‚¹ã‚’åˆ©ç”¨ã™ã‚‹ã€‚ã‚·ã‚¹ãƒ†ãƒ ã® cronjob ã‚’é€šã—ã¦1åˆ†ã«1å›ž owncloud å†…ã® cron.php ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‘¼ã³å‡ºã—ã¦ä¸‹ã•ã„ã€‚",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "httpçµŒç”±ã§1åˆ†é–“ã«1å›žcron.phpã‚’å‘¼ã³å‡ºã™ã‚ˆã†ã« cron.phpãŒwebcron ã‚µãƒ¼ãƒ“ã‚¹ã«ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã™ã€‚",
+"Use systems cron service to call the cron.php file once a minute." => "cron.phpãƒ•ã‚¡ã‚¤ãƒ«ã‚’1åˆ†é–“ã«1å›žå®Ÿè¡Œã™ã‚‹ç‚ºã«ã‚µãƒ¼ãƒãƒ¼ã®cronã‚µãƒ¼ãƒ“ã‚¹ã‚’åˆ©ç”¨ã™ã‚‹ã€‚",
 "Sharing" => "å…±æœ‰",
 "Enable Share API" => "å…±æœ‰APIã‚’æœ‰åŠ¹ã«ã™ã‚‹",
 "Allow apps to use the Share API" => "ã‚¢ãƒ—ãƒªã‹ã‚‰ã®å…±æœ‰APIã®åˆ©ç”¨ã‚’è¨±å¯ã™ã‚‹",
 "Allow links" => "ãƒªãƒ³ã‚¯ã‚’è¨±å¯ã™ã‚‹",
 "Allow users to share items to the public with links" => "ãƒªãƒ³ã‚¯ã«ã‚ˆã‚Šã‚¢ã‚¤ãƒ†ãƒ ã‚’å…¬é–‹ã™ã‚‹ã“ã¨ã‚’è¨±å¯ã™ã‚‹",
+"Allow public uploads" => "ãƒ‘ãƒ–ãƒªãƒƒã‚¯ãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’è¨±å¯",
+"Allow users to enable others to upload into their publicly shared folders" => "å…¬é–‹ã—ã¦ã„ã‚‹å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ã¸ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’å…±æœ‰ã—ã¦ã„ã‚‹ãƒ¡ãƒ³ãƒãƒ¼ã«ã‚‚è¨±å¯",
 "Allow resharing" => "å†å…±æœ‰ã‚’è¨±å¯ã™ã‚‹",
 "Allow users to share items shared with them again" => "ãƒ¦ãƒ¼ã‚¶ãŒå…±æœ‰ã—ã¦ã„ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã®å†å…±æœ‰ã‚’è¨±å¯ã™ã‚‹",
 "Allow users to share with anyone" => "ãƒ¦ãƒ¼ã‚¶ãŒèª°ã¨ã§ã‚‚å…±æœ‰ã™ã‚‹ã“ã¨ã‚’è¨±å¯ã™ã‚‹",
 "Allow users to only share with users in their groups" => "ãƒ¦ãƒ¼ã‚¶ã«ã‚°ãƒ«ãƒ¼ãƒ—å†…ã®ãƒ¦ãƒ¼ã‚¶ã¨ã®ã¿å…±æœ‰ã‚’è¨±å¯ã™ã‚‹",
 "Security" => "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£",
 "Enforce HTTPS" => "å¸¸ã«HTTPSã‚’ä½¿ç”¨ã™ã‚‹",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ownCloudã¸ã®æŽ¥ç¶šã‚’å¸¸ã«æš—å·åŒ–ã™ã‚‹",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "å¸¸ã«SSLæŽ¥ç¶šã‚’æœ‰åŠ¹ï¼ç„¡åŠ¹ã«ã™ã‚‹ãŸã‚ã«ã€HTTPSçµŒç”±ã§ã“ã® ownCloud ã«æŽ¥ç¶šã—ã¦ä¸‹ã•ã„ã€‚",
+"Forces the clients to connect to %s via an encrypted connection." => "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ %sã¸ã®æŽ¥ç¶šã‚’å¸¸ã«æš—å·åŒ–ã™ã‚‹ã€‚",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "å¼·åˆ¶çš„ãªSSLæŽ¥ç¶šã‚’æœ‰åŠ¹ï¼ç„¡åŠ¹ã«ã™ã‚‹ãŸã‚ã«ã€HTTPSçµŒç”±ã§ %s ã¸æŽ¥ç¶šã—ã¦ãã ã•ã„ã€‚",
 "Log" => "ãƒã‚°",
 "Log level" => "ãƒã‚°ãƒ¬ãƒ™ãƒ«",
 "More" => "ã‚‚ã£ã¨è¦‹ã‚‹",
@@ -98,6 +101,7 @@
 "Language" => "è¨€èªž",
 "Help translate" => "ç¿»è¨³ã«å”åŠ›ã™ã‚‹",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAVçµŒç”±ã§ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹</a>ã™ã‚‹ã«ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’åˆ©ç”¨ã—ã¦ãã ã•ã„",
 "Login Name" => "ãƒã‚°ã‚¤ãƒ³å",
 "Create" => "ä½œæˆ",
 "Admin Recovery Password" => "ç®¡ç†è€…å¾©æ—§ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰",
@@ -111,3 +115,4 @@
 "set new password" => "æ–°ã—ã„ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’è¨å®š",
 "Default" => "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ka.php b/settings/l10n/ka.php
index 63425e555b057dbd1d31ae80ca0c39dd35657bbc..e9024a3c1c95381b61d33acf3db821e2f39dd036 100644
--- a/settings/l10n/ka.php
+++ b/settings/l10n/ka.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Password" => "áƒžáƒáƒ áƒáƒšáƒ˜"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 302745052cc5f994f996e666dc501e8dbbdf8e02..09a948a0574971ebd2028335321b3d69bf08dbf7 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ áƒ•áƒ”áƒ  áƒ©áƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ App Store",
 "Authentication error" => "áƒáƒ•áƒ—áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ",
 "Your display name has been changed." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ“áƒ˜áƒ¡áƒ¤áƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜ áƒ£áƒ™áƒ•áƒ” áƒ¨áƒ”áƒ˜áƒªáƒ•áƒáƒšáƒ",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "áƒ£áƒœáƒ“áƒ áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒáƒ— áƒáƒ áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜",
 "__language_name__" => "__language_name__",
 "Security Warning" => "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ“áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ˜áƒ“áƒáƒœ. .htaccess áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ¡áƒáƒª ownCloud áƒ’áƒ•áƒ—áƒáƒ•áƒáƒ–áƒáƒ‘áƒ¡ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ“áƒáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒáƒ— áƒ˜áƒ¡áƒ” áƒ áƒáƒ› data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒáƒ  áƒ˜áƒ§áƒáƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒáƒ“áƒ˜, áƒáƒœ áƒ’áƒáƒ˜áƒ¢áƒáƒœáƒáƒ— data áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ áƒ•áƒ”áƒ‘áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ document root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ—.",
 "Setup Warning" => "áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ áƒ“áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ˜áƒ¡áƒáƒ¡",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ web áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒš áƒ¡áƒ˜áƒœáƒ¥áƒ áƒáƒœáƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ áƒáƒ“áƒ’áƒáƒœ WebDAV áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ˜áƒ§áƒáƒ¡ áƒ’áƒáƒ¢áƒ”áƒ®áƒ˜áƒšáƒ˜.",
-"Please double check the <a href='%s'>installation guides</a>." => "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒ“áƒáƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒáƒ— <a href='%s'>áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒ–áƒáƒ›áƒ™áƒ•áƒšáƒ”áƒ•áƒ˜</a>.",
 "Module 'fileinfo' missing" => "áƒ›áƒáƒ“áƒ£áƒšáƒ˜ 'fileinfo'  áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP áƒ›áƒáƒ“áƒ£áƒšáƒ˜ 'fileinfo' áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒáƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒšáƒáƒ“ áƒ©áƒáƒ áƒ—áƒáƒ— áƒ”áƒ¡ áƒ›áƒáƒ“áƒ£áƒšáƒ˜, áƒ áƒáƒ› áƒ›áƒ˜áƒ˜áƒ¦áƒáƒ— áƒ™áƒáƒ áƒ’áƒ˜ áƒ¨áƒ”áƒ“áƒ”áƒ’áƒ”áƒ‘áƒ˜ mime-typeâ€“áƒ¡ áƒáƒ¦áƒ›áƒáƒ©áƒ”áƒœáƒ˜áƒ¡áƒáƒ¡.",
 "Locale not working" => "áƒšáƒáƒ™áƒáƒšáƒ˜áƒ–áƒáƒªáƒ˜áƒ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ•áƒ”áƒ  áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ¡ %s áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  áƒ”áƒœáƒáƒ¡. áƒ”áƒ¡ áƒ’áƒ£áƒšáƒ˜áƒ¡áƒ®áƒ›áƒáƒ‘áƒ¡ áƒ˜áƒ›áƒáƒ¡ áƒ áƒáƒ› áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒáƒ¡ áƒžáƒ áƒáƒ‘áƒšáƒ”áƒ›áƒ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒš áƒ¡áƒ˜áƒ›áƒ‘áƒáƒšáƒáƒ”áƒ‘áƒ–áƒ” áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ”áƒ‘áƒ¨áƒ˜. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ“áƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ— áƒ¡áƒáƒáƒ˜áƒ áƒ áƒžáƒáƒ™áƒ”áƒ¢áƒ”áƒ‘áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒáƒ–áƒ” áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ˜áƒ§áƒáƒ¡ %s â€“áƒ˜áƒ¡ áƒ›áƒ®áƒáƒ áƒ“áƒáƒáƒ”áƒ áƒ.",
 "Internet connection not working" => "áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒáƒ  áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ¡ áƒáƒ  áƒ’áƒáƒáƒ©áƒœáƒ˜áƒ áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢áƒ—áƒáƒœ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜. áƒ”áƒ¡ áƒœáƒ˜áƒ¨áƒœáƒáƒ•áƒ¡ áƒ˜áƒ›áƒáƒ¡ áƒ áƒáƒ› áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒšáƒ˜ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜ áƒ áƒáƒ’áƒáƒ áƒ˜áƒªáƒáƒ áƒ”áƒ¥áƒ¡áƒ¢áƒ”áƒ áƒœáƒáƒš áƒ¡áƒáƒªáƒáƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ, áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘ áƒáƒœ áƒ¡áƒ®áƒ•áƒáƒ“áƒáƒ¡áƒ®áƒ•áƒ 3rd áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ—áƒáƒœ áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ’áƒáƒ áƒ” áƒ¡áƒáƒ›áƒ§áƒáƒ áƒáƒ“áƒáƒœ áƒ“áƒ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ›áƒ”áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒª áƒáƒ’áƒ áƒ”áƒ—áƒ•áƒ” áƒáƒ  áƒ˜áƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ¡. áƒ©áƒ•áƒ”áƒœ áƒ’áƒ˜áƒ áƒ©áƒ”áƒ•áƒ— áƒ áƒáƒ› áƒ©áƒáƒ áƒ—áƒáƒ— áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒáƒ› áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ˜áƒ›áƒ˜áƒ¡áƒáƒ—áƒ•áƒ˜áƒ¡ áƒ áƒáƒ› áƒ’áƒ¥áƒáƒœáƒ“áƒ”áƒ— ownCloudâ€“áƒ˜áƒ¡ áƒ§áƒ•áƒ”áƒšáƒ áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ áƒ’áƒáƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜.",
 "Cron" => "Cronâ€“áƒ˜",
 "Execute one task with each page loaded" => "áƒ’áƒáƒ£áƒ¨áƒ•áƒ˜ áƒ—áƒ˜áƒ—áƒ áƒ›áƒáƒ¥áƒ›áƒ”áƒ“áƒ”áƒ‘áƒ áƒ§áƒ•áƒ”áƒšáƒ áƒ©áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ£áƒš áƒ’áƒ•áƒ”áƒ áƒ“áƒ–áƒ”",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ webcron áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒáƒ“. áƒ’áƒáƒ£áƒ¨áƒ•áƒ˜áƒ— cron.php áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ›áƒáƒ—áƒáƒ•áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ owncloud root áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒáƒ áƒ˜áƒáƒ¨áƒ˜, áƒ¬áƒ£áƒ—áƒ¨áƒ˜ áƒ”áƒ áƒ—áƒ®áƒ”áƒš  httpâ€“áƒ˜áƒ—.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ” áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ áƒ˜ cron áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒ˜. áƒ’áƒáƒ£áƒ¨áƒ•áƒ˜áƒ— cron.php áƒ¤áƒáƒ˜áƒšáƒ˜ owncloud áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ˜áƒ“áƒáƒœ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ£áƒ  cronjobâ€“áƒ¨áƒ˜ áƒ¬áƒ£áƒ—áƒ¨áƒ˜ áƒ”áƒ áƒ—áƒ®áƒ”áƒš.",
 "Sharing" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ",
 "Enable Share API" => "Share APIâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ",
 "Allow apps to use the Share API" => "áƒ“áƒáƒ£áƒ¨áƒ•áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ  Share API â€“áƒ–áƒ”",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ áƒáƒ› áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ—áƒáƒ•áƒ˜áƒáƒœáƒ—áƒ˜ áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
 "Security" => "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ",
 "Enforce HTTPS" => "HTTPSâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "áƒ•áƒáƒ˜áƒ«áƒ£áƒšáƒáƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜ áƒ áƒáƒ› áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒœáƒ”áƒœ ownCloud áƒ“áƒáƒªáƒ£áƒšáƒ˜ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ— (https).",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ— ownCloudâ€“áƒ¡  HTTPSâ€“áƒ˜áƒ— áƒ áƒáƒ› áƒ¨áƒ”áƒ«áƒšáƒáƒ— SSLâ€“áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ•áƒ.",
 "Log" => "áƒšáƒáƒ’áƒ˜",
 "Log level" => "áƒšáƒáƒ’áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒáƒœáƒ”",
 "More" => "áƒ£áƒ¤áƒ áƒ áƒ›áƒ”áƒ¢áƒ˜",
@@ -109,3 +102,4 @@
 "set new password" => "áƒ“áƒáƒáƒ§áƒ”áƒœáƒ”áƒ— áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜",
 "Default" => "áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 230a2185bfb0585425380f3ae8df786d0b12f526..4473a2c51263195b5aebcd34a211ca1bb42ab9f3 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ì•± ìŠ¤í† ì–´ì—ì„œ ëª©ë¡ì„ ê°€ì ¸ì˜¬ ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
 "Authentication error" => "ì¸ì¦ ì˜¤ë¥˜",
 "Your display name has been changed." => "í‘œì‹œ ì´ë¦„ì´ ë³€ê²½ë˜ì—ˆìŠµë‹ˆë‹¤.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "ì˜¬ë°”ë¥¸ ì•”í˜¸ë¥¼ ìž…ë ¥í•´ì•¼ í•¨",
 "__language_name__" => "í•œêµì–´",
 "Security Warning" => "ë³´ì•ˆ ê²½ê³ ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ë°ì´í„° ë””ë ‰í„°ë¦¬ì™€ íŒŒì¼ì„ ì¸í„°ë„·ì—ì„œ ì ‘ê·¼í•  ìˆ˜ ìžˆëŠ” ê²ƒ ê°™ìŠµë‹ˆë‹¤. ownCloudì—ì„œ ì œê³µí•œ .htaccess íŒŒì¼ì´ ìž‘ë™í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì›¹ ì„œë²„ë¥¼ ë‹¤ì‹œ ì„¤ì •í•˜ì—¬ ë°ì´í„° ë””ë ‰í„°ë¦¬ì— ì ‘ê·¼í•  ìˆ˜ ì—†ë„ë¡ í•˜ê±°ë‚˜ ë¬¸ì„œ ë£¨íŠ¸ ë°”ê¹¥ìª½ìœ¼ë¡œ ì˜®ê¸°ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤.",
 "Setup Warning" => "ì„¤ì • ê²½ê³ ",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV ì¸í„°íŽ˜ì´ìŠ¤ê°€ ì œëŒ€ë¡œ ìž‘ë™í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. ì›¹ ì„œë²„ì—ì„œ íŒŒì¼ ë™ê¸°í™”ë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆë„ë¡ ì„¤ì •ì´ ì œëŒ€ë¡œ ë˜ì§€ ì•Šì€ ê²ƒ ê°™ìŠµë‹ˆë‹¤.",
-"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>ì„¤ì¹˜ ê°€ì´ë“œ</a>ë¥¼ ë‹¤ì‹œ í•œ ë²ˆ í™•ì¸í•˜ì‹ì‹œì˜¤.",
 "Module 'fileinfo' missing" => "ëª¨ë“ˆ 'fileinfo'ê°€ ì—†ìŒ",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP ëª¨ë“ˆ 'fileinfo'ê°€ ì¡´ìž¬í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. MIME í˜•ì‹ ê°ì§€ ê²°ê³¼ë¥¼ í–¥ìƒì‹œí‚¤ê¸° ìœ„í•˜ì—¬ ì´ ëª¨ë“ˆì„ í™œì„±í™”í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤.",
 "Locale not working" => "ë¡œìº˜ì´ ìž‘ë™í•˜ì§€ ì•ŠìŒ",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud ì„œë²„ì˜ ì‹œìŠ¤í…œ ë¡œìº˜ì„ %s(ìœ¼)ë¡œ ì„¤ì •í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. íŒŒì¼ ì´ë¦„ì— íŠ¹ì •í•œ ê¸€ìžê°€ ë“¤ì–´ê°€ ìžˆëŠ” ê²½ìš° ë¬¸ì œê°€ ë°œìƒí•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. %sì„(ë¥¼) ì§€ì›í•˜ê¸° ìœ„í•´ì„œ ì‹œìŠ¤í…œì— í•„ìš”í•œ íŒ¨í‚¤ì§€ë¥¼ ì„¤ì¹˜í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤.",
 "Internet connection not working" => "ì¸í„°ë„·ì— ì—°ê²°í•  ìˆ˜ ì—†ìŒ",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud ì„œë²„ì—ì„œ ì¸í„°ë„·ì— ì—°ê²°í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤. ì™¸ë¶€ ì €ìž¥ì†Œ ë§ˆìš´íŠ¸, ì—…ë°ì´íŠ¸ ì•Œë¦¼, ì™¸ë¶€ ì•± ì„¤ì¹˜ ë“±ì´ ìž‘ë™í•˜ì§€ ì•Šì„ ê²ƒìž…ë‹ˆë‹¤. ì™¸ë¶€ì—ì„œ íŒŒì¼ì— ì ‘ê·¼í•˜ê±°ë‚˜, ì•Œë¦¼ ì´ë©”ì¼ì„ ë³´ë‚´ì§€ ëª»í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. ownCloudì˜ ëª¨ë“  ê¸°ëŠ¥ì„ ì‚¬ìš©í•˜ë ¤ë©´ ì´ ì„œë²„ë¥¼ ì¸í„°ë„·ì— ì—°ê²°í•˜ëŠ” ê²ƒì„ ì¶”ì²œí•©ë‹ˆë‹¤.",
 "Cron" => "í¬ë¡ ",
 "Execute one task with each page loaded" => "ê°œë³„ íŽ˜ì´ì§€ë¥¼ ë¶ˆëŸ¬ì˜¬ ë•Œë§ˆë‹¤ ì‹¤í–‰",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.phpê°€ webcron ì„œë¹„ìŠ¤ì— ë“±ë¡ë˜ì–´ ìžˆìŠµë‹ˆë‹¤. HTTPë¥¼ í†µí•˜ì—¬ 1ë¶„ë§ˆë‹¤ ownCloud ë£¨íŠ¸ì—ì„œ cron.php íŽ˜ì´ì§€ë¥¼ ë¶ˆëŸ¬ì˜µë‹ˆë‹¤.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ì‹œìŠ¤í…œ cron ì„œë¹„ìŠ¤ë¥¼ ì‚¬ìš©í•©ë‹ˆë‹¤. ì‹œìŠ¤í…œ cronjobì„ ì‚¬ìš©í•˜ì—¬ ownCloud í´ë”ì˜ cron.php íŒŒì¼ì„ 1ë¶„ë§ˆë‹¤ ë¶ˆëŸ¬ì˜µë‹ˆë‹¤.",
 "Sharing" => "ê³µìœ ",
 "Enable Share API" => "ê³µìœ  API ì‚¬ìš©í•˜ê¸°",
 "Allow apps to use the Share API" => "ì•±ì—ì„œ ê³µìœ  APIë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆë„ë¡ í—ˆìš©",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "ì‚¬ìš©ìžê°€ ì†í•´ ìžˆëŠ” ê·¸ë£¹ì˜ ì‚¬ìš©ìžì™€ë§Œ ê³µìœ í•  ìˆ˜ ìžˆë„ë¡ í—ˆìš©",
 "Security" => "ë³´ì•ˆ",
 "Enforce HTTPS" => "HTTPS ê°•ì œ ì‚¬ìš©",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "í´ë¼ì´ì–¸íŠ¸ê°€ ownCloudì— í•ìƒ ì•”í˜¸í™”ëœ ì—°ê²°ë¡œ ì—°ê²°í•˜ë„ë¡ ê°•ì œí•©ë‹ˆë‹¤.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "SSL ê°•ì œ ì‚¬ìš© ì„¤ì •ì„ ë³€ê²½í•˜ë ¤ë©´ ownCloud ì¸ìŠ¤í„´ìŠ¤ì— HTTPSë¡œ ì—°ê²°í•˜ì‹ì‹œì˜¤.",
 "Log" => "ë¡œê·¸",
 "Log level" => "ë¡œê·¸ ë‹¨ê³„",
 "More" => "ë” ì¤‘ìš”í•¨",
@@ -111,3 +104,4 @@
 "set new password" => "ìƒˆ ì•”í˜¸ ì„¤ì •",
 "Default" => "ê¸°ë³¸ê°’"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 244aba63a2c72276b05dbcd1aa7d440f6bf85d84..4be8f212d39814eb9d39c91ff2bc2da1094b2ca1 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Enable" => "Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†",
 "Error" => "Ù‡Ù‡â€ŒÚµÙ‡",
 "Saving..." => "Ù¾Ø§Ø´Ú©Ù‡â€ŒÙˆØªØ¯Ù‡â€ŒÚ©Ø§Øª...",
@@ -8,3 +9,4 @@
 "Email" => "Ø¦ÛŒÙ…Ù‡â€ŒÛŒÙ„",
 "Username" => "Ù†Ø§ÙˆÛŒ Ø¨Ù‡â€ŒÚ©Ø§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 7060d41537a95d813ba742d6804dda20db85d77b..7902e37a4f92e38b378e5b4c1555f7470d7cbe6d 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Email saved" => "E-mail gespÃ¤ichert",
@@ -42,3 +43,4 @@
 "Other" => "Aner",
 "Username" => "Benotzernumm"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index eb628a530eb10cb953b03a76853de93c3cd92f25..4e419112a0200a9ae3ce3164a2d315170cedf9fd 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,32 +1,57 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "NeÄ¯manoma Ä¯kelti sÄ…raÅ¡o iÅ¡ ProgramÅ³ Katalogo",
 "Authentication error" => "Autentikacijos klaida",
+"Group already exists" => "GrupÄ— jau egzistuoja",
+"Unable to add group" => "Nepavyko pridÄ—ti grupÄ—s",
 "Could not enable app. " => "Nepavyksta Ä¯jungti aplikacijos.",
 "Email saved" => "El. paÅ¡tas iÅ¡saugotas",
 "Invalid email" => "Netinkamas el. paÅ¡tas",
+"Unable to delete group" => "Nepavyko iÅ¡trinti grupÄ—s",
+"Unable to delete user" => "Nepavyko iÅ¡trinti vartotojo",
 "Language changed" => "Kalba pakeista",
 "Invalid request" => "Klaidinga uÅ¾klausa",
+"Unable to add user to group %s" => "Nepavyko pridÄ—ti vartotojo prie grupÄ—s %s",
+"Unable to remove user from group %s" => "Nepavyko iÅ¡trinti vartotojo iÅ¡ grupÄ—s %s",
+"Couldn't update app." => "Nepavyko atnaujinti programos.",
+"Update to {appversion}" => "Atnaujinti iki {appversion}",
 "Disable" => "IÅ¡jungti",
 "Enable" => "Ä®jungti",
+"Please wait...." => "PraÅ¡ome palaukti...",
 "Error" => "Klaida",
+"Updating...." => "Atnaujinama...",
+"Error while updating app" => "Ä®vyko klaida atnaujinant programÄ…",
+"Updated" => "Atnaujinta",
 "Saving..." => "Saugoma...",
+"deleted" => "iÅ¡trinta",
 "undo" => "anuliuoti",
+"Unable to remove user" => "Nepavyko iÅ¡trinti vartotojo",
 "Groups" => "GrupÄ—s",
 "Delete" => "IÅ¡trinti",
+"add group" => "pridÄ—ti grupÄ™",
+"A valid username must be provided" => "Vartotojo vardas turi bÅ«ti tinkamas",
+"Error creating user" => "Klaida kuriant vartotojÄ…",
+"A valid password must be provided" => "SlaptaÅ¾odis turi bÅ«ti tinkamas",
 "__language_name__" => "Kalba",
 "Security Warning" => "Saugumo praneÅ¡imas",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "JÅ«sÅ³ duomenÅ³ aplankalas ir JÅ«sÅ³ failai turbÅ«t yra pasiekiami per internetÄ…. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebÅ«tÅ³ pasiekiami per internetÄ…, arba persikelti juos kitur.",
+"Module 'fileinfo' missing" => "TrÅ«ksta 'fileinfo' modulio",
 "Cron" => "Cron",
 "Sharing" => "Dalijimasis",
+"Allow links" => "Lesti nuorodas",
+"Allow resharing" => "Leisti dalintis",
+"Security" => "Saugumas",
 "Log" => "Å½urnalas",
 "Log level" => "Å½urnalo iÅ¡samumas",
 "More" => "Daugiau",
 "Less" => "MaÅ¾iau",
+"Version" => "Versija",
 "Add your App" => "PridÄ—ti programÄ—lÄ™",
 "More Apps" => "Daugiau aplikacijÅ³",
 "Select an App" => "Pasirinkite programÄ…",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
 "Update" => "Atnaujinti",
+"Forum" => "Forumas",
+"Bugtracker" => "KlaidÅ³ sekimas",
 "Get the apps to sync your files" => "AtsisiÅ³skite programÄ—liÅ³, kad sinchronizuotumÄ—te savo failus",
 "Password" => "SlaptaÅ¾odis",
 "Your password was changed" => "JÅ«sÅ³ slaptaÅ¾odis buvo pakeistas",
@@ -39,7 +64,13 @@
 "Fill in an email address to enable password recovery" => "PamirÅ¡to slaptaÅ¾odÅ¾io atkÅ«rimui Ä¯veskite savo el. paÅ¡to adresÄ…",
 "Language" => "Kalba",
 "Help translate" => "PadÄ—kite iÅ¡versti",
+"WebDAV" => "WebDAV",
+"Login Name" => "Vartotojo vardas",
 "Create" => "Sukurti",
+"Unlimited" => "Neribota",
 "Other" => "Kita",
-"Username" => "Prisijungimo vardas"
+"Username" => "Prisijungimo vardas",
+"set new password" => "nustatyti naujÄ… slaptaÅ¾odÄ¯",
+"Default" => "Numatytasis"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index b9836634a03aa344ef0e70af666e7c5d3d71611e..eba0f3c89abbaab237d99b1ae9445bfe9dc6a32e 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nevar lejupielÄdÄ“t sarakstu no lietotÅ†u veikala",
 "Authentication error" => "AutentifikÄcijas kÄ¼Å«da",
 "Unable to change display name" => "NevarÄ“ja mainÄ«t redzamo vÄrdu",
@@ -36,20 +37,14 @@
 "A valid password must be provided" => "JÄnorÄda derÄ«ga parole",
 "__language_name__" => "__valodas_nosaukums__",
 "Security Warning" => "BrÄ«dinÄjums par droÅ¡Ä«bu",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "JÅ«su datu direktorija un datnes visdrÄ«zÄk ir pieejamas no interneta. ownCloud nodroÅ¡inÄtÄ .htaccess datne nedarbojas. MÄ“s iesakÄm konfigurÄ“t serveri tÄ, lai datu direktorija vairs nebÅ«tu pieejama, vai arÄ« pÄrvietojiet datu direktoriju Ärpus tÄ«mekÄ¼a servera dokumentu saknes.",
 "Setup Warning" => "IestatÄ«Å¡anas brÄ«dinÄjums",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "JÅ«su serveris vÄ“l nav pareizi iestatÄ«ts, lai Ä¼autu sinhronizÄ“t datnes, jo izskatÄs, ka WebDAV saskarne ir salauzta.",
-"Please double check the <a href='%s'>installation guides</a>." => "LÅ«dzu, vÄ“lreiz pÄrbaudiet <a href='%s'>instalÄ“Å¡anas palÄ«dzÄ«bu</a>.",
 "Module 'fileinfo' missing" => "TrÅ«kst modulis â€œfileinfoâ€",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "TrÅ«kst PHP modulis â€œfileinfoâ€. MÄ“s iesakÄm to aktivÄ“t, lai pÄ“c iespÄ“jas labÄk noteiktu mime tipus.",
 "Locale not working" => "LokÄle nestrÄdÄ",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Å is ownCloud serveris nevar iestatÄ«t sistÄ“mas lokÄli uz %s. Tas nozÄ«mÄ“, ka varÄ“tu bÅ«t problÄ“mas ar noteiktÄm rakstzÄ«mÄ“m datÅ†u nosaukumos. MÄ“s iesakÄm instalÄ“t vajadzÄ«gÄs pakotnes savÄ sistÄ“mÄ %s atbalstam.",
 "Internet connection not working" => "Interneta savienojums nedarbojas",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Å im ownCloud serverim nav strÄdÄjoÅ¡a interneta savienojuma. Tas nozÄ«mÄ“, ka daÅ¾as no Å¡Ä«m iespÄ“jÄm, piemÄ“ram, ÄrÄ“jas krÄtuves montÄ“Å¡ana, paziÅ†oÅ¡ana par atjauninÄjumiem vai treÅ¡Äs puses programmatÅ«ras instalÄ“Å¡ana nestrÄdÄ. VarÄ“tu nestrÄdÄt attÄlinÄta piekÄ¼uve pie datnÄ“m un paziÅ†ojumu e-pasta vÄ“stuÄ¼u sÅ«tÄ«Å¡ana. MÄ“s iesakÄm aktivÄ“t interneta savienojumu Å¡im serverim, ja vÄ“laties visas ownCloud iespÄ“jas.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "IzpildÄ«t vienu uzdevumu ar katru ielÄdÄ“to lapu",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ir reÄ£istrÄ“ts webcron servisÄ. Izsauciet cron.php lapu ownCloud saknÄ“ caur http reizi sekundÄ“.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Izmantot sistÄ“mas cron servisu. Izsauciet cron.php datni ownCloud mapÄ“ caur sistÄ“mas cornjob reizi minÅ«tÄ“.",
 "Sharing" => "DalÄ«Å¡anÄs",
 "Enable Share API" => "AktivÄ“t koplietoÅ¡anas API",
 "Allow apps to use the Share API" => "Ä»auj lietotnÄ“m izmantot koplietoÅ¡anas API",
@@ -61,8 +56,6 @@
 "Allow users to only share with users in their groups" => "Ä»aut lietotÄjiem dalÄ«ties ar lietotÄjiem to grupÄs",
 "Security" => "DroÅ¡Ä«ba",
 "Enforce HTTPS" => "Uzspiest HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "PiespieÅ¾ klientus savienoties ar ownCloud caur Å¡ifrÄ“tu savienojumu.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "LÅ«dzu, savienojieties ar Å¡o ownCloud pakalpojumu caur HTTPS, lai aktivÄ“tu vai deaktivÄ“tu SSL piemÄ“roÅ¡anu.",
 "Log" => "Å½urnÄls",
 "Log level" => "Å½urnÄla lÄ«menis",
 "More" => "VairÄk",
@@ -108,3 +101,4 @@
 "set new password" => "iestatÄ«t jaunu paroli",
 "Default" => "NoklusÄ“juma"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index f36bb8c7fce9b3321b8e067d613f00275a9a718d..61f1b8b3bcdbf90387f99bd7807e4ae33b669a63 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ÐÐµÐ¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð²Ñ‡Ð¸Ñ‚Ð°Ð¼ Ð»Ð¸ÑÑ‚Ð° Ð¾Ð´ App Store",
 "Authentication error" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð²Ð¾ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°",
 "Group already exists" => "Ð“Ñ€ÑƒÐ¿Ð°Ñ‚Ð° Ð²ÐµÑœÐµ Ð¿Ð¾ÑÑ‚Ð¾Ð¸",
@@ -23,7 +24,6 @@
 "Delete" => "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð¾ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ´ÑƒÐ²Ð°ÑšÐµ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¾ Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸ Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸Ñ‚Ðµ Ðµ Ð½Ð°Ñ˜Ð²ÐµÑ€Ð¾Ñ˜Ð°Ñ‚Ð½Ð¾ Ð´Ð¾ÑÑ‚Ð°Ð¿Ð½Ð° Ð¾Ð´ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚. .htaccess Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° ÑˆÑ‚Ð¾ Ñ˜Ð° Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÑƒÐ²Ð° ownCloud Ð½Ðµ Ñ„ÑƒÐ½Ñ†Ð¸Ð¾Ð½Ð¸Ñ€Ð°. Ð¡Ð¸Ð»Ð½Ð¾ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€Ð°Ñ‡ÑƒÐ²Ð°Ð¼Ðµ Ð´Ð° Ð³Ð¾ Ð¸ÑÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð°Ñ‚Ðµ Ð²Ð°ÑˆÐ¸Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ Ð·Ð° Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð¿Ð°Ð¿ÐºÐ° ÑÐ¾ Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸ Ð½Ðµ Ðµ Ð´Ð¾ÑÑ‚Ð°Ð¿Ð½Ð° Ð¿Ñ€ÐµÐºÑƒ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñ‚ Ð¸Ð»Ð¸ Ð¿Ñ€ÐµÐ¼ÐµÑÑ‚ÐµÑ‚Ðµ Ñ˜Ð° Ð½Ð°Ð´Ð²Ð¾Ñ€ Ð¾Ð´ ÐºÐ¾Ñ€ÐµÐ½Ð¾Ñ‚ Ð½Ð° Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€Ð¾Ñ‚.",
 "Log" => "Ð—Ð°Ð¿Ð¸ÑÐ½Ð¸Ðº",
 "Log level" => "ÐÐ¸Ð²Ð¾ Ð½Ð° Ð»Ð¾Ð³Ð¸Ñ€Ð°ÑšÐµ",
 "More" => "ÐŸÐ¾Ð²ÐµÑœÐµ",
@@ -58,3 +58,4 @@
 "Other" => "ÐžÑÑ‚Ð°Ð½Ð°Ñ‚Ð¾",
 "Username" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index d151cba29f94560506ab13d114cbd0ea791378c9..a65afb8ada1a0c4adfbe56bec280fa64c8c758ac 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Authentication error" => "Ralat pengesahan",
 "Email saved" => "Emel disimpan",
 "Invalid email" => "Emel tidak sah",
@@ -34,3 +35,4 @@
 "Other" => "Lain",
 "Username" => "Nama pengguna"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
index 9459a2e53fec7506d16faea3976833a6ac39513e..f49a9c1802373491610a5fecd07d513144cf7c1f 100644
--- a/settings/l10n/my_MM.php
+++ b/settings/l10n/my_MM.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Authentication error" => "á€á€½á€„á€·á€ºá€•á€¼á€¯á€á€»á€€á€ºá€™á€¡á€±á€¬á€„á€ºá€™á€¼á€„á€º",
 "Invalid request" => "á€á€±á€¬á€„á€ºá€¸á€†á€á€¯á€á€»á€€á€ºá€™á€™á€¾á€”á€ºá€€á€”á€ºá€•á€«",
 "Security Warning" => "á€œá€¯á€¶á€á€¼á€¯á€¶á€›á€±á€¸á€žá€á€á€•á€±á€¸á€á€»á€€á€º",
@@ -6,3 +7,4 @@
 "New password" => "á€…á€€á€¬á€¸á€á€¾á€€á€ºá€¡á€žá€…á€º",
 "Username" => "á€žá€¯á€¶á€¸á€…á€½á€²á€žá€°á€¡á€™á€Šá€º"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index f24aa50dbf399c5f96c1623ebe92e9fd742bfd6e..9048d89bad12cf36171892c162fff88c1f7ee5fd 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
 "Authentication error" => "Autentiseringsfeil",
 "Your display name has been changed." => "Ditt visningsnavn er blitt endret.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "Oppgi et gyldig passord",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sikkerhetsadvarsel",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bÃ¸r konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentomrÃ¥de.",
 "Setup Warning" => "Installasjonsadvarsel",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til Ã¥ ikke funkere.",
-"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
 "Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for Ã¥ kunne detektere mime-typen korrekt.",
 "Locale not working" => "SprÃ¥k virker ikke",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud serveren kan ikke sette systemsprÃ¥k til %s. Det kan vÃ¦re problemer med visse tegn i filnavn. Vi foreslÃ¥r at du installerer de nÃ¸dvendige pakkene pÃ¥ ditt system for Ã¥ stÃ¸tte %s.",
 "Internet connection not working" => "Ingen internettilkopling",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslÃ¥r at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "UtfÃ¸r en oppgave med hver side som blir lastet",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert som webcron-tjeneste. KjÃ¸r cron.php siden  i ownCloud rot hvert minutt vha http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk systemets crontjeneste. KjÃ¸r cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt.",
 "Sharing" => "Deling",
 "Enable Share API" => "Aktiver API for Deling",
 "Allow apps to use the Share API" => "Tillat apps Ã¥ bruke API for Deling",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
 "Security" => "Sikkerhet",
 "Enforce HTTPS" => "Tving HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvinger klienter til Ã¥ bruke ownCloud via kryptert tilkopling.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "VÃ¦r vennlig, bruk denne ownCloud instansen via HTTPS for Ã¥ aktivere eller deaktivere tvungen bruk av SSL.",
 "Log" => "Logg",
 "Log level" => "LoggnivÃ¥",
 "More" => "Mer",
@@ -98,6 +91,7 @@
 "Language" => "SprÃ¥k",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for Ã¥ <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">fÃ¥ tilgang til filene dine via WebDAV</a>",
 "Login Name" => "Logginn navn",
 "Create" => "Opprett",
 "Default Storage" => "Standard lager",
@@ -109,3 +103,4 @@
 "set new password" => "sett nytt passord",
 "Default" => "Standard"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d51d1d3af5c3e4c78e8c8c583a581fdeb712dc95..67ddafdc3c5e70032203de31a1cd2692f1fb854a 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
 "Authentication error" => "Authenticatie fout",
 "Your display name has been changed." => "Uw weergavenaam is gewijzigd.",
@@ -37,33 +38,32 @@
 "A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
 "__language_name__" => "Nederlands",
 "Security Warning" => "Beveiligingswaarschuwing",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder.",
 "Setup Warning" => "Instellingswaarschuwing",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Conntroleer de <a href='%s'>installatie handleiding</a> goed.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
 "Locale not working" => "Taalbestand werkt niet",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Deze ownCloud server kan de systeemtaal niet instellen op %s. Hierdoor kunnen er mogelijk problemen optreden met bepaalde tekens in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren zodat %s ondersteund wordt.",
 "Internet connection not working" => "Internet verbinding werkt niet",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Deze ownCloud server heeft geen actieve internet verbinding. dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internet verbinding voor deze server in te schakelen als u alle functies van ownCloud wilt gebruiken.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Bij laden van elke pagina Ã©Ã©n taak uitvoeren",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php is geregistreerd bij een webcron service. Roep eens per minuut de cron.php pagina aan over http in de ownCloud root.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Gebruik de systems cron service. Roep eens per minuut de cron.php file in de ownCloud map via een systeem cronjob.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is geregistreerd bij een webcron service om cron.php eens per minuut aan te roepen via http.",
+"Use systems cron service to call the cron.php file once a minute." => "Gebruik de systeem cron service om het bestand cron.php eens per minuut aan te roepen.",
 "Sharing" => "Delen",
 "Enable Share API" => "Activeren Share API",
 "Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
 "Allow links" => "Toestaan links",
 "Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
+"Allow public uploads" => "Sta publieke uploads toe",
+"Allow users to enable others to upload into their publicly shared folders" => "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden",
 "Allow resharing" => "Toestaan opnieuw delen",
 "Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
 "Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
 "Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
 "Security" => "Beveiliging",
 "Enforce HTTPS" => "Afdwingen HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Afdwingen dat de clients alleen via versleutelde verbinding contact maken met ownCloud.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Maak via HTTPS verbinding met deze ownCloud inrichting om het afdwingen van gebruik van SSL te activeren of deactiveren.",
+"Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Meer",
@@ -98,6 +98,7 @@
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>",
 "Login Name" => "Inlognaam",
 "Create" => "CreÃ«er",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
@@ -111,3 +112,4 @@
 "set new password" => "Instellen nieuw wachtwoord",
 "Default" => "Standaard"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 642f523006175bea4f0d23fce1f5d16b6895e9da..5c7a0756d537f0eef14ba69dd9877458e104835e 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Klarer ikkje Ã¥ lasta inn liste fra app-butikken",
 "Authentication error" => "Autentiseringsfeil",
 "Your display name has been changed." => "Visingsnamnet ditt er endra.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "Du mÃ¥ oppgje eit gyldig passord",
 "__language_name__" => "Nynorsk",
 "Security Warning" => "TryggleiksÃ¥tvaring",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frÃ¥ Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rÃ¥r sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frÃ¥ dokumentrota til tenaren.",
 "Setup Warning" => "OppsettsÃ¥tvaring",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til Ã¥ tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til Ã¥ vera Ã¸ydelagt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
 "Module 'fileinfo' missing" => "Modulen Â«fileinfoÂ» manglar",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen Â«fileinfoÂ» manglar. Me rÃ¥r sterkt til Ã¥ slÃ¥ pÃ¥ denne modulen for Ã¥ best mogleg oppdaga MIME-typar.",
 "Locale not working" => "Regionaldata fungerer ikkje",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rÃ¥r sterkt til Ã¥ installera systempakkane som trengst for Ã¥ stÃ¸tta %s.",
 "Internet connection not working" => "Nettilkoplinga fungerer ikkje",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslÃ¥r at du slÃ¥ pÃ¥ nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "UtfÃ¸r Ã©i oppgÃ¥ve for kvar sidelasting",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk cron-tenesta til systemet. KÃ¸yr fila cron.php i ownCloud-mappa frÃ¥ ein cron-jobb pÃ¥ systemet ein gong i minuttet.",
 "Sharing" => "Deling",
 "Enable Share API" => "SlÃ¥ pÃ¥ API-et for deling",
 "Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper",
 "Security" => "Tryggleik",
 "Enforce HTTPS" => "Krev HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Krev at klientar koplar til ownCloud med ei kryptert tilkopling.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for Ã¥ slÃ¥ av/pÃ¥ SSL-handhevinga.",
 "Log" => "Logg",
 "Log level" => "Log nivÃ¥",
 "More" => "Meir",
@@ -109,3 +102,4 @@
 "set new password" => "lag nytt passord",
 "Default" => "Standard"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 34820d0349d2dd3d187f7777141e9d0cf825c16d..bcc8d2d0337ab656ac59191001f86430830c2939 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Pas possible de cargar la tiÃ¨ra dempuÃ¨i App Store",
 "Authentication error" => "Error d'autentificacion",
 "Group already exists" => "Lo grop existÃs ja",
@@ -25,7 +26,6 @@
 "Security Warning" => "Avertiment de securitat",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executa un prÃ¨tfach amb cada pagina cargada",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utiliza lo servici cron de ton sistÃ¨m operatiu. Executa lo fichiÃ¨r cron.php dins lo dorsier owncloud tras cronjob del sistÃ¨m cada minuta.",
 "Sharing" => "Al partejar",
 "Enable Share API" => "Activa API partejada",
 "Log" => "Jornal",
@@ -49,3 +49,4 @@
 "Other" => "Autres",
 "Username" => "Non d'usanciÃ¨r"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index d5f4f5a155e531666697b875cefd0f7d8cdeaf59..2c4990b285d021f0605d2df010b8c8ffec0c6971 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie moÅ¼na wczytaÄ‡ listy aplikacji",
 "Authentication error" => "BÅ‚Ä…d uwierzytelniania",
 "Your display name has been changed." => "Twoje wyÅ›wietlana nazwa zostaÅ‚a zmieniona.",
@@ -37,33 +38,28 @@
 "A valid password must be provided" => "NaleÅ¼y podaÄ‡ prawidÅ‚owe hasÅ‚o",
 "__language_name__" => "polski",
 "Security Warning" => "OstrzeÅ¼enie o zabezpieczeniach",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Katalog danych i twoje pliki sÄ… prawdopodobnie dostÄ™pne z Internetu. Plik .htaccess dostarczony przez ownCloud nie dziaÅ‚a. Zalecamy skonfigurowanie serwera internetowego w taki sposÃ³b, aby katalog z danymi nie byÅ‚ dostÄ™pny lub przeniesienie katalogu z danymi poza katalog gÅ‚Ã³wny serwera internetowego.",
 "Setup Warning" => "OstrzeÅ¼enia konfiguracji",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umoÅ¼liwiÄ‡ synchronizacjÄ™ plikÃ³w, poniewaÅ¼ interfejs WebDAV wydaje siÄ™ byÄ‡ uszkodzony.",
-"Please double check the <a href='%s'>installation guides</a>." => "SprawdÅº ponownie <a href='%s'>przewodniki instalacji</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "ProszÄ™ sprawdÅº ponownie <a href=\"%s\">przewodnik instalacji</a>.",
 "Module 'fileinfo' missing" => "Brak moduÅ‚u â€žfileinfoâ€",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak moduÅ‚u PHP â€žfileinfoâ€. Zalecamy wÅ‚Ä…czenie tego moduÅ‚u, aby uzyskaÄ‡ najlepsze wyniki podczas wykrywania typÃ³w MIME.",
 "Locale not working" => "Lokalizacja nie dziaÅ‚a",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ten serwer ownCloud nie moÅ¼e wÅ‚Ä…czyÄ‡ ustawieÅ„ regionalnych %s. MoÅ¼e to oznaczaÄ‡, Å¼e wystÄ…piÅ‚y problemy z niektÃ³rymi znakami w nazwach plikÃ³w. Zalecamy instalacjÄ™ wymaganych pakietÃ³w na tym systemie w celu wsparcia %s.",
 "Internet connection not working" => "PoÅ‚Ä…czenie internetowe nie dziaÅ‚a",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ten serwer OwnCloud nie ma dziaÅ‚ajÄ…cego poÅ‚Ä…czenia z Internetem. Oznacza to, Å¼e niektÃ³re z funkcji, takich jak montowanie zewnÄ™trznych zasobÃ³w, powiadomienia o aktualizacji lub instalacja dodatkowych aplikacji nie bÄ™dÄ… dziaÅ‚aÄ‡. DostÄ™p do plikÃ³w z zewnÄ…trz i wysyÅ‚anie powiadomieÅ„ e-mail moÅ¼e rÃ³wnieÅ¼ nie dziaÅ‚aÄ‡. Sugerujemy, aby wÅ‚Ä…czyÄ‡ poÅ‚Ä…czenie internetowe dla tego serwera, jeÅ›li chcesz korzystaÄ‡ ze wszystkich funkcji ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z kaÅ¼dÄ… wczytanÄ… stronÄ…",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php jest zarejestrowany w usÅ‚udze webcron. PrzywoÅ‚aj stronÄ™ cron.php w katalogu gÅ‚Ã³wnym ownCloud raz na minutÄ™ przez http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "UÅ¼yj systemowej usÅ‚ugi cron. PrzywoÅ‚aj plik cron.php z katalogu ownCloud przez systemowy cronjob raz na minutÄ™.",
 "Sharing" => "UdostÄ™pnianie",
 "Enable Share API" => "WÅ‚Ä…cz API udostÄ™pniania",
 "Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostÄ™pniania",
 "Allow links" => "Zezwalaj na odnoÅ›niki",
 "Allow users to share items to the public with links" => "Zezwalaj uÅ¼ytkownikom na publiczne wspÃ³Å‚dzielenie zasobÃ³w za pomocÄ… odnoÅ›nikÃ³w",
+"Allow public uploads" => "PozwÃ³l na  publiczne wczytywanie",
 "Allow resharing" => "Zezwalaj na ponowne udostÄ™pnianie",
 "Allow users to share items shared with them again" => "Zezwalaj uÅ¼ytkownikom na ponowne wspÃ³Å‚dzielenie zasobÃ³w juÅ¼ z nimi wspÃ³Å‚dzielonych",
 "Allow users to share with anyone" => "Zezwalaj uÅ¼ytkownikom na wspÃ³Å‚dzielenie z kimkolwiek",
 "Allow users to only share with users in their groups" => "Zezwalaj uÅ¼ytkownikom wspÃ³Å‚dzieliÄ‡ z uÅ¼ytkownikami ze swoich grup",
 "Security" => "BezpieczeÅ„stwo",
 "Enforce HTTPS" => "WymuÅ› HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Wymusza na klientach na Å‚Ä…czenie siÄ™ ownCloud za poÅ›rednictwem poÅ‚Ä…czenia szyfrowanego.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "ProszÄ™ poÅ‚Ä…cz siÄ™ do tej instancji ownCloud za poÅ›rednictwem protokoÅ‚u HTTPS, aby wÅ‚Ä…czyÄ‡ lub wyÅ‚Ä…czyÄ‡ stosowanie protokoÅ‚u SSL.",
+"Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na Å‚Ä…czenie siÄ™ %s za poÅ›rednictwem poÅ‚Ä…czenia szyfrowanego.",
 "Log" => "Logi",
 "Log level" => "Poziom logÃ³w",
 "More" => "WiÄ™cej",
@@ -111,3 +107,4 @@
 "set new password" => "ustaw nowe hasÅ‚o",
 "Default" => "DomyÅ›lny"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/pl_PL.php b/settings/l10n/pl_PL.php
index 7dcd2fdfae87ce1ef11202a4eab2c4acd05ddd4b..91ae517f236a1be1c734ba6a47d0f806ff0a9a95 100644
--- a/settings/l10n/pl_PL.php
+++ b/settings/l10n/pl_PL.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Update" => "Uaktualnienie",
 "Email" => "Email"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 9a900cbd5af9b5ab13f67d964c3d79aded795838..a46d6e22bde0d06b02a90ca6f4333b5afbf5e372 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "NÃ£o foi possÃvel carregar lista da App Store",
 "Authentication error" => "Erro de autenticaÃ§Ã£o",
 "Your display name has been changed." => "A exibiÃ§Ã£o de seu nome foi alterada.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "ForneÃ§a uma senha vÃ¡lida",
 "__language_name__" => "PortuguÃªs (Brasil)",
 "Security Warning" => "Aviso de SeguranÃ§a",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Seu diretÃ³rio de dados e seus arquivos estÃ£o, provavelmente, acessÃveis a partir da internet. O .htaccess que o ownCloud fornece nÃ£o estÃ¡ funcionando. NÃ³s sugerimos que vocÃª configure o seu servidor web de uma forma que o diretÃ³rio de dados esteja mais acessÃvel ou que vocÃª mova o diretÃ³rio de dados para fora da raiz do servidor web.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Seu diretÃ³rio de dados e seus arquivos sÃ£o, provavelmente, acessÃveis a partir da internet. O arquivo htaccess. nÃ£o estÃ¡ funcionando. NÃ³s sugerimos fortemente que vocÃª configure o seu servidor web de uma forma que o diretÃ³rio de dados nÃ£o esteja mais acessÃvel ou mova o diretÃ³rio de dados para fora do raiz do servidor.",
 "Setup Warning" => "Aviso de ConfiguraÃ§Ã£o",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web nÃ£o estÃ¡ configurado corretamente para permitir sincronizaÃ§Ã£o de arquivos porque a interface WebDAV parece nÃ£o estar funcionando.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira o <a href='%s'>guia de instalaÃ§Ã£o</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, verifique os <a href='%s'>guias de instalaÃ§Ã£o</a>.",
 "Module 'fileinfo' missing" => "MÃ³dulo 'fileinfo' faltando",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O mÃ³dulo PHP 'fileinfo' estÃ¡ faltando. Recomendamos que ative este mÃ³dulo para obter uma melhor detecÃ§Ã£o do tipo de mÃdia (mime-type).",
 "Locale not working" => "LocalizaÃ§Ã£o nÃ£o funcionando",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor ownCloud nÃ£o pode configurar a localizaÃ§Ã£o do sistema para %s.  Isto significa que pode haver problema com alguns caracteres nos nomes de arquivos.  NÃ³s recomendamos fortemente que vocÃª instale os pacotes requeridos em seu sistema para suportar %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "A localidade do sistema nÃ£o pode ser definida para %s. Isso significa que pode haver problemas com certos caracteres em nomes de arquivos. NÃ³s sugerimos  instalar os pacotes necessÃ¡rios no seu sistema para suportar %s.",
 "Internet connection not working" => "Sem conexÃ£o com a internet",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud nÃ£o tem conexÃ£o com a internet. Isto significa que alguns dos recursos como montar armazenamento externo, notificar atualizaÃ§Ãµes ou instalar aplicativos de terceiros nÃ£o funcionam. Acesso remoto a arquivos e envio de e-mails de notificaÃ§Ã£o podem tambÃ©m nÃ£o funcionar. Sugerimos que habilite a conexÃ£o com a internet neste servidor se quiser usufruir de todos os recursos do ownCloud.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor nÃ£o tem conexÃ£o com a internet. Isso significa que algumas das caracterÃsticas como a montagem de armazenamento externo, notificaÃ§Ãµes sobre atualizaÃ§Ãµes ou instalaÃ§Ã£o de aplicativos de 3Âºs terceiros nÃ£o funcionam. Acessar arquivos remotamente e envio de e-mails de notificaÃ§Ã£o tambÃ©m nÃ£o podem funcionar. Sugerimos permitir conexÃ£o com a internet para esse servidor, se vocÃª deseja ter todas as funcionalidades.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Execute uma tarefa com cada pÃ¡gina carregada",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php estÃ¡ registrado no serviÃ§o webcron. Chame a pÃ¡gina cron.php na raÃz do owncloud a cada minuto por http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar serviÃ§o de cron do sistema. Chama o arquivo cron.php na pasta owncloud via cronjob do sistema a cada minuto.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php estÃ¡ registrado em um serviÃ§o webcron chamar cron.php uma vez por minuto usando http.",
+"Use systems cron service to call the cron.php file once a minute." => "Utilizar sistema de serviÃ§os cron para chamar o arquivo cron.php uma vez por minuto.",
 "Sharing" => "Compartilhamento",
 "Enable Share API" => "Habilitar API de Compartilhamento",
 "Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
 "Allow links" => "Permitir links",
 "Allow users to share items to the public with links" => "Permitir que usuÃ¡rios compartilhem itens com o pÃºblico usando links",
+"Allow public uploads" => "Permitir envio pÃºblico",
+"Allow users to enable others to upload into their publicly shared folders" => "Permitir que usuÃ¡rios deem permissÃ£o a outros para enviarem arquivios para suas pastas compartilhadas publicamente",
 "Allow resharing" => "Permitir recompartilhamento",
 "Allow users to share items shared with them again" => "Permitir que usuÃ¡rios compartilhem novamente itens compartilhados com eles",
 "Allow users to share with anyone" => "Permitir que usuÃ¡rios compartilhem com qualquer um",
 "Allow users to only share with users in their groups" => "Permitir que usuÃ¡rios compartilhem somente com usuÃ¡rios em seus grupos",
 "Security" => "SeguranÃ§a",
 "Enforce HTTPS" => "ForÃ§ar HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "ForÃ§a o cliente a conectar-se ao ownCloud por uma conexÃ£o criptografada.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor, conecte-se a esta instÃ¢ncia do ownCloud via HTTPS para habilitar ou desabilitar 'ForÃ§ar SSL'.",
+"Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s atravÃ©s de uma conexÃ£o criptografada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, se conectar ao seu %s via HTTPS para forÃ§ar ativar ou desativar SSL.",
 "Log" => "Registro",
 "Log level" => "NÃvel de registro",
 "More" => "Mais",
@@ -98,6 +101,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use esse endereÃ§o para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>",
 "Login Name" => "Nome de Login",
 "Create" => "Criar",
 "Admin Recovery Password" => "RecuperaÃ§Ã£o da Senha do Administrador",
@@ -111,3 +115,4 @@
 "set new password" => "definir nova senha",
 "Default" => "PadrÃ£o"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 1390cd16be5301dbcbca343f39cc2e4aae892ae1..84d70b6ae7e7e0763ae6e424be10a8ad13933c33 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro na autenticaÃ§Ã£o",
 "Your display name has been changed." => "O seu nome foi alterado",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Uma password vÃ¡lida deve ser fornecida",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Aviso de SeguranÃ§a",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "A sua pasta com os dados e os seus ficheiros estÃ£o provavelmente acessÃveis a partir das internet. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessÃvel, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "A sua pasta com os dados e os seus ficheiros estÃ£o provavelmente acessÃveis a partir das internet. O seu ficheiro .htaccess nÃ£o estÃ¡ a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessÃvel, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
 "Setup Warning" => "Aviso de setup",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web nÃ£o estÃ¡ configurado correctamente para autorizar sincronizaÃ§Ã£o de ficheiros, pois o interface WebDAV parece estar com problemas.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor verifique o<a href='%s'>Guia de instalaÃ§Ã£o</a>.",
 "Module 'fileinfo' missing" => "Falta o mÃ³dulo 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O MÃ³dulo PHP 'fileinfo' nÃ£o se encontra instalado/activado. Ã‰ fortemente recomendado que active este mÃ³dulo para obter os melhores resultado com a detecÃ§Ã£o dos tipos de mime.",
 "Locale not working" => "InternacionalizaÃ§Ã£o nÃ£o estÃ¡ a funcionar",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor de ownCloud nÃ£o consegue definir a codificaÃ§Ã£o de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. Ã‰ fortemente recomendado que instale o pacote recomendado para ser possÃvel ver caracteres codificados em %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Este servidor de ownCloud nÃ£o consegue definir a codificaÃ§Ã£o de caracteres para %s. Isto significa que pode haver problemas com alguns caracteres nos nomes dos ficheiros. Ã‰ fortemente recomendado que instale o pacote recomendado para ser possÃvel ver caracteres codificados em %s.",
 "Internet connection not working" => "A ligaÃ§Ã£o Ã  internet nÃ£o estÃ¡ a funcionar",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud nÃ£o tem uma ligaÃ§Ã£o de internet funcional. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificaÃ§Ãµes sobre actualizÃ§Ãµes, ou a instalaÃ§Ã£o de aplicaÃ§Ãµes nÃ£o irÃ¡ funcionar. Sugerimos que active uma ligaÃ§Ã£o Ã  internet se pretende obter todas as funcionalidades do ownCloud.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor ownCloud nÃ£o tem uma ligaÃ§Ã£o de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificaÃ§Ãµes sobre actualizÃ§Ãµes, ou a instalaÃ§Ã£o de aplicaÃ§Ãµes nÃ£o irÃ¡ funcionar. Sugerimos que active uma ligaÃ§Ã£o Ã  internet se pretender obter todas as funcionalidades do ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executar uma tarefa com cada pÃ¡gina carregada",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php estÃ¡ registado como um serviÃ§o webcron. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar o serviÃ§o cron do sistema. Aceda a pagina cron.php que se encontra na raiz do ownCloud uma vez por minuto utilizando o seu browser.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php estÃ¡ registado num serviÃ§o webcron para chamar a pÃ¡gina cron.php por http uma vez por minuto.",
+"Use systems cron service to call the cron.php file once a minute." => "Use o serviÃ§o cron do sistema para chamar o ficheiro cron.php uma vez por minuto.",
 "Sharing" => "Partilha",
 "Enable Share API" => "Activar a API de partilha",
 "Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
 "Allow links" => "Permitir links",
 "Allow users to share items to the public with links" => "Permitir que os utilizadores partilhem itens com o pÃºblico utilizando um link.",
+"Allow public uploads" => "Permitir Envios PÃºblicos",
+"Allow users to enable others to upload into their publicly shared folders" => "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas",
 "Allow resharing" => "Permitir repartilha",
 "Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens partilhados com eles",
 "Allow users to share with anyone" => "Permitir que os utilizadores partilhem com todos",
 "Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
 "Security" => "SeguranÃ§a",
 "Enforce HTTPS" => "ForÃ§ar HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "ForÃ§ar clientes a ligar atravÃ©s de uma ligaÃ§Ã£o encriptada",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor ligue-se ao ownCloud atravÃ©s de uma ligaÃ§Ã£o HTTPS para ligar/desligar o forÃ§ar da ligaÃ§Ã£o por SSL",
+"Forces the clients to connect to %s via an encrypted connection." => "ForÃ§ar os clientes a ligar a %s atravÃ©s de uma ligaÃ§Ã£o encriptada",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor ligue-se a %s atravÃ©s de uma ligaÃ§Ã£o HTTPS para ligar/desligar o uso de ligaÃ§Ã£o por SSL",
 "Log" => "Registo",
 "Log level" => "NÃvel do registo",
 "More" => "Mais",
@@ -98,6 +101,7 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereÃ§o para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
@@ -111,3 +115,4 @@
 "set new password" => "definir nova palavra-passe",
 "Default" => "PadrÃ£o"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 5fced879701a526172122b8ff00f01ea0b478fc2..0b30001e8c1030e1ee60e2273dd53e442a6e165c 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposibil de actualizat lista din  App Store.",
 "Authentication error" => "Eroare la autentificare",
 "Your display name has been changed." => "Numele afiÅŸat a fost schimbat.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "Trebuie sÄƒ furnizaÅ£i o parolÄƒ validÄƒ",
 "__language_name__" => "_language_name_",
 "Security Warning" => "Avertisment de securitate",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Directorul tÄƒu de date È™i fiÈ™ierele tale probabil sunt accesibile prin internet. FiÈ™ierul .htaccess oferit de ownCloud nu funcÈ›ioneazÄƒ. ÃŽÈ›i recomandÄƒm sÄƒ configurezi server-ul tÄƒu web Ã®ntr-un mod Ã®n care directorul de date sÄƒ nu mai fie accesibil sau mutÄƒ directorul de date Ã®n afara directorului root al server-ului web.",
 "Setup Warning" => "AtenÅ£ie la implementare",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este Ã®ncÄƒ setat corespunzÄƒtor pentru a permite sincronizarea fiÈ™ierelor deoarece interfaÈ›a WebDAV pare a fi Ã®ntreruptÄƒ.",
-"Please double check the <a href='%s'>installation guides</a>." => "VÄƒ rugÄƒm sÄƒ verificaÈ›i <a href='%s'>ghiduri de instalare</ a>.",
 "Module 'fileinfo' missing" => "Modulul \"Fileinfo\" lipseÈ™te",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Modulul PHP \"Fileinfo\" lipseÈ™te. Va recomandam sa activaÅ£i acest modul pentru a obÈ›ine cele mai bune rezultate cu detectarea mime-type.",
 "Locale not working" => "Localizarea nu funcÈ›ioneazÄƒ",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Acest server ownCloud nu poate seta sistemul de localizare pentru% s. Acest lucru Ã®nseamnÄƒ cÄƒ ar putea exista probleme cu anumite caractere Ã®n numele de fiÈ™iere. VÄƒ recomandÄƒm sÄƒ instalaÈ›i pachetele necesare pe sistemul dumneavoastrÄƒ pentru a sprijini% s.",
 "Internet connection not working" => "Conexiunea la internet nu funcÈ›ioneazÄƒ",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Acest server ownCloud nu are nici o conexiune la internet activÄƒ. Acest lucru Ã®nseamnÄƒ cÄƒ anumite caracteristici, cum ar fi montarea mediilor de stocare externe, notificÄƒri despre actualizÄƒri sau instalarea de aplicatii tereÅ£e nu funcÈ›ioneazÄƒ. Accesarea fiÈ™ierelor de la distanÈ›Äƒ È™i trimiterea de e-mailuri de notificare s-ar putea, de asemenea, sÄƒ nu funcÈ›ioneze. VÄƒ sugerÄƒm sÄƒ permiteÅ£i conectarea la Internet pentru acest server, dacÄƒ doriÈ›i sÄƒ aveÈ›i toate caracteristicile de oferite de ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "ExecutÄƒ o sarcinÄƒ la fiecare paginÄƒ Ã®ncÄƒrcatÄƒ",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php este Ã®nregistrat Ã®n serviciul webcron. AcceseazÄƒ pagina cron.php din root-ul owncloud odatÄƒ pe minut prin http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "FoloseÈ™te serviciul cron al sistemului. AcceseazÄƒ fiÈ™ierul cron.php din directorul owncloud printr-un cronjob de sistem odatÄƒ la fiecare minut.",
 "Sharing" => "Partajare",
 "Enable Share API" => "Activare API partajare",
 "Allow apps to use the Share API" => "Permite aplicaÈ›iilor sÄƒ foloseascÄƒ API-ul de partajare",
@@ -101,3 +96,4 @@
 "Storage" => "Stocare",
 "Default" => "ImplicitÄƒ"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index d2c9425c7aac2a18b1d44b355bf6716bccd3761d..c58fafbf27a566f115740f1a46486a0287c578ab 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¸Ð· App Store",
 "Authentication error" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸",
 "Your display name has been changed." => "Ð’Ð°ÑˆÐµ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ Ð±Ñ‹Ð»Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Ð£ÐºÐ°Ð¶Ð¸Ñ‚Ðµ Ð²Ð°Ð»Ð¸Ð´Ð½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ",
 "__language_name__" => "Ð ÑƒÑÑÐºÐ¸Ð¹ ",
 "Security Warning" => "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ð’Ð°Ñˆ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð¸ Ñ„Ð°Ð¹Ð»Ñ‹, Ð²ÐµÑ€Ð¾ÑÑ‚Ð½Ð¾, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð¸Ð· Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð°. Ð¤Ð°Ð¹Ð» .htaccess, Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÑÐµÐ¼Ñ‹Ð¹ ownCloud, Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚. ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¸Ð¼ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð±Ñ‹Ð»Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹, Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚ÑŒ Ð¸Ñ… Ð·Ð° Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‹ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð³Ð¾ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€Ð°.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ, Ñ‡Ñ‚Ð¾ Ð¿Ð°Ð¿ÐºÐ° Ñ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð¸ Ð’Ð°ÑˆÐ¸ Ñ„Ð°Ð¹Ð»Ñ‹ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹ Ð¸Ð· Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð°. Ð¤Ð°Ð¹Ð» .htaccess Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚. ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð¾ Ð¿Ñ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼ Ð’Ð°Ð¼ ÑÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²ÐµÐ±ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¸Ð¼ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð°Ð¿ÐºÐ° Ñ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ Ð±Ñ‹Ð»Ð° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð° Ð¸Ð»Ð¸ Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚Ðµ Ð¿Ð°Ð¿ÐºÑƒ Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ ÐºÑƒÐ´Ð°-Ð½Ð¸Ð±ÑƒÐ´ÑŒ Ð² Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ð¼ÐµÑÑ‚Ð¾ Ð²Ð½Ðµ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² Ð²ÐµÐ±ÑÐµÑ€Ð²ÐµÑ€Ð°.",
 "Setup Warning" => "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð¾ ÑÐ¸Ñ… Ð¿Ð¾Ñ€ Ð½Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½ Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð². ÐŸÐ¾Ñ…Ð¾Ð¶Ðµ Ñ‡Ñ‚Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð² Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾ÑÑ‚Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ° WebDAV.",
-"Please double check the <a href='%s'>installation guides</a>." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ <a href='%s'>Ð¸Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ð¸ Ð¿Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ <a href='%s'>Ð¸Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ð¸ Ð¿Ð¾ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ</a>.",
 "Module 'fileinfo' missing" => "ÐœÐ¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP Ð¼Ð¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚. ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð´Ð»Ñ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñ‚Ð¸Ð¿Ð¾Ð² (mime-type) Ñ„Ð°Ð¹Ð»Ð¾Ð².",
 "Locale not working" => "Ð›Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ÐÑ‚Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ·Ñ‹Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð½Ð° %s. ÐÑ‚Ð¾ Ð¾Ð·Ð½Ð°Ñ‡Ð°ÐµÑ‚, Ñ‡Ñ‚Ð¾ Ð¼Ð¾Ð³ÑƒÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼Ð¸ Ð² Ð¸Ð¼ÐµÐ½Ð°Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð². ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð² Ð²Ð°ÑˆÐµÐ¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ ÑÐ·Ñ‹Ðº Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð² %s. ÐÑ‚Ð¾ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ Ð¼Ð¾Ð³ÑƒÑ‚ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½ÑƒÑ‚ÑŒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼Ð¸ Ð² Ð¸Ð¼ÐµÐ½Ð°Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð². ÐœÑ‹ Ð½Ð°ÑÑ‚Ð¾Ð¹Ñ‡Ð¸Ð²Ð¾ Ð¿Ñ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ðµ Ð¿Ð°ÐºÐµÑ‚Ñ‹ Ð² Ð’Ð°ÑˆÐµÐ¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¸ %s.",
 "Internet connection not working" => "Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ÐÑ‚Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ³Ð¾ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ. ÐÑ‚Ð¾ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€: Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»ÐµÐ¹, ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÑ…, ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÑ‚Ð¾Ñ€Ð¾Ð½Ð½Ð¸Ñ… Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "ÐÑ‚Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€ Ð½Ðµ Ð¸Ð¼ÐµÐµÑ‚ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ‚Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚. ÐÑ‚Ð¾ Ð·Ð½Ð°Ñ‡Ð¸Ñ‚, Ñ‡Ñ‚Ð¾ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸, Ñ‚Ð°ÐºÐ¸Ðµ ÐºÐ°Ðº Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… Ð´Ð¸ÑÐºÐ¾Ð², ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÑ… Ð¸Ð»Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ° ÑÑ‚Ð¾Ñ€Ð¾Ð½Ð½Ð¸Ñ… Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ â€“ Ð½Ðµ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÑŽÑ‚. Ð£Ð´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼ Ð¸ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ° ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ Ð¿Ð¾ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ðµ Ð²ÐµÑ€Ð¾ÑÑ‚Ð½ÐµÐµ Ð²ÑÐµÐ³Ð¾ Ñ‚Ð¾Ð¶Ðµ Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÑ€ÐµÐ´Ð»Ð°Ð³Ð°ÐµÐ¼ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð¾Ð¼ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°, ÐµÑÐ»Ð¸ Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸Ð¼ÐµÑ‚ÑŒ Ð²ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸.",
 "Cron" => "ÐŸÐ»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ñ‰Ð¸Ðº Ð·Ð°Ð´Ð°Ñ‡ Ð¿Ð¾ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸ÑŽ",
 "Execute one task with each page loaded" => "Ð’Ñ‹Ð¿Ð¾Ð»Ð½ÑÑ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð·Ð°Ð´Ð°Ð½Ð¸Ðµ Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†ÐµÐ¹",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Ð—Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ cron.php Ð² ÑÐ»ÑƒÐ¶Ð±Ðµ webcron ÑÐµÑ€Ð²Ð¸ÑÐµ. Ð’Ñ‹Ð·Ñ‹Ð²Ð°ÐµÑ‚ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ cron.php Ð² ÐºÐ¾Ñ€Ð½Ðµ owncloud Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ñ‡ÐµÑ€ÐµÐ· http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½ÑƒÑŽ ÑÐ»ÑƒÐ¶Ð±Ñƒ cron. Ð’Ñ‹Ð·Ð¾Ð² Ñ„Ð°Ð¹Ð»Ð° cron.php Ð² Ð¿Ð°Ð¿ÐºÐµ owncloud Ñ‡ÐµÑ€ÐµÐ· ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ cronjob Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ð² ÑÐµÑ€Ð²Ð¸ÑÐµ webcron, Ñ‡Ñ‚Ð¾Ð±Ñ‹ cron.php Ð²Ñ‹Ð·Ñ‹Ð²Ð°Ð»ÑÑ Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ http.",
+"Use systems cron service to call the cron.php file once a minute." => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²Ð¸Ñ cron Ð´Ð»Ñ Ð²Ñ‹Ð·Ð¾Ð²Ð° cron.php Ñ€Ð°Ð· Ð² Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ.",
 "Sharing" => "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿",
 "Enable Share API" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ API Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°",
 "Allow apps to use the Share API" => "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ API Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°",
 "Allow links" => "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ ÑÑÑ‹Ð»ÐºÐ¸",
 "Allow users to share items to the public with links" => "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð² Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ ÑÐ»ÐµÐ¼ÐµÐ½Ñ‚Ñ‹ Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¹ ÑÑÑ‹Ð»ÐºÐ¾Ð¹",
+"Allow public uploads" => "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
+"Allow users to enable others to upload into their publicly shared folders" => "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÑ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Ð² Ð¸Ñ… Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð¿Ð°Ð¿ÐºÐ¸",
 "Allow resharing" => "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ðµ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°",
 "Allow users to share items shared with them again" => "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¾Ñ‚ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÐ»Ð»ÐµÐ¼ÐµÐ½Ñ‚Ð°Ð¼ ÑƒÐ¶Ðµ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ Ð² Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿",
 "Allow users to share with anyone" => "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð»ÑŽÐ±Ð¾Ð¼Ñƒ",
 "Allow users to only share with users in their groups" => "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸Ñ… Ð³Ñ€ÑƒÐ¿Ð¿",
 "Security" => "Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ",
 "Enforce HTTPS" => "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÑŒ Ðº HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº ownCloud Ñ‡ÐµÑ€ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÑ‚Ð¾Ð¼Ñƒ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ€Ñƒ ownCloud Ñ‡ÐµÑ€ÐµÐ· HTTPS Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ SSL Ð¿Ñ€Ð¸Ð½ÑƒÐ¶Ð´ÐµÐ½Ð¸Ñ.",
+"Forces the clients to connect to %s via an encrypted connection." => "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ðº %s Ñ‡ÐµÑ€ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÐµÑÑŒ Ðº %s Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ HTTPS Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ SSL.",
 "Log" => "Ð›Ð¾Ð³",
 "Log level" => "Ð£Ñ€Ð¾Ð²ÐµÐ½ÑŒ Ð»Ð¾Ð³Ð°",
 "More" => "Ð‘Ð¾Ð»ÑŒÑˆÐµ",
@@ -98,6 +101,7 @@
 "Language" => "Ð¯Ð·Ñ‹Ðº",
 "Help translate" => "ÐŸÐ¾Ð¼Ð¾Ñ‡ÑŒ Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÑ‚Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑ Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð²Ð°ÑˆÐ¸Ð¼ Ñ„Ð°Ð¹Ð»Ð°Ð¼ Ñ‡ÐµÑ€ÐµÐ· WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">",
 "Login Name" => "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
 "Create" => "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ",
 "Admin Recovery Password" => "Ð’Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ÐŸÐ°Ñ€Ð¾Ð»Ñ ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°",
@@ -111,3 +115,4 @@
 "set new password" => "ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ",
 "Default" => "ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 );
+$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);";
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index d80f7b087347d87c7be7cb79c54d5ac8ed6525c6..87b0ec1181291f2c1d6672b808d4639197b943c2 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "ÐžÑˆÐ¸Ð±ÐºÐ°",
 "Saving..." => "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ",
 "deleted" => "ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾",
@@ -7,3 +8,4 @@
 "Email" => "Email",
 "Other" => "Ð”Ñ€ÑƒÐ³Ð¾Ðµ"
 );
+$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);";
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 5fa1eaf5f43cc2f86c5d7169799f796cf13f387e..374990a2c0c926071a8890b530afdd120ab52923 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Authentication error" => "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶± à¶¯à·à·‚à¶ºà¶šà·Š",
 "Group already exists" => "à¶šà¶«à·Šà¶©à·à¶ºà¶¸ à¶¯à·à¶±à¶§à¶¸à¶à·Š à¶à·’à¶¶à·š",
 "Unable to add group" => "à¶šà·à¶«à¶©à¶ºà¶šà·Š à¶‘à¶šà·Š à¶šà·… à¶±à·œà·„à·à¶šà·’ à·€à·’à¶º",
@@ -20,7 +21,6 @@
 "Group Admin" => "à¶šà·à¶«à·Šà¶© à¶´à¶»à·’à¶´à·à¶½à¶š",
 "Delete" => "à¶¸à¶šà· à¶¯à¶¸à¶±à·Šà¶±",
 "Security Warning" => "à¶†à¶»à¶šà·Šà·‚à¶š à¶±à·’à·€à·šà¶¯à¶±à¶ºà¶šà·Š",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "à¶”à¶¶à¶œà·š à¶¯à¶à·Šà¶ à¶©à·’à¶»à·™à¶šà·Šà¶§à¶»à·’à¶º à·„à· à¶œà·œà¶±à·”à·€à¶½à¶§ à¶…à¶±à·Šà¶à¶»à·Šà¶¢à·à¶½à¶ºà·™à¶±à·Š à¶´à·’à·€à·’à·ƒà·’à¶º à·„à·à¶š. ownCloud à·ƒà¶´à¶ºà· à¶‡à¶à·’ .htaccess à¶œà·œà¶±à·”à·€ à¶šà·Šâ€à¶»à·’à¶ºà·à¶šà¶»à¶±à·Šà¶±à·š à¶±à·à¶. à¶…à¶´à·’ à¶à¶»à¶ºà·š à¶šà·’à¶ºà· à·ƒà·’à¶§à·’à¶±à·”à¶ºà·š à¶±à¶¸à·Š, à¶¸à·™à¶¸ à¶¯à¶à·Šà¶ à·„à· à¶œà·œà¶±à·” à¶‘à·ƒà·š à¶´à·’à·€à·’à·ƒà·“à¶¸à¶§ à¶±à·œà·„à·à¶šà·’ à·€à¶± à¶½à·™à·ƒ à¶”à¶¶à·š à·€à·™à¶¶à·Š à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà·  à·€à·’à¶±à·Šâ€à¶ºà·à·ƒ à¶šà¶»à¶± à¶½à·™à·ƒ à·„à· à¶‘à¶¸ à¶©à·’à¶»à·™à¶šà·Šà¶§à¶»à·’à¶º à·€à·™à¶¶à·Š à¶¸à·–à¶½à¶ºà·™à¶±à·Š à¶´à·’à¶§à¶à¶§ à¶œà·™à¶±à¶ºà¶± à¶½à·™à·ƒà¶º.",
 "Sharing" => "à·„à·”à·€à¶¸à·à¶»à·” à¶šà·’à¶»à·“à¶¸",
 "Allow links" => "à¶ºà·œà¶¸à·” à·ƒà¶½à·ƒà¶±à·Šà¶±",
 "Allow resharing" => "à¶ºà·…à·’ à¶ºà·…à·’à¶à·Š à·„à·”à·€à¶¸à·à¶»à·”à·€à¶§ à¶…à·€à·ƒà¶» à¶¯à·™à¶¸à·’",
@@ -50,3 +50,4 @@
 "Other" => "à·€à·™à¶±à¶à·Š",
 "Username" => "à¶´à¶»à·’à·à·“à¶½à¶š à¶±à¶¸"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index b829371b35f701faad7a7eddea197169dcfd0171..ad602ee860f58d71cbc033355bec96261932ba23 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie je moÅ¾nÃ© nahraÅ¥ zoznam z App Store",
 "Authentication error" => "Chyba autentifikÃ¡cie",
 "Your display name has been changed." => "VaÅ¡e zobrazovanÃ© meno bolo zmenenÃ©.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "MusÃte zadaÅ¥ platnÃ© heslo",
 "__language_name__" => "Slovensky",
 "Security Warning" => "BezpeÄnostnÃ© varovanie",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "VÃ¡Å¡ prieÄinok s dÃ¡tami a VaÅ¡e sÃºbory sÃº pravdepodobne dostupnÃ© z internetu. .htaccess sÃºbor dodÃ¡vanÃ½ s inÅ¡talÃ¡ciou ownCloud nespÄºÅˆa Ãºlohu. DÃ´razne VÃ¡m doporuÄujeme nakonfigurovaÅ¥ webserver takÃ½m spÃ´sobom, aby dÃ¡ta v prieÄinku neboli verejnÃ©, alebo presuÅˆte dÃ¡ta mimo Å¡truktÃºry prieÄinkov webservera.",
 "Setup Warning" => "Nastavenia oznÃ¡menÃ",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "VÃ¡Å¡ webovÃ½ server nie je sprÃ¡vne nastavenÃ½ na synchronizÃ¡ciu, pretoÅ¾e rozhranie WebDAV je poÅ¡kodenÃ©.",
-"Please double check the <a href='%s'>installation guides</a>." => "ProsÃm skontrolujte <a href='%s'>inÅ¡talaÄnÃº prÃruÄku</a>.",
 "Module 'fileinfo' missing" => "ChÃ½ba modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ChÃ½ba modul 'fileinfo'. DÃ´razne doporuÄujeme ho povoliÅ¥ pre dosiahnutie najlepÅ¡Ãch vÃ½sledkov zisÅ¥ovania mime-typu.",
 "Locale not working" => "LokalizÃ¡cia nefunguje",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Tento server ownCloud nemÃ´Å¾e nastaviÅ¥ nÃ¡rodnÃ© prostredie systÃ©mu na %s. To znamenÃ¡, Å¾e by mohli byÅ¥ problÃ©my s niektorÃ½mi znakmi v nÃ¡zvoch sÃºborov. VeÄ¾mi odporÃºÄame nainÅ¡talovaÅ¥ poÅ¾adovanÃ© balÃky na podporu %s.",
 "Internet connection not working" => "Pripojenie na internet nefunguje",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Tento server ownCloud nemÃ¡ funkÄnÃ© pripojenie k internetu. To znamenÃ¡, Å¾e niektorÃ© z funkciÃ, ako je pripojenie externÃ©ho ÃºloÅ¾iska, oznÃ¡menia o aktualizÃ¡ciÃ¡ch Äi inÅ¡talÃ¡cia aplikÃ¡ciÃ tretÃch strÃ¡n nefungujÃº. PrÃstup k sÃºborom zo vzdialenÃ½ch miest a odosielanie oznamovacÃch e-mailov tieÅ¾ nemusÃ fungovaÅ¥. OdporÃºÄame pripojiÅ¥ tento server  k internetu, ak chcete vyuÅ¾ÃvaÅ¥ vÅ¡etky vlastnosti ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "VykonaÅ¥ jednu Ãºlohu s kaÅ¾dÃ½m naÄÃtanÃ strÃ¡nky",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php je registrovanÃ¡ u sluÅ¾by webcron. ZavolÃ¡ cron.php strÃ¡nku v koreÅˆovom prieÄinku owncloud raz za minÃºtu cez protokol HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "PouÅ¾ÃvaÅ¥ systÃ©movÃº sluÅ¾bu cron. ZavolaÅ¥ cron.php v prieÄinku owncloud cez systÃ©movÃº Ãºlohu raz za minÃºtu",
 "Sharing" => "ZdieÄ¾anie",
 "Enable Share API" => "PovoliÅ¥ API zdieÄ¾ania",
 "Allow apps to use the Share API" => "PovoliÅ¥ aplikÃ¡ciÃ¡m pouÅ¾ÃvaÅ¥ API na zdieÄ¾anie",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "PovoliÅ¥ pouÅ¾ÃvateÄ¾om zdieÄ¾aÅ¥ len s pouÅ¾ÃvateÄ¾mi v ich skupinÃ¡ch",
 "Security" => "ZabezpeÄenie",
 "Enforce HTTPS" => "VynÃºtiÅ¥ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "VynÃºti pripojovanie klientov ownCloud cez Å¡ifrovanÃ© pripojenie.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k tejto inÅ¡tancii ownCloud cez HTTPS pre povolenie alebo zakÃ¡zanie vynÃºtenia SSL.",
 "Log" => "ZÃ¡znam",
 "Log level" => "ÃšroveÅˆ zÃ¡znamu",
 "More" => "Viac",
@@ -98,6 +91,7 @@
 "Language" => "Jazyk",
 "Help translate" => "PomÃ´cÅ¥ s prekladom",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "PouÅ¾ite tÃºto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prÃstup k sÃºborom cez WebDAV</a>",
 "Login Name" => "Prihlasovacie meno",
 "Create" => "VytvoriÅ¥",
 "Admin Recovery Password" => "Obnovenie hesla administrÃ¡tora",
@@ -111,3 +105,4 @@
 "set new password" => "nastaviÅ¥ novÃ© heslo",
 "Default" => "PredvolenÃ©"
 );
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index f9b6942b97ef7e7568db84e52d20731ea19cbcd6..5ad921201b6d5f45aed584598e409e452095a617 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ni mogoÄe naloÅ¾iti seznama iz programskega srediÅ¡Äa",
 "Authentication error" => "Napaka med overjanjem",
 "Your display name has been changed." => "Prikazano ime je bilo spremenjeno.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "Navedeno mora biti veljavno geslo",
 "__language_name__" => "SlovenÅ¡Äina",
 "Security Warning" => "Varnostno opozorilo",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogoÄen vsem uporabnikom na omreÅ¾ju. Datoteka .htaccess, vkljuÄena v ownCloud, namreÄ ni ustrezno nastavljena. PriporoÄljivo je nastaviti spletni streÅ¾nik tako, da mapa podatkov ne bo javno dostopna, ali pa, da jo prestavite v podrejeno mapo korenske mape spletnega streÅ¾nika.",
 "Setup Warning" => "Opozorilo nastavitve",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni straÅ¾nik Å¡e ni ustrezno nastavljen in ne omogoÄa usklajevanja, saj je nastavitev WebDAV okvarjena.",
-"Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "Module 'fileinfo' missing" => "Manjka modul 'fileinfo'.",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Manjka modul PHP 'fileinfo'. PriporoÄljivo je omogoÄiti ta modul za popolno zaznavanje vrst MIME.",
 "Locale not working" => "Jezikovne prilagoditve ne delujejo.",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Na streÅ¾niku ownCloud ni mogoÄe nastaviti jezikovnih doloÄil na jezik %s. Najverjetneje so teÅ¾ave s posebnimi znaki v imenih datotek. PriporoÄljivo je namestiti zahtevane pakete za podporo jeziku %s.",
 "Internet connection not working" => "Internetna povezava ne deluje.",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "StreÅ¾nik ownCloud je brez delujoÄe internetne povezave. To pomeni, da bodo nekatere moÅ¾nosti onemogoÄene. Ne bo mogoÄe priklapljati zunanjih priklopnih toÄk, ne bo obvestil o posodobitvah ali namestitvah programske opreme, prav tako najverjetneje ne bo mogoÄe poÅ¡iljati obvestilnih sporoÄil preko elektronske poÅ¡te. Za uporabo vseh zmoÅ¾nosti oblaka ownCloud, mora biti internetna povezava vzpostavljena in delujoÄa.",
 "Cron" => "PeriodiÄno opravilo",
 "Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloÅ¾eno stranjo.",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je vpisana pri storitvi webcron. Preko protokola HTTP je datoteka cron.php, ki se nahaja v korenski mapi ownCloud, klicana enkrat na minuto.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporaba sistemske storitve cron. Preko sistemskega posla cron je datoteka cron.php, ki se nahaja v mapi ownCloud, klicana enkrat na minuto.",
 "Sharing" => "Souporaba",
 "Enable Share API" => "OmogoÄi API souporabe",
 "Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine",
 "Security" => "Varnost",
 "Enforce HTTPS" => "Zahtevaj uporabo HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Zahtevaj Å¡ifrirano povezovanje odjemalcev v oblak ownCloud",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Prijava mora biti vzpostavljena z uporabo protokola HTTPS za omogoÄanje Å¡ifriranja SSL.",
 "Log" => "Dnevnik",
 "Log level" => "Raven beleÅ¾enja",
 "More" => "VeÄ",
@@ -111,3 +104,4 @@
 "set new password" => "nastavi novo geslo",
 "Default" => "Privzeto"
 );
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index c81e58e2fa09280fda68306c3292171862329dcc..1a8b588c0bdc77e337a4b44a7540204bb9679caa 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,11 +1,11 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Authentication error" => "Veprim i gabuar gjatÃ« vÃ«rtetimit tÃ« identitetit",
 "Error" => "Veprim i gabuar",
 "undo" => "anulo",
 "Delete" => "Elimino",
 "Security Warning" => "ParalajmÃ«rim sigurie",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk Ã«shtÃ« konfiguruar akoma pÃ«r tÃ« lejuar sinkronizimin e skedarÃ«ve sepse ndÃ«rfaqja WebDAV mund tÃ« jetÃ« e dÃ«mtuar.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirÃ« <a href='%s'>shoqÃ«ruesin e instalimit</a>.",
 "Update" => "Azhurno",
 "Get the apps to sync your files" => "Merrni app-et pÃ«r sinkronizimin e skedarÃ«ve tuaj",
 "Password" => "Kodi",
@@ -13,3 +13,4 @@
 "Email" => "Email-i",
 "Username" => "PÃ«rdoruesi"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 1d1bcdddf5f0599b54b8442bf7d401600c76d024..b2b6538c4c3ae8f8990d5e9a9fdc33638a52c947 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸Ð»Ð¸ÐºÐ¾Ð¼ ÑƒÑ‡Ð¸Ñ‚Ð°Ð²Ð°ÑšÐ° ÑÐ¿Ð¸ÑÐºÐ° Ð¸Ð· Ð¡ÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ð° ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð°",
 "Authentication error" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°",
 "Unable to change display name" => "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ð¼ Ð¸Ð¼Ðµ Ð·Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð·",
@@ -36,10 +37,8 @@
 "A valid password must be provided" => "ÐœÐ¾Ñ€Ð°Ñ‚Ðµ ÑƒÐ½ÐµÑ‚Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ñƒ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ÑÐ½Ð¾ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ ÑÑƒ Ð²Ð°ÑˆÐ¸ Ð¿Ð¾Ð´Ð°Ñ†Ð¸ Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ðµ ÑÐ° Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ð°. Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° .htaccess ÐºÐ¾Ñ˜Ñƒ Ñ˜Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ð¾ Ð¿Ð°ÐºÐµÑ‚ ownCloud Ð½Ðµ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð¸ÑˆÐµ. Ð¡Ð°Ð²ÐµÑ‚ÑƒÑ˜ÐµÐ¼Ð¾ Ð²Ð°Ð¼ Ð´Ð° Ð¿Ð¾Ð´ÐµÑÐ¸Ñ‚Ðµ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¾ Ð´Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼ ÑÐ° Ð¿Ð¾Ð´Ð°Ñ†Ð¸Ð¼Ð° Ð½Ðµ Ð±ÑƒÐ´Ðµ Ð¸Ð·Ð»Ð¾Ð¶ÐµÐ½ Ð¸Ð»Ð¸ Ð´Ð° Ð³Ð° Ð¿Ñ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚Ðµ Ð¸Ð·Ð²Ð°Ð½ ÐºÐ¾Ñ€ÐµÐ½ÑÐºÐ¾Ð³ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼Ð° Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€Ð°.",
 "Setup Warning" => "Ð£Ð¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ Ð¾ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÑƒ",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’Ð°Ñˆ Ð²ÐµÐ± ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð²Ð° ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ˜Ñƒ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜ÐµÑ€ ÑÐµ Ñ‡Ð¸Ð½Ð¸ Ð´Ð° Ñ˜Ðµ WebDAV ÑÑƒÑ‡ÐµÑ™Ðµ Ð½ÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾.",
-"Please double check the <a href='%s'>installation guides</a>." => "ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ <a href='%s'>Ð²Ð¾Ð´Ð¸Ñ‡Ðµ Ð·Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ˜Ñƒ</a>.",
 "Module 'fileinfo' missing" => "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ˜Ðµ Ð¼Ð¾Ð´ÑƒÐ» â€žfileinfoâ€œ",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ˜Ðµ PHP Ð¼Ð¾Ð´ÑƒÐ» â€žfileinfoâ€œ. ÐŸÑ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡ÑƒÑ˜ÐµÐ¼Ð¾ Ð²Ð°Ð¼ Ð´Ð° Ð³Ð° Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸Ñ‚Ðµ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð´Ð¾Ð±Ð¸Ð»Ð¸ Ð½Ð°Ñ˜Ð±Ð¾Ñ™Ðµ Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ðµ Ñ Ð¾Ñ‚ÐºÑ€Ð¸Ð²Ð°ÑšÐµÐ¼ MIME Ð²Ñ€ÑÑ‚Ð°.",
 "Locale not working" => "Ð›Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ˜Ð° Ð½Ðµ Ñ€Ð°Ð´Ð¸",
@@ -56,7 +55,6 @@
 "Allow users to only share with users in their groups" => "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° Ð´Ð° Ð´ÐµÐ»Ðµ ÑÐ°Ð¼Ð¾ ÑÐ° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° Ñƒ ÑšÐ¸Ñ…Ð¾Ð²Ð¸Ð¼ Ð³Ñ€ÑƒÐ¿Ð°Ð¼Ð°",
 "Security" => "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ‚",
 "Enforce HTTPS" => "ÐÐ°Ð¼ÐµÑ‚Ð½Ð¸ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "ÐÐ°Ð¼ÐµÑ›Ðµ ÐºÐ»Ð¸Ñ˜ÐµÐ½Ñ‚Ð¸Ð¼Ð° Ð´Ð° ÑÐµ Ð¿Ð¾Ð²ÐµÐ¶Ñƒ ÑÐ° ownCloud-Ð¾Ð¼ Ð¿ÑƒÑ‚ÐµÐ¼ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ðµ Ð²ÐµÐ·Ðµ.",
 "Log" => "Ð‘ÐµÐ»ÐµÐ¶ÐµÑšÐµ",
 "Log level" => "ÐÐ¸Ð²Ð¾ Ð±ÐµÐ»ÐµÐ¶ÐµÑšÐ°",
 "More" => "Ð’Ð¸ÑˆÐµ",
@@ -102,3 +100,4 @@
 "set new password" => "Ð¿Ð¾ÑÑ‚Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñƒ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ",
 "Default" => "ÐŸÐ¾Ð´Ñ€Ð°Ð·ÑƒÐ¼ÐµÐ²Ð°Ð½Ð¾"
 );
+$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);";
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 8e375a7f23c064099ee67bc1fd6cc0c57e9b2cac..f23e665bb27acf15dce52035d38f57ec0013694e 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Authentication error" => "GreÅ¡ka pri autentifikaciji",
 "Language changed" => "Jezik je izmenjen",
 "Invalid request" => "Neispravan zahtev",
@@ -16,3 +17,4 @@
 "Other" => "Drugo",
 "Username" => "KorisniÄko ime"
 );
+$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);";
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 567c21999015d1c45fea5ad4cb2db9754f77de39..ad1660e25c9e840ab949591c1f587fef4b67a26a 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan frÃ¥n App Store",
 "Authentication error" => "Fel vid autentisering",
 "Your display name has been changed." => "Ditt visningsnamn har Ã¤ndrats.",
@@ -37,33 +38,35 @@
 "A valid password must be provided" => "Ett giltigt lÃ¶senord mÃ¥ste anges",
 "__language_name__" => "__language_name__",
 "Security Warning" => "SÃ¤kerhetsvarning",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datakatalog och dina filer Ã¤r fÃ¶rmodligen tillgÃ¤ngliga frÃ¥n Internet. Den .htaccess-fil som ownCloud tillhandahÃ¥ller fungerar inte. Vi rekommenderar starkt att du konfigurerar webbservern sÃ¥ att datakatalogen inte lÃ¤ngre Ã¤r tillgÃ¤nglig eller att du flyttar datakatalogen utanfÃ¶r webbserverns dokument-root.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datakatalog och dina filer Ã¤r fÃ¶rmodligen Ã¥tkomliga frÃ¥n internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver sÃ¥ att datakatalogen inte lÃ¤ngre Ã¤r Ã¥tkomlig eller du flyttar datakatalogen utanfÃ¶r webbserverns rotkatalog.",
 "Setup Warning" => "Installationsvarning",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver Ã¤r inte korrekt konfigurerad fÃ¶r att tillÃ¥ta filsynkronisering eftersom WebDAV inte verkar fungera.",
-"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "VÃ¤nligen dubbelkolla igenom <a href=\"%s\">installationsguiden</a>.",
 "Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den hÃ¤r modulen fÃ¶r att kunna upptÃ¤cka korrekt mime-typ.",
 "Locale not working" => "Locale fungerar inte",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denna ownCloud server kan inte sÃ¤tta system locale till %s. Det innebÃ¤r att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nÃ¶dvÃ¤ndiga paket pÃ¥ ditt system fÃ¶r att stÃ¶dja %s.",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Systemets sprÃ¥k kan inte sÃ¤ttas till %s. Detta innebÃ¤r att det kan vara problem med vissa tecken i filnamn. Det Ã¤r starkt rekommenderat att installera nÃ¶dvÃ¤ndiga paket sÃ¥ att systemet fÃ¥r stÃ¶d fÃ¶r %s.",
 "Internet connection not working" => "InternetfÃ¶rbindelsen fungerar inte",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Den hÃ¤r ownCloudservern har ingen fungerande internetfÃ¶rbindelse. Det innebÃ¤r att nÃ¥gra funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara sÃ¥ att det inte gÃ¥r att fÃ¥ fjÃ¤rrÃ¥tkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillÃ¥ter internetÃ¥tkomst fÃ¶r den hÃ¤r servern om du vill ha tillgÃ¥ng till alla funktioner hos ownCloud",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Servern har ingen fungerande internetanslutning. Detta innebÃ¤r att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Ã…tkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling fÃ¶r denna server om du vill ha alla funktioner.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php Ã¤r registrerad som en webcron-tjÃ¤nst. Anropa cron.php sidan i ownCloud en gÃ¥ng i minuten Ã¶ver HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "AnvÃ¤nd system-tjÃ¤nsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php Ã¤r registrerad som en webcron-tjÃ¤nst fÃ¶r att anropa cron.php varje minut Ã¶ver http.",
+"Use systems cron service to call the cron.php file once a minute." => "AnvÃ¤nd system-tjÃ¤nsten cron fÃ¶r att anropa cron.php varje minut.",
 "Sharing" => "Dela",
 "Enable Share API" => "Aktivera delat API",
 "Allow apps to use the Share API" => "TillÃ¥t applikationer att anvÃ¤nda delat API",
 "Allow links" => "TillÃ¥t lÃ¤nkar",
 "Allow users to share items to the public with links" => "TillÃ¥t delning till allmÃ¤nheten via publika lÃ¤nkar",
+"Allow public uploads" => "TillÃ¥t offentlig uppladdning",
+"Allow users to enable others to upload into their publicly shared folders" => "TillÃ¥t anvÃ¤ndare att aktivera\nTillÃ¥t anvÃ¤ndare att gÃ¶ra det mÃ¶jligt fÃ¶r andra att ladda upp till sina offentligt delade mappar",
 "Allow resharing" => "TillÃ¥t vidaredelning",
 "Allow users to share items shared with them again" => "TillÃ¥t anvÃ¤ndare att dela vidare filer som delats med dem",
 "Allow users to share with anyone" => "TillÃ¥t delning med alla",
 "Allow users to only share with users in their groups" => "TillÃ¥t bara delning med anvÃ¤ndare i egna grupper",
 "Security" => "SÃ¤kerhet",
 "Enforce HTTPS" => "KrÃ¤v HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvingar klienter att ansluta till ownCloud via en krypterad fÃ¶rbindelse.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "VÃ¤nligen anslut till denna instans av ownCloud via HTTPS fÃ¶r att aktivera/avaktivera SSL",
+"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Anslut till din %s via HTTPS fÃ¶r att aktivera/deaktivera SSL",
 "Log" => "Logg",
 "Log level" => "NivÃ¥ pÃ¥ loggning",
 "More" => "Mer",
@@ -98,6 +101,7 @@
 "Language" => "SprÃ¥k",
 "Help translate" => "HjÃ¤lp att Ã¶versÃ¤tta",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "AnvÃ¤nd denna adress fÃ¶r att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma Ã¥t dina filer via WebDAV</a>",
 "Login Name" => "Inloggningsnamn",
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin Ã¥terstÃ¤llningslÃ¶senord",
@@ -111,3 +115,4 @@
 "set new password" => "ange nytt lÃ¶senord",
 "Default" => "FÃ¶rvald"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 64e9cb85aa7ed03a3d0a0f35145b3884246c3de2..0dc206c7993efd4a2ac4c4c01bcb9a4fb2ac1fb5 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "à®šà¯†à®¯à®²à®¿ à®šà¯‡à®®à®¿à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®ªà®Ÿà¯à®Ÿà®¿à®¯à®²à¯ˆ à®à®±à¯à®±à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯à®³à¯à®³à®¤à¯",
 "Authentication error" => "à®…à®¤à¯à®¤à®¾à®Ÿà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¿à®²à¯ à®µà®´à¯",
 "Group already exists" => "à®•à¯à®´à¯ à®à®±à¯à®•à®©à®µà¯‡ à®‰à®³à¯à®³à®¤à¯",
@@ -22,7 +23,6 @@
 "Delete" => "à®¨à¯€à®•à¯à®•à¯à®•",
 "__language_name__" => "_à®®à¯Šà®´à®¿_à®ªà¯†à®¯à®°à¯_",
 "Security Warning" => "à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®Žà®šà¯à®šà®°à®¿à®•à¯à®•à¯ˆ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ à®®à®±à¯à®±à¯à®®à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à¯‹à®ªà¯à®ªà¯à®•à¯à®•à®³à¯ˆ à®ªà¯†à®°à¯à®®à¯à®ªà®¾à®²à¯à®®à¯ à®‡à®£à¯ˆà®¯à®¤à¯à®¤à®¿à®©à¯‚à®Ÿà®¾à®• à®…à®£à¯à®•à®²à®¾à®®à¯. ownCloud à®‡à®©à®¾à®²à¯ à®µà®´à®™à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®± .htaccess à®•à¯‹à®ªà¯à®ªà¯ à®µà¯‡à®²à¯ˆ à®šà¯†à®¯à¯à®¯à®µà®¿à®²à¯à®²à¯ˆ. à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ˆ à®¨à¯€à®£à¯à®Ÿ à®¨à¯‡à®°à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®…à®£à¯à®•à®•à¯à®•à¯‚à®Ÿà®¿à®¯à®¤à®¾à®• à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à¯ˆ à®¤à®•à®µà®®à¯ˆà®•à¯à®•à¯à®®à®¾à®±à¯ à®¨à®¾à®™à¯à®•à®³à¯ à®‰à®±à¯à®¤à®¿à®¯à®¾à®• à®•à¯‚à®±à¯à®•à®¿à®±à¯‹à®®à¯ à®…à®²à¯à®²à®¤à¯ à®¤à®°à®µà¯ à®…à®Ÿà¯ˆà®µà¯ˆ à®µà®²à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®¯à®• à®®à¯‚à®² à®†à®µà®£à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà¯†à®³à®¿à®¯à¯‡ à®…à®•à®±à¯à®±à¯à®•.  ",
 "More" => "à®®à¯‡à®²à®¤à®¿à®•",
 "Less" => "à®•à¯à®±à¯ˆà®µà®¾à®©",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
@@ -48,3 +48,4 @@
 "Other" => "à®®à®±à¯à®±à®µà¯ˆ",
 "Username" => "à®ªà®¯à®©à®¾à®³à®°à¯ à®ªà¯†à®¯à®°à¯"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
index 3a85a015205ced09c4e5bc9a889c9f113f8b2bbe..21caa79912afd487a477a4e59a4665711dc520bf 100644
--- a/settings/l10n/te.php
+++ b/settings/l10n/te.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "à°ªà±Šà°°à°ªà°¾à°Ÿà±",
 "Delete" => "à°¤à±Šà°²à°—à°¿à°‚à°šà±",
 "More" => "à°®à°°à°¿à°¨à±à°¨à°¿",
@@ -9,3 +10,4 @@
 "Language" => "à°à°¾à°·",
 "Username" => "à°µà°¾à°¡à±à°•à°°à°¿ à°ªà±‡à°°à±"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 9725df23c243c716e286b883dd87e82953c334ab..505e9ff29cb21a7e2786da9a847fdd83dd5162a6 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹‚à¸«à¸¥à¸”à¸£à¸²à¸¢à¸à¸²à¸£à¸ˆà¸²à¸ App Store à¹„à¸”à¹‰",
 "Authentication error" => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
 "Group already exists" => "à¸¡à¸µà¸à¸¥à¸¸à¹ˆà¸¡à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸šà¸šà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§",
@@ -30,11 +31,8 @@
 "Delete" => "à¸¥à¸š",
 "__language_name__" => "à¸ à¸²à¸©à¸²à¹„à¸—à¸¢",
 "Security Warning" => "à¸„à¸³à¹€à¸•à¸·à¸à¸™à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹à¸¥à¸°à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸”à¹‰à¸ˆà¸²à¸à¸à¸´à¸™à¹€à¸—à¸à¸£à¹Œà¹€à¸™à¹‡à¸• à¹„à¸Ÿà¸¥à¹Œ .htaccess à¸—à¸µà¹ˆ ownCloud à¸¡à¸µà¹ƒà¸«à¹‰à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰à¸à¸¢à¹ˆà¸²à¸‡à¹€à¸«à¸¡à¸²à¸°à¸ªà¸¡ à¹€à¸£à¸²à¸‚à¸à¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸„à¸¸à¸“à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹€à¸§à¹‡à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹ƒà¸«à¸¡à¹ˆà¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸—à¸µà¹ˆà¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸”à¹‰à¸à¸µà¸à¸•à¹ˆà¸à¹„à¸› à¸«à¸£à¸·à¸à¸„à¸¸à¸“à¹„à¸”à¹‰à¸¢à¹‰à¸²à¸¢à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸›à¸à¸¢à¸¹à¹ˆà¸ à¸²à¸¢à¸™à¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡ root à¸‚à¸à¸‡à¹€à¸§à¹‡à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¹à¸¥à¹‰à¸§",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "à¸›à¸£à¸°à¸¡à¸§à¸¥à¸„à¸³à¸ªà¸±à¹ˆà¸‡à¸«à¸™à¸¶à¹ˆà¸‡à¸‡à¸²à¸™à¹ƒà¸™à¹à¸•à¹ˆà¸¥à¸°à¸„à¸£à¸±à¹‰à¸‡à¸—à¸µà¹ˆà¸¡à¸µà¸à¸²à¸£à¹‚à¸«à¸¥à¸”à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸š",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™à¹à¸¥à¹‰à¸§à¸à¸±à¸šà¹€à¸§à¹‡à¸šà¸œà¸¹à¹‰à¹ƒà¸«à¹‰à¸šà¸£à¸´à¸à¸²à¸£ webcron à¹€à¸£à¸µà¸¢à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸š cron.php à¸—à¸µà¹ˆà¸•à¸³à¹à¸«à¸™à¹ˆà¸‡ root à¸‚à¸à¸‡ owncloud à¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸à¸™à¸µà¹‰à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆà¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡ http",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "à¹ƒà¸Šà¹‰à¸šà¸£à¸´à¸à¸²à¸£ cron à¸ˆà¸²à¸à¸£à¸°à¸šà¸š à¹€à¸£à¸µà¸¢à¸à¹„à¸Ÿà¸¥à¹Œ cron.php à¹ƒà¸™à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ owncloud à¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡ cronjob à¸‚à¸à¸‡à¸£à¸°à¸šà¸šà¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸à¸™à¸µà¹‰à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ",
 "Sharing" => "à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥",
 "Enable Share API" => "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ API à¸ªà¸³à¸«à¸£à¸±à¸šà¸„à¸¸à¸“à¸ªà¸¡à¸šà¸±à¸•à¸´à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥",
 "Allow apps to use the Share API" => "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸à¸›à¸¯à¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰ API à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸”à¹‰",
@@ -88,3 +86,4 @@
 "set new password" => "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆ",
 "Default" => "à¸„à¹ˆà¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 30b637ab94da48aa90adad09423ca3927dbde0cd..27ae7ae25bac718df31e8cd0edacdff4c2ce6072 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Store'dan liste yÃ¼klenemiyor",
 "Authentication error" => "Kimlik doÄŸrulama hatasÄ±",
 "Your display name has been changed." => "GÃ¶rÃ¼ntÃ¼lenen isminiz deÄŸiÅŸtirildi.",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "GeÃ§erli bir parola mutlaka saÄŸlanmalÄ±",
 "__language_name__" => "TÃ¼rkÃ§e",
 "Security Warning" => "GÃ¼venlik Uyarisi",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarÄ±nÄ±z bÃ¼yÃ¼k ihtimalle internet Ã¼zerinden eriÅŸilebilir. Owncloud tarafÄ±ndan saÄŸlanan .htaccess  dosyasÄ± Ã§alÄ±ÅŸmÄ±yor. Web sunucunuzu yapÄ±landÄ±rarak data dizinine eriÅŸimi kapatmanÄ±zÄ± veya data dizinini web sunucu dÃ¶kÃ¼man dizini dÄ±ÅŸÄ±na almanÄ±zÄ± ÅŸiddetle tavsiye ederiz.",
 "Setup Warning" => "Kurulum UyarÄ±sÄ±",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi iÃ§in dÃ¼zgÃ¼n bir ÅŸekilde yapÄ±landÄ±rÄ±lmamÄ±ÅŸ. WevDAV arabirimini sorunlu gÃ¶zÃ¼kÃ¼yor.",
-"Please double check the <a href='%s'>installation guides</a>." => "LÃ¼tfen <a href='%s'>kurulum kÄ±lavuzlarÄ±nÄ±</a> iki kez kontrol edin.",
 "Module 'fileinfo' missing" => "ModÃ¼l 'fileinfo' kayÄ±p",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modÃ¼lÃ¼ 'fileinfo' kayÄ±p. MIME-tip tanÄ±ma ile en iyi sonuÃ§larÄ± elde etmek iÃ§in bu modÃ¼lÃ¼ etkinleÅŸtirmenizi Ã¶neririz.",
 "Locale not working" => "Locale Ã§alÄ±ÅŸmÄ±yor.",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Bu ownCloud sunucusu sistem yerelini %s olarak deÄŸiÅŸtiremedi. Bu, dosya adlarÄ±ndaki bazÄ± karakterler ile sorun yaÅŸanabileceÄŸi anlamÄ±na gelir. %s yerelini desteklemek iÃ§in gerekli paketleri kurmanÄ±zÄ± ÅŸiddetle Ã¶neririz.",
 "Internet connection not working" => "Ä°nternet baÄŸlantÄ±sÄ± Ã§alÄ±ÅŸmÄ±yor",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "ownCloud sunucusunun internet baÄŸlantÄ±sÄ± yok. Bu nedenle harici depolama baÄŸlantÄ±sÄ±, gÃ¼ncelleÅŸtirme bildirimleri veya 3. parti uygulama kurma gibi bazÄ± Ã¶zellikler Ã§alÄ±ÅŸmayacaktÄ±r. Uzak dosyalara eriÅŸim ve e-posta ile bildirim gÃ¶nderme Ã§alÄ±ÅŸmayacak. EÄŸer ownCloud tÃ¼m Ã¶zelliklerini kullanmak istiyorsanÄ±z, internet baÄŸlantÄ±sÄ± gerekmektedir.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "YÃ¼klenen her sayfa ile bir gÃ¶rev Ã§alÄ±ÅŸtÄ±r",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php bir webcron hizmetinde kaydedilir. Owncloud kÃ¶kÃ¼ndeki cron.php sayfasÄ±nÄ± http Ã¼zerinden dakikada bir Ã§aÄŸÄ±r.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Sistemin cron hizmetini kullan. Bir sistem cronjob'Ä± ile owncloud klasÃ¶rÃ¼ndeki cron.php dosyasÄ±nÄ± dakikada bir Ã§aÄŸÄ±r.",
 "Sharing" => "PaylaÅŸÄ±m",
 "Enable Share API" => "PaylaÅŸÄ±m API'sini etkinleÅŸtir.",
 "Allow apps to use the Share API" => "UygulamalarÄ±n paylaÅŸÄ±m API'sini kullanmasÄ±na izin ver",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "KullanÄ±cÄ±larÄ±n sadece kendi gruplarÄ±ndaki kullanÄ±cÄ±larla paylaÅŸmasÄ±na izin ver",
 "Security" => "GÃ¼venlik",
 "Enforce HTTPS" => "HTTPS baÄŸlantÄ±sÄ±na zorla",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Ä°stemcileri ownCloud'a ÅŸifreli bir baÄŸlantÄ± ile baÄŸlanmaya zorlar.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasÄ±nÄ± etkinleÅŸtirmek ya da devre dÄ±ÅŸÄ± bÄ±rakmak iÃ§in lÃ¼tfen bu ownCloud Ã¶rneÄŸine HTTPS ile baÄŸlanÄ±n.",
 "Log" => "KayÄ±tlar",
 "Log level" => "GÃ¼nlÃ¼k seviyesi",
 "More" => "Daha fazla",
@@ -98,9 +91,11 @@
 "Language" => "Dil",
 "Help translate" => "Ã‡evirilere yardÄ±m edin",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">DosyalarÄ±nÄ±za WebDAV Ã¼zerinen eriÅŸme </a> iÃ§in  bu adresi kullanÄ±n",
 "Login Name" => "GiriÅŸ AdÄ±",
 "Create" => "OluÅŸtur",
 "Admin Recovery Password" => "YÃ¶netici kurtarma parolasÄ±",
+"Enter the recovery password in order to recover the users files during password change" => "Parola deÄŸiÅŸtirme sÄ±rasÄ±nda kullanÄ±cÄ± dosyalarÄ±nÄ± kurtarmak iÃ§in bir kurtarma paroalsÄ± girin",
 "Default Storage" => "VarsayÄ±lan Depolama",
 "Unlimited" => "Limitsiz",
 "Other" => "DiÄŸer",
@@ -110,3 +105,4 @@
 "set new password" => "yeni parola belirle",
 "Default" => "VarsayÄ±lan"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index abed87ef0d419443c9b1989dec2e689d1b92a3ba..d182d9198dee529439f43747c7b2181c7655ce5b 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ø¦Û•Ù¾ Ø¨Ø§Ø²Ù‰Ø±Ù‰Ø¯Ù‰Ù† ØªÙ‰Ø²Ù‰Ù…Ù†Ù‰ ÙŠÛˆÙƒÙ„Ù‰ÙŠÛ•Ù„Ù…Ù‰Ø¯Ù‰",
 "Authentication error" => "Ø³Ø§Ù„Ø§Ú¾Ù‰ÙŠÛ•Øª Ø¯Û•Ù„Ù‰Ù„Ù„Û•Ø´ Ø®Ø§ØªØ§Ù„Ù‰Ù‚Ù‰",
 "Your display name has been changed." => "ÙƒÛ†Ø±Ø³Ù‰ØªÙ‰Ø¯Ù‰ØºØ§Ù† Ø¦Ù‰Ø³Ù…Ù‰ÚÙ‰Ø² Ø¦Û†Ø²Ú¯Û•Ø±Ø¯Ù‰.",
@@ -70,3 +71,4 @@
 "set new password" => "ÙŠÛÚÙ‰ Ø¦Ù‰Ù… ØªÛ•ÚØ´Û•",
 "Default" => "ÙƒÛ†ÚÛˆÙ„Ø¯Ù‰ÙƒÙ‰"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 8b567f3995aa24bd9cbaca5d0528c32964256052..c6a9ab28624827dbc3bdd5b9581d852efad6bce9 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð· App Store",
 "Authentication error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—",
 "Unable to change display name" => "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ðµ Ñ–Ð¼'Ñ",
@@ -36,20 +37,14 @@
 "A valid password must be provided" => "ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ð·Ð°Ð´Ð°Ñ‚Ð¸ Ð²Ñ–Ñ€Ð½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ",
 "__language_name__" => "__language_name__",
 "Security Warning" => "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÐºÑƒ",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ð’Ð°Ñˆ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ Ð· Ð´Ð°Ð½Ð¸Ð¼Ð¸ Ñ‚Ð° Ð’Ð°ÑˆÑ– Ñ„Ð°Ð¹Ð»Ð¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ– Ð· Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ. Ð¤Ð°Ð¹Ð» .htaccess, Ð½Ð°Ð´Ð°Ð½Ð¸Ð¹ Ð· ownCloud, Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”. ÐœÐ¸ Ð½Ð°Ð¿Ð¾Ð»ÐµÐ³Ð»Ð¸Ð²Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ Ð’Ð°Ð¼ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ²Ñ–Ð¹ Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€ Ñ‚Ð°ÐºÐ¸Ð¼ Ñ‡Ð¸Ð½Ð¾Ð¼, Ñ‰Ð¾Ð± ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ data Ð±Ñ–Ð»ÑŒÑˆÐµ Ð½Ðµ Ð±ÑƒÐ² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹, Ð°Ð±Ð¾ Ð¿ÐµÑ€ÐµÐ¼Ñ–ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ data Ð·Ð° Ð¼ÐµÐ¶Ñ– ÐºÐ¾Ñ€ÐµÐ½ÐµÐ²Ð¾Ð³Ð¾ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€Ð°.",
 "Setup Warning" => "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸ ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ–",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ð’Ð°Ñˆ Web-ÑÐµÑ€Ð²ÐµÑ€ Ñ‰Ðµ Ð½Ðµ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ Ñ‡Ð¸Ð½Ð¾Ð¼ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–ÑŽ Ñ„Ð°Ð¹Ð»Ñ–Ð², Ñ‡ÐµÑ€ÐµÐ· Ñ‚Ðµ Ñ‰Ð¾ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ WebDAV, Ð·Ð´Ð°Ñ”Ñ‚ÑŒÑÑ, Ð·Ð»Ð°Ð¼Ð°Ð½Ð¸Ð¹.",
-"Please double check the <a href='%s'>installation guides</a>." => "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ <a href='%s'>Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð¿Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑŽ</a>.",
 "Module 'fileinfo' missing" => "ÐœÐ¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–Ð¹",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP Ð¼Ð¾Ð´ÑƒÐ»ÑŒ 'fileinfo' Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–Ð¹. ÐœÐ¸ Ð½Ð°Ð¿Ð¾Ð»ÐµÐ³Ð»Ð¸Ð²Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ñ†ÐµÐ¹ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ, Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ ÐºÑ€Ð°Ñ‰Ñ– Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¸ Ð²Ð¸ÑÐ²Ð»ÐµÐ½Ð½Ñ– MIME-Ñ‚Ð¸Ð¿Ñ–Ð².",
 "Locale not working" => "Ð›Ð¾ÐºÐ°Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Ð¦ÐµÐ¹ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¼Ð¾Ð²Ñƒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð¸ %s. Ð¦Ðµ Ð¾Ð·Ð½Ð°Ñ‡Ð°Ñ”, Ñ‰Ð¾ Ð¼Ð¾Ð¶ÑƒÑ‚ÑŒ Ð±ÑƒÑ‚Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð· Ð´ÐµÑÐºÐ¸Ð¼Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼Ð¸ Ð² Ñ–Ð¼ÐµÐ½Ð°Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð². ÐœÐ¸ Ð½Ð°Ð¿Ð¾Ð»ÐµÐ³Ð»Ð¸Ð²Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ñ– Ð¿Ð°ÐºÐµÑ‚Ð¸ Ñƒ Ð²Ð°ÑˆÑ–Ð¹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ– Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸ %s.",
 "Internet connection not working" => "Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑ”",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Ð¦ÐµÐ¹ ÑÐµÑ€Ð²ÐµÑ€ ownCloud Ð½Ðµ Ð¼Ð°Ñ” Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ. Ð¦Ðµ Ð¾Ð·Ð½Ð°Ñ‡Ð°Ñ”, Ñ‰Ð¾ Ð´ÐµÑÐºÑ– Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ—, Ñ‚Ð°ÐºÑ– ÑÐº Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ–Ñ… Ð½Ð°ÐºÐ¾Ð¿Ð¸Ñ‡ÑƒÐ²Ð°Ñ‡Ñ–Ð², Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð°Ð±Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ñ–Ð¶Ð½Ð¸Ñ… Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÑŽÑ‚ÑŒ. Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð² â€‹â€‹Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾ Ñ‚Ð° Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²ÐºÐ° Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾ÑŽ Ð¿Ð¾ÑˆÑ‚Ð¾ÑŽ Ñ‚Ð°ÐºÐ¾Ð¶ Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ñ‚Ð¸. ÐœÐ¸ Ð¿Ñ€Ð¾Ð¿Ð¾Ð½ÑƒÑ”Ð¼Ð¾ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ Ð†Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚Ñƒ Ð´Ð»Ñ Ð´Ð°Ð½Ð¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ð°, ÑÐºÑ‰Ð¾ Ð²Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð¼Ð°Ñ‚Ð¸ Ð²ÑÑ– Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑ‚Ñ– ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ð’Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð¾Ð´Ð½Ðµ Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐºÐ¾Ð¶Ð½Ð¾Ñ— Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾Ñ— ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÐ¸ ",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php Ð·Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð² ÑÐ»ÑƒÐ¶Ð±Ñ– webcron. Ð’Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ” cron.php ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ Ð² ÐºÐ¾Ñ€ÐµÐ½ÐµÐ²Ð¾Ð¼Ñƒ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð·Ñ– owncloud ÐºÐ¾Ð¶Ð½Ñƒ Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ð¿Ð¾ http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¸Ð¹ cron ÑÐµÑ€Ð²Ñ–Ñ. Ð’Ð¸ÐºÐ»Ð¸Ðº cron.php Ñ„Ð°Ð¹Ð»Ð° Ð· owncloud Ñ‚ÐµÐºÐ¸ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ cronjob Ñ€Ð°Ð· Ð½Ð° Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ.",
 "Sharing" => "Ð¡Ð¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿",
 "Enable Share API" => "Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ API ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ",
 "Allow apps to use the Share API" => "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°Ð¼ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ API ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ",
@@ -61,8 +56,6 @@
 "Allow users to only share with users in their groups" => "Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼ Ð²Ñ–Ð´ÐºÑ€Ð¸Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ð· Ñ—Ñ…Ð½ÑŒÐ¾Ñ— Ð³Ñ€ÑƒÐ¿Ð¸",
 "Security" => "Ð‘ÐµÐ·Ð¿ÐµÐºÐ°",
 "Enforce HTTPS" => "ÐŸÑ€Ð¸Ð¼ÑƒÑÐ¾Ð²Ðµ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ²Ð°Ð½Ð½Ñ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Ð—Ð¾Ð±Ð¾Ð²'ÑÐ·Ð°Ñ‚Ð¸ ÐºÐ»Ñ–Ñ”Ð½Ñ‚Ñ–Ð² Ð¿Ñ–Ð´'Ñ”Ð´Ð½ÑƒÐ²Ð°Ñ‚Ð¸ÑÑŒ Ð´Ð¾ ownCloud Ñ‡ÐµÑ€ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ðµ Ð·'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð¹Ñ‚ÐµÑÑŒ Ð´Ð¾ Ñ†ÑŒÐ¾Ð³Ð¾ ownCloud Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ HTTPS, Ñ‰Ð¾Ð± ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð°Ð±Ð¾ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ SSL.",
 "Log" => "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»",
 "Log level" => "Ð Ñ–Ð²ÐµÐ½ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»ÑŽÐ²Ð°Ð½Ð½Ñ",
 "More" => "Ð‘Ñ–Ð»ÑŒÑˆÐµ",
@@ -108,3 +101,4 @@
 "set new password" => "Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ",
 "Default" => "Ð—Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼"
 );
+$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);";
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index ce1d425c9703ca19b532c34a8b9a34e4a6e35052..ff3eb3d11ca413d48ee22b236dc521cee8394220 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "Ø§ÛŒØ±Ø±",
 "Password" => "Ù¾Ø§Ø³ÙˆØ±Úˆ",
 "New password" => "Ù†ÛŒØ§ Ù¾Ø§Ø³ÙˆØ±Úˆ",
 "Username" => "ÛŒÙˆØ²Ø± Ù†ÛŒÙ…"
 );
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 4768e9b243e6f2f0a111871f450ec1774a264296..4607229b4d9b50202284c07f3adec728c8fcffec 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "KhÃ´ng thá»ƒ táº£i danh sÃ¡ch á»©ng dá»¥ng tá»« App Store",
 "Authentication error" => "Lá»—i xÃ¡c thá»±c",
 "Unable to change display name" => "KhÃ´ng thá»ƒ thay Ä‘á»•i tÃªn hiá»ƒn thá»‹",
@@ -31,11 +32,8 @@
 "Delete" => "XÃ³a",
 "__language_name__" => "__NgÃ´n ngá»¯___",
 "Security Warning" => "Cáº£nh báº£o báº£o máºt",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ThÆ° má»¥c dá»¯ liá»‡u vÃ  nhá»¯ng táºp tin cá»§a báº¡n cÃ³ thá»ƒ dá»… dÃ ng bá»‹ truy cáºp tá»« máº¡ng. Táºp tin .htaccess do ownCloud cung cáº¥p khÃ´ng hoáº¡t Ä‘á»™ng. ChÃºng tÃ´i Ä‘á» nghá»‹ báº¡n nÃªn cáº¥u hÃ¬nh láº¡i mÃ¡y chá»§ web Ä‘á»ƒ thÆ° má»¥c dá»¯ liá»‡u khÃ´ng cÃ²n bá»‹ truy cáºp hoáº·c báº¡n nÃªn di chuyá»ƒn thÆ° má»¥c dá»¯ liá»‡u ra bÃªn ngoÃ i thÆ° má»¥c gá»‘c cá»§a mÃ¡y chá»§.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Thá»±c thi tÃ¡c vá»¥ má»—i khi trang Ä‘Æ°á»£c táº£i",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php Ä‘Ã£ Ä‘Æ°á»£c Ä‘Äƒng kÃ½ táº¡i má»™t dá»‹ch vá»¥ webcron. Gá»i trang cron.php má»—i phÃºt má»™t láº§n thÃ´ng qua giao thá»©c http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Sá» dá»¥ng dá»‹ch vá»¥ cron cá»§a há»‡ thá»‘ng. Gá»i tá»‡p tin cron.php má»—i phÃºt má»™t láº§n.",
 "Sharing" => "Chia sáº»",
 "Enable Share API" => "Báºt chia sáº» API",
 "Allow apps to use the Share API" => "Cho phÃ©p cÃ¡c á»©ng dá»¥ng sá» dá»¥ng chia sáº» API",
@@ -89,3 +87,4 @@
 "set new password" => "Ä‘áº·t máºt kháº©u má»›i",
 "Default" => "Máº·c Ä‘á»‹nh"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 65a6938c8b6e48b901027c15bb7ec400b82629ee..46c024762356cb5b0591f3793e820f50868051d6 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ä¸èƒ½ä»ŽApp Store ä¸åŠ è½½åˆ—è¡¨",
 "Authentication error" => "éªŒè¯é”™è¯¯",
 "Your display name has been changed." => "æ‚¨çš„æ˜¾ç¤ºåç§°å·²ä¿®æ”¹",
@@ -37,32 +38,37 @@
 "A valid password must be provided" => "è¯·å¡«å†™æœ‰æ•ˆå¯†ç ",
 "__language_name__" => "Chinese",
 "Security Warning" => "å®‰å…¨è¦å‘Š",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ‚¨çš„æ–‡ä»¶æˆ–è®¸èƒ½å¤Ÿä»Žäº’è”ç½‘è®¿é—®ã€‚ownCloud æä¾›çš„ .htaccesss æ–‡ä»¶æœªå…¶ä½œç”¨ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‚¨é…ç½®ç½‘ç»œæœåŠ¡å™¨ä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸èƒ½ä»Žäº’è”ç½‘è®¿é—®ï¼Œæˆ–å°†ç§»åŠ¨æ•°æ®æ–‡ä»¶å¤¹ç§»å‡ºç½‘ç»œæœåŠ¡å™¨æ–‡æ¡£æ ¹ç›®å½•ã€‚",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ‚¨çš„æ–‡ä»¶æˆ–è®¸èƒ½å¤Ÿä»Žäº’è”ç½‘è®¿é—®ã€‚ownCloud æä¾›çš„ .htaccesss æ–‡ä»¶æœªå…¶ä½œç”¨ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‚¨é…ç½®ç½‘ç»œæœåŠ¡å™¨ä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸èƒ½ä»Žäº’è”ç½‘è®¿é—®ï¼Œæˆ–å°†ç§»åŠ¨æ•°æ®æ–‡ä»¶å¤¹ç§»å‡ºç½‘ç»œæœåŠ¡å™¨æ–‡æ¡£æ ¹ç›®å½•ã€‚",
 "Setup Warning" => "é…ç½®æ³¨æ„",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "å› WebDAVæŽ¥å£æ•…éšœï¼Œæ‚¨çš„ç½‘ç»œæœåŠ¡å™¨å¥½åƒå¹¶æœªå…è®¸æ–‡ä»¶åŒæ¥ã€‚",
-"Please double check the <a href='%s'>installation guides</a>." => "è¯·åŒå‡»<a href='%s'>å®‰è£…å‘å¯¼</a>ã€‚",
+"Please double check the <a href=\"%s\">installation guides</a>." => "è¯·åŒå‡»<a href='%s'>å®‰è£…å‘å¯¼</a>ã€‚",
 "Module 'fileinfo' missing" => "æ¨¡å—â€œfileinfoâ€ä¸¢å¤±ã€‚",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP æ¨¡å—â€œfileinfoâ€ä¸¢å¤±ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‰“å¼€æ¤æ¨¡å—æ¥èŽ·å¾— mine ç±»åž‹æ£€æµ‹çš„æœ€ä½³ç»“æžœã€‚",
 "Locale not working" => "åŒºåŸŸè®¾ç½®æœªè¿ä½œ",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud æœåŠ¡å™¨ä¸èƒ½æŠŠç³»ç»ŸåŒºåŸŸè®¾ç½®åˆ° %sã€‚è¿™æ„å‘³ç€æ–‡ä»¶åå¯å†…å¯èƒ½å«æœ‰æŸäº›å¼•èµ·é—®é¢˜çš„å—ç¬¦ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨æ‚¨çš„ç³»ç»Ÿä¸Šå®‰è£…å¿…è¦çš„åŒ…æ¥æ”¯æŒâ€œ%sâ€ã€‚",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud æœåŠ¡å™¨ä¸èƒ½æŠŠç³»ç»ŸåŒºåŸŸè®¾ç½®ä¸º %sã€‚è¿™æ„å‘³ç€æ–‡ä»¶åå¯å†…å¯èƒ½å«æœ‰æŸäº›å¼•èµ·é—®é¢˜çš„å—ç¬¦ã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨æ‚¨çš„ç³»ç»Ÿä¸Šå®‰è£…å¿…è¦çš„åŒºåŸŸ/è¯è¨€æ”¯æŒåŒ…æ¥æ”¯æŒ â€œ%sâ€ ã€‚",
 "Internet connection not working" => "äº’è”ç½‘è¿žæŽ¥æœªè¿ä½œ",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "æœåŠ¡å™¨æ²¡æœ‰å¯ç”¨çš„Internetè¿žæŽ¥ã€‚è¿™æ„å‘³ç€åƒæŒ‚è½½å¤–éƒ¨å‚¨å˜ã€ç‰ˆæœ¬æ›´æ–°æç¤ºå’Œå®‰è£…ç¬¬ä¸‰æ–¹æ’ä»¶ç‰åŠŸèƒ½ä¼šå¤±æ•ˆã€‚è¿œç¨‹è®¿é—®æ–‡ä»¶å’Œå‘é€é‚®ä»¶æé†’ä¹Ÿå¯èƒ½ä¼šå¤±æ•ˆã€‚å¦‚æžœæ‚¨éœ€è¦è¿™äº›åŠŸèƒ½ï¼Œå»ºè®®å¼€å¯æœåŠ¡å™¨çš„è‹±ç‰¹ç½‘è¿žæŽ¥ã€‚",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "åœ¨æ¯ä¸ªé¡µé¢è½½å…¥æ—¶æ‰§è¡Œä¸€é¡¹ä»»åŠ¡",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php å·²ä½œä¸º webcron æœåŠ¡æ³¨å†Œã€‚owncloud æ ¹ç”¨æˆ·å°†é€šè¿‡ http åè®®æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ cron.phpã€‚",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ä½¿ç”¨ç³»ç»Ÿ cron æœåŠ¡ã€‚é€šè¿‡ç³»ç»Ÿ cronjob æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ owncloud æ–‡ä»¶å¤¹ä¸‹çš„ cron.php",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php å·²ä½œä¸º webcron æœåŠ¡æ³¨å†Œã€‚owncloud å°†é€šè¿‡ http åè®®æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ cron.phpã€‚",
+"Use systems cron service to call the cron.php file once a minute." => "ä½¿ç”¨ç³»ç»Ÿ cron æœåŠ¡ã€‚é€šè¿‡ç³»ç»Ÿ cronjob æ¯åˆ†é’Ÿè°ƒç”¨ä¸€æ¬¡ owncloud æ–‡ä»¶å¤¹ä¸‹çš„ cron.php",
 "Sharing" => "åˆ†äº«",
 "Enable Share API" => "å¼€å¯åˆ†äº«API",
 "Allow apps to use the Share API" => "å…è®¸åº”ç”¨ä½¿ç”¨åˆ†äº«API",
 "Allow links" => "å…è®¸é“¾æŽ¥",
 "Allow users to share items to the public with links" => "å…è®¸ç”¨æˆ·é€šè¿‡é“¾æŽ¥å…±äº«å†…å®¹",
+"Allow public uploads" => "å…è®¸å…¬ä¼—è´¦æˆ·ä¸Šä¼ ",
+"Allow users to enable others to upload into their publicly shared folders" => "å…è®¸å…¶å®ƒäººå‘ç”¨æˆ·çš„å…¬ä¼—å…±äº«æ–‡ä»¶å¤¹é‡Œä¸Šä¼ æ–‡ä»¶",
 "Allow resharing" => "å…è®¸è½¬å¸–",
 "Allow users to share items shared with them again" => "å…è®¸ç”¨æˆ·å†æ¬¡å…±äº«å·²å…±äº«çš„å†…å®¹",
 "Allow users to share with anyone" => "å…è®¸ç”¨æˆ·å‘ä»»ä½•äººåˆ†äº«",
 "Allow users to only share with users in their groups" => "åªå…è®¸ç”¨æˆ·å‘æ‰€åœ¨ç¾¤ç»„ä¸çš„å…¶ä»–ç”¨æˆ·åˆ†äº«",
 "Security" => "å®‰å…¨",
 "Enforce HTTPS" => "å¼ºåˆ¶HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥ä¸ŽownCloudè¿žæŽ¥",
+"Forces the clients to connect to %s via an encrypted connection." => "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥ä¸Ž%sè¿žæŽ¥",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "è¯·é€šè¿‡HTTPSåè®®è¿žæŽ¥åˆ° %sï¼Œéœ€è¦å¯ç”¨æˆ–è€…ç¦æ¢å¼ºåˆ¶SSLçš„å¼€å…³ã€‚",
 "Log" => "æ—¥å¿—",
+"Log level" => "æ—¥å¿—ç‰çº§",
 "More" => "æ›´å¤š",
 "Less" => "æ›´å°‘",
 "Version" => "ç‰ˆæœ¬",
@@ -95,8 +101,11 @@
 "Language" => "è¯è¨€",
 "Help translate" => "å¸®åŠ©ç¿»è¯‘",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "è®¿é—®WebDAVè¯·ç‚¹å‡» <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">æ¤å¤„</a>",
 "Login Name" => "ç™»å½•å",
 "Create" => "æ–°å»º",
+"Admin Recovery Password" => "ç®¡ç†å‘˜æ¢å¤å¯†ç ",
+"Enter the recovery password in order to recover the users files during password change" => "åœ¨æ¢å¤å¯†ç çš„è¿‡ç¨‹ä¸è¯·è¾“å…¥æ¢å¤å¯†é’¥æ¥æ¢å¤ç”¨æˆ·æ•°æ®",
 "Default Storage" => "é»˜è®¤å®¹é‡",
 "Unlimited" => "æ— é™åˆ¶",
 "Other" => "å…¶ä»–",
@@ -106,3 +115,4 @@
 "set new password" => "è®¾ç½®æ–°çš„å¯†ç ",
 "Default" => "é»˜è®¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 7a11845404f40fcf3c8b1b6a4b0b7cfdaf5f0c40..5a42bf0675449165328bbb09fa53d857f7d7f035 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "æ— æ³•ä»Žåº”ç”¨å•†åº—è½½å…¥åˆ—è¡¨",
 "Authentication error" => "è®¤è¯å‡ºé”™",
 "Your display name has been changed." => "æ‚¨çš„æ˜¾ç¤ºåå—å·²ç»æ”¹å˜",
@@ -37,20 +38,14 @@
 "A valid password must be provided" => "å¿…é¡»æä¾›åˆæ³•çš„å¯†ç ",
 "__language_name__" => "ç®€ä½“ä¸æ–‡",
 "Security Warning" => "å®‰å…¨è¦å‘Š",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "æ‚¨çš„æ•°æ®æ–‡ä»¶å¤¹å’Œæ–‡ä»¶å¯ç”±äº’è”ç½‘è®¿é—®ã€‚OwnCloudæä¾›çš„.htaccessæ–‡ä»¶æœªç”Ÿæ•ˆã€‚æˆ‘ä»¬å¼ºçƒˆå»ºè®®æ‚¨é…ç½®æœåŠ¡å™¨ï¼Œä»¥ä½¿æ•°æ®æ–‡ä»¶å¤¹ä¸å¯è¢«è®¿é—®ï¼Œæˆ–è€…å°†æ•°æ®æ–‡ä»¶å¤¹ç§»åˆ°webæœåŠ¡å™¨æ ¹ç›®å½•ä»¥å¤–ã€‚",
 "Setup Warning" => "è®¾ç½®è¦å‘Š",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "æ‚¨çš„WebæœåŠ¡å™¨å°šæœªæ£ç¡®è®¾ç½®ä»¥å…è®¸æ–‡ä»¶åŒæ¥, å› ä¸ºWebDAVçš„æŽ¥å£ä¼¼ä¹Žå·²æŸå.",
-"Please double check the <a href='%s'>installation guides</a>." => "è¯·è®¤çœŸæ£€æŸ¥<a href='%s'>å®‰è£…æŒ‡å—</a>.",
 "Module 'fileinfo' missing" => "æ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHPæ¨¡å—'æ–‡ä»¶ä¿¡æ¯'ä¸¢å¤±. æˆ‘ä»¬å¼ºçƒˆå»ºè®®å¯ç”¨æ¤æ¨¡å—ä»¥ä¾¿mimeç±»åž‹æ£€æµ‹å–å¾—æœ€ä½³ç»“æžœ.",
 "Locale not working" => "æœ¬åœ°åŒ–æ— æ³•å·¥ä½œ",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "æ¤ownCloudæœåŠ¡å™¨æ— æ³•è®¾ç½®ç³»ç»Ÿæœ¬åœ°åŒ–åˆ°%s. è¿™æ„å‘³ç€å¯èƒ½æ–‡ä»¶åä¸æœ‰ä¸€äº›å—ç¬¦å¼•èµ·é—®é¢˜. æˆ‘ä»¬å¼ºçƒˆå»ºè®®åœ¨ä½ ç³»ç»Ÿä¸Šå®‰è£…æ‰€éœ€çš„è½¯ä»¶åŒ…æ¥æ”¯æŒ%s",
 "Internet connection not working" => "å› ç‰¹ç½‘è¿žæŽ¥æ— æ³•å·¥ä½œ",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "æ¤ownCloudæœåŠ¡å™¨ä¸Šæ²¡æœ‰å¯ç”¨çš„å› ç‰¹ç½‘è¿žæŽ¥. è¿™æ„å‘³ç€æŸäº›ç‰¹æ€§ä¾‹å¦‚æŒ‚è½½å¤–éƒ¨å˜å‚¨å™¨, æé†’æ›´æ–°æˆ–å®‰è£…ç¬¬ä¸‰æ–¹åº”ç”¨æ— æ³•å·¥ä½œ. ä»Žè¿œç¨‹è®¿é—®æ–‡ä»¶å’Œå‘é€æé†’ç”µåé‚®ä»¶å¯èƒ½ä¹Ÿæ— æ³•å·¥ä½œ. å¦‚æžœä½ æƒ³è¦ownCloudçš„æ‰€æœ‰ç‰¹æ€§, æˆ‘ä»¬å»ºè®®å¯ç”¨æ¤æœåŠ¡å™¨çš„å› ç‰¹ç½‘è¿žæŽ¥.",
 "Cron" => "è®¡åˆ’ä»»åŠ¡",
 "Execute one task with each page loaded" => "æ¯ä¸ªé¡µé¢åŠ è½½åŽæ‰§è¡Œä¸€ä¸ªä»»åŠ¡",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.phpå·²è¢«æ³¨å†Œåˆ°ç½‘ç»œå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚é€šè¿‡httpæ¯åˆ†é’Ÿè°ƒç”¨owncloudæ ¹ç›®å½•çš„cron.phpç½‘é¡µã€‚",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ä½¿ç”¨ç³»ç»Ÿå®šæ—¶ä»»åŠ¡æœåŠ¡ã€‚æ¯åˆ†é’Ÿé€šè¿‡ç³»ç»Ÿå®šæ—¶ä»»åŠ¡è°ƒç”¨owncloudæ–‡ä»¶å¤¹ä¸çš„cron.phpæ–‡ä»¶",
 "Sharing" => "å…±äº«",
 "Enable Share API" => "å¯ç”¨å…±äº«API",
 "Allow apps to use the Share API" => "å…è®¸åº”ç”¨è½¯ä»¶ä½¿ç”¨å…±äº«API",
@@ -62,8 +57,6 @@
 "Allow users to only share with users in their groups" => "å…è®¸ç”¨æˆ·åªå‘åŒç»„ç”¨æˆ·å…±äº«",
 "Security" => "å®‰å…¨",
 "Enforce HTTPS" => "å¼ºåˆ¶ä½¿ç”¨ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "å¼ºåˆ¶å®¢æˆ·ç«¯é€šè¿‡åŠ å¯†è¿žæŽ¥è¿žæŽ¥åˆ° ownCloudã€‚",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "è¯·ç»ç”±HTTPSè¿žæŽ¥åˆ°è¿™ä¸ªownCloudå®žä¾‹æ¥å¯ç”¨æˆ–ç¦ç”¨å¼ºåˆ¶SSL.",
 "Log" => "æ—¥å¿—",
 "Log level" => "æ—¥å¿—çº§åˆ«",
 "More" => "æ›´å¤š",
@@ -111,3 +104,4 @@
 "set new password" => "è®¾ç½®æ–°å¯†ç ",
 "Default" => "é»˜è®¤"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 8da974627517e40a7cf227d628884a6548eb8cdf..f9bdb44956dabc0308e05c7dd66c410029f236a9 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Error" => "éŒ¯èª¤",
 "Groups" => "ç¾¤çµ„",
 "Delete" => "åˆªé™¤",
@@ -7,3 +8,4 @@
 "Email" => "é›»éƒµ",
 "Username" => "ç”¨æˆ¶åç¨±"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 8bdfc37b2bacb87bbaec313302861e67eabcaf54..0a0fcf84e2d1b5f39f12fbb64a878b8fb3f7fbb3 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
 "Unable to load list from App Store" => "ç„¡æ³•å¾ž App Store è®€å–æ¸…å–®",
 "Authentication error" => "èªè‰éŒ¯èª¤",
 "Your display name has been changed." => "å·²æ›´æ”¹é¡¯ç¤ºåç¨±",
@@ -13,8 +14,8 @@
 "Language changed" => "èªžè¨€å·²è®Šæ›´",
 "Invalid request" => "ç„¡æ•ˆè«‹æ±‚",
 "Admins can't remove themself from the admin group" => "ç®¡ç†è€…å¸³è™Ÿç„¡æ³•å¾žç®¡ç†è€…ç¾¤çµ„ä¸ç§»é™¤",
-"Unable to add user to group %s" => "ä½¿ç”¨è€…åŠ å…¥ç¾¤çµ„%séŒ¯èª¤",
-"Unable to remove user from group %s" => "ä½¿ç”¨è€…ç§»å‡ºç¾¤çµ„%séŒ¯èª¤",
+"Unable to add user to group %s" => "ä½¿ç”¨è€…åŠ å…¥ç¾¤çµ„ %s éŒ¯èª¤",
+"Unable to remove user from group %s" => "ä½¿ç”¨è€…ç§»å‡ºç¾¤çµ„ %s éŒ¯èª¤",
 "Couldn't update app." => "ç„¡æ³•æ›´æ–°æ‡‰ç”¨ç¨‹å¼",
 "Update to {appversion}" => "æ›´æ–°è‡³ {appversion}",
 "Disable" => "åœç”¨",
@@ -29,47 +30,49 @@
 "undo" => "å¾©åŽŸ",
 "Unable to remove user" => "ç„¡æ³•åˆªé™¤ç”¨æˆ¶",
 "Groups" => "ç¾¤çµ„",
-"Group Admin" => "ç¾¤çµ„ ç®¡ç†å“¡",
+"Group Admin" => "ç¾¤çµ„ç®¡ç†å“¡",
 "Delete" => "åˆªé™¤",
 "add group" => "æ–°å¢žç¾¤çµ„",
-"A valid username must be provided" => "ä¸€å®šè¦æä¾›ä¸€å€‹æœ‰æ•ˆçš„ç”¨æˆ¶å",
-"Error creating user" => "å‰µå»ºç”¨æˆ¶æ™‚å‡ºç¾éŒ¯èª¤",
+"A valid username must be provided" => "å¿…é ˆæä¾›ä¸€å€‹æœ‰æ•ˆçš„ç”¨æˆ¶å",
+"Error creating user" => "å»ºç«‹ç”¨æˆ¶æ™‚å‡ºç¾éŒ¯èª¤",
 "A valid password must be provided" => "ä¸€å®šè¦æä¾›ä¸€å€‹æœ‰æ•ˆçš„å¯†ç¢¼",
-"__language_name__" => "__èªžè¨€_åç¨±__",
+"__language_name__" => "__language_name__",
 "Security Warning" => "å®‰å…¨æ€§è¦å‘Š",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "æ‚¨çš„è³‡æ–™ç›®éŒ„ (Data Directory) å’Œæª”æ¡ˆå¯èƒ½å¯ä»¥ç”±ç¶²éš›ç¶²è·¯ä¸Šé¢å…¬é–‹å˜å–ã€‚Owncloud æ‰€æä¾›çš„ .htaccess è¨å®šæª”ä¸¦æœªç”Ÿæ•ˆï¼Œæˆ‘å€‘å¼·çƒˆå»ºè°æ‚¨è¨å®šæ‚¨çš„ç¶²é ä¼ºæœå™¨ä»¥é˜²æ¢è³‡æ–™ç›®éŒ„è¢«å…¬é–‹å˜å–ï¼Œæˆ–å°‡æ‚¨çš„è³‡æ–™ç›®éŒ„ç§»å‡ºç¶²é ä¼ºæœå™¨çš„ document root ã€‚",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "æ‚¨çš„è³‡æ–™ç›®éŒ„ (Data Directory) å’Œæª”æ¡ˆå¯èƒ½å¯ä»¥ç”±ç¶²éš›ç¶²è·¯ä¸Šé¢å…¬é–‹å˜å–ã€‚Owncloud æ‰€æä¾›çš„ .htaccess è¨å®šæª”ä¸¦æœªç”Ÿæ•ˆï¼Œæˆ‘å€‘å¼·çƒˆå»ºè°æ‚¨è¨å®šæ‚¨çš„ç¶²é ä¼ºæœå™¨ä»¥é˜²æ¢è³‡æ–™ç›®éŒ„è¢«å…¬é–‹å˜å–ï¼Œæˆ–å°‡æ‚¨çš„è³‡æ–™ç›®éŒ„ç§»å‡ºç¶²é ä¼ºæœå™¨çš„ document root ã€‚",
 "Setup Warning" => "è¨å®šè¦å‘Š",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "æ‚¨çš„ç¶²é ä¼ºæœå™¨å°šæœªè¢«æ£ç¢ºè¨å®šä¾†é€²è¡Œæª”æ¡ˆåŒæ¥ï¼Œå› ç‚ºæ‚¨çš„ WebDAV ç•Œé¢ä¼¼ä¹Žç„¡æ³•ä½¿ç”¨ã€‚",
-"Please double check the <a href='%s'>installation guides</a>." => "è«‹åƒè€ƒ<a href='%s'>å®‰è£æŒ‡å—</a>ã€‚",
+"Please double check the <a href=\"%s\">installation guides</a>." => "è«‹åƒè€ƒ<a href='%s'>å®‰è£æŒ‡å—</a>ã€‚",
 "Module 'fileinfo' missing" => "éºå¤± 'fileinfo' æ¨¡çµ„",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "æœªåµæ¸¬åˆ° PHP æ¨¡çµ„ 'fileinfo'ã€‚æˆ‘å€‘å¼·çƒˆå»ºè°å•Ÿç”¨é€™å€‹æ¨¡çµ„ä»¥å–å¾—æœ€å¥½çš„ mime-type æ”¯æ´ã€‚",
 "Locale not working" => "èªžç³»ç„¡æ³•é‹ä½œ",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud ä¼ºæœå™¨ç„¡æ³•å°‡ç³»çµ±èªžç³»è¨ç‚º %s ï¼Œå¯èƒ½æœ‰ä¸€äº›æª”åä¸çš„å—å…ƒæœ‰å•é¡Œï¼Œå»ºè°æ‚¨å®‰è£æ‰€æœ‰æ‰€éœ€çš„å¥—ä»¶ä»¥æ”¯æ´ %s ã€‚",
-"Internet connection not working" => "åŽ»é€£ç·š",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "é€™è‡º ownCloud ä¼ºæœå™¨æ²’æœ‰é€£æŽ¥åˆ°ç¶²éš›ç¶²è·¯ï¼Œå› æ¤æœ‰äº›åŠŸèƒ½åƒæ˜¯æŽ›è¼‰å¤–éƒ¨å„²å˜ç©ºé–“ã€æ›´æ–° ownCloud æˆ–æ‡‰ç”¨ç¨‹å¼çš„é€šçŸ¥æ²’æœ‰è¾¦æ³•é‹ä½œã€‚é€éŽç¶²éš›ç¶²è·¯å˜å–æª”æ¡ˆé‚„æœ‰é›»åéƒµä»¶é€šçŸ¥å¯èƒ½ä¹Ÿç„¡æ³•é‹ä½œã€‚å¦‚æžœæƒ³è¦ ownCloud å®Œæ•´çš„åŠŸèƒ½ï¼Œå»ºè°æ‚¨å°‡é€™è‡ºä¼ºæœå™¨é€£æŽ¥è‡³ç¶²éš›ç¶²è·¯ã€‚",
-"Cron" => "å®šæœŸåŸ·è¡Œ",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud ä¼ºæœå™¨ç„¡æ³•å°‡ç³»çµ±èªžç³»è¨ç‚º %s ï¼Œå¯èƒ½æœ‰ä¸€äº›æª”åä¸çš„å—å…ƒæœ‰å•é¡Œï¼Œå»ºè°æ‚¨å®‰è£æ‰€æœ‰æ‰€éœ€çš„å¥—ä»¶ä»¥æ”¯æ´ %s ã€‚",
+"Internet connection not working" => "ç„¡ç¶²éš›ç¶²è·¯å˜å–",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "é€™è‡º ownCloud ä¼ºæœå™¨æ²’æœ‰é€£æŽ¥åˆ°ç¶²éš›ç¶²è·¯ï¼Œå› æ¤æœ‰äº›åŠŸèƒ½åƒæ˜¯æŽ›è¼‰å¤–éƒ¨å„²å˜ç©ºé–“ã€æ›´æ–° ownCloud æˆ–æ‡‰ç”¨ç¨‹å¼çš„é€šçŸ¥æ²’æœ‰è¾¦æ³•é‹ä½œã€‚é€éŽç¶²éš›ç¶²è·¯å˜å–æª”æ¡ˆé‚„æœ‰é›»åéƒµä»¶é€šçŸ¥å¯èƒ½ä¹Ÿç„¡æ³•é‹ä½œã€‚å¦‚æžœæƒ³è¦ ownCloud å®Œæ•´çš„åŠŸèƒ½ï¼Œå»ºè°æ‚¨å°‡é€™è‡ºä¼ºæœå™¨é€£æŽ¥è‡³ç¶²éš›ç¶²è·¯ã€‚",
+"Cron" => "Cron",
 "Execute one task with each page loaded" => "ç•¶é é¢è¼‰å…¥æ™‚ï¼ŒåŸ·è¡Œ",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php å·²ç¶“åœ¨ webcron æœå‹™ç•¶ä¸è¨»å†Šï¼Œè«‹æ¯åˆ†é˜é€éŽ HTTP å‘¼å« ownCloud æ ¹ç›®éŒ„ç•¶ä¸çš„ cron.php ä¸€æ¬¡ã€‚",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ä½¿ç”¨ç³»çµ±çš„ cron æœå‹™ï¼Œæ¯åˆ†é˜åŸ·è¡Œä¸€æ¬¡ owncloud è³‡æ–™å¤¾ä¸çš„ cron.php ã€‚",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php å·²ç¶“è¨»å†Š webcron æœå‹™ï¼Œwebcron æ¯åˆ†é˜æœƒå‘¼å« cron.php ä¸€æ¬¡ã€‚",
+"Use systems cron service to call the cron.php file once a minute." => "ä½¿ç”¨ç³»çµ±çš„ cron æœå‹™ä¾†å‘¼å« cron.php æ¯åˆ†é˜ä¸€æ¬¡ã€‚",
 "Sharing" => "åˆ†äº«",
 "Enable Share API" => "å•Ÿç”¨åˆ†äº« API",
 "Allow apps to use the Share API" => "å…è¨± apps ä½¿ç”¨åˆ†äº« API",
 "Allow links" => "å…è¨±é€£çµ",
-"Allow users to share items to the public with links" => "å…è¨±ä½¿ç”¨è€…é€éŽå…¬é–‹çš„é€£çµåˆ†äº«æª”æ¡ˆ",
+"Allow users to share items to the public with links" => "å…è¨±ä½¿ç”¨è€…ä»¥çµé€£å…¬é–‹åˆ†äº«æª”æ¡ˆ",
+"Allow public uploads" => "å…è¨±ä»»ä½•äººä¸Šå‚³",
+"Allow users to enable others to upload into their publicly shared folders" => "å…è¨±ä½¿ç”¨è€…å°‡ä»–å€‘å…¬é–‹åˆ†äº«çš„è³‡æ–™å¤¾è¨å®šç‚ºã€Œä»»ä½•äººçš†å¯ä¸Šå‚³ã€",
 "Allow resharing" => "å…è¨±è½‰è²¼åˆ†äº«",
 "Allow users to share items shared with them again" => "å…è¨±ä½¿ç”¨è€…åˆ†äº«å…¶ä»–ä½¿ç”¨è€…åˆ†äº«çµ¦ä»–çš„æª”æ¡ˆ",
 "Allow users to share with anyone" => "å…è¨±ä½¿ç”¨è€…èˆ‡ä»»ä½•äººåˆ†äº«æª”æ¡ˆ",
 "Allow users to only share with users in their groups" => "åƒ…å…è¨±ä½¿ç”¨è€…åœ¨ç¾¤çµ„å…§åˆ†äº«",
 "Security" => "å®‰å…¨æ€§",
 "Enforce HTTPS" => "å¼·åˆ¶å•Ÿç”¨ HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "å¼·åˆ¶æŒ‡å®šç”¨æˆ¶ç«¯ä½¿ç”¨åŠ å¯†çš„é€£ç·šé€£æŽ¥åˆ° ownCloud",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "è«‹ä½¿ç”¨ HTTPS é€£ç·šåˆ° ownCloudï¼Œæˆ–æ˜¯é—œé–‰å¼·åˆ¶ä½¿ç”¨ SSL çš„é¸é …ã€‚",
+"Forces the clients to connect to %s via an encrypted connection." => "å¼·è¿«ç”¨æˆ¶ç«¯ä½¿ç”¨åŠ å¯†é€£ç·šé€£æŽ¥åˆ° %s",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "è«‹ä½¿ç”¨ HTTPS é€£ç·šåˆ° %s ä»¥å•“ç”¨æˆ–åœç”¨å¼·åˆ¶ SSL åŠ å¯†ã€‚",
 "Log" => "ç´€éŒ„",
 "Log level" => "ç´€éŒ„å±¤ç´š",
 "More" => "æ›´å¤š",
-"Less" => "å°‘",
+"Less" => "æ›´å°‘",
 "Version" => "ç‰ˆæœ¬",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "ç”±<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud ç¤¾å€</a>é–‹ç™¼ï¼Œ<a href=\"https://github.com/owncloud\" target=\"_blank\">æºä»£ç¢¼</a>åœ¨<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>è¨±å¯è‰ä¸‹ç™¼å¸ƒã€‚",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "ç”± <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud ç¤¾ç¾¤</a>é–‹ç™¼ï¼Œ<a href=\"https://github.com/owncloud\" target=\"_blank\">åŽŸå§‹ç¢¼</a>åœ¨ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> è¨±å¯è‰ä¸‹ç™¼å¸ƒã€‚",
 "Add your App" => "æ·»åŠ ä½ çš„ App",
 "More Apps" => "æ›´å¤šApps",
 "Select an App" => "é¸æ“‡ä¸€å€‹æ‡‰ç”¨ç¨‹å¼",
@@ -98,9 +101,11 @@
 "Language" => "èªžè¨€",
 "Help translate" => "å¹«åŠ©ç¿»è¯",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "ä½¿ç”¨<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">é€™å€‹ç¶²å€</a>ä¾†é€éŽ WebDAV å˜å–æ‚¨çš„æª”æ¡ˆ",
 "Login Name" => "ç™»å…¥åç¨±",
 "Create" => "å»ºç«‹",
 "Admin Recovery Password" => "ç®¡ç†è€…å¾©åŽŸå¯†ç¢¼",
+"Enter the recovery password in order to recover the users files during password change" => "ç‚ºäº†ä¿®æ”¹å¯†ç¢¼æ™‚èƒ½å¤ å–å›žä½¿ç”¨è€…è³‡æ–™ï¼Œè«‹è¼¸å…¥å¦ä¸€çµ„é‚„åŽŸç”¨å¯†ç¢¼",
 "Default Storage" => "é è¨å„²å˜å€",
 "Unlimited" => "ç„¡é™åˆ¶",
 "Other" => "å…¶ä»–",
@@ -110,3 +115,4 @@
 "set new password" => "è¨å®šæ–°å¯†ç¢¼",
 "Default" => "é è¨"
 );
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/personal.php b/settings/personal.php
index 2c0b4b9e33fc665198f3513d6bdbf111a59fd24e..1e2e1cf6723a8543fe5b8c5ee69488ef7b25c6ec 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -34,7 +34,7 @@ $languages=array();
 $commonlanguages = array();
 foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
-	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
+	if(substr($l->t('__language_name__'), 0, 1) !== '_') {//first check if the language name is in the translation file
 		$ln=array('code'=>$lang, 'name'=> (string)$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
 		$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4af53a649b89840aff14bf8c4e05eeb16b81b2e7..2b14c1460d6b538316c50dc9c98c170a1079dee0 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -4,8 +4,6 @@
  * See the COPYING-README file.
  */
 $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
-
-$defaults = new OC_Defaults(); // initialize themable default strings and urls
 ?>
 
 <?php
@@ -17,7 +15,7 @@ if (!$_['htaccessworking']) {
 	<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
 
 	<span class="securitywarning">
-		<?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?>
+		<?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?>
 	</span>
 
 </fieldset>
@@ -32,7 +30,7 @@ if (!$_['isWebDavWorking']) {
 
 	<span class="securitywarning">
 		<?php p($l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.')); ?>
-		<?php print_unescaped($l->t('Please double check the <a href=\'%s\'>installation guides</a>.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html')); ?>
+		<?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', $theme->getDocBaseUrl().'/server/5.0/admin_manual/installation.html')); ?>
 	</span>
 
 </fieldset>
@@ -62,7 +60,7 @@ if (!$_['islocaleworking']) {
 		<span class="connectionwarning">
 		<?php
 			$locales = 'en_US.UTF-8/en_US.UTF8';
-			p($l->t('This ownCloud server can\'t set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.', array($locales, $locales)));
+			p($l->t('System locale can\'t be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.', array($locales, $locales)));
 			?>
 	</span>
 
@@ -77,7 +75,7 @@ if (!$_['internetconnectionworking']) {
 	<legend><strong><?php p($l->t('Internet connection not working'));?></strong></legend>
 
 		<span class="connectionwarning">
-		<?php p($l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.')); ?>
+		<?php p($l->t('This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donÂ´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')); ?>
 	</span>
 
 </fieldset>
@@ -96,7 +94,7 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="ajax"
-					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
+					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_ajax">AJAX</label><br/>
@@ -106,21 +104,21 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="webcron"
-					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
+					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_webcron">Webcron</label><br/>
-				<em><?php p($l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http.")); ?></em>
+				<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php once a minute over http.")); ?></em>
 			</td>
 		</tr>
 		<tr>
 			<td>
 				<input type="radio" name="mode" value="cron"
-					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
 					print_unescaped('checked="checked"');
 				} ?>>
 				<label for="backgroundjobs_cron">Cron</label><br/>
-				<em><?php p($l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute.")); ?></em>
+				<em><?php p($l->t("Use systems cron service to call the cron.php file once a minute.")); ?></em>
 			</td>
 		</tr>
 	</table>
@@ -132,34 +130,44 @@ if (!$_['internetconnectionworking']) {
 		<tr>
 			<td id="enable">
 				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="shareAPIEnabled"><?php p($l->t('Enable Share API'));?></label><br/>
 				<em><?php p($l->t('Allow apps to use the Share API')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
-					   value="1" <?php if ($_['allowLinks'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
 				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
 			</td>
 		</tr>
+		<?php if (!\OCP\App::isEnabled('files_encryption')) { ?>
 		<tr>
 			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+				<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
+				       value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
+				<em><?php p($l->t('Allow users to enable others to upload into their publicly shared folders')); ?></em>
+			</td>
+		</tr>
+		<?php } ?>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
 				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-					   value="1" <?php if ($_['allowResharing'] == 'yes') print_unescaped('checked="checked"'); ?> />
+					   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
 				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
 			</td>
 		</tr>
 		<tr>
-			<td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-					   value="global" <?php if ($_['sharePolicy'] == 'global') print_unescaped('checked="checked"'); ?> />
+					   value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
 				<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
 				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
-					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') print_unescaped('checked="checked"'); ?> />
+					   value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> />
 				<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
 			</td>
 		</tr>
@@ -181,10 +189,16 @@ if (!$_['internetconnectionworking']) {
 					?>
 					<?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> />
 				<label for="forcessl"><?php p($l->t('Enforce HTTPS'));?></label><br/>
-				<em><?php p($l->t('Enforces the clients to connect to ownCloud via an encrypted connection.')); ?></em>
+				<em><?php p($l->t(
+					'Forces the clients to connect to %s via an encrypted connection.',
+					$theme->getName()
+				)); ?></em>
 				<?php if (!$_['isConnectedViaHTTPS']) {
 					print_unescaped("<br/><em>");
-					p($l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.'));
+					p($l->t(
+						'Please connect to your %s via HTTPS to enable or disable the SSL enforcement.',
+						$theme->getName()
+					));
 					print_unescaped("</em>");
 				}
 				?>
@@ -198,7 +212,7 @@ if (!$_['internetconnectionworking']) {
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 	<option value='<?php p($_['loglevel'])?>'><?php p($levels[$_['loglevel']])?></option>
 	<?php for ($i = 0; $i < 5; $i++):
-	if ($i != $_['loglevel']):?>
+	if ($i !== $_['loglevel']):?>
 		<option value='<?php p($i)?>'><?php p($levels[$i])?></option>
 		<?php endif;
 endfor;?>
@@ -234,7 +248,7 @@ endfor;?>
 
 <fieldset class="personalblock">
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
-	<strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
+	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getVersionString()); ?>
 <?php if (OC_Util::getEditionString() === ''): ?>
 	<p>
 		<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
@@ -243,6 +257,6 @@ endfor;?>
 </fieldset>
 <fieldset class="personalblock credits-footer">
 <p>
-	<?php print_unescaped($defaults->getShortFooter()); ?>
+	<?php print_unescaped($theme->getShortFooter()); ?>
 </p>
 </fieldset>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 147ad834a9c5c8422d1e23148ff9aeb7386d4f07..7d677bdd4557e07733509993e86df49b82f6cd3e 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,9 +4,7 @@
  * See the COPYING-README file.
  */?>
 
-<?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
-
-<div class="clientsbox">
+<div class="clientsbox center">
 	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" />
@@ -18,7 +16,7 @@
 		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" />
 	</a>
 	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
-	<center><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></center>
+	<p class="center"><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
 	<?php }?>
 </div>
 
@@ -96,7 +94,7 @@ if($_['passwordChangeSupported']) {
 		<?php endforeach;?>
 		</select>
 		<?php if (OC_Util::getEditionString() === ''): ?>
-		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
+		<a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
 			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
 		<?php endif; ?>
 	</fieldset>
@@ -105,7 +103,7 @@ if($_['passwordChangeSupported']) {
 <fieldset class="personalblock">
 	<legend><strong><?php p($l->t('WebDAV'));?></strong></legend>
 	<code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br />
-	<em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($defaults->getDocBaseUrl())));?></em>
+	<em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($theme->getDocBaseUrl())));?></em>
 </fieldset>
 
 <?php foreach($_['forms'] as $form) {
@@ -114,13 +112,13 @@ if($_['passwordChangeSupported']) {
 
 <fieldset class="personalblock">
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
-	<strong><?php p($defaults->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
+	<strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
 <?php if (OC_Util::getEditionString() === ''): ?>
 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
 <?php endif; ?>
 </fieldset>
 <fieldset class="personalblock credits-footer">
 <p>
-	<?php print_unescaped($defaults->getShortFooter()); ?>
+	<?php print_unescaped($theme->getShortFooter()); ?>
 </p>
 </fieldset>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 9fcc11ab89a4bf680d170ec54eb1d2605935fa1a..4ddef3ff1b56e0675bcc5abb7097d9a799b46343 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -43,12 +43,12 @@ $_['subadmingroups'] = array_flip($items);
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<option
-					<?php if($_['default_quota']=='none') print_unescaped('selected="selected"');?>
+					<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
 						value='none'>
 					<?php p($l->t('Unlimited'));?>
 				</option>
 				<?php foreach($_['quota_preset'] as $preset):?>
-				<?php if($preset!='default'):?>
+				<?php if($preset !== 'default'):?>
 				<option
 				<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
 					value='<?php p($preset);?>'>
@@ -132,12 +132,12 @@ $_['subadmingroups'] = array_flip($items);
 			<td class="quota">
 				<select class='quota-user'>
 					<option
-						<?php if($user['quota']=='default') print_unescaped('selected="selected"');?>
+						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
 							value='default'>
 						<?php p($l->t('Default'));?>
 					</option>
 					<option
-					<?php if($user['quota']=='none') print_unescaped('selected="selected"');?>
+					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
 							value='none'>
 						<?php p($l->t('Unlimited'));?>
 					</option>
diff --git a/settings/users.php b/settings/users.php
index e5c8a7aaa8d2963f6aab0dae4ddc57c689dbab36..ba79ae93b28acea4092325a24f4684bb26210d05 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -52,7 +52,7 @@ foreach($accessibleusers as $uid => $displayName) {
 		&& array_search($quota, array('none', 'default'))===false;
 
 	$name = $displayName;
-	if ( $displayName != $uid ) {
+	if ( $displayName !== $uid ) {
 		$name = $name . ' ('.$uid.')';
 	} 
 	
diff --git a/tests/data/l10n/cs.php b/tests/data/l10n/cs.php
new file mode 100644
index 0000000000000000000000000000000000000000..1c5907bc148d7c83ee3afde3d6e09293a322c60e
--- /dev/null
+++ b/tests/data/l10n/cs.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+	"_%n window__%n windows_" => array("%n okno", "%n okna", "%n oken")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/tests/data/l10n/de.php b/tests/data/l10n/de.php
new file mode 100644
index 0000000000000000000000000000000000000000..858ec8af49c60834e5e1b377a8b55975ea6fa74c
--- /dev/null
+++ b/tests/data/l10n/de.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+	"_%n file__%n files_" => array("%n Datei", "%n Dateien")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/tests/data/l10n/ru.php b/tests/data/l10n/ru.php
new file mode 100644
index 0000000000000000000000000000000000000000..dd46293db6cdde30cd3c704d38adb5e73499a1b6
--- /dev/null
+++ b/tests/data/l10n/ru.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+	"_%n file__%n files_" => array("%n Ñ„Ð°Ð¹Ð»", "%n Ñ„Ð°Ð¹Ð»Ð°", "%n Ñ„Ð°Ð¹Ð»Ð¾Ð²")
+);
+$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);";
diff --git a/tests/data/testimage.gif b/tests/data/testimage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3026395c5e652cb617d6124df386683edf4166e5
Binary files /dev/null and b/tests/data/testimage.gif differ
diff --git a/tests/data/testimage.jpg b/tests/data/testimage.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2f51a2a6cdd462c682072980223fb076b1d258e4
Binary files /dev/null and b/tests/data/testimage.jpg differ
diff --git a/tests/data/testimage.png b/tests/data/testimage.png
new file mode 100644
index 0000000000000000000000000000000000000000..257598f04f5e8fd0dc795136c16fde2b6ec0c17e
Binary files /dev/null and b/tests/data/testimage.png differ
diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
deleted file mode 100644
index bb5eb483dbf150bcb523c2907f64eed31cf09998..0000000000000000000000000000000000000000
--- a/tests/lib/cache/apc.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2012 Robin Appelman icewind@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-class Test_Cache_APC extends Test_Cache {
-	public function setUp() {
-		if(!extension_loaded('apc')) {
-			$this->markTestSkipped('The apc extension is not available.');
-			return;
-		}
-		if(!ini_get('apc.enable_cli') && OC::$CLI) {
-			$this->markTestSkipped('apc not available in CLI.');
-			return;
-		}
-		$this->instance=new OC_Cache_APC();
-	}
-}
diff --git a/tests/lib/config.php b/tests/lib/config.php
new file mode 100644
index 0000000000000000000000000000000000000000..c67a66c832e4afd1fd96a3e69e87d7707e515275
--- /dev/null
+++ b/tests/lib/config.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Config extends PHPUnit_Framework_TestCase {
+	const CONFIG_FILE = 'static://config.php';
+	const CONFIG_DIR = 'static://';
+	const TESTCONTENT = '<?php $CONFIG=array("foo"=>"bar");';
+
+	/**
+	 * @var \OC\Config
+	 */
+	private $config;
+
+	function setUp() {
+		file_put_contents(self::CONFIG_FILE, self::TESTCONTENT);
+		$this->config = new OC\Config(self::CONFIG_DIR);
+	}
+
+	public function testReadData() {
+		$config = new OC\Config('/non-existing');
+		$this->assertAttributeEquals(array(), 'cache', $config);
+
+		$this->assertAttributeEquals(array('foo' => 'bar'), 'cache', $this->config);
+	}
+
+	public function testGetKeys() {
+		$this->assertEquals(array('foo'), $this->config->getKeys());
+	}
+
+	public function testGetValue() {
+		$this->assertEquals('bar', $this->config->getValue('foo'));
+		$this->assertEquals(null, $this->config->getValue('bar'));
+		$this->assertEquals('moo', $this->config->getValue('bar', 'moo'));
+	}
+
+	public function testSetValue() {
+		$this->config->setDebugMode(false);
+		$this->config->setValue('foo', 'moo');
+		$this->assertAttributeEquals(array('foo' => 'moo'), 'cache', $this->config);
+		$content = file_get_contents(self::CONFIG_FILE);
+
+		$expected = "<?php\n\$CONFIG = array (\n  'foo' => 'moo',\n);\n";
+		$this->assertEquals($expected, $content);
+		$this->config->setValue('bar', 'red');
+		$this->assertAttributeEquals(array('foo' => 'moo', 'bar' => 'red'), 'cache', $this->config);
+		$content = file_get_contents(self::CONFIG_FILE);
+
+		$expected = "<?php\n\$CONFIG = array (\n  'foo' => 'moo',\n  'bar' => 'red',\n);\n";
+		$this->assertEquals($expected, $content);
+	}
+
+	public function testDeleteKey() {
+		$this->config->setDebugMode(false);
+		$this->config->deleteKey('foo');
+		$this->assertAttributeEquals(array(), 'cache', $this->config);
+		$content = file_get_contents(self::CONFIG_FILE);
+
+		$expected = "<?php\n\$CONFIG = array (\n);\n";
+		$this->assertEquals($expected, $content);
+	}
+
+	public function testSavingDebugMode() {
+		$this->config->setDebugMode(true);
+		$this->config->deleteKey('foo'); // change something so we save to the config file
+		$this->assertAttributeEquals(array(), 'cache', $this->config);
+		$this->assertAttributeEquals(true, 'debugMode', $this->config);
+		$content = file_get_contents(self::CONFIG_FILE);
+
+		$expected = "<?php\ndefine('DEBUG',true);\n\$CONFIG = array (\n);\n";
+		$this->assertEquals($expected, $content);
+	}
+
+	/**
+	 * @expectedException \OC\HintException
+	 */
+	public function testWriteData() {
+		$config = new OC\Config('/non-writable');
+		$config->setValue('foo', 'bar');
+	}
+}
diff --git a/tests/lib/db.php b/tests/lib/db.php
index 69e3542f9263f4a29cdf2b309cdb014fb6089464..51edbf7b309bdfd9c6608aa7ebbb23311511ed2e 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -37,7 +37,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$result = $query->execute(array('uri_1'));
 		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
-		$this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null
+		$this->assertFalse($row);
 		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)');
 		$result = $query->execute(array('fullname test', 'uri_1'));
 		$this->assertEquals(1, $result);
@@ -71,7 +71,19 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$result = $query->execute(array('uri_3'));
 		$this->assertTrue((bool)$result);
 	}
-
+	
+	public function testLastInsertId() {
+		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)');
+		$result1 = OC_DB::executeAudited($query, array('insertid 1','uri_1'));
+		$id1 = OC_DB::insertid('*PREFIX*'.$this->table2);
+		
+		// we don't know the id we should expect, so insert another row
+		$result2 = OC_DB::executeAudited($query, array('insertid 2','uri_2'));
+		$id2 = OC_DB::insertid('*PREFIX*'.$this->table2);
+		// now we can check if the two ids are in correct order
+		$this->assertGreaterThan($id1, $id2);
+	}
+	
 	public function testinsertIfNotExist() {
 		$categoryentries = array(
 				array('user' => 'test', 'type' => 'contact', 'category' => 'Family',    'expectedResult' => 1),
@@ -94,7 +106,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$query = OC_DB::prepare('SELECT * FROM `*PREFIX*'.$this->table3.'`');
 		$result = $query->execute();
 		$this->assertTrue((bool)$result);
-		$this->assertEquals(4, $result->numRows());
+		$this->assertEquals(4, count($result->fetchAll()));
 	}
 
 	public function testinsertIfNotExistDontOverwrite() {
diff --git a/tests/lib/db/mdb2schemareader.php b/tests/lib/db/mdb2schemareader.php
new file mode 100644
index 0000000000000000000000000000000000000000..b9b241194fda920ba423e16d7a892fd3e0b2e90e
--- /dev/null
+++ b/tests/lib/db/mdb2schemareader.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\DB;
+
+use Doctrine\DBAL\Platforms\MySqlPlatform;
+
+class MDB2SchemaReader extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\DB\MDB2SchemaReader $reader
+	 */
+	protected $reader;
+
+	/**
+	 * @return \OC\Config
+	 */
+	protected function getConfig() {
+		$config = $this->getMockBuilder('\OC\Config')
+			->disableOriginalConstructor()
+			->getMock();
+		$config->expects($this->any())
+			->method('getValue')
+			->will($this->returnValueMap(array(
+				array('dbname', 'owncloud', 'testDB'),
+				array('dbtableprefix', 'oc_', 'test_')
+			)));
+		return $config;
+	}
+
+	public function testRead() {
+		$reader = new \OC\DB\MDB2SchemaReader($this->getConfig(), new MySqlPlatform());
+		$schema = $reader->loadSchemaFromFile(__DIR__ . '/testschema.xml');
+		$this->assertCount(1, $schema->getTables());
+
+		$table = $schema->getTable('test_table');
+		$this->assertCount(7, $table->getColumns());
+
+		$this->assertEquals(4, $table->getColumn('integerfield')->getLength());
+		$this->assertTrue($table->getColumn('integerfield')->getAutoincrement());
+		$this->assertNull($table->getColumn('integerfield')->getDefault());
+		$this->assertTrue($table->getColumn('integerfield')->getNotnull());
+		$this->assertInstanceOf('Doctrine\DBAL\Types\IntegerType', $table->getColumn('integerfield')->getType());
+
+		$this->assertSame(10, $table->getColumn('integerfield_default')->getDefault());
+
+		$this->assertEquals(32, $table->getColumn('textfield')->getLength());
+		$this->assertFalse($table->getColumn('textfield')->getAutoincrement());
+		$this->assertSame('foo', $table->getColumn('textfield')->getDefault());
+		$this->assertTrue($table->getColumn('textfield')->getNotnull());
+		$this->assertInstanceOf('Doctrine\DBAL\Types\StringType', $table->getColumn('textfield')->getType());
+
+		$this->assertNull($table->getColumn('clobfield')->getLength());
+		$this->assertFalse($table->getColumn('clobfield')->getAutoincrement());
+		$this->assertSame('', $table->getColumn('clobfield')->getDefault());
+		$this->assertTrue($table->getColumn('clobfield')->getNotnull());
+		$this->assertInstanceOf('Doctrine\DBAL\Types\TextType', $table->getColumn('clobfield')->getType());
+
+		$this->assertNull($table->getColumn('booleanfield')->getLength());
+		$this->assertFalse($table->getColumn('booleanfield')->getAutoincrement());
+		$this->assertFalse($table->getColumn('booleanfield')->getDefault());
+		$this->assertInstanceOf('Doctrine\DBAL\Types\BooleanType', $table->getColumn('booleanfield')->getType());
+
+		$this->assertTrue($table->getColumn('booleanfield_true')->getDefault());
+		$this->assertFalse($table->getColumn('booleanfield_false')->getDefault());
+
+		$this->assertCount(2, $table->getIndexes());
+		$this->assertEquals(array('integerfield'), $table->getIndex('primary')->getUnquotedColumns());
+		$this->assertTrue($table->getIndex('primary')->isPrimary());
+		$this->assertTrue($table->getIndex('primary')->isUnique());
+		$this->assertEquals(array('booleanfield'), $table->getIndex('index_boolean')->getUnquotedColumns());
+		$this->assertFalse($table->getIndex('index_boolean')->isPrimary());
+		$this->assertFalse($table->getIndex('index_boolean')->isUnique());
+	}
+}
diff --git a/tests/lib/db/testschema.xml b/tests/lib/db/testschema.xml
new file mode 100644
index 0000000000000000000000000000000000000000..509b55ee81fd400ea1e2b38aded90a4ebe47dfce
--- /dev/null
+++ b/tests/lib/db/testschema.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<database>
+
+	<name>*dbname*</name>
+	<create>true</create>
+	<overwrite>false</overwrite>
+
+	<charset>utf8</charset>
+
+	<table>
+
+		<name>*dbprefix*table</name>
+
+		<declaration>
+			<field>
+				<name>integerfield</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
+				<length>4</length>
+			</field>
+			<field>
+				<name>integerfield_default</name>
+				<type>integer</type>
+				<default>10</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+			<field>
+				<name>textfield</name>
+				<type>text</type>
+				<default>foo</default>
+				<notnull>true</notnull>
+				<length>32</length>
+			</field>
+			<field>
+				<name>clobfield</name>
+				<type>clob</type>
+				<notnull>true</notnull>
+			</field>
+			<field>
+				<name>booleanfield</name>
+				<type>boolean</type>
+			</field>
+			<field>
+				<name>booleanfield_true</name>
+				<type>boolean</type>
+				<default>true</default>
+			</field>
+			<field>
+				<name>booleanfield_false</name>
+				<type>boolean</type>
+				<default>false</default>
+			</field>
+
+			<index>
+				<name>index_primary</name>
+				<primary>true</primary>
+				<unique>true</unique>
+				<field>
+					<name>integerfield</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+			<index>
+				<name>index_boolean</name>
+				<unique>false</unique>
+				<field>
+					<name>booleanfield</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+		</declaration>
+	</table>
+</database>
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 527c1d1b2a13c84092ab68175393dedb7b5f4698..247373a5cb9fd641b8e8e07a1f2f793650313bd7 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -127,6 +127,11 @@ class Cache extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals(1025, $this->cache->calculateFolderSize($file1));
 
+		$this->cache->remove($file2);
+		$this->cache->remove($file3);
+		$this->cache->remove($file4);
+		$this->assertEquals(0, $this->cache->calculateFolderSize($file1));
+
 		$this->cache->remove('folder');
 		$this->assertFalse($this->cache->inCache('folder/foo'));
 		$this->assertFalse($this->cache->inCache('folder/bar'));
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 263ceadccc7deeb0497e6fbb92860253b1d2fef7..f6deb93a49e1a37215878327bd7cd056b1078af4 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -143,6 +143,24 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$newData = $this->cache->get('');
 		$this->assertEquals($oldData['etag'], $newData['etag']);
 		$this->assertEquals(-1, $newData['size']);
+
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE);
+		$oldData = $this->cache->get('');
+		$this->assertNotEquals(-1, $oldData['size']);
+		$this->scanner->scanFile('', \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE);
+		$newData = $this->cache->get('');
+		$this->assertEquals($oldData['etag'], $newData['etag']);
+		$this->assertEquals($oldData['size'], $newData['size']);
+
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE);
+		$newData = $this->cache->get('');
+		$this->assertEquals($oldData['etag'], $newData['etag']);
+		$this->assertEquals($oldData['size'], $newData['size']);
+
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE);
+		$newData = $this->cache->get('');
+		$this->assertEquals($oldData['etag'], $newData['etag']);
+		$this->assertEquals($oldData['size'], $newData['size']);
 	}
 
 	public function testRemovedFile() {
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index fb3e05e66b3c74380aa9196545cd917d48231708..3f339a10016a29b716a9c49d24b702f84c35b7e8 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -168,74 +168,27 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($this->instance->isReadable('/lorem.txt'));
 		$ctimeEnd = time();
 		$mTime = $this->instance->filemtime('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 1));
-		$this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 1));
+		$this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 5));
+		$this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 5));
 
-		$this->assertTrue(($ctimeStart - 1) <= $mTime);
+		$this->assertTrue(($ctimeStart - 5) <= $mTime);
 		$this->assertTrue($mTime <= ($ctimeEnd + 1));
 		$this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
 
 		$stat = $this->instance->stat('/lorem.txt');
-		//only size and mtime are requered in the result
+		//only size and mtime are required in the result
 		$this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
 		$this->assertEquals($stat['mtime'], $mTime);
 
-		$mtimeStart = time();
-		$supportsTouch = $this->instance->touch('/lorem.txt');
-		$mtimeEnd = time();
-		if ($supportsTouch !== false) {
+		if ($this->instance->touch('/lorem.txt', 100) !== false) {
 			$mTime = $this->instance->filemtime('/lorem.txt');
-			$this->assertTrue(($mtimeStart - 1) <= $mTime);
-			$this->assertTrue($mTime <= ($mtimeEnd + 1));
-
-			$this->assertTrue($this->instance->hasUpdated('/lorem.txt', $mtimeStart - 1));
-
-			if ($this->instance->touch('/lorem.txt', 100) !== false) {
-				$mTime = $this->instance->filemtime('/lorem.txt');
-				$this->assertEquals($mTime, 100);
-			}
+			$this->assertEquals($mTime, 100);
 		}
 
 		$mtimeStart = time();
-		$fh = $this->instance->fopen('/lorem.txt', 'a');
-		fwrite($fh, ' ');
-		fclose($fh);
-		clearstatcache();
-		$mtimeEnd = time();
-		$mTime = $this->instance->filemtime('/lorem.txt');
-		$this->assertTrue(($mtimeStart - 1) <= $mTime);
-		$this->assertTrue($mTime <= ($mtimeEnd + 1));
 
 		$this->instance->unlink('/lorem.txt');
-		$this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 1));
-	}
-
-	public function testSearch() {
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
-		$pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
-		$this->instance->file_put_contents('/logo-wide.png', file_get_contents($pngFile, 'r'));
-		$svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
-		$this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r'));
-		$result = $this->instance->search('logo');
-		$this->assertEquals(2, count($result));
-		$this->assertContains('/logo-wide.svg', $result);
-		$this->assertContains('/logo-wide.png', $result);
-	}
-
-	public function testSearchInSubFolder() {
-		$this->instance->mkdir('sub');
-		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
-		$this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r'));
-		$pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
-		$this->instance->file_put_contents('/sub/logo-wide.png', file_get_contents($pngFile, 'r'));
-		$svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
-		$this->instance->file_put_contents('/sub/logo-wide.svg', file_get_contents($svgFile, 'r'));
-
-		$result = $this->instance->search('logo');
-		$this->assertEquals(2, count($result));
-		$this->assertContains('/sub/logo-wide.svg', $result);
-		$this->assertContains('/sub/logo-wide.png', $result);
+		$this->assertTrue($this->instance->hasUpdated('/', $mtimeStart - 5));
 	}
 
 	public function testFOpen() {
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
new file mode 100644
index 0000000000000000000000000000000000000000..a021d215ae5f683e30d5021a66b6ce57703dd1f1
--- /dev/null
+++ b/tests/lib/files/utils/scanner.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Utils;
+
+use OC\Files\Mount\Mount;
+use OC\Files\Storage\Temporary;
+
+class TestScanner extends \OC\Files\Utils\Scanner {
+	/**
+	 * @var \OC\Files\Mount\Mount[] $mounts
+	 */
+	private $mounts = array();
+
+	/**
+	 * @param \OC\Files\Mount\Mount $mount
+	 */
+	public function addMount($mount) {
+		$this->mounts[] = $mount;
+	}
+
+	protected function getMounts($dir) {
+		return $this->mounts;
+	}
+}
+
+class Scanner extends \PHPUnit_Framework_TestCase {
+	public function testReuseExistingRoot() {
+		$storage = new Temporary(array());
+		$mount = new Mount($storage, '');
+		$cache = $storage->getCache();
+
+		$storage->mkdir('folder');
+		$storage->file_put_contents('foo.txt', 'qwerty');
+		$storage->file_put_contents('folder/bar.txt', 'qwerty');
+
+		$scanner = new TestScanner('');
+		$scanner->addMount($mount);
+
+		$scanner->scan('');
+		$this->assertTrue($cache->inCache('folder/bar.txt'));
+		$oldRoot = $cache->get('');
+
+		$scanner->scan('');
+		$newRoot = $cache->get('');
+		$this->assertEquals($oldRoot, $newRoot);
+	}
+
+	public function testReuseExistingFile() {
+		$storage = new Temporary(array());
+		$mount = new Mount($storage, '');
+		$cache = $storage->getCache();
+
+		$storage->mkdir('folder');
+		$storage->file_put_contents('foo.txt', 'qwerty');
+		$storage->file_put_contents('folder/bar.txt', 'qwerty');
+
+		$scanner = new TestScanner('');
+		$scanner->addMount($mount);
+
+		$scanner->scan('');
+		$this->assertTrue($cache->inCache('folder/bar.txt'));
+		$old = $cache->get('folder/bar.txt');
+
+		$scanner->scan('');
+		$new = $cache->get('folder/bar.txt');
+		$this->assertEquals($old, $new);
+	}
+}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 830913a91ad991161d4cebcce871b63504fadca9..3bac9e770aa1b73fa81bd0b162a3c83618bdc8ce 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -20,10 +20,19 @@ class View extends \PHPUnit_Framework_TestCase {
 	private $storages = array();
 
 	public function setUp() {
+		\OC_User::clearBackends();
+		\OC_User::useBackend(new \OC_User_Dummy());
+
+		//login
+		\OC_User::createUser('test', 'test');
+		$this->user=\OC_User::getUser();
+		\OC_User::setUserId('test');
+
 		\OC\Files\Filesystem::clearMounts();
 	}
 
 	public function tearDown() {
+		\OC_User::setUserId($this->user);
 		foreach ($this->storages as $storage) {
 			$cache = $storage->getCache();
 			$ids = $cache->getAll();
diff --git a/tests/lib/group.php b/tests/lib/group.php
index 9128bd7ddce741b3c6f4a5b6f31b5f90213c55e1..d2c9ce461483e53f57cdea49ad1b986016edd9d1 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -1,56 +1,61 @@
 <?php
 /**
-* ownCloud
-*
-* @author Robin Appelman
-* @author Bernhard Posselt
-* @copyright 2012 Robin Appelman icewind@owncloud.com
-* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @author Bernhard Posselt
+ * @copyright 2012 Robin Appelman icewind@owncloud.com
+ * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 class Test_Group extends PHPUnit_Framework_TestCase {
 	function setUp() {
 		OC_Group::clearBackends();
+		OC_User::clearBackends();
 	}
 
 	function testSingleBackend() {
+		$userBackend = new \OC_User_Dummy();
+		\OC_User::getManager()->registerBackend($userBackend);
 		OC_Group::useBackend(new OC_Group_Dummy());
-		
-		$group1=uniqid();
-		$group2=uniqid();
+
+		$group1 = uniqid();
+		$group2 = uniqid();
 		OC_Group::createGroup($group1);
 		OC_Group::createGroup($group2);
 
-		$user1=uniqid();
-		$user2=uniqid();
+		$user1 = uniqid();
+		$user2 = uniqid();
+		$userBackend->createUser($user1, '');
+		$userBackend->createUser($user2, '');
 
 		$this->assertFalse(OC_Group::inGroup($user1, $group1));
 		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 		$this->assertFalse(OC_Group::inGroup($user1, $group2));
 		$this->assertFalse(OC_Group::inGroup($user2, $group2));
 
-		$this->assertTrue((bool)OC_Group::addToGroup($user1, $group1));
+		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
 
 		$this->assertTrue(OC_Group::inGroup($user1, $group1));
 		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 		$this->assertFalse(OC_Group::inGroup($user1, $group2));
 		$this->assertFalse(OC_Group::inGroup($user2, $group2));
 
-		$this->assertFalse((bool)OC_Group::addToGroup($user1, $group1));
+		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
 
 		$this->assertEquals(array($user1), OC_Group::usersInGroup($group1));
 		$this->assertEquals(array(), OC_Group::usersInGroup($group2));
@@ -65,37 +70,37 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 	}
 
 
-	public function testNoEmptyGIDs(){
+	public function testNoEmptyGIDs() {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		$emptyGroup = null;
 
-		$this->assertEquals(false, OC_Group::createGroup($emptyGroup));
+		$this->assertFalse(OC_Group::createGroup($emptyGroup));
 	}
 
 
-	public function testNoGroupsTwice(){
+	public function testNoGroupsTwice() {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		$group = uniqid();
 		OC_Group::createGroup($group);
 
 		$groupCopy = $group;
 
-		$this->assertEquals(false, OC_Group::createGroup($groupCopy));
+		OC_Group::createGroup($groupCopy);
 		$this->assertEquals(array($group), OC_Group::getGroups());
 	}
 
 
-	public function testDontDeleteAdminGroup(){
+	public function testDontDeleteAdminGroup() {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		$adminGroup = 'admin';
 		OC_Group::createGroup($adminGroup);
 
-		$this->assertEquals(false, OC_Group::deleteGroup($adminGroup));
+		$this->assertFalse(OC_Group::deleteGroup($adminGroup));
 		$this->assertEquals(array($adminGroup), OC_Group::getGroups());
 	}
 
 
-	public function testDontAddUserToNonexistentGroup(){
+	public function testDontAddUserToNonexistentGroup() {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		$groupNonExistent = 'notExistent';
 		$user = uniqid();
@@ -105,8 +110,11 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 	}
 
 
-	public function testUsersInGroup(){
+	public function testUsersInGroup() {
 		OC_Group::useBackend(new OC_Group_Dummy());
+		$userBackend = new \OC_User_Dummy();
+		\OC_User::getManager()->registerBackend($userBackend);
+
 		$group1 = uniqid();
 		$group2 = uniqid();
 		$group3 = uniqid();
@@ -117,27 +125,32 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 		OC_Group::createGroup($group2);
 		OC_Group::createGroup($group3);
 
+		$userBackend->createUser($user1, '');
+		$userBackend->createUser($user2, '');
+		$userBackend->createUser($user3, '');
+
 		OC_Group::addToGroup($user1, $group1);
 		OC_Group::addToGroup($user2, $group1);
 		OC_Group::addToGroup($user3, $group1);
 		OC_Group::addToGroup($user3, $group2);
 
 		$this->assertEquals(array($user1, $user2, $user3),
-					OC_Group::usersInGroups(array($group1, $group2, $group3)));
+			OC_Group::usersInGroups(array($group1, $group2, $group3)));
 
 		// FIXME: needs more parameter variation
 	}
 
 
-
 	function testMultiBackend() {
-		$backend1=new OC_Group_Dummy();
-		$backend2=new OC_Group_Dummy();
+		$userBackend = new \OC_User_Dummy();
+		\OC_User::getManager()->registerBackend($userBackend);
+		$backend1 = new OC_Group_Dummy();
+		$backend2 = new OC_Group_Dummy();
 		OC_Group::useBackend($backend1);
 		OC_Group::useBackend($backend2);
 
-		$group1=uniqid();
-		$group2=uniqid();
+		$group1 = uniqid();
+		$group2 = uniqid();
 		OC_Group::createGroup($group1);
 
 		//groups should be added to the first registered backend
@@ -154,20 +167,23 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 		$this->assertTrue(OC_Group::groupExists($group1));
 		$this->assertTrue(OC_Group::groupExists($group2));
 
-		$user1=uniqid();
-		$user2=uniqid();
+		$user1 = uniqid();
+		$user2 = uniqid();
+
+		$userBackend->createUser($user1, '');
+		$userBackend->createUser($user2, '');
 
 		$this->assertFalse(OC_Group::inGroup($user1, $group1));
 		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 
 
-		$this->assertTrue((bool)OC_Group::addToGroup($user1, $group1));
+		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
 
 		$this->assertTrue(OC_Group::inGroup($user1, $group1));
 		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 		$this->assertFalse($backend2->inGroup($user1, $group1));
 
-		$this->assertFalse((bool)OC_Group::addToGroup($user1, $group1));
+		OC_Group::addToGroup($user1, $group1);
 
 		$this->assertEquals(array($user1), OC_Group::usersInGroup($group1));
 
diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php
new file mode 100644
index 0000000000000000000000000000000000000000..75e975d9e6505bb60e3bb45248b545faac0afc94
--- /dev/null
+++ b/tests/lib/group/group.php
@@ -0,0 +1,316 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Group;
+
+use OC\User\User;
+
+class Group extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @return \PHPUnit_Framework_MockObject_MockObject | \OC\User\Manager
+	 */
+	protected function getUserManager() {
+		$userManager = $this->getMock('\OC\User\Manager');
+		$user1 = new User('user1', null);
+		$user2 = new User('user2', null);
+		$user3 = new User('user3', null);
+		$userManager->expects($this->any())
+			->method('get')
+			->will($this->returnValueMap(array(
+				array('user1', $user1),
+				array('user2', $user2),
+				array('user3', $user3)
+			)));
+		return $userManager;
+	}
+
+	public function testGetUsersSingleBackend() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('usersInGroup')
+			->with('group1')
+			->will($this->returnValue(array('user1', 'user2')));
+
+		$users = $group->getUsers();
+
+		$this->assertEquals(2, count($users));
+		$user1 = $users[0];
+		$user2 = $users[1];
+		$this->assertEquals('user1', $user1->getUID());
+		$this->assertEquals('user2', $user2->getUID());
+	}
+
+	public function testGetUsersMultipleBackends() {
+		$backend1 = $this->getMock('OC_Group_Database');
+		$backend2 = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
+
+		$backend1->expects($this->once())
+			->method('usersInGroup')
+			->with('group1')
+			->will($this->returnValue(array('user1', 'user2')));
+
+		$backend2->expects($this->once())
+			->method('usersInGroup')
+			->with('group1')
+			->will($this->returnValue(array('user2', 'user3')));
+
+		$users = $group->getUsers();
+
+		$this->assertEquals(3, count($users));
+		$user1 = $users[0];
+		$user2 = $users[1];
+		$user3 = $users[2];
+		$this->assertEquals('user1', $user1->getUID());
+		$this->assertEquals('user2', $user2->getUID());
+		$this->assertEquals('user3', $user3->getUID());
+	}
+
+	public function testInGroupSingleBackend() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(true));
+
+		$this->assertTrue($group->inGroup(new User('user1', null)));
+	}
+
+	public function testInGroupMultipleBackends() {
+		$backend1 = $this->getMock('OC_Group_Database');
+		$backend2 = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
+
+		$backend1->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(false));
+
+		$backend2->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(true));
+
+		$this->assertTrue($group->inGroup(new User('user1', null)));
+	}
+
+	public function testAddUser() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(false));
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend->expects($this->once())
+			->method('addToGroup')
+			->with('user1', 'group1');
+
+		$group->addUser(new User('user1', null));
+	}
+
+	public function testAddUserAlreadyInGroup() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(true));
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend->expects($this->never())
+			->method('addToGroup');
+
+		$group->addUser(new User('user1', null));
+	}
+
+	public function testRemoveUser() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(true));
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend->expects($this->once())
+			->method('removeFromGroup')
+			->with('user1', 'group1');
+
+		$group->removeUser(new User('user1', null));
+	}
+
+	public function testRemoveUserNotInGroup() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(false));
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend->expects($this->never())
+			->method('removeFromGroup');
+
+		$group->removeUser(new User('user1', null));
+	}
+
+	public function testRemoveUserMultipleBackends() {
+		$backend1 = $this->getMock('OC_Group_Database');
+		$backend2 = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
+
+		$backend1->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(true));
+		$backend1->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend1->expects($this->once())
+			->method('removeFromGroup')
+			->with('user1', 'group1');
+
+		$backend2->expects($this->once())
+			->method('inGroup')
+			->with('user1', 'group1')
+			->will($this->returnValue(true));
+		$backend2->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend2->expects($this->once())
+			->method('removeFromGroup')
+			->with('user1', 'group1');
+
+		$group->removeUser(new User('user1', null));
+	}
+
+	public function testSearchUsers() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('usersInGroup')
+			->with('group1', '2')
+			->will($this->returnValue(array('user2')));
+
+		$users = $group->searchUsers('2');
+
+		$this->assertEquals(1, count($users));
+		$user2 = $users[0];
+		$this->assertEquals('user2', $user2->getUID());
+	}
+
+	public function testSearchUsersMultipleBackends() {
+		$backend1 = $this->getMock('OC_Group_Database');
+		$backend2 = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
+
+		$backend1->expects($this->once())
+			->method('usersInGroup')
+			->with('group1', '2')
+			->will($this->returnValue(array('user2')));
+		$backend2->expects($this->once())
+			->method('usersInGroup')
+			->with('group1', '2')
+			->will($this->returnValue(array('user2')));
+
+		$users = $group->searchUsers('2');
+
+		$this->assertEquals(1, count($users));
+		$user2 = $users[0];
+		$this->assertEquals('user2', $user2->getUID());
+	}
+
+	public function testSearchUsersLimitAndOffset() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('usersInGroup')
+			->with('group1', 'user', 1, 1)
+			->will($this->returnValue(array('user2')));
+
+		$users = $group->searchUsers('user', 1, 1);
+
+		$this->assertEquals(1, count($users));
+		$user2 = $users[0];
+		$this->assertEquals('user2', $user2->getUID());
+	}
+
+	public function testSearchUsersMultipleBackendsLimitAndOffset() {
+		$backend1 = $this->getMock('OC_Group_Database');
+		$backend2 = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend1, $backend2), $userManager);
+
+		$backend1->expects($this->once())
+			->method('usersInGroup')
+			->with('group1', 'user', 2, 1)
+			->will($this->returnValue(array('user2')));
+		$backend2->expects($this->once())
+			->method('usersInGroup')
+			->with('group1', 'user', 1, 0)
+			->will($this->returnValue(array('user1')));
+
+		$users = $group->searchUsers('user', 2, 1);
+
+		$this->assertEquals(2, count($users));
+		$user2 = $users[0];
+		$user1 = $users[1];
+		$this->assertEquals('user2', $user2->getUID());
+		$this->assertEquals('user1', $user1->getUID());
+	}
+
+	public function testDelete() {
+		$backend = $this->getMock('OC_Group_Database');
+		$userManager = $this->getUserManager();
+		$group = new \OC\Group\Group('group1', array($backend), $userManager);
+
+		$backend->expects($this->once())
+			->method('deleteGroup')
+			->with('group1');
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$group->delete();
+	}
+}
diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..9d3adf51a0c8b9dff88b0c6d8ef35db2901a8173
--- /dev/null
+++ b/tests/lib/group/manager.php
@@ -0,0 +1,313 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Group;
+
+use OC\User\User;
+
+class Manager extends \PHPUnit_Framework_TestCase {
+	public function testGet() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$backend->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(true));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$group = $manager->get('group1');
+		$this->assertNotNull($group);
+		$this->assertEquals('group1', $group->getGID());
+	}
+
+	public function testGetNoBackend() {
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+
+		$this->assertNull($manager->get('group1'));
+	}
+
+	public function testGetNotExists() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$backend->expects($this->once())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(false));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$this->assertNull($manager->get('group1'));
+	}
+
+	public function testGetDeleted() {
+		$backend = new \OC_Group_Dummy();
+		$backend->createGroup('group1');
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$group = $manager->get('group1');
+		$group->delete();
+		$this->assertNull($manager->get('group1'));
+	}
+
+	public function testGetMultipleBackends() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
+		 */
+		$backend1 = $this->getMock('\OC_Group_Database');
+		$backend1->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(false));
+
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2
+		 */
+		$backend2 = $this->getMock('\OC_Group_Database');
+		$backend2->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(true));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend1);
+		$manager->addBackend($backend2);
+
+		$group = $manager->get('group1');
+		$this->assertNotNull($group);
+		$this->assertEquals('group1', $group->getGID());
+	}
+
+	public function testCreate() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$backend->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(false));
+		$backend->expects($this->once())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+		$backend->expects($this->once())
+			->method('createGroup');
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$group = $manager->createGroup('group1');
+		$this->assertEquals('group1', $group->getGID());
+	}
+
+	public function testCreateExists() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$backend->expects($this->any())
+			->method('groupExists')
+			->with('group1')
+			->will($this->returnValue(true));
+		$backend->expects($this->never())
+			->method('createGroup');
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$group = $manager->createGroup('group1');
+		$this->assertEquals('group1', $group->getGID());
+	}
+
+	public function testSearch() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$backend->expects($this->once())
+			->method('getGroups')
+			->with('1')
+			->will($this->returnValue(array('group1')));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$groups = $manager->search('1');
+		$this->assertEquals(1, count($groups));
+		$group1 = $groups[0];
+		$this->assertEquals('group1', $group1->getGID());
+	}
+
+	public function testSearchMultipleBackends() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
+		 */
+		$backend1 = $this->getMock('\OC_Group_Database');
+		$backend1->expects($this->once())
+			->method('getGroups')
+			->with('1')
+			->will($this->returnValue(array('group1')));
+
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2
+		 */
+		$backend2 = $this->getMock('\OC_Group_Database');
+		$backend2->expects($this->once())
+			->method('getGroups')
+			->with('1')
+			->will($this->returnValue(array('group12', 'group1')));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend1);
+		$manager->addBackend($backend2);
+
+		$groups = $manager->search('1');
+		$this->assertEquals(2, count($groups));
+		$group1 = $groups[0];
+		$group12 = $groups[1];
+		$this->assertEquals('group1', $group1->getGID());
+		$this->assertEquals('group12', $group12->getGID());
+	}
+
+	public function testSearchMultipleBackendsLimitAndOffset() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
+		 */
+		$backend1 = $this->getMock('\OC_Group_Database');
+		$backend1->expects($this->once())
+			->method('getGroups')
+			->with('1', 2, 1)
+			->will($this->returnValue(array('group1')));
+
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2
+		 */
+		$backend2 = $this->getMock('\OC_Group_Database');
+		$backend2->expects($this->once())
+			->method('getGroups')
+			->with('1', 1, 0)
+			->will($this->returnValue(array('group12')));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend1);
+		$manager->addBackend($backend2);
+
+		$groups = $manager->search('1', 2, 1);
+		$this->assertEquals(2, count($groups));
+		$group1 = $groups[0];
+		$group12 = $groups[1];
+		$this->assertEquals('group1', $group1->getGID());
+		$this->assertEquals('group12', $group12->getGID());
+	}
+
+	public function testGetUserGroups() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
+		 */
+		$backend = $this->getMock('\OC_Group_Database');
+		$backend->expects($this->once())
+			->method('getUserGroups')
+			->with('user1')
+			->will($this->returnValue(array('group1')));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend);
+
+		$groups = $manager->getUserGroups(new User('user1', null));
+		$this->assertEquals(1, count($groups));
+		$group1 = $groups[0];
+		$this->assertEquals('group1', $group1->getGID());
+	}
+
+	public function testGetUserGroupsMultipleBackends() {
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend1
+		 */
+		$backend1 = $this->getMock('\OC_Group_Database');
+		$backend1->expects($this->once())
+			->method('getUserGroups')
+			->with('user1')
+			->will($this->returnValue(array('group1')));
+		/**
+		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend2
+		 */
+		$backend2 = $this->getMock('\OC_Group_Database');
+		$backend2->expects($this->once())
+			->method('getUserGroups')
+			->with('user1')
+			->will($this->returnValue(array('group1', 'group2')));
+
+		/**
+		 * @var \OC\User\Manager $userManager
+		 */
+		$userManager = $this->getMock('\OC\User\Manager');
+		$manager = new \OC\Group\Manager($userManager);
+		$manager->addBackend($backend1);
+		$manager->addBackend($backend2);
+
+		$groups = $manager->getUserGroups(new User('user1', null));
+		$this->assertEquals(2, count($groups));
+		$group1 = $groups[0];
+		$group2 = $groups[1];
+		$this->assertEquals('group1', $group1->getGID());
+		$this->assertEquals('group2', $group2->getGID());
+	}
+}
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 6acb0dfaa6b1cf1a2eb8b2e7f5e1079e7a089d58..67b5a3d43ecc509bd56822e0df00341ea05cb881 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -146,4 +146,64 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 		$result = OC_Helper::recursiveArraySearch($haystack, "NotFound");
 		$this->assertFalse($result);
 	}
+
+	function testBuildNotExistingFileNameForView() {
+		$viewMock = $this->getMock('\OC\Files\View', array(), array(), '', false);
+		$this->assertEquals('/filename', OC_Helper::buildNotExistingFileNameForView('/', 'filename', $viewMock));
+		$this->assertEquals('dir/filename.ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename.ext exists
+		$this->assertEquals('dir/filename (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename.ext exists
+		$viewMock->expects($this->at(1))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename (2).ext exists
+		$this->assertEquals('dir/filename (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename.ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename (1).ext exists
+		$this->assertEquals('dir/filename (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (1).ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename (2).ext exists
+		$this->assertEquals('dir/filename (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (2).ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename (2).ext exists
+		$viewMock->expects($this->at(1))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename (3).ext exists
+		$this->assertEquals('dir/filename (4).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename (2).ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename(1).ext exists
+		$this->assertEquals('dir/filename(2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1).ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename(1) (1).ext exists
+		$this->assertEquals('dir/filename(1) (2).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (1).ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename(1) (1).ext exists
+		$viewMock->expects($this->at(1))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename(1) (2).ext exists
+		$this->assertEquals('dir/filename(1) (3).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (1).ext', $viewMock));
+
+		$viewMock->expects($this->at(0))
+			->method('file_exists')
+			->will($this->returnValue(true)); // filename(1) (2) (3).ext exists
+		$this->assertEquals('dir/filename(1) (2) (4).ext', OC_Helper::buildNotExistingFileNameForView('dir', 'filename(1) (2) (3).ext', $viewMock));
+	}
 }
diff --git a/tests/lib/hooks/forwardingemitter.php b/tests/lib/hooks/forwardingemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..decf6bb354cae24f0bf1afc7572cd5dee7e10bf7
--- /dev/null
+++ b/tests/lib/hooks/forwardingemitter.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Hooks;
+use OC\Hooks\PublicEmitter;
+
+class DummyForwardingEmitter extends \OC\Hooks\ForwardingEmitter {
+	public function emitEvent($scope, $method, $arguments = array()) {
+		$this->emit($scope, $method, $arguments);
+	}
+
+	/**
+	 * @param \OC\Hooks\Emitter $emitter
+	 */
+	public function forward($emitter) {
+		parent::forward($emitter);
+	}
+}
+
+/**
+ * Class ForwardingEmitter
+ *
+ * allows forwarding all listen calls to other emitters
+ *
+ * @package OC\Hooks
+ */
+class ForwardingEmitter extends BasicEmitter {
+	public function testSingleForward() {
+		$baseEmitter = new PublicEmitter();
+		$forwardingEmitter = new DummyForwardingEmitter();
+		$forwardingEmitter->forward($baseEmitter);
+		$hookCalled = false;
+		$forwardingEmitter->listen('Test', 'test', function () use (&$hookCalled) {
+			$hookCalled = true;
+		});
+		$baseEmitter->emit('Test', 'test');
+		$this->assertTrue($hookCalled);
+	}
+
+	public function testMultipleForwards() {
+		$baseEmitter1 = new PublicEmitter();
+		$baseEmitter2 = new PublicEmitter();
+		$forwardingEmitter = new DummyForwardingEmitter();
+		$forwardingEmitter->forward($baseEmitter1);
+		$forwardingEmitter->forward($baseEmitter2);
+		$hookCalled = 0;
+		$forwardingEmitter->listen('Test', 'test1', function () use (&$hookCalled) {
+			$hookCalled++;
+		});
+		$forwardingEmitter->listen('Test', 'test2', function () use (&$hookCalled) {
+			$hookCalled++;
+		});
+		$baseEmitter1->emit('Test', 'test1');
+		$baseEmitter1->emit('Test', 'test2');
+		$this->assertEquals(2, $hookCalled);
+	}
+
+	public function testForwardExistingHooks() {
+		$baseEmitter = new PublicEmitter();
+		$forwardingEmitter = new DummyForwardingEmitter();
+		$hookCalled = false;
+		$forwardingEmitter->listen('Test', 'test', function () use (&$hookCalled) {
+			$hookCalled = true;
+		});
+		$forwardingEmitter->forward($baseEmitter);
+		$baseEmitter->emit('Test', 'test');
+		$this->assertTrue($hookCalled);
+	}
+}
diff --git a/tests/lib/image.php b/tests/lib/image.php
new file mode 100644
index 0000000000000000000000000000000000000000..0583c300075b87c88faf0b42689bdefad27e91ed
--- /dev/null
+++ b/tests/lib/image.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher SchÃ¤pers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Image extends PHPUnit_Framework_TestCase {
+
+	public function testGetMimeTypeForFile() {
+		$mimetype = \OC_Image::getMimeTypeForFile(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertEquals('image/png', $mimetype);
+
+		$mimetype = \OC_Image::getMimeTypeForFile(OC::$SERVERROOT.'/tests/data/testimage.jpg');
+		$this->assertEquals('image/jpeg', $mimetype);
+
+		$mimetype = \OC_Image::getMimeTypeForFile(OC::$SERVERROOT.'/tests/data/testimage.gif');
+		$this->assertEquals('image/gif', $mimetype);
+
+		$mimetype = \OC_Image::getMimeTypeForFile(null);
+		$this->assertEquals('', $mimetype);
+	}
+
+	public function testConstructDestruct() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertInstanceOf('\OC_Image', $img);
+		unset($img);
+
+		$imgcreate = imagecreatefromjpeg(OC::$SERVERROOT.'/tests/data/testimage.jpg');
+		$img = new \OC_Image($imgcreate);
+		$this->assertInstanceOf('\OC_Image', $img);
+		unset($img);
+
+		$base64 = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'));
+		$img = new \OC_Image($base64);
+		$this->assertInstanceOf('\OC_Image', $img);
+		unset($img);
+
+		$img = new \OC_Image(null);
+		$this->assertInstanceOf('\OC_Image', $img);
+		unset($img);
+	}
+
+	public function testValid() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertTrue($img->valid());
+
+		$text = base64_encode("Lorem ipsum dolor sir amet â€¦");
+		$img = new \OC_Image($text);
+		$this->assertFalse($img->valid());
+
+		$img = new \OC_Image(null);
+		$this->assertFalse($img->valid());
+	}
+
+	public function testMimeType() {
+		$this->markTestSkipped("When loading from data or base64, imagetype is always image/png, see #4258.");
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertEquals('image/png', $img->mimeType());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertEquals('image/jpeg', $img->mimeType());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$this->assertEquals('image/gif', $img->mimeType());
+
+		$img = new \OC_Image(null);
+		$this->assertEquals('', $img->mimeType());
+	}
+
+	public function testWidth() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertEquals(128, $img->width());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertEquals(1680, $img->width());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$this->assertEquals(64, $img->width());
+
+		$img = new \OC_Image(null);
+		$this->assertEquals(-1, $img->width());
+	}
+
+	public function testHeight() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertEquals(128, $img->height());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertEquals(1050, $img->height());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$this->assertEquals(64, $img->height());
+
+		$img = new \OC_Image(null);
+		$this->assertEquals(-1, $img->height());
+	}
+
+	public function testSave() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$img->resize(16);
+		$img->save(OC::$SERVERROOT.'/tests/data/testimage2.png');
+		$this->assertEquals(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage2.png'), $img->data());
+	}
+
+	public function testData() {
+		$this->markTestSkipped("\OC_Image->data() converts to png before outputting data, see #4258.");
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertEquals($expected, $img->data());
+
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.jpg');
+		$expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg');
+		$this->assertEquals($expected, $img->data());
+
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.gif');
+		$expected = file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif');
+		$this->assertEquals($expected, $img->data());
+	}
+
+	public function testToString() {
+		$this->markTestSkipped("\OC_Image->data() converts to png before outputting data, see #4258.");
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png'));
+		$this->assertEquals($expected, (string)$img);
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertEquals($expected, (string)$img);
+
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.gif');
+		$expected = base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif'));
+		$this->assertEquals($expected, (string)$img);
+	}
+
+	public function testResize() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertTrue($img->resize(32));
+		$this->assertEquals(32, $img->width());
+		$this->assertEquals(32, $img->height());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertTrue($img->resize(840));
+		$this->assertEquals(840, $img->width());
+		$this->assertEquals(525, $img->height());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$this->assertTrue($img->resize(100));
+		$this->assertEquals(100, $img->width());
+		$this->assertEquals(100, $img->height());
+	}
+
+	public function testPreciseResize() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertTrue($img->preciseResize(128, 512));
+		$this->assertEquals(128, $img->width());
+		$this->assertEquals(512, $img->height());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertTrue($img->preciseResize(64, 840));
+		$this->assertEquals(64, $img->width());
+		$this->assertEquals(840, $img->height());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$this->assertTrue($img->preciseResize(1000, 1337));
+		$this->assertEquals(1000, $img->width());
+		$this->assertEquals(1337, $img->height());
+	}
+
+	public function testCenterCrop() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$img->centerCrop();
+		$this->assertEquals(128, $img->width());
+		$this->assertEquals(128, $img->height());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$img->centerCrop();
+		$this->assertEquals(1050, $img->width());
+		$this->assertEquals(1050, $img->height());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$img->centerCrop(512);
+		$this->assertEquals(512, $img->width());
+		$this->assertEquals(512, $img->height());
+	}
+
+	public function testCrop() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertTrue($img->crop(0, 0, 50, 20));
+		$this->assertEquals(50, $img->width());
+		$this->assertEquals(20, $img->height());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertTrue($img->crop(500, 700, 550, 300));
+		$this->assertEquals(550, $img->width());
+		$this->assertEquals(300, $img->height());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$this->assertTrue($img->crop(10, 10, 15, 15));
+		$this->assertEquals(15, $img->width());
+		$this->assertEquals(15, $img->height());
+	}
+
+	public function testFitIn() {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$this->assertTrue($img->fitIn(200, 100));
+		$this->assertEquals(100, $img->width());
+		$this->assertEquals(100, $img->height());
+
+		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+		$this->assertTrue($img->fitIn(840, 840));
+		$this->assertEquals(840, $img->width());
+		$this->assertEquals(525, $img->height());
+
+		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
+		$this->assertTrue($img->fitIn(200, 250));
+		$this->assertEquals(200, $img->width());
+		$this->assertEquals(200, $img->height());
+	}
+}
diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php
new file mode 100644
index 0000000000000000000000000000000000000000..12eac818f84c5c7520c122c122dd2a23343e2282
--- /dev/null
+++ b/tests/lib/l10n.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas MÃ¼ller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_L10n extends PHPUnit_Framework_TestCase {
+
+	public function testGermanPluralTranslations() {
+		$l = new OC_L10N('test');
+		$transFile = OC::$SERVERROOT.'/tests/data/l10n/de.php';
+
+		$l->load($transFile);
+		$this->assertEquals('1 Datei', (string)$l->n('%n file', '%n files', 1));
+		$this->assertEquals('2 Dateien', (string)$l->n('%n file', '%n files', 2));
+	}
+
+	public function testRussianPluralTranslations() {
+		$l = new OC_L10N('test');
+		$transFile = OC::$SERVERROOT.'/tests/data/l10n/ru.php';
+
+		$l->load($transFile);
+		$this->assertEquals('1 Ñ„Ð°Ð¹Ð»', (string)$l->n('%n file', '%n files', 1));
+		$this->assertEquals('2 Ñ„Ð°Ð¹Ð»Ð°', (string)$l->n('%n file', '%n files', 2));
+		$this->assertEquals('6 Ñ„Ð°Ð¹Ð»Ð¾Ð²', (string)$l->n('%n file', '%n files', 6));
+		$this->assertEquals('21 Ñ„Ð°Ð¹Ð»', (string)$l->n('%n file', '%n files', 21));
+		$this->assertEquals('22 Ñ„Ð°Ð¹Ð»Ð°', (string)$l->n('%n file', '%n files', 22));
+		$this->assertEquals('26 Ñ„Ð°Ð¹Ð»Ð¾Ð²', (string)$l->n('%n file', '%n files', 26));
+
+		/*
+		  1 file	1 Ñ„Ð°Ð¹Ð»	1 Ð¿Ð°Ð¿ÐºÐ°
+		2-4 files	2-4 Ñ„Ð°Ð¹Ð»Ð°	2-4 Ð¿Ð°Ð¿ÐºÐ¸
+		5-20 files	5-20 Ñ„Ð°Ð¹Ð»Ð¾Ð²	5-20 Ð¿Ð°Ð¿Ð¾Ðº
+		21 files	21 Ñ„Ð°Ð¹Ð»	21 Ð¿Ð°Ð¿ÐºÐ°
+		22-24 files	22-24 Ñ„Ð°Ð¹Ð»Ð°	22-24 Ð¿Ð°Ð¿ÐºÐ¸
+		25-30 files	25-30 Ñ„Ð°Ð¹Ð»Ð¾Ð²	25-30 Ð¿Ð°Ð¿Ð¾Ðº
+		etc
+		100 files	100 Ñ„Ð°Ð¹Ð»Ð¾Ð²,	100 Ð¿Ð°Ð¿Ð¾Ðº
+		1000 files	1000 Ñ„Ð°Ð¹Ð»Ð¾Ð²	1000 Ð¿Ð°Ð¿Ð¾Ðº
+		*/
+	}
+
+	public function testCzechPluralTranslations() {
+		$l = new OC_L10N('test');
+		$transFile = OC::$SERVERROOT.'/tests/data/l10n/cs.php';
+
+		$l->load($transFile);
+		$this->assertEquals('1 okno', (string)$l->n('%n window', '%n windows', 1));
+		$this->assertEquals('2 okna', (string)$l->n('%n window', '%n windows', 2));
+		$this->assertEquals('5 oken', (string)$l->n('%n window', '%n windows', 5));
+	}
+
+	/**
+	 * Issue #4360: Do not call strtotime() on numeric strings.
+	 */
+	public function testNumericStringToDateTime() {
+		$l = new OC_L10N('test');
+		$this->assertSame('February 13, 2009 23:31', $l->l('datetime', '1234567890'));
+	}
+
+	public function testNumericToDateTime() {
+		$l = new OC_L10N('test');
+		$this->assertSame('February 13, 2009 23:31', $l->l('datetime', 1234567890));
+	}
+}
diff --git a/tests/lib/memcache/apc.php b/tests/lib/memcache/apc.php
new file mode 100644
index 0000000000000000000000000000000000000000..e5d753a4fa5e27381651fd1643238bc0eaacadd4
--- /dev/null
+++ b/tests/lib/memcache/apc.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Memcache;
+
+class APC extends Cache {
+	public function setUp() {
+		if(!\OC\Memcache\APC::isAvailable()) {
+			$this->markTestSkipped('The apc extension is not available.');
+			return;
+		}
+		if(\OC\Memcache\APCu::isAvailable()) {
+			$this->markTestSkipped('The apc extension is emulated by ACPu.');
+			return;
+		}
+		$this->instance=new \OC\Memcache\APC(uniqid());
+	}
+}
diff --git a/tests/lib/memcache/apcu.php b/tests/lib/memcache/apcu.php
new file mode 100644
index 0000000000000000000000000000000000000000..7b99e7cd5e0fcd95fe2d03ff22f2aeedf23b95a4
--- /dev/null
+++ b/tests/lib/memcache/apcu.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Memcache;
+
+class APCu extends Cache {
+	public function setUp() {
+		if(!\OC\Memcache\APCu::isAvailable()) {
+			$this->markTestSkipped('The APCu extension is not available.');
+			return;
+		}
+		$this->instance=new \OC\Memcache\APCu(uniqid());
+	}
+}
diff --git a/tests/lib/memcache/cache.php b/tests/lib/memcache/cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..d07c492cef01d05814e7fd76d5cf3025ce2ec0cb
--- /dev/null
+++ b/tests/lib/memcache/cache.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Memcache;
+
+abstract class Cache extends \Test_Cache {
+	public function testExistsAfterSet() {
+		$this->assertFalse($this->instance->hasKey('foo'));
+		$this->instance->set('foo', 'bar');
+		$this->assertTrue($this->instance->hasKey('foo'));
+	}
+
+	public function testGetAfterSet() {
+		$this->assertNull($this->instance->get('foo'));
+		$this->instance->set('foo', 'bar');
+		$this->assertEquals('bar', $this->instance->get('foo'));
+	}
+
+	public function testDoesNotExistAfterRemove() {
+		$this->instance->set('foo', 'bar');
+		$this->instance->remove('foo');
+		$this->assertFalse($this->instance->hasKey('foo'));
+	}
+
+	public function testArrayAccessSet() {
+		$this->instance['foo'] = 'bar';
+		$this->assertEquals('bar', $this->instance->get('foo'));
+	}
+
+	public function testArrayAccessGet() {
+		$this->instance->set('foo', 'bar');
+		$this->assertEquals('bar', $this->instance['foo']);
+	}
+
+	public function testArrayAccessExists() {
+		$this->assertFalse(isset($this->instance['foo']));
+		$this->instance->set('foo', 'bar');
+		$this->assertTrue(isset($this->instance['foo']));
+	}
+
+	public function testArrayAccessUnset() {
+		$this->instance->set('foo', 'bar');
+		unset($this->instance['foo']);
+		$this->assertFalse($this->instance->hasKey('foo'));
+	}
+
+	public function tearDown() {
+		if ($this->instance) {
+			$this->instance->clear();
+		}
+	}
+}
diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b38ae8ef3c54b3e92011ceb55b13b23efba0453
--- /dev/null
+++ b/tests/lib/memcache/memcached.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Memcache;
+
+class Memcached extends Cache {
+	public function setUp() {
+		if (!\OC\Memcache\Memcached::isAvailable()) {
+			$this->markTestSkipped('The memcached extension is not available.');
+			return;
+		}
+		$this->instance = new \OC\Memcache\Memcached(uniqid());
+	}
+}
diff --git a/tests/lib/memcache/xcache.php b/tests/lib/memcache/xcache.php
new file mode 100644
index 0000000000000000000000000000000000000000..f59afda396664ec1c63e94a7c37816a80cd21ba1
--- /dev/null
+++ b/tests/lib/memcache/xcache.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Memcache;
+
+class XCache extends Cache {
+	public function setUp() {
+		if (!\OC\Memcache\XCache::isAvailable()) {
+			$this->markTestSkipped('The xcache extension is not available.');
+			return;
+		}
+		$this->instance = new \OC\Memcache\XCache(uniqid());
+	}
+}
diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
new file mode 100644
index 0000000000000000000000000000000000000000..612cc81926ba8e33302513f89b5dde73d42e2617
--- /dev/null
+++ b/tests/lib/preferences.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright (c) 2013 Christopher SchÃ¤pers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Preferences extends PHPUnit_Framework_TestCase {
+	public static function setUpBeforeClass() {
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)');
+		$query->execute(array("Someuser", "someapp", "somekey", "somevalue"));
+
+		$query->execute(array("Someuser", "getusersapp", "somekey", "somevalue"));
+		$query->execute(array("Anotheruser", "getusersapp", "somekey", "someothervalue"));
+		$query->execute(array("Anuser", "getusersapp", "somekey", "somevalue"));
+
+		$query->execute(array("Someuser", "getappsapp", "somekey", "somevalue"));
+
+		$query->execute(array("Someuser", "getkeysapp", "firstkey", "somevalue"));
+		$query->execute(array("Someuser", "getkeysapp", "anotherkey", "somevalue"));
+		$query->execute(array("Someuser", "getkeysapp", "key-tastic", "somevalue"));
+
+		$query->execute(array("Someuser", "getvalueapp", "key", "a value for a key"));
+
+		$query->execute(array("Deleteuser", "deleteapp", "deletekey", "somevalue"));
+		$query->execute(array("Deleteuser", "deleteapp", "somekey", "somevalue"));
+		$query->execute(array("Deleteuser", "someapp", "somekey", "somevalue"));
+	}
+
+	public static function tearDownAfterClass() {
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?');
+		$query->execute(array('Someuser'));
+		$query->execute(array('Anotheruser'));
+		$query->execute(array('Anuser'));
+	}
+
+	public function testGetUsers() {
+		$query = \OC_DB::prepare('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`');
+		$result = $query->execute();
+		$expected = array();
+		while ($row = $result->fetchRow()) {
+			$expected[] = $row['userid'];
+		}
+
+		$this->assertEquals($expected, \OC_Preferences::getUsers());
+	}
+
+	public function testGetApps() {
+		$query = \OC_DB::prepare('SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?');
+		$result = $query->execute(array('Someuser'));
+		$expected = array();
+		while ($row = $result->fetchRow()) {
+			$expected[] = $row['appid'];
+		}
+
+		$this->assertEquals($expected, \OC_Preferences::getApps('Someuser'));
+	}
+
+	public function testGetKeys() {
+		$query = \OC_DB::prepare('SELECT DISTINCT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?');
+		$result = $query->execute(array('Someuser', 'getkeysapp'));
+		$expected = array();
+		while ($row = $result->fetchRow()) {
+			$expected[] = $row['configkey'];
+		}
+
+		$this->assertEquals($expected, \OC_Preferences::getKeys('Someuser', 'getkeysapp'));
+	}
+
+	public function testGetValue() {
+		$this->assertNull(\OC_Preferences::getValue('nonexistant', 'nonexistant', 'nonexistant'));
+
+		$this->assertEquals('default', \OC_Preferences::getValue('nonexistant', 'nonexistant', 'nonexistant', 'default'));
+
+		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?');
+		$result = $query->execute(array('Someuser', 'getvalueapp', 'key'));
+		$row = $result->fetchRow();
+		$expected = $row['configvalue'];
+		$this->assertEquals($expected, \OC_Preferences::getValue('Someuser', 'getvalueapp', 'key'));
+	}
+
+	public function testSetValue() {
+		$this->assertTrue(\OC_Preferences::setValue('Someuser', 'setvalueapp', 'newkey', 'newvalue'));
+		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?');
+		$result = $query->execute(array('Someuser', 'setvalueapp', 'newkey'));
+		$row = $result->fetchRow();
+		$value = $row['configvalue'];
+		$this->assertEquals('newvalue', $value);
+
+		$this->assertTrue(\OC_Preferences::setValue('Someuser', 'setvalueapp', 'newkey', 'othervalue'));
+		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?');
+		$result = $query->execute(array('Someuser', 'setvalueapp', 'newkey'));
+		$row = $result->fetchRow();
+		$value = $row['configvalue'];
+		$this->assertEquals('othervalue', $value);
+	}
+
+	public function testDeleteKey() {
+		$this->assertTrue(\OC_Preferences::deleteKey('Deleteuser', 'deleteapp', 'deletekey'));
+		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?');
+		$result = $query->execute(array('Deleteuser', 'deleteapp', 'deletekey'));
+		$this->assertEquals(0, $result->numRows());
+	}
+
+	public function testDeleteApp() {
+		$this->assertTrue(\OC_Preferences::deleteApp('Deleteuser', 'deleteapp'));
+		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?');
+		$result = $query->execute(array('Deleteuser', 'deleteapp'));
+		$this->assertEquals(0, $result->numRows());
+	}
+
+	public function testDeleteUser() {
+		$this->assertTrue(\OC_Preferences::deleteUser('Deleteuser'));
+		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?');
+		$result = $query->execute(array('Deleteuser'));
+		$this->assertEquals(0, $result->numRows());
+	}
+
+	public function testDeleteAppFromAllUsers() {
+		$this->assertTrue(\OC_Preferences::deleteAppFromAllUsers('someapp'));
+		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `appid` = ?');
+		$result = $query->execute(array('someapp'));
+		$this->assertEquals(0, $result->numRows());
+	}
+}
diff --git a/tests/lib/template/resourcelocator.php b/tests/lib/template/resourcelocator.php
new file mode 100644
index 0000000000000000000000000000000000000000..d80d222e2c96039d0a084858f5fe4a4bbab23244
--- /dev/null
+++ b/tests/lib/template/resourcelocator.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_ResourceLocator extends PHPUnit_Framework_TestCase {
+	public function getResourceLocator( $theme, $form_factor, $core_map, $party_map, $appsroots ) {
+		return $this->getMockForAbstractClass('OC\Template\ResourceLocator',
+			array( $theme, $form_factor, $core_map, $party_map, $appsroots ),
+			'', true, true, true, array());
+	}
+
+	public function testConstructor() {
+		$locator = $this->getResourceLocator('theme', 'form_factor',
+			array('core'=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
+		$this->assertAttributeEquals('theme', 'theme', $locator);
+		$this->assertAttributeEquals('form_factor', 'form_factor', $locator);
+		$this->assertAttributeEquals('core', 'serverroot', $locator);
+		$this->assertAttributeEquals(array('core'=>'map','3rd'=>'party'), 'mapping', $locator);
+		$this->assertAttributeEquals('3rd', 'thirdpartyroot', $locator);
+		$this->assertAttributeEquals('map', 'webroot', $locator);
+		$this->assertAttributeEquals(array(), 'resources', $locator);
+	}
+
+	public function testFind() {
+		$locator = $this->getResourceLocator('theme', 'form_factor',
+			array('core'=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
+		$locator->expects($this->once())
+			->method('doFind')
+			->with('foo');
+		$locator->expects($this->once())
+			->method('doFindTheme')
+			->with('foo');
+		$locator->find(array('foo'));
+
+		$locator = $this->getResourceLocator('theme', 'form_factor',
+			array('core'=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
+		$locator->expects($this->once())
+			->method('doFind')
+			->with('foo')
+			->will($this->throwException(new Exception('test')));
+		try {
+			$locator->find(array('foo'));
+		} catch (\Exception $e) {
+			$this->assertEquals('test formfactor:form_factor serverroot:core', $e->getMessage());
+		}
+	}
+
+	public function testAppendIfExist() {
+		$locator = $this->getResourceLocator('theme', 'form_factor',
+			array(__DIR__=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
+		$method = new ReflectionMethod($locator, 'appendIfExist');
+		$method->setAccessible(true);
+
+		$method->invoke($locator, __DIR__, basename(__FILE__), 'webroot');
+		$resource1 = array(__DIR__, 'webroot', basename(__FILE__));
+		$this->assertEquals(array($resource1), $locator->getResources());
+
+		$method->invoke($locator, __DIR__, basename(__FILE__));
+		$resource2 = array(__DIR__, 'map', basename(__FILE__));
+		$this->assertEquals(array($resource1, $resource2), $locator->getResources());
+
+		$method->invoke($locator, __DIR__, 'does-not-exist');
+		$this->assertEquals(array($resource1, $resource2), $locator->getResources());
+	}
+}
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 9742d57ac7a9ba57d7783966d1b50bdece147908..13aa49c8c6f606164a657e08ad1664e4c588bd82 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -7,13 +7,27 @@
  */
 
 class Test_Util extends PHPUnit_Framework_TestCase {
+	public function testGetVersion() {
+		$version = \OC_Util::getVersion();
+		$this->assertTrue(is_array($version));
+		foreach ($version as $num) {
+			$this->assertTrue(is_int($num));
+		}
+	}
 
-	// Constructor
-	function Test_Util() {
-		date_default_timezone_set("UTC");
+	public function testGetVersionString() {
+		$version = \OC_Util::getVersionString();
+		$this->assertTrue(is_string($version));
+	}
+
+	public function testGetEditionString() {
+		$edition = \OC_Util::getEditionString();
+		$this->assertTrue(is_string($edition));
 	}
 
 	function testFormatDate() {
+		date_default_timezone_set("UTC");
+
 		$result = OC_Util::formatDate(1350129205);
 		$expected = 'October 13, 2012 11:53';
 		$this->assertEquals($expected, $result);
@@ -44,6 +58,19 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		$this->assertEquals("/%C2%A7%23%40test%25%26%5E%C3%A4/-child", $result);
 	}
 
+	public function testFileInfoLoaded() {
+		$expected = function_exists('finfo_open');
+		$this->assertEquals($expected, \OC_Util::fileInfoLoaded());
+	}
+
+	public function testIsInternetConnectionEnabled() {
+		\OC_Config::setValue("has_internet_connection", false);
+		$this->assertFalse(\OC_Util::isInternetConnectionEnabled());
+
+		\OC_Config::setValue("has_internet_connection", true);
+		$this->assertTrue(\OC_Util::isInternetConnectionEnabled());
+	}
+
 	function testGenerate_random_bytes() {
 		$result = strlen(OC_Util::generate_random_bytes(59));
 		$this->assertEquals(59, $result);
@@ -61,8 +88,28 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		OC_Config::deleteKey('mail_domain');
 	}
 
-  function testGetInstanceIdGeneratesValidId() {
-    OC_Config::deleteKey('instanceid');
-    $this->assertStringStartsWith('oc', OC_Util::getInstanceId());
-  }
+	function testGetInstanceIdGeneratesValidId() {
+		OC_Config::deleteKey('instanceid');
+		$this->assertStringStartsWith('oc', OC_Util::getInstanceId());
+	}
+
+	/**
+	 * @dataProvider baseNameProvider
+	 */
+	public function testBaseName($expected, $file)
+	{
+		$base = \OC_Util::basename($file);
+		$this->assertEquals($expected, $base);
+	}
+
+	public function baseNameProvider()
+	{
+		return array(
+			array('public_html', '/home/user/public_html/'),
+			array('public_html', '/home/user/public_html'),
+			array('', '/'),
+			array('public_html', 'public_html'),
+			array('442aa682de2a64db1e010f50e60fd9c9', 'local::C:\Users\ADMINI~1\AppData\Local\Temp\2/442aa682de2a64db1e010f50e60fd9c9/')
+		);
+	}
 }
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 23b2d6c0060f293df7de59ce17f587d7182c2324..a893e96ad9722525ac382b3b13c514d8f94e2433 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <phpunit bootstrap="bootstrap.php"
 		 strict="true"
+		 verbose="true"
 		 timeoutForSmallTests="900"
 		 timeoutForMediumTests="900"
 		 timeoutForLargeTests="900"
diff --git a/upgrade.php b/upgrade.php
new file mode 100644
index 0000000000000000000000000000000000000000..518b514cd8a61de61b6a93059c9da6c60ca60726
--- /dev/null
+++ b/upgrade.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Arthur Schiwon
+* @copyright 2013 Arthur Schiwon blizzz@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+$RUNTIME_NOAPPS = true; //no apps, yet
+
+require_once 'lib/base.php';
+
+// Don't do anything if ownCloud has not been installed
+if(!OC_Config::getValue('installed', false)) {
+	exit(0);
+}
+
+$br = OC::$CLI ? PHP_EOL : '<br/>';
+
+if(OC::checkUpgrade(false)) {
+	$updater = new \OC\Updater();
+
+	$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($br) {
+		echo 'Turned on maintenance mode'.$br;
+	});
+	$updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($br) {
+		echo 'Turned off maintenance mode'.$br;
+		echo 'Update successful'.$br;
+	});
+		$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($br) {
+		echo 'Updated database'.$br;
+	});
+	$updater->listen('\OC\Updater', 'filecacheStart', function () use ($br) {
+		echo 'Updating filecache, this may take really long...'.$br;
+	});
+	$updater->listen('\OC\Updater', 'filecacheDone', function () use ($br) {
+		echo 'Updated filecache'.$br;
+	});
+	$updater->listen('\OC\Updater', 'filecacheProgress', function ($out)
+		use ($br) {
+		echo '... ' . $out . '% done ...'.$br;
+	});
+
+	$updater->listen('\OC\Updater', 'failure', function ($message) use ($br) {
+		echo $message.$br;
+		OC_Config::setValue('maintenance', false);
+	});
+
+	$updater->upgrade();
+} else {
+	if(OC_Config::getValue('maintenance', false)) {
+		//Possible scenario: ownCloud core is updated but an app failed
+		echo 'ownCloud is in maintenance mode'.$br;
+		echo 'Maybe an upgrade is already in process. Please check the '
+			. 'logfile (data/owncloud.log). If you want to re-run the '
+			. 'upgrade procedure, remove the "maintenance mode" from '
+			. 'config.php and call this script again.'
+			.$br;
+	} else {
+		echo 'ownCloud is already latest version'.$br;
+	}
+}